mirror of https://gitee.com/openkylin/libvirt.git
qemu: fix memlock without vIOMMU
When there is no vIOMMU, vfio devices don't need to lock the entire guest
memory per-device, but they still need to lock the entire guest memory to
share between all vfio devices. This memory accounting is not shared
with vDPA devices, so it should be added to the memlock limit separately.
Commit 8d5704e2
added support for multiple vfio/vdpa devices but
calculated the limits incorrectly when there were both vdpa and vfio
devices and no vIOMMU. In this case, the memory lock limit was not
increased separately for the vfio devices.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2143838
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
parent
3211895be3
commit
2a2d586043
|
@ -9470,10 +9470,14 @@ qemuDomainGetMemLockLimitBytes(virDomainDef *def,
|
|||
*/
|
||||
int factor = nvdpa;
|
||||
|
||||
if (def->iommu)
|
||||
if (nvfio || forceVFIO) {
|
||||
if (nvfio && def->iommu)
|
||||
factor += nvfio;
|
||||
else
|
||||
factor += 1;
|
||||
}
|
||||
|
||||
memKB = MAX(factor, 1) * virDomainDefGetMemoryTotal(def) + 1024 * 1024;
|
||||
memKB = factor * virDomainDefGetMemoryTotal(def) + 1024 * 1024;
|
||||
}
|
||||
|
||||
return memKB << 10;
|
||||
|
|
Loading…
Reference in New Issue