From: Jens Axboe <axboe@kernel.dk>
To: Ming Lei <ming.lei@redhat.com>,
Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Christoph Hellwig <hch@infradead.org>,
linux-block@vger.kernel.org,
linux-m68k <linux-m68k@lists.linux-m68k.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 4/5] block: move queue enter logic into blk_mq_submit_bio()
Date: Thu, 11 Nov 2021 15:17:27 -0700 [thread overview]
Message-ID: <17ce59ff-bc8c-e8c8-22e1-96605440629a@kernel.dk> (raw)
In-Reply-To: <YY01hzAuvmeMxO+0@T590>
On 11/11/21 8:23 AM, Ming Lei wrote:
> Hi Geert,
>
> On Thu, Nov 11, 2021 at 03:51:28PM +0100, Geert Uytterhoeven wrote:
>> Hi Ming,
>>
>> On Thu, Nov 11, 2021 at 2:45 PM Ming Lei <ming.lei@redhat.com> wrote:
>>> On Thu, Nov 11, 2021 at 01:58:38PM +0100, Geert Uytterhoeven wrote:
>>>> On Thu, 4 Nov 2021, Jens Axboe wrote:
>>>>> On 11/4/21 1:04 PM, Christoph Hellwig wrote:
>>>>>> On Thu, Nov 04, 2021 at 01:02:54PM -0600, Jens Axboe wrote:
>>>>>>> On 11/4/21 12:52 PM, Christoph Hellwig wrote:
>>>>>>>> Looks good:
>>>>>>>>
>>>>>>>> Reviewed-by: Christoph Hellwig <hch@lst.de>
>>>>>>>
>>>>>>> So these two are now:
>>>>>>>
>>>>>>> https://git.kernel.dk/cgit/linux-block/commit/?h=for-5.16/block&id=c98cb5bbdab10d187aff9b4e386210eb2332af96
>>>>>>>
>>>>>>> which is the one I sent here, and then the next one gets cleaned up to
>>>>>>> remove that queue enter helper:
>>>>>>>
>>>>>>> https://git.kernel.dk/cgit/linux-block/commit/?h=for-5.16/block&id=7f930eb31eeb07f1b606b3316d8ad3ab6a92905b
>>>>>>>
>>>>>>> Can I add your reviewed-by to this last one as well? Only change is the
>>>>>>> removal of blk_mq_enter_queue() and the weird construct there, it's just
>>>>>>> bio_queue_enter() now.
>>>>>>
>>>>>> Sure.
>>>>>
>>>>> Thanks, prematurely already done, as you could tell :-)
>>>>
>>>> The updated version is now commit 900e080752025f00 ("block: move queue
>>>> enter logic into blk_mq_submit_bio()") in Linus' tree.
>>>>
>>>> I have bisected failures on m68k/atari (on ARAnyM, using nfhd as the
>>>> root device) to this commit, e.g.:
>>>>
>>>> sd 0:0:0:0: [sda] tag#0 FAILED Result: hostbyte=DID_OK driverbyte=DRIVER_OK cmd_age=0s
>>>> sd 0:0:0:0: [sda] tag#0 Sense Key : Illegal Request [current]
>>>> sd 0:0:0:0: [sda] tag#0 Add. Sense: Invalid field in cdb
>>>> sd 0:0:0:0: [sda] tag#0 CDB: Write(10) 2a 08 00 00 00 01 00 00 08 00
>>>> critical target error, dev sda, sector 1 op 0x1:(WRITE) flags 0x20800 phys_seg 1 prio class 0
>>>> Buffer I/O error on dev sda1, logical block 0, lost sync page write
>>>>
>>>> EXT4-fs (sda1): I/O error while writing superblock
>>>> sd 0:0:0:0: [sda] tag#0 FAILED Result: hostbyte=DID_OK driverbyte=DRIVER_OK cmd_age=0s
>>>> sd 0:0:0:0: [sda] tag#0 Sense Key : Illegal Request [current]
>>>> sd 0:0:0:0: [sda] tag#0 Add. Sense: Invalid field in cdb
>>>> sd 0:0:0:0: [sda] tag#0 CDB: Write(10) 2a 08 00 00 00 01 00 00 08 00
>>>> critical target error, dev sda, sector 1 op 0x1:(WRITE) flags 0x20800 phys_seg 1 prio class 0
>>>> Buffer I/O error on dev sda1, logical block 0, lost sync page write
>>>> EXT4-fs (sda1): I/O error while writing superblock
>>>>
>>>> This may happen either when mounting the root file system (leading to an
>>>> unable to mount root fs panic), or later (leading to a read-only
>>>> rootfs).
>>>
>>> BTW, today I just found that hang in blk_mq_freeze_queue_wait() is
>>> caused by commit 900e080752025f00, and the following patch can fix it:
>>>
>>> - blk-mq: don't grab ->q_usage_counter in blk_mq_sched_bio_merge
>>>
>>> https://lore.kernel.org/linux-block/20211111085650.GA476@lst.de/T/#m759b88fda094a65ebf29bc81b780967cdaf9cf28
>>>
>>> Maybe you can try the above patch.
>>
>> Thanks! I have applied both patches, but it doesn't make a difference.
>
> Thanks for your test!
>
> Can you try the following patch?
>
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index f511db395c7f..a5ab2f2e9f67 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -2517,7 +2517,6 @@ static struct request *blk_mq_get_new_requests(struct request_queue *q,
> struct blk_mq_alloc_data data = {
> .q = q,
> .nr_tags = 1,
> - .cmd_flags = bio->bi_opf,
> };
> struct request *rq;
>
> @@ -2525,6 +2524,7 @@ static struct request *blk_mq_get_new_requests(struct request_queue *q,
> return NULL;
> if (unlikely(!submit_bio_checks(bio)))
> goto put_exit;
> + data.cmd_flags = bio->bi_opf;
> if (blk_mq_attempt_bio_merge(q, bio, nsegs, same_queue_rq))
> goto put_exit;
That's definitely a real fix, akin to the other pre-enter variants, this
one just post checks. Geert, can you give this a whirl?
Ming, would you mind sending this as a real patch?
--
Jens Axboe
next prev parent reply other threads:[~2021-11-11 22:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20211104182201.83906-1-axboe@kernel.dk>
[not found] ` <20211104182201.83906-5-axboe@kernel.dk>
[not found] ` <YYQoLzMn7+s9hxpX@infradead.org>
[not found] ` <2865c289-7014-2250-0f5b-a9ed8770d0ec@kernel.dk>
[not found] ` <YYQo4ougXZvgv11X@infradead.org>
[not found] ` <8c6163f4-0c0f-5254-5f79-9074f5a73cfe@kernel.dk>
[not found] ` <461c4758-2675-1d11-ac8a-6f25ef01d781@kernel.dk>
[not found] ` <YYQr3jl3avsuOUAJ@infradead.org>
[not found] ` <3d29a5ce-aace-6198-3ea9-e6f603e74aa1@kernel.dk>
[not found] ` <YYQuyt2/y1MgzRi0@infradead.org>
[not found] ` <87ee0091-9c2f-50e8-c8f2-dcebebb9de48@kernel.dk>
2021-11-11 12:58 ` [PATCH 4/5] block: move queue enter logic into blk_mq_submit_bio() Geert Uytterhoeven
2021-11-11 13:19 ` Martin K. Petersen
2021-11-11 14:48 ` Geert Uytterhoeven
2021-11-11 15:36 ` Martin K. Petersen
2021-11-11 21:35 ` Michael Schmitz
2021-11-12 7:37 ` Geert Uytterhoeven
2021-11-12 22:34 ` Michael Schmitz
2021-11-13 7:02 ` Michael Schmitz
2021-11-13 10:06 ` Geert Uytterhoeven
2021-11-13 22:11 ` Michael Schmitz
2021-11-11 13:44 ` Ming Lei
2021-11-11 14:51 ` Geert Uytterhoeven
2021-11-11 15:23 ` Ming Lei
2021-11-11 22:17 ` Jens Axboe [this message]
2021-11-12 0:44 ` Ming Lei
2021-11-12 7:51 ` Geert Uytterhoeven
2021-11-15 19:23 ` Michael Schmitz
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=17ce59ff-bc8c-e8c8-22e1-96605440629a@kernel.dk \
--to=axboe@kernel.dk \
--cc=geert@linux-m68k.org \
--cc=hch@infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=ming.lei@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;
as well as URLs for NNTP newsgroup(s).