public inbox for io-uring@vger.kernel.org
 help / color / mirror / Atom feed
From: Jens Axboe <axboe@kernel.dk>
To: Ming Lei <ming.lei@redhat.com>
Cc: io-uring <io-uring@vger.kernel.org>, Yi Zhang <yi.zhang@redhat.com>
Subject: Re: [PATCH] io_uring: fix IOPOLL with passthrough I/O
Date: Wed, 14 Jan 2026 08:33:54 -0700	[thread overview]
Message-ID: <af727108-b20a-45b0-b46c-07244be4cacb@kernel.dk> (raw)
In-Reply-To: <aWe2-iz6eaIyuIZl@fedora>

On 1/14/26 8:32 AM, Ming Lei wrote:
> On Wed, Jan 14, 2026 at 08:12:15AM -0700, Jens Axboe wrote:
>> A previous commit improving IOPOLL made an incorrect assumption that
>> task_work isn't used with IOPOLL. This can cause crashes when doing
>> passthrough I/O on nvme, where queueing the completion task_work will
>> trample on the same memory that holds the completed list of requests.
>>
>> Fix it up by shuffling the members around, so we're not sharing any
>> parts that end up getting used in this path.
>>
>> Fixes: 3c7d76d6128a ("io_uring: IOPOLL polling improvements")
>> Reported-by: Yi Zhang <yi.zhang@redhat.com>
>> Link: https://lore.kernel.org/linux-block/CAHj4cs_SLPj9v9w5MgfzHKy+983enPx3ZQY2kMuMJ1202DBefw@mail.gmail.com/
>> Signed-off-by: Jens Axboe <axboe@kernel.dk>
>>
>> ---
>>
>> diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h
>> index e4c804f99c30..211686ad89fd 100644
>> --- a/include/linux/io_uring_types.h
>> +++ b/include/linux/io_uring_types.h
>> @@ -713,13 +713,10 @@ struct io_kiocb {
>>  	atomic_t			refs;
>>  	bool				cancel_seq_set;
>>  
>> -	/*
>> -	 * IOPOLL doesn't use task_work, so use the ->iopoll_node list
>> -	 * entry to manage pending iopoll requests.
>> -	 */
>>  	union {
>>  		struct io_task_work	io_task_work;
>> -		struct list_head	iopoll_node;
>> +		/* For IOPOLL setup queues, with hybrid polling */
>> +		u64                     iopoll_start;
>>  	};
>>  
>>  	union {
>> @@ -728,8 +725,8 @@ struct io_kiocb {
>>  		 * poll
>>  		 */
>>  		struct hlist_node	hash_node;
>> -		/* For IOPOLL setup queues, with hybrid polling */
>> -		u64                     iopoll_start;
>> +		/* IOPOLL completion handling */
>> +		struct list_head	iopoll_node;
>>  		/* for private io_kiocb freeing */
>>  		struct rcu_head		rcu_head;
> 
> ->hash_node is used by uring_cmd in
> io_uring_cmd_mark_cancelable()/io_uring_cmd_del_cancelable(), so this
> way may break uring_cmd if supporting iopoll and cancelable in future.

We don't support cancelation on requests that go via the block stack,
never have and probably never will. But I should make a comment about
that, just in case...

-- 
Jens Axboe

  reply	other threads:[~2026-01-14 15:33 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-14 15:12 [PATCH] io_uring: fix IOPOLL with passthrough I/O Jens Axboe
2026-01-14 15:32 ` Ming Lei
2026-01-14 15:33   ` Jens Axboe [this message]
2026-01-14 15:50     ` Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=af727108-b20a-45b0-b46c-07244be4cacb@kernel.dk \
    --to=axboe@kernel.dk \
    --cc=io-uring@vger.kernel.org \
    --cc=ming.lei@redhat.com \
    --cc=yi.zhang@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox