From: Michael Tokarev <mjt@tls.msk.ru>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
"Michael Tokarev" <mjt@tls.msk.ru>
Subject: [Stable-7.2.11 44/59] hw/virtio: Introduce virtio_bh_new_guarded() helper
Date: Thu, 18 Apr 2024 23:02:04 +0300 [thread overview]
Message-ID: <20240418200224.952785-3-mjt@tls.msk.ru> (raw)
In-Reply-To: <qemu-stable-7.2.11-20240418230159@cover.tls.msk.ru>
From: Philippe Mathieu-Daudé <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>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20240409105537.18308-2-philmd@linaro.org>
(cherry picked from commit ec0504b989ca61e03636384d3602b7bf07ffe4da)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(Mjt: trivial #include context fixup in include/hw/virtio/virtio.h)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index e4f8ed1e63..4a35d7cb0c 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -5029,3 +5029,13 @@ static void virtio_register_types(void)
}
type_init(virtio_register_types)
+
+QEMUBH *virtio_bh_new_guarded_full(DeviceState *dev,
+ QEMUBHFunc *cb, void *opaque,
+ const char *name)
+{
+ DeviceState *transport = qdev_get_parent_bus(dev)->parent;
+
+ return qemu_bh_new_full(cb, opaque, name,
+ &transport->mem_reentrancy_guard);
+}
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 96a56430a6..c1a7c9bd3b 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -23,6 +23,7 @@
#include "standard-headers/linux/virtio_ring.h"
#include "qom/object.h"
#include "hw/virtio/vhost.h"
+#include "block/aio.h"
/*
* A guest should never accept this. It implies negotiation is broken
@@ -463,4 +464,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(DeviceState *dev,
+ QEMUBHFunc *cb, void *opaque,
+ const char *name);
+#define virtio_bh_new_guarded(dev, cb, opaque) \
+ virtio_bh_new_guarded_full((dev), (cb), (opaque), (stringify(cb)))
+
#endif
--
2.39.2
next prev parent reply other threads:[~2024-04-18 20:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 20:02 [Stable-7.2.11 v2 00/59] Patch Round-up for stable 7.2.11, freeze on 2024-04-20 Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 42/59] tcg/optimize: Do not attempt to constant fold neg_vec Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 43/59] linux-user: Fix waitid return of siginfo_t and rusage Michael Tokarev
2024-04-18 20:02 ` Michael Tokarev [this message]
2024-04-18 20:02 ` [Stable-7.2.11 45/59] hw/display/virtio-gpu: Protect from DMA re-entrancy bugs Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 46/59] hw/char/virtio-serial-bus: " Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 47/59] hw/virtio/virtio-crypto: " Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 48/59] qemu-options: Fix CXL Fixed Memory Window interleave-granularity typo Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 49/59] hw/block/nand: Factor nand_load_iolen() method out Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 50/59] hw/block/nand: Have blk_load() take unsigned offset and return boolean Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 51/59] hw/block/nand: Fix out-of-bound access in NAND block buffer Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 52/59] hw/misc/applesmc: Fix memory leak in reset() handler Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 53/59] backends/cryptodev: Do not abort for invalid session ID Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 54/59] hw/net/lan9118: Fix overflow in MIL TX FIFO Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 55/59] hw/net/lan9118: Replace magic '2048' value by MIL_TXFIFO_SIZE definition Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 56/59] hw/sd/sdhci: Do not update TRNMOD when Command Inhibit (DAT) is set Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 57/59] target/sh4: add missing CHECK_NOT_DELAY_SLOT Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 58/59] ppc/spapr: Introduce SPAPR_IRQ_NR_IPIS to refer IRQ range for CPU IPIs Michael Tokarev
2024-04-18 20:02 ` [Stable-7.2.11 59/59] ppc/spapr: Initialize max_cpus limit to SPAPR_IRQ_NR_IPIS Michael Tokarev
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=20240418200224.952785-3-mjt@tls.msk.ru \
--to=mjt@tls.msk.ru \
--cc=kraxel@redhat.com \
--cc=mst@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.