提交 94fe557f 编写于 作者: J Jens Axboe 提交者: Chen Jun

io_uring: use bottom half safe lock for fixed file data

stable inclusion
from stable-5.10.5
commit 25a2de679b5d55ead2f99881c7d3e9b745325f39
bugzilla: 46931

--------------------------------

commit ac0648a5 upstream.

io_file_data_ref_zero() can be invoked from soft-irq from the RCU core,
hence we need to ensure that the file_data lock is bottom half safe. Use
the _bh() variants when grabbing this lock.

Reported-by: syzbot+1f4ba1e5520762c523c6@syzkaller.appspotmail.com
Signed-off-by: NJens Axboe <axboe@kernel.dk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 8b40a98b
...@@ -7000,9 +7000,9 @@ static int io_sqe_files_unregister(struct io_ring_ctx *ctx) ...@@ -7000,9 +7000,9 @@ static int io_sqe_files_unregister(struct io_ring_ctx *ctx)
if (!data) if (!data)
return -ENXIO; return -ENXIO;
spin_lock(&data->lock); spin_lock_bh(&data->lock);
ref_node = data->node; ref_node = data->node;
spin_unlock(&data->lock); spin_unlock_bh(&data->lock);
if (ref_node) if (ref_node)
percpu_ref_kill(&ref_node->refs); percpu_ref_kill(&ref_node->refs);
...@@ -7385,7 +7385,7 @@ static void io_file_data_ref_zero(struct percpu_ref *ref) ...@@ -7385,7 +7385,7 @@ static void io_file_data_ref_zero(struct percpu_ref *ref)
data = ref_node->file_data; data = ref_node->file_data;
ctx = data->ctx; ctx = data->ctx;
spin_lock(&data->lock); spin_lock_bh(&data->lock);
ref_node->done = true; ref_node->done = true;
while (!list_empty(&data->ref_list)) { while (!list_empty(&data->ref_list)) {
...@@ -7397,7 +7397,7 @@ static void io_file_data_ref_zero(struct percpu_ref *ref) ...@@ -7397,7 +7397,7 @@ static void io_file_data_ref_zero(struct percpu_ref *ref)
list_del(&ref_node->node); list_del(&ref_node->node);
first_add |= llist_add(&ref_node->llist, &ctx->file_put_llist); first_add |= llist_add(&ref_node->llist, &ctx->file_put_llist);
} }
spin_unlock(&data->lock); spin_unlock_bh(&data->lock);
if (percpu_ref_is_dying(&data->refs)) if (percpu_ref_is_dying(&data->refs))
delay = 0; delay = 0;
...@@ -7520,9 +7520,9 @@ static int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg, ...@@ -7520,9 +7520,9 @@ static int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg,
} }
file_data->node = ref_node; file_data->node = ref_node;
spin_lock(&file_data->lock); spin_lock_bh(&file_data->lock);
list_add_tail(&ref_node->node, &file_data->ref_list); list_add_tail(&ref_node->node, &file_data->ref_list);
spin_unlock(&file_data->lock); spin_unlock_bh(&file_data->lock);
percpu_ref_get(&file_data->refs); percpu_ref_get(&file_data->refs);
return ret; return ret;
out_fput: out_fput:
...@@ -7679,10 +7679,10 @@ static int __io_sqe_files_update(struct io_ring_ctx *ctx, ...@@ -7679,10 +7679,10 @@ static int __io_sqe_files_update(struct io_ring_ctx *ctx,
if (needs_switch) { if (needs_switch) {
percpu_ref_kill(&data->node->refs); percpu_ref_kill(&data->node->refs);
spin_lock(&data->lock); spin_lock_bh(&data->lock);
list_add_tail(&ref_node->node, &data->ref_list); list_add_tail(&ref_node->node, &data->ref_list);
data->node = ref_node; data->node = ref_node;
spin_unlock(&data->lock); spin_unlock_bh(&data->lock);
percpu_ref_get(&ctx->file_data->refs); percpu_ref_get(&ctx->file_data->refs);
} else } else
destroy_fixed_file_ref_node(ref_node); destroy_fixed_file_ref_node(ref_node);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册