[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 09/14] vdpa: disable RAM block discard only for the first devi
From: |
Eugenio Pérez |
Subject: |
[PATCH v5 09/14] vdpa: disable RAM block discard only for the first device |
Date: |
Fri, 3 Mar 2023 18:24:40 +0100 |
Although it does not make a big difference, its more correct and
simplifies the cleanup path in subsequent patches.
Move ram_block_discard_disable(false) call to the top of
vhost_vdpa_cleanup because:
* We cannot use vhost_vdpa_first_dev after dev->opaque = NULL
assignment.
* Improve the stack order in cleanup: since it is the last action taken
in init, it should be the first at cleanup.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-vdpa.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index c9a82ce5e0..49afa59261 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -431,16 +431,6 @@ static int vhost_vdpa_init(struct vhost_dev *dev, void
*opaque, Error **errp)
trace_vhost_vdpa_init(dev, opaque);
int ret;
- /*
- * Similar to VFIO, we end up pinning all guest memory and have to
- * disable discarding of RAM.
- */
- ret = ram_block_discard_disable(true);
- if (ret) {
- error_report("Cannot set discarding of RAM broken");
- return ret;
- }
-
v = opaque;
v->dev = dev;
dev->opaque = opaque ;
@@ -452,6 +442,16 @@ static int vhost_vdpa_init(struct vhost_dev *dev, void
*opaque, Error **errp)
return 0;
}
+ /*
+ * Similar to VFIO, we end up pinning all guest memory and have to
+ * disable discarding of RAM.
+ */
+ ret = ram_block_discard_disable(true);
+ if (ret) {
+ error_report("Cannot set discarding of RAM broken");
+ return ret;
+ }
+
vhost_vdpa_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE |
VIRTIO_CONFIG_S_DRIVER);
@@ -577,12 +577,15 @@ static int vhost_vdpa_cleanup(struct vhost_dev *dev)
assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_VDPA);
v = dev->opaque;
trace_vhost_vdpa_cleanup(dev, v);
+ if (vhost_vdpa_first_dev(dev)) {
+ ram_block_discard_disable(false);
+ }
+
vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs);
memory_listener_unregister(&v->listener);
vhost_vdpa_svq_cleanup(dev);
dev->opaque = NULL;
- ram_block_discard_disable(false);
return 0;
}
--
2.31.1
- [PATCH v5 00/14] Dynamically switch to vhost shadow virtqueues at vdpa net migration, Eugenio Pérez, 2023/03/03
- [PATCH v5 01/14] vdpa net: move iova tree creation from init to start, Eugenio Pérez, 2023/03/03
- [PATCH v5 02/14] vdpa: Remember last call fd set, Eugenio Pérez, 2023/03/03
- [PATCH v5 05/14] vdpa: add vhost_vdpa->suspended parameter, Eugenio Pérez, 2023/03/03
- [PATCH v5 04/14] vdpa: rewind at get_base, not set_base, Eugenio Pérez, 2023/03/03
- [PATCH v5 06/14] vdpa: add vhost_vdpa_suspend, Eugenio Pérez, 2023/03/03
- [PATCH v5 07/14] vdpa: move vhost reset after get vring base, Eugenio Pérez, 2023/03/03
- [PATCH v5 03/14] vdpa: Negotiate _F_SUSPEND feature, Eugenio Pérez, 2023/03/03
- [PATCH v5 08/14] vdpa: add vdpa net migration state notifier, Eugenio Pérez, 2023/03/03
- [PATCH v5 09/14] vdpa: disable RAM block discard only for the first device,
Eugenio Pérez <=
- [PATCH v5 10/14] vdpa net: block migration if the device has CVQ, Eugenio Pérez, 2023/03/03
- [PATCH v5 11/14] vdpa: block migration if device has unsupported features, Eugenio Pérez, 2023/03/03
- [PATCH v5 13/14] vdpa net: allow VHOST_F_LOG_ALL, Eugenio Pérez, 2023/03/03
- [PATCH v5 12/14] vdpa: block migration if SVQ does not admit a feature, Eugenio Pérez, 2023/03/03
- [PATCH v5 14/14] vdpa: return VHOST_F_LOG_ALL in vhost-vdpa devices, Eugenio Pérez, 2023/03/03
- Re: [PATCH v5 00/14] Dynamically switch to vhost shadow virtqueues at vdpa net migration, Lei Yang, 2023/03/07