summaryrefslogtreecommitdiff
path: root/io_uring
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2025-01-24 14:32:25 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-02-08 10:02:17 +0100
commit016bc7b496d8f77d287fc8912aa2a53961eeab92 (patch)
treef371b9d905c02a7f0736b78d378ee9890e125a95 /io_uring
parenta089eada0b02d9eb7398ee49a9164eae4a1491c9 (diff)
downloadlinux-016bc7b496d8f77d287fc8912aa2a53961eeab92.tar.gz
linux-016bc7b496d8f77d287fc8912aa2a53961eeab92.tar.bz2
linux-016bc7b496d8f77d287fc8912aa2a53961eeab92.zip
io_uring/register: use atomic_read/write for sq_flags migration
[ Upstream commit a23ad06bfee5e51cd9e51aebf11401e7b4b5d00a ] A previous commit changed all of the migration from the old to the new ring for resizing to use READ/WRITE_ONCE. However, ->sq_flags is an atomic_t, and while most archs won't complain on this, some will indeed flag this: io_uring/register.c:554:9: sparse: sparse: cast to non-scalar io_uring/register.c:554:9: sparse: sparse: cast from non-scalar Just use atomic_set/atomic_read for handling this case. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202501242000.A2sKqaCL-lkp@intel.com/ Fixes: 2c5aae129f42 ("io_uring/register: document io_register_resize_rings() shared mem usage") Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'io_uring')
-rw-r--r--io_uring/register.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/io_uring/register.c b/io_uring/register.c
index 371aec87e078..14ece7754e4c 100644
--- a/io_uring/register.c
+++ b/io_uring/register.c
@@ -553,7 +553,7 @@ overflow:
ctx->cqe_cached = ctx->cqe_sentinel = NULL;
WRITE_ONCE(n.rings->sq_dropped, READ_ONCE(o.rings->sq_dropped));
- WRITE_ONCE(n.rings->sq_flags, READ_ONCE(o.rings->sq_flags));
+ atomic_set(&n.rings->sq_flags, atomic_read(&o.rings->sq_flags));
WRITE_ONCE(n.rings->cq_flags, READ_ONCE(o.rings->cq_flags));
WRITE_ONCE(n.rings->cq_overflow, READ_ONCE(o.rings->cq_overflow));