0b5938814d
- hw/sd/sdhci: Do not update TRNMOD when Command Inhibit (DAT) is set(CVE-2024-3447) - hw/virtio/virtio-crypto: Protect from DMA re-entrancy bugs(CVE-2024-3446) - hw/char/virtio-serial-bus: Protect from DMA re-entrancy bugs(CVE-2024-3446) - hw/display/virtio-gpu: Protect from DMA re-entrancy bugs(CVE-2024-3446) - hw/virtio: Introduce virtio_bh_new_guarded() helper - hw/net/net_tx_pkt: Fix overrun in update_sctp_checksum() - hw/nvme: fix -Werror=maybe-uninitialized - block/virtio-blk: Fix memory leak from virtio_blk_zone_report - hw/net/virtio-net: fix qemu set used ring flag even vhost started - hw/scsi/scsi-generic: Fix io_timeout property not applying - tests: bios-tables-test: Rename smbios type 4 related test functions Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
68 lines
2.4 KiB
Diff
68 lines
2.4 KiB
Diff
From 8c1ad2043705184da00d39250402a70f403d14a7 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
|
|
Date: Thu, 4 Apr 2024 20:56:11 +0200
|
|
Subject: [PATCH] hw/virtio: Introduce virtio_bh_new_guarded() helper
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
---
|
|
hw/virtio/virtio.c | 10 ++++++++++
|
|
include/hw/virtio/virtio.h | 7 +++++++
|
|
2 files changed, 17 insertions(+)
|
|
|
|
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
|
|
index d00effe4d5..202aae868e 100644
|
|
--- a/hw/virtio/virtio.c
|
|
+++ b/hw/virtio/virtio.c
|
|
@@ -4148,3 +4148,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 e612441357..60494aed62 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
|
|
@@ -510,4 +511,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.27.0
|
|
|