From patchwork Wed Sep 13 15:16:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 139003 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce21:0:b0:3f4:cb6f:45e2 with SMTP id m1csp1248545vqx; Wed, 13 Sep 2023 11:20:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE1gF47adVVsZBHX1Y8Rn+7z9oF8BscNyJ/sJUcqylXdn3hBZFUn68BMEXNWt5gwm+zfstO X-Received: by 2002:a05:6358:71c2:b0:132:ce36:ee31 with SMTP id u2-20020a05635871c200b00132ce36ee31mr3880846rwu.6.1694629246179; Wed, 13 Sep 2023 11:20:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694629246; cv=none; d=google.com; s=arc-20160816; b=izahiB0z1sTfcsczusSGsy7jCWayvr95zBQu8wtpTE3hqOmiwu2FwoMg4Ph5rMiEbu x2WJXZK6HpB3bkj6GSbxbVfBdTyQRxqL5Gp6VlfQ8TsLw2v3JOjCNvxIqY97Qg3/VsJQ nXBIlOJrgg5Apr2siyBOrnGtIDyWwxDBHveLr2yBlFmQzbdk1a8D0Q33BKujr8+JIQ28 HjNx9WxBPqOKvbJlg4JrO7GyvSGdMUCK73ZyWrjs2Z5oDNKlmmjkejm7Xi2qnOjgMgAU wWe9BlJFpkF+JxrzQsyF06ysr7xbkFioj6wSwg1+p5RA1nE2LMDELPJcVqSmDM5H4lT9 7bvQ== 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 :dkim-signature; bh=Dj7vqocDNNbQLsHxPquEzULPZP2DWtKivkF6Ijm0nQA=; fh=szS6nKOHqWqdmo+pDmdMHkpBM8bpzBlMJyKfLi9jRHY=; b=JwInMMfS1tqzXeUPGIq6Vq9FfX7KXMD+Rb0O6TYNnPBvnmJH/fjmpU9Hnxyr1dqc9M rFL2YiMVUM+Vi/BAu9R5FxQ0FiqE/yU02WfWDPmy2yluG7XcKXQJdsT3xVrHUceBj8pX coLZcH3vTIGcrG6yuvm0lFy3lPIeF3Cwd+wQOthLcRzEQdw7xARFMMFxH4NzvDoysnuU BlMh9Gq5k02VKgzcx7hf113aV4Pg1LMcaNwAaji0RhBJgSFBjBiIURpsUhr4o60zV4PC FFPmygBnmVCfMoNGhVTrnnY+Bm2V8+iEOUzngCdJDYzlrHGKgs+9RtPtK9FGf7RNaK/F faAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=wTrJglrX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id v202-20020a6361d3000000b0057751b4abe2si7643438pgb.111.2023.09.13.11.20.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:20:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=wTrJglrX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 27ECE84A6C75; Wed, 13 Sep 2023 08:17:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241649AbjIMPRK (ORCPT + 36 others); Wed, 13 Sep 2023 11:17:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241684AbjIMPQn (ORCPT ); Wed, 13 Sep 2023 11:16:43 -0400 Received: from out-215.mta1.migadu.com (out-215.mta1.migadu.com [IPv6:2001:41d0:203:375::d7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A15F5C1 for ; Wed, 13 Sep 2023 08:16:39 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1694618198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Dj7vqocDNNbQLsHxPquEzULPZP2DWtKivkF6Ijm0nQA=; b=wTrJglrXKddvN2j1EuQ7ruRuUNx10JYg6pOcbN5+v6fpthbUIZB3gjo7wBPSvcHVeAJvFl XX5FhjgJa2RNnEO0bK9JIXJ1McJ27k3vYWhAGCVrmkIVdlBRUF6nJ4rIukP+ProFpe/Sj1 kqdvjCi6k4cdtXNXQLCqCfGBJ5k8Tbg= From: chengming.zhou@linux.dev To: axboe@kernel.dk, hch@lst.de, ming.lei@redhat.com, bvanassche@acm.org Cc: kbusch@kernel.org, mst@redhat.com, damien.lemoal@opensource.wdc.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, chengming.zhou@linux.dev, Chengming Zhou Subject: [PATCH v2 4/5] blk-mq: update driver tags request table when start request Date: Wed, 13 Sep 2023 15:16:15 +0000 Message-Id: <20230913151616.3164338-5-chengming.zhou@linux.dev> In-Reply-To: <20230913151616.3164338-1-chengming.zhou@linux.dev> References: <20230913151616.3164338-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 08:17:30 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776947556675551539 X-GMAIL-MSGID: 1776947556675551539 From: Chengming Zhou Now we update driver tags request table in blk_mq_get_driver_tag(), so the driver that support queue_rqs() have to update that inflight table by itself. Move it to blk_mq_start_request(), which is a better place where we setup the deadline for request timeout check. And it's just where the request becomes inflight. Signed-off-by: Chengming Zhou Reviewed-by: Ming Lei --- block/blk-mq.c | 1 + block/blk-mq.h | 3 --- drivers/block/virtio_blk.c | 2 -- drivers/nvme/host/pci.c | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 68ce9357463b..e2d11183f62e 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1259,6 +1259,7 @@ void blk_mq_start_request(struct request *rq) blk_add_timer(rq); WRITE_ONCE(rq->state, MQ_RQ_IN_FLIGHT); + rq->mq_hctx->tags->rqs[rq->tag] = rq; #ifdef CONFIG_BLK_DEV_INTEGRITY if (blk_integrity_rq(rq) && req_op(rq) == REQ_OP_WRITE) diff --git a/block/blk-mq.h b/block/blk-mq.h index 560a76df290a..f75a9ecfebde 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -351,12 +351,9 @@ bool __blk_mq_alloc_driver_tag(struct request *rq); static inline bool blk_mq_get_driver_tag(struct request *rq) { - struct blk_mq_hw_ctx *hctx = rq->mq_hctx; - if (rq->tag == BLK_MQ_NO_TAG && !__blk_mq_alloc_driver_tag(rq)) return false; - hctx->tags->rqs[rq->tag] = rq; return true; } diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 1fe011676d07..4689ac2e0c0e 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -470,8 +470,6 @@ static bool virtblk_prep_rq_batch(struct request *req) struct virtio_blk *vblk = req->mq_hctx->queue->queuedata; struct virtblk_req *vbr = blk_mq_rq_to_pdu(req); - req->mq_hctx->tags->rqs[req->tag] = req; - return virtblk_prep_rq(req->mq_hctx, vblk, req, vbr) == BLK_STS_OK; } diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 2f57da12d983..c2e942808eff 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -924,7 +924,6 @@ static bool nvme_prep_rq_batch(struct nvme_queue *nvmeq, struct request *req) if (unlikely(!nvme_check_ready(&nvmeq->dev->ctrl, req, true))) return false; - req->mq_hctx->tags->rqs[req->tag] = req; return nvme_prep_rq(nvmeq->dev, req) == BLK_STS_OK; }