Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22B1EC433FE for ; Thu, 11 Nov 2021 15:24:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F31CE610D0 for ; Thu, 11 Nov 2021 15:24:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233810AbhKKP1T (ORCPT ); Thu, 11 Nov 2021 10:27:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:28426 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230177AbhKKP1R (ORCPT ); Thu, 11 Nov 2021 10:27:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636644267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xP/n7Ya4LdxDEtIDEGCX9m3FRWyjQSq7JTDVmcBw4lI=; b=PZV0QT7CVQpre/tQDzVC11FWDmAwQC52usfIu0IRW5cXlfp+w81L1lqdZLrEN4daz7HckI 221lj/lNk9ZUn4eTdB24vyCcOW4ri1FNscVRR4ZKUzuH/HhJkaZ16pdTqceOVwIGn5MUT7 tt0udaKIAyY8q0/y1+VkzkVL5dGzVZc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-596-Q1j15KLhNIeKRDW04t7cug-1; Thu, 11 Nov 2021 10:24:24 -0500 X-MC-Unique: Q1j15KLhNIeKRDW04t7cug-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74EF61B18BF3; Thu, 11 Nov 2021 15:24:08 +0000 (UTC) Received: from T590 (ovpn-8-24.pek2.redhat.com [10.72.8.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4212A19C59; Thu, 11 Nov 2021 15:23:56 +0000 (UTC) Date: Thu, 11 Nov 2021 23:23:51 +0800 From: Ming Lei To: Geert Uytterhoeven Cc: Jens Axboe , Christoph Hellwig , linux-block@vger.kernel.org, linux-m68k , Linux Kernel Mailing List Subject: Re: [PATCH 4/5] block: move queue enter logic into blk_mq_submit_bio() Message-ID: References: <8c6163f4-0c0f-5254-5f79-9074f5a73cfe@kernel.dk> <461c4758-2675-1d11-ac8a-6f25ef01d781@kernel.dk> <3d29a5ce-aace-6198-3ea9-e6f603e74aa1@kernel.dk> <87ee0091-9c2f-50e8-c8f2-dcebebb9de48@kernel.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 > > > > > > > > > > > > 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; -- Ming