From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Gerd Hoffmann" <kraxel@redhat.com>,
"Amit Shah" <amit@kernel.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Alexander Bulekov" <alxndr@bu.edu>,
"Gonglei (Arei)" <arei.gonglei@huawei.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Mauro Matteo Cascella" <mcascell@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH-for-9.0 1/4] hw/virtio: Introduce virtio_bh_new_guarded() helper
Date: Thu, 4 Apr 2024 21:13:36 +0200 [thread overview]
Message-ID: <20240404191339.5688-2-philmd@linaro.org> (raw)
In-Reply-To: <20240404191339.5688-1-philmd@linaro.org>
Introduce virtio_bh_new_guarded(), similar to qemu_bh_new_guarded()
but using the transport memory guard, instead of the device one
(there can only be one virtio device per virtio bus).
Inspired-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/virtio/virtio.h | 7 +++++++
hw/virtio/virtio.c | 10 ++++++++++
2 files changed, 17 insertions(+)
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index b3c74a1bca..12419d6355 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -22,6 +22,7 @@
#include "standard-headers/linux/virtio_config.h"
#include "standard-headers/linux/virtio_ring.h"
#include "qom/object.h"
+#include "block/aio.h"
/*
* A guest should never accept this. It implies negotiation is broken
@@ -527,4 +528,10 @@ static inline bool virtio_device_disabled(VirtIODevice *vdev)
bool virtio_legacy_allowed(VirtIODevice *vdev);
bool virtio_legacy_check_disabled(VirtIODevice *vdev);
+QEMUBH *virtio_bh_new_guarded_full(VirtIODevice *vdev,
+ QEMUBHFunc *cb, void *opaque,
+ const char *name);
+#define virtio_bh_new_guarded(vdev, cb, opaque) \
+ virtio_bh_new_guarded_full((vdev), (cb), (opaque), (stringify(cb)))
+
#endif
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index fb6b4ccd83..e1735cf7fd 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -4176,3 +4176,13 @@ static void virtio_register_types(void)
}
type_init(virtio_register_types)
+
+QEMUBH *virtio_bh_new_guarded_full(VirtIODevice *vdev,
+ QEMUBHFunc *cb, void *opaque,
+ const char *name)
+{
+ BusState *virtio_bus = qdev_get_parent_bus(DEVICE(vdev));
+ DeviceState *transport = virtio_bus->parent;
+
+ return qemu_bh_new_full(cb, opaque, name, &transport->mem_reentrancy_guard);
+}
--
2.41.0
next prev parent reply other threads:[~2024-04-04 19:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-04 19:13 [PATCH-for-9.0 0/4] hw/virtio: Protect from more DMA re-entrancy bugs Philippe Mathieu-Daudé
2024-04-04 19:13 ` Philippe Mathieu-Daudé [this message]
2024-04-04 19:13 ` [PATCH-for-9.0 2/4] hw/display/virtio-gpu: Protect from " Philippe Mathieu-Daudé
2024-04-04 19:13 ` [PATCH-for-9.0 3/4] hw/char/virtio-serial-bus: " Philippe Mathieu-Daudé
2024-04-08 7:14 ` Philippe Mathieu-Daudé
2024-04-08 10:08 ` Michael S. Tsirkin
2024-04-08 11:04 ` Philippe Mathieu-Daudé
2024-04-08 15:20 ` Michael S. Tsirkin
2024-04-08 18:22 ` Philippe Mathieu-Daudé
2024-04-04 19:13 ` [PATCH-for-9.0 4/4] hw/virtio/virtio-crypto: " Philippe Mathieu-Daudé
2024-04-05 7:02 ` [PATCH-for-9.0 0/4] hw/virtio: Protect from more " Gerd Hoffmann
2024-04-08 7:37 ` Mauro Matteo Cascella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240404191339.5688-2-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=alxndr@bu.edu \
--cc=amit@kernel.org \
--cc=arei.gonglei@huawei.com \
--cc=kraxel@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mcascell@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).