From patchwork Fri Dec 23 12:52:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 36129 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp138616wrn; Thu, 22 Dec 2022 20:55:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXtxDmQ5ZEDkAiQ3qaWjCf/HQ2djwLqqDUi1Nz/0huDOfwT63LEV09/6t0EcZKpBM836//vg X-Received: by 2002:a17:902:82c7:b0:18c:bba:b8f4 with SMTP id u7-20020a17090282c700b0018c0bbab8f4mr23912156plz.68.1671771337506; Thu, 22 Dec 2022 20:55:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671771337; cv=none; d=google.com; s=arc-20160816; b=MwrMD5LelyJlLvcG/BTo9w1jYXCOH2W01GtJo3IXUIaqLBANFqicjSrcZMcWuVvcpS oFPZ83alIjGPjTYmQaKtaigb6evbuOnANoD8jAE+h4qXU0gaUh0vW8mCi8l0w7Vp+MXy qkUPn1F7Ycbp8gKXQ+sa/puRjTv0YOy6iSep1ZoJAtZ4jwOwtgfsjUMb0FS5mIU31pEG YdlLFg5m6tAFvt6RRTp0uPi7niBlabZVLGVRpy2zSK+wKf6eUUTd5ak2I7P+HcK3uxsu REUzYRNrmUqUt7dOqHOcEPwi9tR7ZvNriioH6MUOpsrrKi/Xo3LLIINjeZgiy87NOLFk fP8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=QCTcP9UnRfvQRM6k7pJHzHbZpp0yQyOJzu9VI2M/C10=; b=GdIIaMv0Pp0a2mr+566pIBp0wbtZyslk/MC6tn9g/RqU6M0i79r/Olk7BLSYVkZ8ln SlHyybwSSw3UVm8z4yR8GmyLq4eVpDGd/cM15oSPiG7kVQ6b6214fF3JRm4HSEo9mmji XDgXG5j1xtwTkcMtjWch/j8R5TOe/sDlVy9T4VYvVQb7VKUe5MUlg5b1mT5XHuNA86Gn sSw2IFT7olkEik451PUw4zXusJ2ZedCuPwTRChHk/6KU3I7XAlE7dy0a8PriLZQ6/RKf gH8gmZTMUVFNpAjqa9zgwxMfyxecw2Jr2+ymvvHjguCNImEChb7HkU9icDQWlb5REzrv IyBg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i12-20020a170902c94c00b001871e838ba9si2716808pla.344.2022.12.22.20.55.24; Thu, 22 Dec 2022 20:55:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235911AbiLWEyQ (ORCPT + 99 others); Thu, 22 Dec 2022 23:54:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230062AbiLWExf (ORCPT ); Thu, 22 Dec 2022 23:53:35 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36A4FBC19; Thu, 22 Dec 2022 20:53:35 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NdZZK0k7yz4f3p5W; Fri, 23 Dec 2022 12:53:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDXjbFHNKVjpOduAQ--.93S10; Fri, 23 Dec 2022 12:53:31 +0800 (CST) From: Kemeng Shi To: axboe@kernel.dk, dwagner@suse.de, hare@suse.de, ming.lei@redhat.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Cc: hch@lst.de, john.garry@huawei.com, shikemeng@huaweicloud.com Subject: [PATCH 08/13] blk-mq: simplify flush check in blk_mq_dispatch_rq_list Date: Fri, 23 Dec 2022 20:52:18 +0800 Message-Id: <20221223125223.1687670-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20221223125223.1687670-1-shikemeng@huaweicloud.com> References: <20221223125223.1687670-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDXjbFHNKVjpOduAQ--.93S10 X-Coremail-Antispam: 1UD129KBjvJXoW7CFyxAr1fCF4kuw48XrWkZwb_yoW8JFWkpF W3Gayqkr4aqw12yry8Aa9xG3ZrAws5AF1UuFZxCw1aqF45Gr4xtr9aga15Wa4kCrsayr4Y vayUWrWYvF45Xa7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752979301729019280?= X-GMAIL-MSGID: =?utf-8?q?1752979301729019280?= For busy error BLK_STS*_RESOURCE, request will always be added back to list, so need_resource will not be true and ret will not be == BLK_STS_DEV_RESOURCE if list is empty. We could remove these dead check. If list is empty, we only need to send extra flush if error happens at last request in the list which is stored in ret. So send a extra flush if ret is not BLK_STS_OK instead of errors is non-zero to avoid unnecessary flush for error at middle request in list. Signed-off-by: Kemeng Shi --- block/blk-mq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index f67acd78a9c2..9c5971b04adc 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2084,8 +2084,8 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list, /* If we didn't flush the entire list, we could have told the driver * there was more coming, but that turned out to be a lie. */ - if ((!list_empty(list) || errors || needs_resource || - ret == BLK_STS_DEV_RESOURCE) && q->mq_ops->commit_rqs && queued) + if ((!list_empty(list) || ret != BLK_STS_OK) && + q->mq_ops->commit_rqs && queued) q->mq_ops->commit_rqs(hctx); /* * Any items that need requeuing? Stuff them into hctx->dispatch,