io_uring/sqpoll: annotate data race for access in debug check
PATCH 1/1 io_uring/sqpoll: annotate data race for access in debug check
sqd->thread must only be access while holding sqd->lock. In io_sq_thread_stop, the sqd->thread access to wake up the sq thread is placed while holding sqd->lock, but the access in debug check is not. As this access if for debug check only, we can safely ignore the data race here. So we annotate this access with data_race to silence KCSAN.
--- io_uring/sqpoll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/sqpoll.c +1 -1
@@ -57,7 +57,7 @@ void io_sq_thread_park(struct io_sq_data *sqd)void io_sq_thread_stop (struct io_sq_data *sqd) { -WARN_ON_ONCE (sqd->thread == current); +WARN_ON_ONCE (data_race (sqd->thread) == current);WARN_ON_ONCE (test_bit (IO_SQ_THREAD_SHOULD_STOP , &sqd->state));set_bit (IO_SQ_THREAD_SHOULD_STOP , &sqd->state);
Signature · 1 line
2.43.0
Hi,
Quoted 36 lines
-----Original Message-----
From: Bui Quang Minh <[email protected]>
Sent: Wednesday, January 8, 2025 11:11 PM
To: [email protected]
Cc: Bui Quang Minh <[email protected]>; Jens Axboe <[email protected]>; Pavel Begunkov <[email protected]>; io- [email protected]; [email protected]
Subject: [PATCH]io_uring/sqpoll: annotate data race for access in debug check
sqd->threadmust only be access while holdingsqd->lock. Inio_sq_thread_stop, thesqd->threadaccess to wake up the sq thread is placed while holdingsqd->lock, but the access in debug check is not. As this access if for debug check only, we can safely ignore the data race here. So we annotate this access withdata_raceto silence KCSAN.Reported-by [email protected]Signed-off-by Bui Quang Minh <[email protected]>--- io_uring/sqpoll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)io_uring/sqpoll.c index renamed from io_uring/sqpoll.c +0
-0
9e5bd79fd2b5..2088c56dbaa0100644io_uring/sqpoll.c +1
-2@@ -57,7 +57,7 @@ void io_sq_thread_park(struct io_sq_data *sqd)void io_sq_thread_stop (struct io_sq_data *sqd) { -WARN_ON_ONCE (sqd->thread == current); +WARN_ON_ONCE (data_race (sqd->thread) == current);WARN_ON_ONCE (test_bit (IO_SQ_THREAD_SHOULD_STOP , &sqd- >state));set_bit (IO_SQ_THREAD_SHOULD_STOP , &sqd->state); --
Quoted 2 lines
2.43.0
The modification of this patch itself is fine, but there are two other things I need to confirm. 1、Does the io_uring_cancel_generic() require the same modification?
2、It is not holding sqd->lock in io_req_normal_work_add(), is it safe?
Thanks.
---
Li Zetao
Quoted 36 lines · lizetao
Hi,
Quoted 34 lines
-----Original Message-----
From: Bui Quang Minh <[email protected]>
Sent: Wednesday, January 8, 2025 11:11 PM
To: [email protected]
Cc: Bui Quang Minh <[email protected]>; Jens Axboe <[email protected]>; Pavel Begunkov <[email protected]>; io- [email protected]; [email protected]
Subject: [PATCH]io_uring/sqpoll: annotate data race for access in debug check
sqd->threadmust only be access while holdingsqd->lock. Inio_sq_thread_stop, thesqd->threadaccess to wake up the sq thread is placed while holdingsqd->lock, but the access in debug check is not. As this access if for debug check only, we can safely ignore the data race here. So we annotate this access withdata_raceto silence KCSAN.Reported-by [email protected]Signed-off-by Bui Quang Minh <[email protected]>--- io_uring/sqpoll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)io_uring/sqpoll.c index renamed from io_uring/sqpoll.c +0
-0
9e5bd79fd2b5..2088c56dbaa0100644io_uring/sqpoll.c +1
-1@@ -57,7 +57,7 @@ void io_sq_thread_park(struct io_sq_data *sqd)void io_sq_thread_stop (struct io_sq_data *sqd) { -WARN_ON_ONCE (sqd->thread == current); +WARN_ON_ONCE (data_race (sqd->thread) == current);WARN_ON_ONCE (test_bit (IO_SQ_THREAD_SHOULD_STOP , &sqd- > state));
Quoted 7 lines
Quoted 4 lines
io_uring/sqpoll.c +0
-1set_bit (IO_SQ_THREAD_SHOULD_STOP , &sqd->state); --2.43.0
The modification of this patch itself is fine, but there are two other things I need to confirm. 1、Does the
io_uring_cancel_generic()require the same modification?
I think yes, there is another syzbot's bug report on data race on the io_uring_cancel_generic I'm currently looking at. Here is the link: https://syzkaller.appspot.com/bug?extid=3c750be01dab672c513d
Quoted 1 line
2、It is not holding
sqd->lockinio_req_normal_work_add(), is it safe?
This is a valid point, I think we should add lock here too. I will try to write a proof-of-concept to validate this.
Thanks,
Quang Minh.