include/block/aio.h | 8 ++++---- include/hw/virtio/virtio.h | 2 +- include/qemu/main-loop.h | 3 +-- block/linux-aio.c | 6 +++--- block/nvme.c | 8 ++++---- block/win32-aio.c | 4 ++-- hw/hyperv/hyperv.c | 6 +++--- hw/hyperv/hyperv_testdev.c | 5 +++-- hw/hyperv/vmbus.c | 8 ++++---- hw/nvme/ctrl.c | 8 ++++---- hw/usb/ccid-card-emulated.c | 5 +++-- hw/virtio/vhost-shadow-virtqueue.c | 11 ++++++----- hw/virtio/vhost.c | 5 +++-- hw/virtio/virtio.c | 26 ++++++++++++++------------ tests/unit/test-aio.c | 9 +++++---- tests/unit/test-nested-aio-poll.c | 8 ++++---- util/aio-posix.c | 14 ++++++-------- util/aio-win32.c | 10 +++++----- util/async.c | 6 +++--- util/main-loop.c | 3 +-- 20 files changed, 79 insertions(+), 76 deletions(-)
aio_set_event_notifier() and aio_set_event_notifier_poll() in
util/aio-posix.c and util/aio-win32.c are casting function pointers of
functions that take an "EventNotifier *" pointer as parameter to function
pointers that take a "void *" pointer as parameter (i.e. the IOHandler
type). When those function pointers are later used to call the referenced
function, this triggers undefined behavior errors with the latest version
of Clang in Fedora 40 when compiling with the option "-fsanitize=undefined".
And this also prevents enabling the strict mode of CFI which is currently
disabled with -fsanitize-cfi-icall-generalize-pointers. Thus let us avoid
the problem by using "void *" as parameter in all spots where it is needed.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
Yes, I know, the patch looks ugly ... but I don't see a better way to
tackle this. If someone has a better idea, suggestions are welcome!
include/block/aio.h | 8 ++++----
include/hw/virtio/virtio.h | 2 +-
include/qemu/main-loop.h | 3 +--
block/linux-aio.c | 6 +++---
block/nvme.c | 8 ++++----
block/win32-aio.c | 4 ++--
hw/hyperv/hyperv.c | 6 +++---
hw/hyperv/hyperv_testdev.c | 5 +++--
hw/hyperv/vmbus.c | 8 ++++----
hw/nvme/ctrl.c | 8 ++++----
hw/usb/ccid-card-emulated.c | 5 +++--
hw/virtio/vhost-shadow-virtqueue.c | 11 ++++++-----
hw/virtio/vhost.c | 5 +++--
hw/virtio/virtio.c | 26 ++++++++++++++------------
tests/unit/test-aio.c | 9 +++++----
tests/unit/test-nested-aio-poll.c | 8 ++++----
util/aio-posix.c | 14 ++++++--------
util/aio-win32.c | 10 +++++-----
util/async.c | 6 +++---
util/main-loop.c | 3 +--
20 files changed, 79 insertions(+), 76 deletions(-)
diff --git a/include/block/aio.h b/include/block/aio.h
index 8378553eb9..01e7ea069d 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -476,9 +476,9 @@ void aio_set_fd_handler(AioContext *ctx,
*/
void aio_set_event_notifier(AioContext *ctx,
EventNotifier *notifier,
- EventNotifierHandler *io_read,
+ IOHandler *io_read,
AioPollFn *io_poll,
- EventNotifierHandler *io_poll_ready);
+ IOHandler *io_poll_ready);
/*
* Set polling begin/end callbacks for an event notifier that has already been
@@ -491,8 +491,8 @@ void aio_set_event_notifier(AioContext *ctx,
*/
void aio_set_event_notifier_poll(AioContext *ctx,
EventNotifier *notifier,
- EventNotifierHandler *io_poll_begin,
- EventNotifierHandler *io_poll_end);
+ IOHandler *io_poll_begin,
+ IOHandler *io_poll_end);
/* Return a GSource that lets the main loop poll the file descriptors attached
* to this AioContext.
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 7d5ffdc145..e98cecfdd7 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -396,7 +396,7 @@ void virtio_device_release_ioeventfd(VirtIODevice *vdev);
bool virtio_device_ioeventfd_enabled(VirtIODevice *vdev);
EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq);
void virtio_queue_set_host_notifier_enabled(VirtQueue *vq, bool enabled);
-void virtio_queue_host_notifier_read(EventNotifier *n);
+void virtio_queue_host_notifier_read(void *n);
void virtio_queue_aio_attach_host_notifier(VirtQueue *vq, AioContext *ctx);
void virtio_queue_aio_attach_host_notifier_no_poll(VirtQueue *vq, AioContext *ctx);
void virtio_queue_aio_detach_host_notifier(VirtQueue *vq, AioContext *ctx);
diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
index 5764db157c..ba73a0c6da 100644
--- a/include/qemu/main-loop.h
+++ b/include/qemu/main-loop.h
@@ -241,8 +241,7 @@ void qemu_set_fd_handler(int fd,
* @handler: A level-triggered callback that is fired when @e
* has been set. @e is passed to it as a parameter.
*/
-void event_notifier_set_handler(EventNotifier *e,
- EventNotifierHandler *handler);
+void event_notifier_set_handler(EventNotifier *e, IOHandler *handler);
GSource *iohandler_get_g_source(void);
AioContext *iohandler_get_aio_context(void);
diff --git a/block/linux-aio.c b/block/linux-aio.c
index ec05d946f3..61f796f7e0 100644
--- a/block/linux-aio.c
+++ b/block/linux-aio.c
@@ -253,9 +253,9 @@ static void qemu_laio_completion_bh(void *opaque)
qemu_laio_process_completions_and_submit(s);
}
-static void qemu_laio_completion_cb(EventNotifier *e)
+static void qemu_laio_completion_cb(void *e)
{
- LinuxAioState *s = container_of(e, LinuxAioState, e);
+ LinuxAioState *s = container_of((EventNotifier *)e, LinuxAioState, e);
if (event_notifier_test_and_clear(&s->e)) {
qemu_laio_process_completions_and_submit(s);
@@ -271,7 +271,7 @@ static bool qemu_laio_poll_cb(void *opaque)
return io_getevents_peek(s->ctx, &events);
}
-static void qemu_laio_poll_ready(EventNotifier *opaque)
+static void qemu_laio_poll_ready(void *opaque)
{
EventNotifier *e = opaque;
LinuxAioState *s = container_of(e, LinuxAioState, e);
diff --git a/block/nvme.c b/block/nvme.c
index 3a3c6da73d..6c254de2a1 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -656,9 +656,9 @@ static void nvme_poll_queues(BDRVNVMeState *s)
}
}
-static void nvme_handle_event(EventNotifier *n)
+static void nvme_handle_event(void *n)
{
- BDRVNVMeState *s = container_of(n, BDRVNVMeState,
+ BDRVNVMeState *s = container_of((EventNotifier *)n, BDRVNVMeState,
irq_notifier[MSIX_SHARED_IRQ_IDX]);
trace_nvme_handle_event(s);
@@ -732,9 +732,9 @@ static bool nvme_poll_cb(void *opaque)
return false;
}
-static void nvme_poll_ready(EventNotifier *e)
+static void nvme_poll_ready(void *e)
{
- BDRVNVMeState *s = container_of(e, BDRVNVMeState,
+ BDRVNVMeState *s = container_of((EventNotifier *)e, BDRVNVMeState,
irq_notifier[MSIX_SHARED_IRQ_IDX]);
nvme_poll_queues(s);
diff --git a/block/win32-aio.c b/block/win32-aio.c
index 6327861e1d..0c276028cd 100644
--- a/block/win32-aio.c
+++ b/block/win32-aio.c
@@ -92,9 +92,9 @@ static void win32_aio_process_completion(QEMUWin32AIOState *s,
qemu_aio_unref(waiocb);
}
-static void win32_aio_completion_cb(EventNotifier *e)
+static void win32_aio_completion_cb(void *e)
{
- QEMUWin32AIOState *s = container_of(e, QEMUWin32AIOState, e);
+ QEMUWin32AIOState *s = container_of((EventNotifier *)e, QEMUWin32AIOState, e);
DWORD count;
ULONG_PTR key;
OVERLAPPED *ov;
diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c
index 483dcca308..c4a27e3529 100644
--- a/hw/hyperv/hyperv.c
+++ b/hw/hyperv/hyperv.c
@@ -329,10 +329,10 @@ int hyperv_post_msg(HvSintRoute *sint_route, struct hyperv_message *src_msg)
return 0;
}
-static void sint_ack_handler(EventNotifier *notifier)
+static void sint_ack_handler(void *notifier)
{
- HvSintRoute *sint_route = container_of(notifier, HvSintRoute,
- sint_ack_notifier);
+ HvSintRoute *sint_route = container_of((EventNotifier *)notifier,
+ HvSintRoute, sint_ack_notifier);
event_notifier_test_and_clear(notifier);
/*
diff --git a/hw/hyperv/hyperv_testdev.c b/hw/hyperv/hyperv_testdev.c
index 9a56ddf83f..d1d6b9fa4c 100644
--- a/hw/hyperv/hyperv_testdev.c
+++ b/hw/hyperv/hyperv_testdev.c
@@ -190,9 +190,10 @@ static void msg_conn_destroy(HypervTestDev *dev, uint8_t conn_id)
assert(false);
}
-static void evt_conn_handler(EventNotifier *notifier)
+static void evt_conn_handler(void *notifier)
{
- TestEvtConn *conn = container_of(notifier, TestEvtConn, notifier);
+ TestEvtConn *conn = container_of((EventNotifier *)notifier, TestEvtConn,
+ notifier);
event_notifier_test_and_clear(notifier);
diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c
index 490d805d29..f7e1595ac0 100644
--- a/hw/hyperv/vmbus.c
+++ b/hw/hyperv/vmbus.c
@@ -1273,9 +1273,9 @@ void vmbus_free_req(void *req)
g_free(req);
}
-static void channel_event_cb(EventNotifier *e)
+static void channel_event_cb(void *e)
{
- VMBusChannel *chan = container_of(e, VMBusChannel, notifier);
+ VMBusChannel *chan = container_of((EventNotifier *)e, VMBusChannel, notifier);
if (event_notifier_test_and_clear(e)) {
/*
* All receives are supposed to happen within the device worker, so
@@ -2225,10 +2225,10 @@ static void vmbus_resched(VMBus *vmbus)
aio_bh_schedule_oneshot(qemu_get_aio_context(), vmbus_run, vmbus);
}
-static void vmbus_signal_event(EventNotifier *e)
+static void vmbus_signal_event(void *e)
{
VMBusChannel *chan;
- VMBus *vmbus = container_of(e, VMBus, notifier);
+ VMBus *vmbus = container_of((EventNotifier *)e, VMBus, notifier);
unsigned long *int_map;
hwaddr addr, len;
bool is_dirty = false;
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 127c3d2383..c53adf3489 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -4486,9 +4486,9 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest *req)
return NVME_INVALID_OPCODE | NVME_DNR;
}
-static void nvme_cq_notifier(EventNotifier *e)
+static void nvme_cq_notifier(void *e)
{
- NvmeCQueue *cq = container_of(e, NvmeCQueue, notifier);
+ NvmeCQueue *cq = container_of((EventNotifier *)e, NvmeCQueue, notifier);
NvmeCtrl *n = cq->ctrl;
if (!event_notifier_test_and_clear(e)) {
@@ -4526,9 +4526,9 @@ static int nvme_init_cq_ioeventfd(NvmeCQueue *cq)
return 0;
}
-static void nvme_sq_notifier(EventNotifier *e)
+static void nvme_sq_notifier(void *e)
{
- NvmeSQueue *sq = container_of(e, NvmeSQueue, notifier);
+ NvmeSQueue *sq = container_of((EventNotifier *)e, NvmeSQueue, notifier);
if (!event_notifier_test_and_clear(e)) {
return;
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index 3ee9c73b87..98246363b9 100644
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -360,9 +360,10 @@ static void *event_thread(void *arg)
return NULL;
}
-static void card_event_handler(EventNotifier *notifier)
+static void card_event_handler(void *notifier)
{
- EmulatedState *card = container_of(notifier, EmulatedState, notifier);
+ EmulatedState *card = container_of((EventNotifier *)notifier,
+ EmulatedState, notifier);
EmulEvent *event, *next;
event_notifier_test_and_clear(&card->notifier);
diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c
index fc5f408f77..c9d8418c00 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -351,9 +351,10 @@ static void vhost_handle_guest_kick(VhostShadowVirtqueue *svq)
*
* @n: guest kick event notifier, the one that guest set to notify svq.
*/
-static void vhost_handle_guest_kick_notifier(EventNotifier *n)
+static void vhost_handle_guest_kick_notifier(void *n)
{
- VhostShadowVirtqueue *svq = container_of(n, VhostShadowVirtqueue, svq_kick);
+ VhostShadowVirtqueue *svq = container_of((EventNotifier *)n,
+ VhostShadowVirtqueue, svq_kick);
event_notifier_test_and_clear(n);
vhost_handle_guest_kick(svq);
}
@@ -556,10 +557,10 @@ size_t vhost_svq_poll(VhostShadowVirtqueue *svq, size_t num)
* Note that we are not making any buffers available in the loop, there is no
* way that it runs more than virtqueue size times.
*/
-static void vhost_svq_handle_call(EventNotifier *n)
+static void vhost_svq_handle_call(void *n)
{
- VhostShadowVirtqueue *svq = container_of(n, VhostShadowVirtqueue,
- hdev_call);
+ VhostShadowVirtqueue *svq = container_of((EventNotifier *)n,
+ VhostShadowVirtqueue, hdev_call);
event_notifier_test_and_clear(n);
vhost_svq_flush(svq, true);
}
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 4acd77e890..e624dfafc0 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1363,9 +1363,10 @@ static int vhost_virtqueue_set_busyloop_timeout(struct vhost_dev *dev,
return 0;
}
-static void vhost_virtqueue_error_notifier(EventNotifier *n)
+static void vhost_virtqueue_error_notifier(void *n)
{
- struct vhost_virtqueue *vq = container_of(n, struct vhost_virtqueue,
+ struct vhost_virtqueue *vq = container_of((EventNotifier *)n,
+ struct vhost_virtqueue,
error_notifier);
struct vhost_dev *dev = vq->dev;
int index = vq - dev->vqs;
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 893a072c9d..80589b4823 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -3480,16 +3480,17 @@ uint16_t virtio_get_queue_index(VirtQueue *vq)
return vq->queue_index;
}
-static void virtio_queue_guest_notifier_read(EventNotifier *n)
+static void virtio_queue_guest_notifier_read(void *n)
{
- VirtQueue *vq = container_of(n, VirtQueue, guest_notifier);
+ VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue, guest_notifier);
if (event_notifier_test_and_clear(n)) {
virtio_irq(vq);
}
}
-static void virtio_config_guest_notifier_read(EventNotifier *n)
+static void virtio_config_guest_notifier_read(void *n)
{
- VirtIODevice *vdev = container_of(n, VirtIODevice, config_notifier);
+ VirtIODevice *vdev = container_of((EventNotifier *)n, VirtIODevice,
+ config_notifier);
if (event_notifier_test_and_clear(n)) {
virtio_notify_config(vdev);
@@ -3533,9 +3534,10 @@ EventNotifier *virtio_queue_get_guest_notifier(VirtQueue *vq)
return &vq->guest_notifier;
}
-static void virtio_queue_host_notifier_aio_poll_begin(EventNotifier *n)
+static void virtio_queue_host_notifier_aio_poll_begin(void *n)
{
- VirtQueue *vq = container_of(n, VirtQueue, host_notifier);
+ VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue,
+ host_notifier);
virtio_queue_set_notification(vq, 0);
}
@@ -3548,16 +3550,16 @@ static bool virtio_queue_host_notifier_aio_poll(void *opaque)
return vq->vring.desc && !virtio_queue_empty(vq);
}
-static void virtio_queue_host_notifier_aio_poll_ready(EventNotifier *n)
+static void virtio_queue_host_notifier_aio_poll_ready(void *n)
{
- VirtQueue *vq = container_of(n, VirtQueue, host_notifier);
+ VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue, host_notifier);
virtio_queue_notify_vq(vq);
}
-static void virtio_queue_host_notifier_aio_poll_end(EventNotifier *n)
+static void virtio_queue_host_notifier_aio_poll_end(void *n)
{
- VirtQueue *vq = container_of(n, VirtQueue, host_notifier);
+ VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue, host_notifier);
/* Caller polls once more after this to catch requests that race with us */
virtio_queue_set_notification(vq, 1);
@@ -3634,9 +3636,9 @@ void virtio_queue_aio_detach_host_notifier(VirtQueue *vq, AioContext *ctx)
*/
}
-void virtio_queue_host_notifier_read(EventNotifier *n)
+void virtio_queue_host_notifier_read(void *n)
{
- VirtQueue *vq = container_of(n, VirtQueue, host_notifier);
+ VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue, host_notifier);
if (event_notifier_test_and_clear(n)) {
virtio_queue_notify_vq(vq);
}
diff --git a/tests/unit/test-aio.c b/tests/unit/test-aio.c
index e77d86be87..b83e2fdc49 100644
--- a/tests/unit/test-aio.c
+++ b/tests/unit/test-aio.c
@@ -70,7 +70,7 @@ static void timer_test_cb(void *opaque)
}
}
-static void dummy_io_handler_read(EventNotifier *e)
+static void dummy_io_handler_read(void *e)
{
}
@@ -85,9 +85,10 @@ static void bh_delete_cb(void *opaque)
}
}
-static void event_ready_cb(EventNotifier *e)
+static void event_ready_cb(void *e)
{
- EventNotifierTestData *data = container_of(e, EventNotifierTestData, e);
+ EventNotifierTestData *data = container_of((EventNotifier *)e,
+ EventNotifierTestData, e);
g_assert(event_notifier_test_and_clear(e));
data->n++;
if (data->active > 0) {
@@ -101,7 +102,7 @@ static void event_ready_cb(EventNotifier *e)
/* Tests using aio_*. */
static void set_event_notifier(AioContext *nctx, EventNotifier *notifier,
- EventNotifierHandler *handler)
+ IOHandler *handler)
{
aio_set_event_notifier(nctx, notifier, handler, NULL, NULL);
}
diff --git a/tests/unit/test-nested-aio-poll.c b/tests/unit/test-nested-aio-poll.c
index d8fd92c43b..8f30f7c7e6 100644
--- a/tests/unit/test-nested-aio-poll.c
+++ b/tests/unit/test-nested-aio-poll.c
@@ -28,7 +28,7 @@ typedef struct {
bool nested;
} TestData;
-static void io_read(EventNotifier *notifier)
+static void io_read(void *notifier)
{
event_notifier_test_and_clear(notifier);
}
@@ -43,9 +43,9 @@ static bool io_poll_false(void *opaque)
return false;
}
-static void io_poll_ready(EventNotifier *notifier)
+static void io_poll_ready(void *notifier)
{
- TestData *td = container_of(notifier, TestData, poll_notifier);
+ TestData *td = container_of((EventNotifier *)notifier, TestData, poll_notifier);
g_assert(!td->nested);
td->nested = true;
@@ -60,7 +60,7 @@ static void io_poll_ready(EventNotifier *notifier)
}
/* dummy_notifier never triggers */
-static void io_poll_never_ready(EventNotifier *notifier)
+static void io_poll_never_ready(void *notifier)
{
g_assert_not_reached();
}
diff --git a/util/aio-posix.c b/util/aio-posix.c
index 266c9dd35f..c6766daa54 100644
--- a/util/aio-posix.c
+++ b/util/aio-posix.c
@@ -194,23 +194,21 @@ static void aio_set_fd_poll(AioContext *ctx, int fd,
void aio_set_event_notifier(AioContext *ctx,
EventNotifier *notifier,
- EventNotifierHandler *io_read,
+ IOHandler *io_read,
AioPollFn *io_poll,
- EventNotifierHandler *io_poll_ready)
+ IOHandler *io_poll_ready)
{
aio_set_fd_handler(ctx, event_notifier_get_fd(notifier),
- (IOHandler *)io_read, NULL, io_poll,
- (IOHandler *)io_poll_ready, notifier);
+ io_read, NULL, io_poll, io_poll_ready, notifier);
}
void aio_set_event_notifier_poll(AioContext *ctx,
EventNotifier *notifier,
- EventNotifierHandler *io_poll_begin,
- EventNotifierHandler *io_poll_end)
+ IOHandler *io_poll_begin,
+ IOHandler *io_poll_end)
{
aio_set_fd_poll(ctx, event_notifier_get_fd(notifier),
- (IOHandler *)io_poll_begin,
- (IOHandler *)io_poll_end);
+ io_poll_begin, io_poll_end);
}
static bool poll_set_started(AioContext *ctx, AioHandlerList *ready_list,
diff --git a/util/aio-win32.c b/util/aio-win32.c
index d144f9391f..1d698ed431 100644
--- a/util/aio-win32.c
+++ b/util/aio-win32.c
@@ -28,7 +28,7 @@ struct AioHandler {
EventNotifier *e;
IOHandler *io_read;
IOHandler *io_write;
- EventNotifierHandler *io_notify;
+ IOHandler *io_notify;
GPollFD pfd;
int deleted;
void *opaque;
@@ -132,9 +132,9 @@ void aio_set_fd_handler(AioContext *ctx,
void aio_set_event_notifier(AioContext *ctx,
EventNotifier *e,
- EventNotifierHandler *io_notify,
+ IOHandler *io_notify,
AioPollFn *io_poll,
- EventNotifierHandler *io_poll_ready)
+ IOHandler *io_poll_ready)
{
AioHandler *node;
@@ -171,8 +171,8 @@ void aio_set_event_notifier(AioContext *ctx,
void aio_set_event_notifier_poll(AioContext *ctx,
EventNotifier *notifier,
- EventNotifierHandler *io_poll_begin,
- EventNotifierHandler *io_poll_end)
+ IOHandler *io_poll_begin,
+ IOHandler *io_poll_end)
{
/* Not implemented */
}
diff --git a/util/async.c b/util/async.c
index 0467890052..d606901049 100644
--- a/util/async.c
+++ b/util/async.c
@@ -520,9 +520,9 @@ static void aio_timerlist_notify(void *opaque, QEMUClockType type)
aio_notify(opaque);
}
-static void aio_context_notifier_cb(EventNotifier *e)
+static void aio_context_notifier_cb(void *e)
{
- AioContext *ctx = container_of(e, AioContext, notifier);
+ AioContext *ctx = container_of((EventNotifier *)e, AioContext, notifier);
event_notifier_test_and_clear(&ctx->notifier);
}
@@ -541,7 +541,7 @@ static bool aio_context_notifier_poll(void *opaque)
return qatomic_read(&ctx->notified);
}
-static void aio_context_notifier_poll_ready(EventNotifier *e)
+static void aio_context_notifier_poll_ready(void *e)
{
/* Do nothing, we just wanted to kick the event loop */
}
diff --git a/util/main-loop.c b/util/main-loop.c
index a0386cfeb6..035b4e5769 100644
--- a/util/main-loop.c
+++ b/util/main-loop.c
@@ -645,8 +645,7 @@ void qemu_set_fd_handler(int fd,
opaque);
}
-void event_notifier_set_handler(EventNotifier *e,
- EventNotifierHandler *handler)
+void event_notifier_set_handler(EventNotifier *e, IOHandler *handler)
{
iohandler_init();
aio_set_event_notifier(iohandler_ctx, e, handler, NULL, NULL);
--
2.45.1On Wed, May 29, 2024 at 07:49:48PM +0200, Thomas Huth wrote:
> aio_set_event_notifier() and aio_set_event_notifier_poll() in
> util/aio-posix.c and util/aio-win32.c are casting function pointers of
> functions that take an "EventNotifier *" pointer as parameter to function
> pointers that take a "void *" pointer as parameter (i.e. the IOHandler
> type). When those function pointers are later used to call the referenced
> function, this triggers undefined behavior errors with the latest version
> of Clang in Fedora 40 when compiling with the option "-fsanitize=undefined".
> And this also prevents enabling the strict mode of CFI which is currently
> disabled with -fsanitize-cfi-icall-generalize-pointers. Thus let us avoid
> the problem by using "void *" as parameter in all spots where it is needed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> Yes, I know, the patch looks ugly ... but I don't see a better way to
> tackle this. If someone has a better idea, suggestions are welcome!
>
> include/block/aio.h | 8 ++++----
> include/hw/virtio/virtio.h | 2 +-
> include/qemu/main-loop.h | 3 +--
> block/linux-aio.c | 6 +++---
> block/nvme.c | 8 ++++----
> block/win32-aio.c | 4 ++--
> hw/hyperv/hyperv.c | 6 +++---
> hw/hyperv/hyperv_testdev.c | 5 +++--
> hw/hyperv/vmbus.c | 8 ++++----
> hw/nvme/ctrl.c | 8 ++++----
> hw/usb/ccid-card-emulated.c | 5 +++--
> hw/virtio/vhost-shadow-virtqueue.c | 11 ++++++-----
> hw/virtio/vhost.c | 5 +++--
> hw/virtio/virtio.c | 26 ++++++++++++++------------
> tests/unit/test-aio.c | 9 +++++----
> tests/unit/test-nested-aio-poll.c | 8 ++++----
> util/aio-posix.c | 14 ++++++--------
> util/aio-win32.c | 10 +++++-----
> util/async.c | 6 +++---
> util/main-loop.c | 3 +--
> 20 files changed, 79 insertions(+), 76 deletions(-)
>
> diff --git a/include/block/aio.h b/include/block/aio.h
> index 8378553eb9..01e7ea069d 100644
> --- a/include/block/aio.h
> +++ b/include/block/aio.h
> @@ -476,9 +476,9 @@ void aio_set_fd_handler(AioContext *ctx,
> */
> void aio_set_event_notifier(AioContext *ctx,
> EventNotifier *notifier,
> - EventNotifierHandler *io_read,
> + IOHandler *io_read,
> AioPollFn *io_poll,
> - EventNotifierHandler *io_poll_ready);
> + IOHandler *io_poll_ready);
>
> /*
> * Set polling begin/end callbacks for an event notifier that has already been
> @@ -491,8 +491,8 @@ void aio_set_event_notifier(AioContext *ctx,
> */
> void aio_set_event_notifier_poll(AioContext *ctx,
> EventNotifier *notifier,
> - EventNotifierHandler *io_poll_begin,
> - EventNotifierHandler *io_poll_end);
> + IOHandler *io_poll_begin,
> + IOHandler *io_poll_end);
>
> /* Return a GSource that lets the main loop poll the file descriptors attached
> * to this AioContext.
> diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
> index 7d5ffdc145..e98cecfdd7 100644
> --- a/include/hw/virtio/virtio.h
> +++ b/include/hw/virtio/virtio.h
> @@ -396,7 +396,7 @@ void virtio_device_release_ioeventfd(VirtIODevice *vdev);
> bool virtio_device_ioeventfd_enabled(VirtIODevice *vdev);
> EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq);
> void virtio_queue_set_host_notifier_enabled(VirtQueue *vq, bool enabled);
> -void virtio_queue_host_notifier_read(EventNotifier *n);
> +void virtio_queue_host_notifier_read(void *n);
> void virtio_queue_aio_attach_host_notifier(VirtQueue *vq, AioContext *ctx);
> void virtio_queue_aio_attach_host_notifier_no_poll(VirtQueue *vq, AioContext *ctx);
> void virtio_queue_aio_detach_host_notifier(VirtQueue *vq, AioContext *ctx);
> diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
> index 5764db157c..ba73a0c6da 100644
> --- a/include/qemu/main-loop.h
> +++ b/include/qemu/main-loop.h
> @@ -241,8 +241,7 @@ void qemu_set_fd_handler(int fd,
> * @handler: A level-triggered callback that is fired when @e
> * has been set. @e is passed to it as a parameter.
> */
> -void event_notifier_set_handler(EventNotifier *e,
> - EventNotifierHandler *handler);
> +void event_notifier_set_handler(EventNotifier *e, IOHandler *handler);
>
> GSource *iohandler_get_g_source(void);
> AioContext *iohandler_get_aio_context(void);
> diff --git a/block/linux-aio.c b/block/linux-aio.c
> index ec05d946f3..61f796f7e0 100644
> --- a/block/linux-aio.c
> +++ b/block/linux-aio.c
> @@ -253,9 +253,9 @@ static void qemu_laio_completion_bh(void *opaque)
> qemu_laio_process_completions_and_submit(s);
> }
>
> -static void qemu_laio_completion_cb(EventNotifier *e)
> +static void qemu_laio_completion_cb(void *e)
> {
> - LinuxAioState *s = container_of(e, LinuxAioState, e);
> + LinuxAioState *s = container_of((EventNotifier *)e, LinuxAioState, e);
>
> if (event_notifier_test_and_clear(&s->e)) {
> qemu_laio_process_completions_and_submit(s);
> @@ -271,7 +271,7 @@ static bool qemu_laio_poll_cb(void *opaque)
> return io_getevents_peek(s->ctx, &events);
> }
>
> -static void qemu_laio_poll_ready(EventNotifier *opaque)
> +static void qemu_laio_poll_ready(void *opaque)
> {
> EventNotifier *e = opaque;
> LinuxAioState *s = container_of(e, LinuxAioState, e);
> diff --git a/block/nvme.c b/block/nvme.c
> index 3a3c6da73d..6c254de2a1 100644
> --- a/block/nvme.c
> +++ b/block/nvme.c
> @@ -656,9 +656,9 @@ static void nvme_poll_queues(BDRVNVMeState *s)
> }
> }
>
> -static void nvme_handle_event(EventNotifier *n)
> +static void nvme_handle_event(void *n)
> {
> - BDRVNVMeState *s = container_of(n, BDRVNVMeState,
> + BDRVNVMeState *s = container_of((EventNotifier *)n, BDRVNVMeState,
> irq_notifier[MSIX_SHARED_IRQ_IDX]);
>
> trace_nvme_handle_event(s);
> @@ -732,9 +732,9 @@ static bool nvme_poll_cb(void *opaque)
> return false;
> }
>
> -static void nvme_poll_ready(EventNotifier *e)
> +static void nvme_poll_ready(void *e)
> {
> - BDRVNVMeState *s = container_of(e, BDRVNVMeState,
> + BDRVNVMeState *s = container_of((EventNotifier *)e, BDRVNVMeState,
> irq_notifier[MSIX_SHARED_IRQ_IDX]);
>
> nvme_poll_queues(s);
> diff --git a/block/win32-aio.c b/block/win32-aio.c
> index 6327861e1d..0c276028cd 100644
> --- a/block/win32-aio.c
> +++ b/block/win32-aio.c
> @@ -92,9 +92,9 @@ static void win32_aio_process_completion(QEMUWin32AIOState *s,
> qemu_aio_unref(waiocb);
> }
>
> -static void win32_aio_completion_cb(EventNotifier *e)
> +static void win32_aio_completion_cb(void *e)
> {
> - QEMUWin32AIOState *s = container_of(e, QEMUWin32AIOState, e);
> + QEMUWin32AIOState *s = container_of((EventNotifier *)e, QEMUWin32AIOState, e);
> DWORD count;
> ULONG_PTR key;
> OVERLAPPED *ov;
> diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c
> index 483dcca308..c4a27e3529 100644
> --- a/hw/hyperv/hyperv.c
> +++ b/hw/hyperv/hyperv.c
> @@ -329,10 +329,10 @@ int hyperv_post_msg(HvSintRoute *sint_route, struct hyperv_message *src_msg)
> return 0;
> }
>
> -static void sint_ack_handler(EventNotifier *notifier)
> +static void sint_ack_handler(void *notifier)
> {
> - HvSintRoute *sint_route = container_of(notifier, HvSintRoute,
> - sint_ack_notifier);
> + HvSintRoute *sint_route = container_of((EventNotifier *)notifier,
> + HvSintRoute, sint_ack_notifier);
> event_notifier_test_and_clear(notifier);
>
> /*
> diff --git a/hw/hyperv/hyperv_testdev.c b/hw/hyperv/hyperv_testdev.c
> index 9a56ddf83f..d1d6b9fa4c 100644
> --- a/hw/hyperv/hyperv_testdev.c
> +++ b/hw/hyperv/hyperv_testdev.c
> @@ -190,9 +190,10 @@ static void msg_conn_destroy(HypervTestDev *dev, uint8_t conn_id)
> assert(false);
> }
>
> -static void evt_conn_handler(EventNotifier *notifier)
> +static void evt_conn_handler(void *notifier)
> {
> - TestEvtConn *conn = container_of(notifier, TestEvtConn, notifier);
> + TestEvtConn *conn = container_of((EventNotifier *)notifier, TestEvtConn,
> + notifier);
>
> event_notifier_test_and_clear(notifier);
>
> diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c
> index 490d805d29..f7e1595ac0 100644
> --- a/hw/hyperv/vmbus.c
> +++ b/hw/hyperv/vmbus.c
> @@ -1273,9 +1273,9 @@ void vmbus_free_req(void *req)
> g_free(req);
> }
>
> -static void channel_event_cb(EventNotifier *e)
> +static void channel_event_cb(void *e)
> {
> - VMBusChannel *chan = container_of(e, VMBusChannel, notifier);
> + VMBusChannel *chan = container_of((EventNotifier *)e, VMBusChannel, notifier);
> if (event_notifier_test_and_clear(e)) {
> /*
> * All receives are supposed to happen within the device worker, so
> @@ -2225,10 +2225,10 @@ static void vmbus_resched(VMBus *vmbus)
> aio_bh_schedule_oneshot(qemu_get_aio_context(), vmbus_run, vmbus);
> }
>
> -static void vmbus_signal_event(EventNotifier *e)
> +static void vmbus_signal_event(void *e)
> {
> VMBusChannel *chan;
> - VMBus *vmbus = container_of(e, VMBus, notifier);
> + VMBus *vmbus = container_of((EventNotifier *)e, VMBus, notifier);
> unsigned long *int_map;
> hwaddr addr, len;
> bool is_dirty = false;
> diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
> index 127c3d2383..c53adf3489 100644
> --- a/hw/nvme/ctrl.c
> +++ b/hw/nvme/ctrl.c
> @@ -4486,9 +4486,9 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest *req)
> return NVME_INVALID_OPCODE | NVME_DNR;
> }
>
> -static void nvme_cq_notifier(EventNotifier *e)
> +static void nvme_cq_notifier(void *e)
> {
> - NvmeCQueue *cq = container_of(e, NvmeCQueue, notifier);
> + NvmeCQueue *cq = container_of((EventNotifier *)e, NvmeCQueue, notifier);
> NvmeCtrl *n = cq->ctrl;
>
> if (!event_notifier_test_and_clear(e)) {
> @@ -4526,9 +4526,9 @@ static int nvme_init_cq_ioeventfd(NvmeCQueue *cq)
> return 0;
> }
>
> -static void nvme_sq_notifier(EventNotifier *e)
> +static void nvme_sq_notifier(void *e)
> {
> - NvmeSQueue *sq = container_of(e, NvmeSQueue, notifier);
> + NvmeSQueue *sq = container_of((EventNotifier *)e, NvmeSQueue, notifier);
>
> if (!event_notifier_test_and_clear(e)) {
> return;
> diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
> index 3ee9c73b87..98246363b9 100644
> --- a/hw/usb/ccid-card-emulated.c
> +++ b/hw/usb/ccid-card-emulated.c
> @@ -360,9 +360,10 @@ static void *event_thread(void *arg)
> return NULL;
> }
>
> -static void card_event_handler(EventNotifier *notifier)
> +static void card_event_handler(void *notifier)
> {
> - EmulatedState *card = container_of(notifier, EmulatedState, notifier);
> + EmulatedState *card = container_of((EventNotifier *)notifier,
> + EmulatedState, notifier);
> EmulEvent *event, *next;
>
> event_notifier_test_and_clear(&card->notifier);
> diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c
> index fc5f408f77..c9d8418c00 100644
> --- a/hw/virtio/vhost-shadow-virtqueue.c
> +++ b/hw/virtio/vhost-shadow-virtqueue.c
> @@ -351,9 +351,10 @@ static void vhost_handle_guest_kick(VhostShadowVirtqueue *svq)
> *
> * @n: guest kick event notifier, the one that guest set to notify svq.
> */
> -static void vhost_handle_guest_kick_notifier(EventNotifier *n)
> +static void vhost_handle_guest_kick_notifier(void *n)
> {
> - VhostShadowVirtqueue *svq = container_of(n, VhostShadowVirtqueue, svq_kick);
> + VhostShadowVirtqueue *svq = container_of((EventNotifier *)n,
> + VhostShadowVirtqueue, svq_kick);
> event_notifier_test_and_clear(n);
> vhost_handle_guest_kick(svq);
> }
> @@ -556,10 +557,10 @@ size_t vhost_svq_poll(VhostShadowVirtqueue *svq, size_t num)
> * Note that we are not making any buffers available in the loop, there is no
> * way that it runs more than virtqueue size times.
> */
> -static void vhost_svq_handle_call(EventNotifier *n)
> +static void vhost_svq_handle_call(void *n)
> {
> - VhostShadowVirtqueue *svq = container_of(n, VhostShadowVirtqueue,
> - hdev_call);
> + VhostShadowVirtqueue *svq = container_of((EventNotifier *)n,
> + VhostShadowVirtqueue, hdev_call);
> event_notifier_test_and_clear(n);
> vhost_svq_flush(svq, true);
> }
> diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
> index 4acd77e890..e624dfafc0 100644
> --- a/hw/virtio/vhost.c
> +++ b/hw/virtio/vhost.c
> @@ -1363,9 +1363,10 @@ static int vhost_virtqueue_set_busyloop_timeout(struct vhost_dev *dev,
> return 0;
> }
>
> -static void vhost_virtqueue_error_notifier(EventNotifier *n)
> +static void vhost_virtqueue_error_notifier(void *n)
> {
> - struct vhost_virtqueue *vq = container_of(n, struct vhost_virtqueue,
> + struct vhost_virtqueue *vq = container_of((EventNotifier *)n,
> + struct vhost_virtqueue,
> error_notifier);
> struct vhost_dev *dev = vq->dev;
> int index = vq - dev->vqs;
> diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
> index 893a072c9d..80589b4823 100644
> --- a/hw/virtio/virtio.c
> +++ b/hw/virtio/virtio.c
> @@ -3480,16 +3480,17 @@ uint16_t virtio_get_queue_index(VirtQueue *vq)
> return vq->queue_index;
> }
>
> -static void virtio_queue_guest_notifier_read(EventNotifier *n)
> +static void virtio_queue_guest_notifier_read(void *n)
> {
> - VirtQueue *vq = container_of(n, VirtQueue, guest_notifier);
> + VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue, guest_notifier);
> if (event_notifier_test_and_clear(n)) {
> virtio_irq(vq);
> }
> }
> -static void virtio_config_guest_notifier_read(EventNotifier *n)
> +static void virtio_config_guest_notifier_read(void *n)
> {
> - VirtIODevice *vdev = container_of(n, VirtIODevice, config_notifier);
> + VirtIODevice *vdev = container_of((EventNotifier *)n, VirtIODevice,
> + config_notifier);
>
> if (event_notifier_test_and_clear(n)) {
> virtio_notify_config(vdev);
> @@ -3533,9 +3534,10 @@ EventNotifier *virtio_queue_get_guest_notifier(VirtQueue *vq)
> return &vq->guest_notifier;
> }
>
> -static void virtio_queue_host_notifier_aio_poll_begin(EventNotifier *n)
> +static void virtio_queue_host_notifier_aio_poll_begin(void *n)
> {
> - VirtQueue *vq = container_of(n, VirtQueue, host_notifier);
> + VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue,
> + host_notifier);
>
> virtio_queue_set_notification(vq, 0);
> }
> @@ -3548,16 +3550,16 @@ static bool virtio_queue_host_notifier_aio_poll(void *opaque)
> return vq->vring.desc && !virtio_queue_empty(vq);
> }
>
> -static void virtio_queue_host_notifier_aio_poll_ready(EventNotifier *n)
> +static void virtio_queue_host_notifier_aio_poll_ready(void *n)
> {
> - VirtQueue *vq = container_of(n, VirtQueue, host_notifier);
> + VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue, host_notifier);
>
> virtio_queue_notify_vq(vq);
> }
>
> -static void virtio_queue_host_notifier_aio_poll_end(EventNotifier *n)
> +static void virtio_queue_host_notifier_aio_poll_end(void *n)
> {
> - VirtQueue *vq = container_of(n, VirtQueue, host_notifier);
> + VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue, host_notifier);
>
> /* Caller polls once more after this to catch requests that race with us */
> virtio_queue_set_notification(vq, 1);
> @@ -3634,9 +3636,9 @@ void virtio_queue_aio_detach_host_notifier(VirtQueue *vq, AioContext *ctx)
> */
> }
>
> -void virtio_queue_host_notifier_read(EventNotifier *n)
> +void virtio_queue_host_notifier_read(void *n)
> {
> - VirtQueue *vq = container_of(n, VirtQueue, host_notifier);
> + VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue, host_notifier);
> if (event_notifier_test_and_clear(n)) {
> virtio_queue_notify_vq(vq);
> }
> diff --git a/tests/unit/test-aio.c b/tests/unit/test-aio.c
> index e77d86be87..b83e2fdc49 100644
> --- a/tests/unit/test-aio.c
> +++ b/tests/unit/test-aio.c
> @@ -70,7 +70,7 @@ static void timer_test_cb(void *opaque)
> }
> }
>
> -static void dummy_io_handler_read(EventNotifier *e)
> +static void dummy_io_handler_read(void *e)
> {
> }
>
> @@ -85,9 +85,10 @@ static void bh_delete_cb(void *opaque)
> }
> }
>
> -static void event_ready_cb(EventNotifier *e)
> +static void event_ready_cb(void *e)
> {
> - EventNotifierTestData *data = container_of(e, EventNotifierTestData, e);
> + EventNotifierTestData *data = container_of((EventNotifier *)e,
> + EventNotifierTestData, e);
> g_assert(event_notifier_test_and_clear(e));
> data->n++;
> if (data->active > 0) {
> @@ -101,7 +102,7 @@ static void event_ready_cb(EventNotifier *e)
> /* Tests using aio_*. */
>
> static void set_event_notifier(AioContext *nctx, EventNotifier *notifier,
> - EventNotifierHandler *handler)
> + IOHandler *handler)
> {
> aio_set_event_notifier(nctx, notifier, handler, NULL, NULL);
> }
> diff --git a/tests/unit/test-nested-aio-poll.c b/tests/unit/test-nested-aio-poll.c
> index d8fd92c43b..8f30f7c7e6 100644
> --- a/tests/unit/test-nested-aio-poll.c
> +++ b/tests/unit/test-nested-aio-poll.c
> @@ -28,7 +28,7 @@ typedef struct {
> bool nested;
> } TestData;
>
> -static void io_read(EventNotifier *notifier)
> +static void io_read(void *notifier)
> {
> event_notifier_test_and_clear(notifier);
> }
> @@ -43,9 +43,9 @@ static bool io_poll_false(void *opaque)
> return false;
> }
>
> -static void io_poll_ready(EventNotifier *notifier)
> +static void io_poll_ready(void *notifier)
> {
> - TestData *td = container_of(notifier, TestData, poll_notifier);
> + TestData *td = container_of((EventNotifier *)notifier, TestData, poll_notifier);
>
> g_assert(!td->nested);
> td->nested = true;
> @@ -60,7 +60,7 @@ static void io_poll_ready(EventNotifier *notifier)
> }
>
> /* dummy_notifier never triggers */
> -static void io_poll_never_ready(EventNotifier *notifier)
> +static void io_poll_never_ready(void *notifier)
> {
> g_assert_not_reached();
> }
> diff --git a/util/aio-posix.c b/util/aio-posix.c
> index 266c9dd35f..c6766daa54 100644
> --- a/util/aio-posix.c
> +++ b/util/aio-posix.c
> @@ -194,23 +194,21 @@ static void aio_set_fd_poll(AioContext *ctx, int fd,
>
> void aio_set_event_notifier(AioContext *ctx,
> EventNotifier *notifier,
> - EventNotifierHandler *io_read,
> + IOHandler *io_read,
> AioPollFn *io_poll,
> - EventNotifierHandler *io_poll_ready)
> + IOHandler *io_poll_ready)
> {
> aio_set_fd_handler(ctx, event_notifier_get_fd(notifier),
> - (IOHandler *)io_read, NULL, io_poll,
> - (IOHandler *)io_poll_ready, notifier);
> + io_read, NULL, io_poll, io_poll_ready, notifier);
> }
>
> void aio_set_event_notifier_poll(AioContext *ctx,
> EventNotifier *notifier,
> - EventNotifierHandler *io_poll_begin,
> - EventNotifierHandler *io_poll_end)
> + IOHandler *io_poll_begin,
> + IOHandler *io_poll_end)
> {
> aio_set_fd_poll(ctx, event_notifier_get_fd(notifier),
> - (IOHandler *)io_poll_begin,
> - (IOHandler *)io_poll_end);
> + io_poll_begin, io_poll_end);
> }
>
> static bool poll_set_started(AioContext *ctx, AioHandlerList *ready_list,
> diff --git a/util/aio-win32.c b/util/aio-win32.c
> index d144f9391f..1d698ed431 100644
> --- a/util/aio-win32.c
> +++ b/util/aio-win32.c
> @@ -28,7 +28,7 @@ struct AioHandler {
> EventNotifier *e;
> IOHandler *io_read;
> IOHandler *io_write;
> - EventNotifierHandler *io_notify;
> + IOHandler *io_notify;
> GPollFD pfd;
> int deleted;
> void *opaque;
> @@ -132,9 +132,9 @@ void aio_set_fd_handler(AioContext *ctx,
>
> void aio_set_event_notifier(AioContext *ctx,
> EventNotifier *e,
> - EventNotifierHandler *io_notify,
> + IOHandler *io_notify,
> AioPollFn *io_poll,
> - EventNotifierHandler *io_poll_ready)
> + IOHandler *io_poll_ready)
> {
> AioHandler *node;
>
> @@ -171,8 +171,8 @@ void aio_set_event_notifier(AioContext *ctx,
>
> void aio_set_event_notifier_poll(AioContext *ctx,
> EventNotifier *notifier,
> - EventNotifierHandler *io_poll_begin,
> - EventNotifierHandler *io_poll_end)
> + IOHandler *io_poll_begin,
> + IOHandler *io_poll_end)
> {
> /* Not implemented */
> }
> diff --git a/util/async.c b/util/async.c
> index 0467890052..d606901049 100644
> --- a/util/async.c
> +++ b/util/async.c
> @@ -520,9 +520,9 @@ static void aio_timerlist_notify(void *opaque, QEMUClockType type)
> aio_notify(opaque);
> }
>
> -static void aio_context_notifier_cb(EventNotifier *e)
> +static void aio_context_notifier_cb(void *e)
> {
> - AioContext *ctx = container_of(e, AioContext, notifier);
> + AioContext *ctx = container_of((EventNotifier *)e, AioContext, notifier);
>
> event_notifier_test_and_clear(&ctx->notifier);
> }
> @@ -541,7 +541,7 @@ static bool aio_context_notifier_poll(void *opaque)
> return qatomic_read(&ctx->notified);
> }
>
> -static void aio_context_notifier_poll_ready(EventNotifier *e)
> +static void aio_context_notifier_poll_ready(void *e)
> {
> /* Do nothing, we just wanted to kick the event loop */
> }
> diff --git a/util/main-loop.c b/util/main-loop.c
> index a0386cfeb6..035b4e5769 100644
> --- a/util/main-loop.c
> +++ b/util/main-loop.c
> @@ -645,8 +645,7 @@ void qemu_set_fd_handler(int fd,
> opaque);
> }
>
> -void event_notifier_set_handler(EventNotifier *e,
> - EventNotifierHandler *handler)
> +void event_notifier_set_handler(EventNotifier *e, IOHandler *handler)
> {
> iohandler_init();
> aio_set_event_notifier(iohandler_ctx, e, handler, NULL, NULL);
> --
> 2.45.1
On Wed, May 29, 2024 at 07:49:48PM +0200, Thomas Huth wrote:
> aio_set_event_notifier() and aio_set_event_notifier_poll() in
> util/aio-posix.c and util/aio-win32.c are casting function pointers of
> functions that take an "EventNotifier *" pointer as parameter to function
> pointers that take a "void *" pointer as parameter (i.e. the IOHandler
> type). When those function pointers are later used to call the referenced
> function, this triggers undefined behavior errors with the latest version
> of Clang in Fedora 40 when compiling with the option "-fsanitize=undefined".
> And this also prevents enabling the strict mode of CFI which is currently
> disabled with -fsanitize-cfi-icall-generalize-pointers. Thus let us avoid
> the problem by using "void *" as parameter in all spots where it is needed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> Yes, I know, the patch looks ugly ... but I don't see a better way to
> tackle this. If someone has a better idea, suggestions are welcome!
An alternative is adding EventNotifierHandler *io_read, *io_poll_ready,
*io_poll_begin, and *io_poll_end fields to EventNotifier so that
aio_set_event_notifier() and aio_set_event_notifier_poll() can pass
helper functions to the underlying aio_set_fd_handler() and
aio_set_fd_poll() APIs. These helper functions then invoke the
EventNotifier callbacks:
/* Helpers */
static void event_notifier_io_read(void *opaque)
{
EventNotifier *notifier = opaque;
notifier->io_read(notifier);
}
static void event_notifier_io_poll_ready(void *opaque)
{
EventNotifier *notifier = opaque;
notifier->io_poll_ready(notifier);
}
void aio_set_event_notifier(AioContext *ctx,
EventNotifier *notifier,
EventNotifierHandler *io_read,
AioPollFn *io_poll,
EventNotifierHandler *io_poll_ready)
{
notifier->io_read = io_read;
notifier->io_poll_ready = io_poll_ready;
aio_set_fd_handler(ctx, event_notifier_get_fd(notifier),
io_read ? event_notifier_io_read : NULL,
NULL, io_poll,
io_poll_ready ? event_notifier_io_poll_ready : NULL,
notifier);
}
...same for aio_set_event_notifier_poll()...
This is not beautiful either but keeps the API type safe and simpler for
users.
>
> include/block/aio.h | 8 ++++----
> include/hw/virtio/virtio.h | 2 +-
> include/qemu/main-loop.h | 3 +--
> block/linux-aio.c | 6 +++---
> block/nvme.c | 8 ++++----
> block/win32-aio.c | 4 ++--
> hw/hyperv/hyperv.c | 6 +++---
> hw/hyperv/hyperv_testdev.c | 5 +++--
> hw/hyperv/vmbus.c | 8 ++++----
> hw/nvme/ctrl.c | 8 ++++----
> hw/usb/ccid-card-emulated.c | 5 +++--
> hw/virtio/vhost-shadow-virtqueue.c | 11 ++++++-----
> hw/virtio/vhost.c | 5 +++--
> hw/virtio/virtio.c | 26 ++++++++++++++------------
> tests/unit/test-aio.c | 9 +++++----
> tests/unit/test-nested-aio-poll.c | 8 ++++----
> util/aio-posix.c | 14 ++++++--------
> util/aio-win32.c | 10 +++++-----
> util/async.c | 6 +++---
> util/main-loop.c | 3 +--
> 20 files changed, 79 insertions(+), 76 deletions(-)
>
> diff --git a/include/block/aio.h b/include/block/aio.h
> index 8378553eb9..01e7ea069d 100644
> --- a/include/block/aio.h
> +++ b/include/block/aio.h
> @@ -476,9 +476,9 @@ void aio_set_fd_handler(AioContext *ctx,
> */
> void aio_set_event_notifier(AioContext *ctx,
> EventNotifier *notifier,
> - EventNotifierHandler *io_read,
> + IOHandler *io_read,
> AioPollFn *io_poll,
> - EventNotifierHandler *io_poll_ready);
> + IOHandler *io_poll_ready);
>
> /*
> * Set polling begin/end callbacks for an event notifier that has already been
> @@ -491,8 +491,8 @@ void aio_set_event_notifier(AioContext *ctx,
> */
> void aio_set_event_notifier_poll(AioContext *ctx,
> EventNotifier *notifier,
> - EventNotifierHandler *io_poll_begin,
> - EventNotifierHandler *io_poll_end);
> + IOHandler *io_poll_begin,
> + IOHandler *io_poll_end);
>
> /* Return a GSource that lets the main loop poll the file descriptors attached
> * to this AioContext.
> diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
> index 7d5ffdc145..e98cecfdd7 100644
> --- a/include/hw/virtio/virtio.h
> +++ b/include/hw/virtio/virtio.h
> @@ -396,7 +396,7 @@ void virtio_device_release_ioeventfd(VirtIODevice *vdev);
> bool virtio_device_ioeventfd_enabled(VirtIODevice *vdev);
> EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq);
> void virtio_queue_set_host_notifier_enabled(VirtQueue *vq, bool enabled);
> -void virtio_queue_host_notifier_read(EventNotifier *n);
> +void virtio_queue_host_notifier_read(void *n);
> void virtio_queue_aio_attach_host_notifier(VirtQueue *vq, AioContext *ctx);
> void virtio_queue_aio_attach_host_notifier_no_poll(VirtQueue *vq, AioContext *ctx);
> void virtio_queue_aio_detach_host_notifier(VirtQueue *vq, AioContext *ctx);
> diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
> index 5764db157c..ba73a0c6da 100644
> --- a/include/qemu/main-loop.h
> +++ b/include/qemu/main-loop.h
> @@ -241,8 +241,7 @@ void qemu_set_fd_handler(int fd,
> * @handler: A level-triggered callback that is fired when @e
> * has been set. @e is passed to it as a parameter.
> */
> -void event_notifier_set_handler(EventNotifier *e,
> - EventNotifierHandler *handler);
> +void event_notifier_set_handler(EventNotifier *e, IOHandler *handler);
>
> GSource *iohandler_get_g_source(void);
> AioContext *iohandler_get_aio_context(void);
> diff --git a/block/linux-aio.c b/block/linux-aio.c
> index ec05d946f3..61f796f7e0 100644
> --- a/block/linux-aio.c
> +++ b/block/linux-aio.c
> @@ -253,9 +253,9 @@ static void qemu_laio_completion_bh(void *opaque)
> qemu_laio_process_completions_and_submit(s);
> }
>
> -static void qemu_laio_completion_cb(EventNotifier *e)
> +static void qemu_laio_completion_cb(void *e)
> {
> - LinuxAioState *s = container_of(e, LinuxAioState, e);
> + LinuxAioState *s = container_of((EventNotifier *)e, LinuxAioState, e);
>
> if (event_notifier_test_and_clear(&s->e)) {
> qemu_laio_process_completions_and_submit(s);
> @@ -271,7 +271,7 @@ static bool qemu_laio_poll_cb(void *opaque)
> return io_getevents_peek(s->ctx, &events);
> }
>
> -static void qemu_laio_poll_ready(EventNotifier *opaque)
> +static void qemu_laio_poll_ready(void *opaque)
> {
> EventNotifier *e = opaque;
> LinuxAioState *s = container_of(e, LinuxAioState, e);
> diff --git a/block/nvme.c b/block/nvme.c
> index 3a3c6da73d..6c254de2a1 100644
> --- a/block/nvme.c
> +++ b/block/nvme.c
> @@ -656,9 +656,9 @@ static void nvme_poll_queues(BDRVNVMeState *s)
> }
> }
>
> -static void nvme_handle_event(EventNotifier *n)
> +static void nvme_handle_event(void *n)
> {
> - BDRVNVMeState *s = container_of(n, BDRVNVMeState,
> + BDRVNVMeState *s = container_of((EventNotifier *)n, BDRVNVMeState,
> irq_notifier[MSIX_SHARED_IRQ_IDX]);
>
> trace_nvme_handle_event(s);
> @@ -732,9 +732,9 @@ static bool nvme_poll_cb(void *opaque)
> return false;
> }
>
> -static void nvme_poll_ready(EventNotifier *e)
> +static void nvme_poll_ready(void *e)
> {
> - BDRVNVMeState *s = container_of(e, BDRVNVMeState,
> + BDRVNVMeState *s = container_of((EventNotifier *)e, BDRVNVMeState,
> irq_notifier[MSIX_SHARED_IRQ_IDX]);
>
> nvme_poll_queues(s);
> diff --git a/block/win32-aio.c b/block/win32-aio.c
> index 6327861e1d..0c276028cd 100644
> --- a/block/win32-aio.c
> +++ b/block/win32-aio.c
> @@ -92,9 +92,9 @@ static void win32_aio_process_completion(QEMUWin32AIOState *s,
> qemu_aio_unref(waiocb);
> }
>
> -static void win32_aio_completion_cb(EventNotifier *e)
> +static void win32_aio_completion_cb(void *e)
> {
> - QEMUWin32AIOState *s = container_of(e, QEMUWin32AIOState, e);
> + QEMUWin32AIOState *s = container_of((EventNotifier *)e, QEMUWin32AIOState, e);
> DWORD count;
> ULONG_PTR key;
> OVERLAPPED *ov;
> diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c
> index 483dcca308..c4a27e3529 100644
> --- a/hw/hyperv/hyperv.c
> +++ b/hw/hyperv/hyperv.c
> @@ -329,10 +329,10 @@ int hyperv_post_msg(HvSintRoute *sint_route, struct hyperv_message *src_msg)
> return 0;
> }
>
> -static void sint_ack_handler(EventNotifier *notifier)
> +static void sint_ack_handler(void *notifier)
> {
> - HvSintRoute *sint_route = container_of(notifier, HvSintRoute,
> - sint_ack_notifier);
> + HvSintRoute *sint_route = container_of((EventNotifier *)notifier,
> + HvSintRoute, sint_ack_notifier);
> event_notifier_test_and_clear(notifier);
>
> /*
> diff --git a/hw/hyperv/hyperv_testdev.c b/hw/hyperv/hyperv_testdev.c
> index 9a56ddf83f..d1d6b9fa4c 100644
> --- a/hw/hyperv/hyperv_testdev.c
> +++ b/hw/hyperv/hyperv_testdev.c
> @@ -190,9 +190,10 @@ static void msg_conn_destroy(HypervTestDev *dev, uint8_t conn_id)
> assert(false);
> }
>
> -static void evt_conn_handler(EventNotifier *notifier)
> +static void evt_conn_handler(void *notifier)
> {
> - TestEvtConn *conn = container_of(notifier, TestEvtConn, notifier);
> + TestEvtConn *conn = container_of((EventNotifier *)notifier, TestEvtConn,
> + notifier);
>
> event_notifier_test_and_clear(notifier);
>
> diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c
> index 490d805d29..f7e1595ac0 100644
> --- a/hw/hyperv/vmbus.c
> +++ b/hw/hyperv/vmbus.c
> @@ -1273,9 +1273,9 @@ void vmbus_free_req(void *req)
> g_free(req);
> }
>
> -static void channel_event_cb(EventNotifier *e)
> +static void channel_event_cb(void *e)
> {
> - VMBusChannel *chan = container_of(e, VMBusChannel, notifier);
> + VMBusChannel *chan = container_of((EventNotifier *)e, VMBusChannel, notifier);
> if (event_notifier_test_and_clear(e)) {
> /*
> * All receives are supposed to happen within the device worker, so
> @@ -2225,10 +2225,10 @@ static void vmbus_resched(VMBus *vmbus)
> aio_bh_schedule_oneshot(qemu_get_aio_context(), vmbus_run, vmbus);
> }
>
> -static void vmbus_signal_event(EventNotifier *e)
> +static void vmbus_signal_event(void *e)
> {
> VMBusChannel *chan;
> - VMBus *vmbus = container_of(e, VMBus, notifier);
> + VMBus *vmbus = container_of((EventNotifier *)e, VMBus, notifier);
> unsigned long *int_map;
> hwaddr addr, len;
> bool is_dirty = false;
> diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
> index 127c3d2383..c53adf3489 100644
> --- a/hw/nvme/ctrl.c
> +++ b/hw/nvme/ctrl.c
> @@ -4486,9 +4486,9 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest *req)
> return NVME_INVALID_OPCODE | NVME_DNR;
> }
>
> -static void nvme_cq_notifier(EventNotifier *e)
> +static void nvme_cq_notifier(void *e)
> {
> - NvmeCQueue *cq = container_of(e, NvmeCQueue, notifier);
> + NvmeCQueue *cq = container_of((EventNotifier *)e, NvmeCQueue, notifier);
> NvmeCtrl *n = cq->ctrl;
>
> if (!event_notifier_test_and_clear(e)) {
> @@ -4526,9 +4526,9 @@ static int nvme_init_cq_ioeventfd(NvmeCQueue *cq)
> return 0;
> }
>
> -static void nvme_sq_notifier(EventNotifier *e)
> +static void nvme_sq_notifier(void *e)
> {
> - NvmeSQueue *sq = container_of(e, NvmeSQueue, notifier);
> + NvmeSQueue *sq = container_of((EventNotifier *)e, NvmeSQueue, notifier);
>
> if (!event_notifier_test_and_clear(e)) {
> return;
> diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
> index 3ee9c73b87..98246363b9 100644
> --- a/hw/usb/ccid-card-emulated.c
> +++ b/hw/usb/ccid-card-emulated.c
> @@ -360,9 +360,10 @@ static void *event_thread(void *arg)
> return NULL;
> }
>
> -static void card_event_handler(EventNotifier *notifier)
> +static void card_event_handler(void *notifier)
> {
> - EmulatedState *card = container_of(notifier, EmulatedState, notifier);
> + EmulatedState *card = container_of((EventNotifier *)notifier,
> + EmulatedState, notifier);
> EmulEvent *event, *next;
>
> event_notifier_test_and_clear(&card->notifier);
> diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c
> index fc5f408f77..c9d8418c00 100644
> --- a/hw/virtio/vhost-shadow-virtqueue.c
> +++ b/hw/virtio/vhost-shadow-virtqueue.c
> @@ -351,9 +351,10 @@ static void vhost_handle_guest_kick(VhostShadowVirtqueue *svq)
> *
> * @n: guest kick event notifier, the one that guest set to notify svq.
> */
> -static void vhost_handle_guest_kick_notifier(EventNotifier *n)
> +static void vhost_handle_guest_kick_notifier(void *n)
> {
> - VhostShadowVirtqueue *svq = container_of(n, VhostShadowVirtqueue, svq_kick);
> + VhostShadowVirtqueue *svq = container_of((EventNotifier *)n,
> + VhostShadowVirtqueue, svq_kick);
> event_notifier_test_and_clear(n);
> vhost_handle_guest_kick(svq);
> }
> @@ -556,10 +557,10 @@ size_t vhost_svq_poll(VhostShadowVirtqueue *svq, size_t num)
> * Note that we are not making any buffers available in the loop, there is no
> * way that it runs more than virtqueue size times.
> */
> -static void vhost_svq_handle_call(EventNotifier *n)
> +static void vhost_svq_handle_call(void *n)
> {
> - VhostShadowVirtqueue *svq = container_of(n, VhostShadowVirtqueue,
> - hdev_call);
> + VhostShadowVirtqueue *svq = container_of((EventNotifier *)n,
> + VhostShadowVirtqueue, hdev_call);
> event_notifier_test_and_clear(n);
> vhost_svq_flush(svq, true);
> }
> diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
> index 4acd77e890..e624dfafc0 100644
> --- a/hw/virtio/vhost.c
> +++ b/hw/virtio/vhost.c
> @@ -1363,9 +1363,10 @@ static int vhost_virtqueue_set_busyloop_timeout(struct vhost_dev *dev,
> return 0;
> }
>
> -static void vhost_virtqueue_error_notifier(EventNotifier *n)
> +static void vhost_virtqueue_error_notifier(void *n)
> {
> - struct vhost_virtqueue *vq = container_of(n, struct vhost_virtqueue,
> + struct vhost_virtqueue *vq = container_of((EventNotifier *)n,
> + struct vhost_virtqueue,
> error_notifier);
> struct vhost_dev *dev = vq->dev;
> int index = vq - dev->vqs;
> diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
> index 893a072c9d..80589b4823 100644
> --- a/hw/virtio/virtio.c
> +++ b/hw/virtio/virtio.c
> @@ -3480,16 +3480,17 @@ uint16_t virtio_get_queue_index(VirtQueue *vq)
> return vq->queue_index;
> }
>
> -static void virtio_queue_guest_notifier_read(EventNotifier *n)
> +static void virtio_queue_guest_notifier_read(void *n)
> {
> - VirtQueue *vq = container_of(n, VirtQueue, guest_notifier);
> + VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue, guest_notifier);
> if (event_notifier_test_and_clear(n)) {
> virtio_irq(vq);
> }
> }
> -static void virtio_config_guest_notifier_read(EventNotifier *n)
> +static void virtio_config_guest_notifier_read(void *n)
> {
> - VirtIODevice *vdev = container_of(n, VirtIODevice, config_notifier);
> + VirtIODevice *vdev = container_of((EventNotifier *)n, VirtIODevice,
> + config_notifier);
>
> if (event_notifier_test_and_clear(n)) {
> virtio_notify_config(vdev);
> @@ -3533,9 +3534,10 @@ EventNotifier *virtio_queue_get_guest_notifier(VirtQueue *vq)
> return &vq->guest_notifier;
> }
>
> -static void virtio_queue_host_notifier_aio_poll_begin(EventNotifier *n)
> +static void virtio_queue_host_notifier_aio_poll_begin(void *n)
> {
> - VirtQueue *vq = container_of(n, VirtQueue, host_notifier);
> + VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue,
> + host_notifier);
>
> virtio_queue_set_notification(vq, 0);
> }
> @@ -3548,16 +3550,16 @@ static bool virtio_queue_host_notifier_aio_poll(void *opaque)
> return vq->vring.desc && !virtio_queue_empty(vq);
> }
>
> -static void virtio_queue_host_notifier_aio_poll_ready(EventNotifier *n)
> +static void virtio_queue_host_notifier_aio_poll_ready(void *n)
> {
> - VirtQueue *vq = container_of(n, VirtQueue, host_notifier);
> + VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue, host_notifier);
>
> virtio_queue_notify_vq(vq);
> }
>
> -static void virtio_queue_host_notifier_aio_poll_end(EventNotifier *n)
> +static void virtio_queue_host_notifier_aio_poll_end(void *n)
> {
> - VirtQueue *vq = container_of(n, VirtQueue, host_notifier);
> + VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue, host_notifier);
>
> /* Caller polls once more after this to catch requests that race with us */
> virtio_queue_set_notification(vq, 1);
> @@ -3634,9 +3636,9 @@ void virtio_queue_aio_detach_host_notifier(VirtQueue *vq, AioContext *ctx)
> */
> }
>
> -void virtio_queue_host_notifier_read(EventNotifier *n)
> +void virtio_queue_host_notifier_read(void *n)
> {
> - VirtQueue *vq = container_of(n, VirtQueue, host_notifier);
> + VirtQueue *vq = container_of((EventNotifier *)n, VirtQueue, host_notifier);
> if (event_notifier_test_and_clear(n)) {
> virtio_queue_notify_vq(vq);
> }
> diff --git a/tests/unit/test-aio.c b/tests/unit/test-aio.c
> index e77d86be87..b83e2fdc49 100644
> --- a/tests/unit/test-aio.c
> +++ b/tests/unit/test-aio.c
> @@ -70,7 +70,7 @@ static void timer_test_cb(void *opaque)
> }
> }
>
> -static void dummy_io_handler_read(EventNotifier *e)
> +static void dummy_io_handler_read(void *e)
> {
> }
>
> @@ -85,9 +85,10 @@ static void bh_delete_cb(void *opaque)
> }
> }
>
> -static void event_ready_cb(EventNotifier *e)
> +static void event_ready_cb(void *e)
> {
> - EventNotifierTestData *data = container_of(e, EventNotifierTestData, e);
> + EventNotifierTestData *data = container_of((EventNotifier *)e,
> + EventNotifierTestData, e);
> g_assert(event_notifier_test_and_clear(e));
> data->n++;
> if (data->active > 0) {
> @@ -101,7 +102,7 @@ static void event_ready_cb(EventNotifier *e)
> /* Tests using aio_*. */
>
> static void set_event_notifier(AioContext *nctx, EventNotifier *notifier,
> - EventNotifierHandler *handler)
> + IOHandler *handler)
> {
> aio_set_event_notifier(nctx, notifier, handler, NULL, NULL);
> }
> diff --git a/tests/unit/test-nested-aio-poll.c b/tests/unit/test-nested-aio-poll.c
> index d8fd92c43b..8f30f7c7e6 100644
> --- a/tests/unit/test-nested-aio-poll.c
> +++ b/tests/unit/test-nested-aio-poll.c
> @@ -28,7 +28,7 @@ typedef struct {
> bool nested;
> } TestData;
>
> -static void io_read(EventNotifier *notifier)
> +static void io_read(void *notifier)
> {
> event_notifier_test_and_clear(notifier);
> }
> @@ -43,9 +43,9 @@ static bool io_poll_false(void *opaque)
> return false;
> }
>
> -static void io_poll_ready(EventNotifier *notifier)
> +static void io_poll_ready(void *notifier)
> {
> - TestData *td = container_of(notifier, TestData, poll_notifier);
> + TestData *td = container_of((EventNotifier *)notifier, TestData, poll_notifier);
>
> g_assert(!td->nested);
> td->nested = true;
> @@ -60,7 +60,7 @@ static void io_poll_ready(EventNotifier *notifier)
> }
>
> /* dummy_notifier never triggers */
> -static void io_poll_never_ready(EventNotifier *notifier)
> +static void io_poll_never_ready(void *notifier)
> {
> g_assert_not_reached();
> }
> diff --git a/util/aio-posix.c b/util/aio-posix.c
> index 266c9dd35f..c6766daa54 100644
> --- a/util/aio-posix.c
> +++ b/util/aio-posix.c
> @@ -194,23 +194,21 @@ static void aio_set_fd_poll(AioContext *ctx, int fd,
>
> void aio_set_event_notifier(AioContext *ctx,
> EventNotifier *notifier,
> - EventNotifierHandler *io_read,
> + IOHandler *io_read,
> AioPollFn *io_poll,
> - EventNotifierHandler *io_poll_ready)
> + IOHandler *io_poll_ready)
> {
> aio_set_fd_handler(ctx, event_notifier_get_fd(notifier),
> - (IOHandler *)io_read, NULL, io_poll,
> - (IOHandler *)io_poll_ready, notifier);
> + io_read, NULL, io_poll, io_poll_ready, notifier);
> }
>
> void aio_set_event_notifier_poll(AioContext *ctx,
> EventNotifier *notifier,
> - EventNotifierHandler *io_poll_begin,
> - EventNotifierHandler *io_poll_end)
> + IOHandler *io_poll_begin,
> + IOHandler *io_poll_end)
> {
> aio_set_fd_poll(ctx, event_notifier_get_fd(notifier),
> - (IOHandler *)io_poll_begin,
> - (IOHandler *)io_poll_end);
> + io_poll_begin, io_poll_end);
> }
>
> static bool poll_set_started(AioContext *ctx, AioHandlerList *ready_list,
> diff --git a/util/aio-win32.c b/util/aio-win32.c
> index d144f9391f..1d698ed431 100644
> --- a/util/aio-win32.c
> +++ b/util/aio-win32.c
> @@ -28,7 +28,7 @@ struct AioHandler {
> EventNotifier *e;
> IOHandler *io_read;
> IOHandler *io_write;
> - EventNotifierHandler *io_notify;
> + IOHandler *io_notify;
> GPollFD pfd;
> int deleted;
> void *opaque;
> @@ -132,9 +132,9 @@ void aio_set_fd_handler(AioContext *ctx,
>
> void aio_set_event_notifier(AioContext *ctx,
> EventNotifier *e,
> - EventNotifierHandler *io_notify,
> + IOHandler *io_notify,
> AioPollFn *io_poll,
> - EventNotifierHandler *io_poll_ready)
> + IOHandler *io_poll_ready)
> {
> AioHandler *node;
>
> @@ -171,8 +171,8 @@ void aio_set_event_notifier(AioContext *ctx,
>
> void aio_set_event_notifier_poll(AioContext *ctx,
> EventNotifier *notifier,
> - EventNotifierHandler *io_poll_begin,
> - EventNotifierHandler *io_poll_end)
> + IOHandler *io_poll_begin,
> + IOHandler *io_poll_end)
> {
> /* Not implemented */
> }
> diff --git a/util/async.c b/util/async.c
> index 0467890052..d606901049 100644
> --- a/util/async.c
> +++ b/util/async.c
> @@ -520,9 +520,9 @@ static void aio_timerlist_notify(void *opaque, QEMUClockType type)
> aio_notify(opaque);
> }
>
> -static void aio_context_notifier_cb(EventNotifier *e)
> +static void aio_context_notifier_cb(void *e)
> {
> - AioContext *ctx = container_of(e, AioContext, notifier);
> + AioContext *ctx = container_of((EventNotifier *)e, AioContext, notifier);
>
> event_notifier_test_and_clear(&ctx->notifier);
> }
> @@ -541,7 +541,7 @@ static bool aio_context_notifier_poll(void *opaque)
> return qatomic_read(&ctx->notified);
> }
>
> -static void aio_context_notifier_poll_ready(EventNotifier *e)
> +static void aio_context_notifier_poll_ready(void *e)
> {
> /* Do nothing, we just wanted to kick the event loop */
> }
> diff --git a/util/main-loop.c b/util/main-loop.c
> index a0386cfeb6..035b4e5769 100644
> --- a/util/main-loop.c
> +++ b/util/main-loop.c
> @@ -645,8 +645,7 @@ void qemu_set_fd_handler(int fd,
> opaque);
> }
>
> -void event_notifier_set_handler(EventNotifier *e,
> - EventNotifierHandler *handler)
> +void event_notifier_set_handler(EventNotifier *e, IOHandler *handler)
> {
> iohandler_init();
> aio_set_event_notifier(iohandler_ctx, e, handler, NULL, NULL);
> --
> 2.45.1
>
On 29/05/2024 20.22, Stefan Hajnoczi wrote:
> On Wed, May 29, 2024 at 07:49:48PM +0200, Thomas Huth wrote:
>> aio_set_event_notifier() and aio_set_event_notifier_poll() in
>> util/aio-posix.c and util/aio-win32.c are casting function pointers of
>> functions that take an "EventNotifier *" pointer as parameter to function
>> pointers that take a "void *" pointer as parameter (i.e. the IOHandler
>> type). When those function pointers are later used to call the referenced
>> function, this triggers undefined behavior errors with the latest version
>> of Clang in Fedora 40 when compiling with the option "-fsanitize=undefined".
>> And this also prevents enabling the strict mode of CFI which is currently
>> disabled with -fsanitize-cfi-icall-generalize-pointers. Thus let us avoid
>> the problem by using "void *" as parameter in all spots where it is needed.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> Yes, I know, the patch looks ugly ... but I don't see a better way to
>> tackle this. If someone has a better idea, suggestions are welcome!
>
> An alternative is adding EventNotifierHandler *io_read, *io_poll_ready,
> *io_poll_begin, and *io_poll_end fields to EventNotifier so that
> aio_set_event_notifier() and aio_set_event_notifier_poll() can pass
> helper functions to the underlying aio_set_fd_handler() and
> aio_set_fd_poll() APIs. These helper functions then invoke the
> EventNotifier callbacks:
>
> /* Helpers */
> static void event_notifier_io_read(void *opaque)
> {
> EventNotifier *notifier = opaque;
> notifier->io_read(notifier);
> }
That's a nice idea, thanks, I'll give it a try!
Thomas
© 2016 - 2024 Red Hat, Inc.