util/vfio-helpers.c: Use ram_block_discard_disable() in qemu_vfio_open_pci()
PATCH 1/1 util/vfio-helpers.c: Use ram_block_discard_disable() in qemu_vfio_open_pci()
Currently, when using "nvme://" for a block device, like
-drive file=nvme://0000:01:00.0/1,if=none,id=drive0 \
-device virtio-blk,drive=drive0 \VFIO may pin all guest memory, and discarding of RAM no longer works as expected. I was able to reproduce this easily with my
01:00.0 Non-Volatile memory controller: Samsung Electronics Co Ltd
NVMe SSD Controller SM981/PM981/PM983
Similar to common VFIO, we have to disable it, making sure that:
a) virtio-balloon won't discard any memory ("silently disabled")
b) virtio-mem and nvme:// run mutually exclusive
--- stubs/ram-block.c | 6 ++++++ util/vfio-helpers.c | 14 ++++++++++++++ 2 files changed, 20 insertions(+)
stubs/ram-block.c +6 -0
@@ -1,6 +1,7 @@#include "qemu/osdep.h" #include "exec/ramlist.h" #include "exec/cpu-common.h" +#include "exec/memory.h" void *qemu_ram_get_host_addr (RAMBlock *rb) {
@@ -29,3 +30,8 @@ int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) {return 0 ; } + +int ram_block_discard_disable (bool state) +{ +return 0 ; +}
util/vfio-helpers.c +14 -0
@@ -16,6 +16,7 @@#include "qapi/error.h" #include "exec/ramlist.h" #include "exec/cpu-common.h" +#include "exec/memory.h" #include "trace.h" #include "qemu/error-report.h" #include "standard-headers/linux/pci_regs.h"
@@ -494,8 +495,20 @@ QEMUVFIOState *qemu_vfio_open_pci(const char *device, Error **errp)int r;QEMUVFIOState *s =g_new0 (QEMUVFIOState,1 ); +/* +* VFIO may pin all memory inside mappings, resulting it in pinning +* all memory inside RAM blocks unconditionally. +*/ + r =ram_block_discard_disable (true); +if (r) { +error_setg_errno (errp, -r,"Cannot set discarding of RAM broken" ); +g_free (s); +return NULL ; + } + r =qemu_vfio_init_pci (s, device, errp);if (r) { +ram_block_discard_disable (false);g_free (s);return NULL ; }
@@ -837,4 +850,5 @@ void qemu_vfio_close(QEMUVFIOState *s)close (s->device);close (s->group);close (s->container); +ram_block_discard_disable (false); }
Signature · 1 line
2.26.2
Hi David,
Is this aiming at 5.2?
Quoted 88 lines · David Hildenbrand
Currently, when using "nvme://" for a block device, like
-drive file=nvme://0000:01:00.0/1,if=none,id=drive0 \ -device virtio-blk,drive=drive0 \VFIO may pin all guest memory, and discarding of RAM no longer works as expected. I was able to reproduce this easily with my
01:00.0 Non-Volatile memory controller: Samsung Electronics Co Ltd
NVMe SSD Controller SM981/PM981/PM983Similar to common VFIO, we have to disable it, making sure that:
a) virtio-balloon won't discard any memory ("silently disabled")
b) virtio-mem and nvme:// run mutually exclusiveCc Paolo Bonzini <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Alex Williamson <[email protected]>Cc Wei Yang <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Cc Igor Mammedov <[email protected]>Cc Pankaj Gupta <[email protected]>Cc Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- stubs/ram-block.c | 6 ++++++ util/vfio-helpers.c | 14 ++++++++++++++ 2 files changed, 20 insertions(+)stubs/ram-block.c +6
-0@@ -1,6 +1,7 @@#include "qemu/osdep.h" #include "exec/ramlist.h" #include "exec/cpu-common.h" +#include "exec/memory.h" void *qemu_ram_get_host_addr (RAMBlock *rb) {@@ -29,3 +30,8 @@ int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) {return 0 ; } + +int ram_block_discard_disable (bool state) +{ +return 0 ; +}util/vfio-helpers.c +14
-0@@ -16,6 +16,7 @@#include "qapi/error.h" #include "exec/ramlist.h" #include "exec/cpu-common.h" +#include "exec/memory.h" #include "trace.h" #include "qemu/error-report.h" #include "standard-headers/linux/pci_regs.h" @@ -494,8 +495,20 @@ QEMUVFIOState *qemu_vfio_open_pci(const char *device, Error **errp)int r;QEMUVFIOState *s =g_new0 (QEMUVFIOState,1 ); +/* +* VFIO may pin all memory inside mappings, resulting it in pinning +* all memory inside RAM blocks unconditionally. +*/ + r =ram_block_discard_disable (true); +if (r) { +error_setg_errno (errp, -r,"Cannot set discarding of RAM broken" ); +g_free (s); +return NULL ; + } + r =qemu_vfio_init_pci (s, device, errp);if (r) { +ram_block_discard_disable (false);g_free (s);return NULL ; }@@ -837,4 +850,5 @@ void qemu_vfio_close(QEMUVFIOState *s)close (s->device);close (s->group);close (s->container); +ram_block_discard_disable (false); }
Quoted 3 lines · Philippe Mathieu-Daudé
Hi David,
Is this aiming at 5.2?
Hi,
Good point!
If possible, we want this in 5.2.
Thanks!
Quoted 91 lines · David Hildenbrand
Quoted 88 lines
Currently, when using "nvme://" for a block device, like
-drive file=nvme://0000:01:00.0/1,if=none,id=drive0 \ -device virtio-blk,drive=drive0 \VFIO may pin all guest memory, and discarding of RAM no longer works as expected. I was able to reproduce this easily with my
01:00.0 Non-Volatile memory controller: Samsung Electronics Co Ltd
NVMe SSD Controller SM981/PM981/PM983Similar to common VFIO, we have to disable it, making sure that:
a) virtio-balloon won't discard any memory ("silently disabled")
b) virtio-mem and nvme:// run mutually exclusiveCc Paolo Bonzini <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Alex Williamson <[email protected]>Cc Wei Yang <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Cc Igor Mammedov <[email protected]>Cc Pankaj Gupta <[email protected]>Cc Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- stubs/ram-block.c | 6 ++++++ util/vfio-helpers.c | 14 ++++++++++++++ 2 files changed, 20 insertions(+)stubs/ram-block.c +6
-0@@ -1,6 +1,7 @@#include "qemu/osdep.h" #include "exec/ramlist.h" #include "exec/cpu-common.h" +#include "exec/memory.h" void *qemu_ram_get_host_addr (RAMBlock *rb) {@@ -29,3 +30,8 @@ int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) {return 0 ; } + +int ram_block_discard_disable (bool state) +{ +return 0 ; +}util/vfio-helpers.c +14
-0@@ -16,6 +16,7 @@#include "qapi/error.h" #include "exec/ramlist.h" #include "exec/cpu-common.h" +#include "exec/memory.h" #include "trace.h" #include "qemu/error-report.h" #include "standard-headers/linux/pci_regs.h" @@ -494,8 +495,20 @@ QEMUVFIOState *qemu_vfio_open_pci(const char *device, Error **errp)int r;QEMUVFIOState *s =g_new0 (QEMUVFIOState,1 ); +/* +* VFIO may pin all memory inside mappings, resulting it in pinning +* all memory inside RAM blocks unconditionally. +*/ + r =ram_block_discard_disable (true); +if (r) { +error_setg_errno (errp, -r,"Cannot set discarding of RAM broken" ); +g_free (s); +return NULL ; + } + r =qemu_vfio_init_pci (s, device, errp);if (r) { +ram_block_discard_disable (false);g_free (s);return NULL ; }@@ -837,4 +850,5 @@ void qemu_vfio_close(QEMUVFIOState *s)close (s->device);close (s->group);close (s->container); +ram_block_discard_disable (false); }
Signature · 3 lines
Thanks, David / dhildenb
Paolo Bonzini
AppliedQuoted 83 lines · David Hildenbrand
Currently, when using "nvme://" for a block device, like
-drive file=nvme://0000:01:00.0/1,if=none,id=drive0 \ -device virtio-blk,drive=drive0 \VFIO may pin all guest memory, and discarding of RAM no longer works as expected. I was able to reproduce this easily with my
01:00.0 Non-Volatile memory controller: Samsung Electronics Co Ltd
NVMe SSD Controller SM981/PM981/PM983Similar to common VFIO, we have to disable it, making sure that:
a) virtio-balloon won't discard any memory ("silently disabled")
b) virtio-mem and nvme:// run mutually exclusiveCc Paolo Bonzini <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Alex Williamson <[email protected]>Cc Wei Yang <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Cc Igor Mammedov <[email protected]>Cc Pankaj Gupta <[email protected]>Cc Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- stubs/ram-block.c | 6 ++++++ util/vfio-helpers.c | 14 ++++++++++++++ 2 files changed, 20 insertions(+)stubs/ram-block.c +6
-0@@ -1,6 +1,7 @@#include "qemu/osdep.h" #include "exec/ramlist.h" #include "exec/cpu-common.h" +#include "exec/memory.h" void *qemu_ram_get_host_addr (RAMBlock *rb) {@@ -29,3 +30,8 @@ int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) {return 0 ; } + +int ram_block_discard_disable (bool state) +{ +return 0 ; +}util/vfio-helpers.c +13
-0@@ -16,6 +16,7 @@#include "qapi/error.h" #include "exec/ramlist.h" #include "exec/cpu-common.h" +#include "exec/memory.h" #include "trace.h" #include "qemu/error-report.h" #include "standard-headers/linux/pci_regs.h" @@ -494,8 +495,20 @@ QEMUVFIOState *qemu_vfio_open_pci(const char *device, Error **errp)int r;QEMUVFIOState *s =g_new0 (QEMUVFIOState,1 ); +/* +* VFIO may pin all memory inside mappings, resulting it in pinning +* all memory inside RAM blocks unconditionally. +*/ + r =ram_block_discard_disable (true); +if (r) { +error_setg_errno (errp, -r,"Cannot set discarding of RAM broken" ); +g_free (s); +return NULL ; + } + r =qemu_vfio_init_pci (s, device, errp);if (r) { +ram_block_discard_disable (false);g_free (s);return NULL ; }
util/vfio-helpers.c void qemu_vfio_close(QEMUVFIOState *s) · line 854
Quoted 5 lines
util/vfio-helpers.c +1
-0@@ -837,4 +850,5 @@ void qemu_vfio_close(QEMUVFIOState *s)close (s->device);close (s->group);close (s->container); +ram_block_discard_disable (false); }
Queued, thanks.
Paolo