io_uring/waitid: fix KCSAN warning on io_waitid->head
Jens Axboe
maintainerPATCH 1/1 io_uring/waitid: fix KCSAN warning on io_waitid->head
Storing of the iw->head entry inside the wait_queue callback, or when removing a waitid item, really should use proper load/store acquire/release semantics, and KCSAN correctly warns of that. Ensure that they do so.
Reported-by [email protected]
Fixes a48c0cbf28c0 ("io_uring/waitid: have io_waitid_complete() remove wait queue entry")
Signed-off-by Jens Axboe <[email protected]>
---
Introduced in 6.19, queued in io_uring-6.19.
io_uring/waitid.c +3 -3
@@ -114,11 +114,11 @@ static void io_waitid_remove_wq(struct io_kiocb *req) struct io_waitid *iw = io_kiocb_to_cmd(req, struct io_waitid);struct wait_queue_head *head; - head =READ_ONCE (iw->head); + head =smp_load_acquire (&iw->head);if (head) {struct io_waitid_async *iwa = req->async_data; - iw->head =NULL ; +smp_store_release (&iw->head,NULL );spin_lock_irq (&head->lock);list_del_init (&iwa->wo.child_wait.entry);spin_unlock_irq (&head->lock);
@@ -246,7 +246,7 @@ static int io_waitid_wait(struct wait_queue_entry *wait, unsigned mode,return 0 ;list_del_init (&wait->entry); - iw->head =NULL ; +smp_store_release (&iw->head,NULL );/* cancel is in progress */ if (atomic_fetch_inc (&iw->refs) &IO_WAITID_REF_MASK )
Signature · 1 line
Jens Axboe