[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/5] hw/virtio: Remove NULL check in virtio_free_region_cache(
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 3/5] hw/virtio: Remove NULL check in virtio_free_region_cache() |
Date: |
Thu, 2 Sep 2021 18:50:37 +0200 |
virtio_free_region_cache() is called within call_rcu(),
always with a non-NULL argument. Ensure new code keep it
that way by replacing the NULL check by an assertion.
Add a comment this function is called within call_rcu().
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Worth mentioning the left-over from c611c76417f?
("virtio: add MemoryListener to cache ring translations")
---
hw/virtio/virtio.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index b37344bb5e1..97f60017466 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -133,12 +133,10 @@ struct VirtQueue
QLIST_ENTRY(VirtQueue) node;
};
+/* Called within call_rcu(). */
static void virtio_free_region_cache(VRingMemoryRegionCaches *caches)
{
- if (!caches) {
- return;
- }
-
+ assert(caches != NULL);
address_space_cache_destroy(&caches->desc);
address_space_cache_destroy(&caches->avail);
address_space_cache_destroy(&caches->used);
--
2.31.1
- [PATCH v2 0/5] hw/virtio: Minor housekeeping patches, Philippe Mathieu-Daudé, 2021/09/02
- [PATCH v2 1/5] hw/virtio: Document virtio_queue_packed_empty_rcu is called within RCU, Philippe Mathieu-Daudé, 2021/09/02
- [PATCH v2 2/5] hw/virtio: Comment virtqueue_flush() must be called with RCU read lock, Philippe Mathieu-Daudé, 2021/09/02
- [PATCH v2 3/5] hw/virtio: Remove NULL check in virtio_free_region_cache(),
Philippe Mathieu-Daudé <=
- [PATCH v2 4/5] hw/virtio: Acquire RCU read lock in virtqueue_packed_drop_all(), Philippe Mathieu-Daudé, 2021/09/02
- [PATCH v2 5/5] hw/virtio: Have virtqueue_get_avail_bytes() pass caches arg to callees, Philippe Mathieu-Daudé, 2021/09/02
- Re: [PATCH v2 0/5] hw/virtio: Minor housekeeping patches, Michael S. Tsirkin, 2021/09/05