tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'io_uring-5.13-2021-05-22' of git://git.kernel.dk/linux-block

Browse Source 
Pull io_uring fixes from Jens Axboe:
 "One fix for a regression with poll in this merge window, and another
  just hardens the io-wq exit path a bit"

* tag 'io_uring-5.13-2021-05-22' of git://git.kernel.dk/linux-block:
  io_uring: fortify tctx/io_wq cleanup
  io_uring: don't modify req->poll for rw
This commit is contained in:
Linus Torvalds
2021-05-22 07:36:36 -10:00
parent 23d7292630 ba5ef6dc8a
commit b9231dfbcb
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/io_uring.c
+7 -7
View File
@@ -5019,10 +5019,10 @@ static void __io_queue_proc(struct io_poll_iocb *poll, struct io_poll_table *pt,
* Can't handle multishot for double wait for now, turn it * Can't handle multishot for double wait for now, turn it
* into one-shot mode. * into one-shot mode.
*/ */
if (!(req->poll.events & EPOLLONESHOT)) if (!(poll_one->events & EPOLLONESHOT))
req->poll.events |= EPOLLONESHOT; poll_one->events |= EPOLLONESHOT;
/* double add on the same waitqueue head, ignore */ /* double add on the same waitqueue head, ignore */
if (poll->head == head) if (poll_one->head == head)
return; return;
poll = kmalloc(sizeof(*poll), GFP_ATOMIC); poll = kmalloc(sizeof(*poll), GFP_ATOMIC);
if (!poll) { if (!poll) {
@@ -9035,15 +9035,15 @@ static void io_uring_del_task_file(unsigned long index)
static void io_uring_clean_tctx(struct io_uring_task *tctx) static void io_uring_clean_tctx(struct io_uring_task *tctx)
{ {
struct io_wq *wq = tctx->io_wq;
struct io_tctx_node *node; struct io_tctx_node *node;
unsigned long index; unsigned long index;
tctx->io_wq = NULL;
xa_for_each(&tctx->xa, index, node) xa_for_each(&tctx->xa, index, node)
io_uring_del_task_file(index); io_uring_del_task_file(index);
if (tctx->io_wq) { if (wq)
io_wq_put_and_exit(tctx->io_wq); io_wq_put_and_exit(wq);
tctx->io_wq = NULL;
}
} }
static s64 tctx_inflight(struct io_uring_task *tctx, bool tracked) static s64 tctx_inflight(struct io_uring_task *tctx, bool tracked)