[PATCHv5,6/9] scsi: use request to get integrity segments

Message ID	20240913182854.2445457-7-kbusch@meta.com
State	New
Headers	show Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8A4413AA53 for <linux-scsi@vger.kernel.org>; Fri, 13 Sep 2024 18:29:21 +0000 (UTC) From: Keith Busch <kbusch@meta.com> To: <axboe@kernel.dk>, <hch@lst.de>, <martin.petersen@oracle.com>, <linux-block@vger.kernel.org>, <linux-nvme@lists.infradead.org>, <linux-scsi@vger.kernel.org> CC: <sagi@grimberg.me>, Keith Busch <kbusch@kernel.org>, Kanchan Joshi <joshi.k@samsung.com> Subject: [PATCHv5 6/9] scsi: use request to get integrity segments Date: Fri, 13 Sep 2024 11:28:51 -0700 Message-ID: <20240913182854.2445457-7-kbusch@meta.com> In-Reply-To: <20240913182854.2445457-1-kbusch@meta.com> References: <20240913182854.2445457-1-kbusch@meta.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain
Series	block integrity merging and counting \| expand [PATCHv5,0/9] block integrity merging and counting [PATCHv5,1/9] blk-mq: unconditional nr_integrity_segments [PATCHv5,2/9] blk-mq: set the nr_integrity_segments from bio [PATCHv5,3/9] blk-integrity: properly account for segments [PATCHv5,4/9] blk-integrity: consider entire bio list for merging [PATCHv5,5/9] block: provide a request helper for user integrity segments [PATCHv5,6/9] scsi: use request to get integrity segments [PATCHv5,7/9] nvme-rdma: use request to get integrity segments [PATCHv5,8/9] block: unexport blk_rq_count_integrity_sg [PATCHv5,9/9] blk-integrity: improved sg segment mapping

Message ID

20240913182854.2445457-7-kbusch@meta.com

State

New

Headers

From: Keith Busch <kbusch@meta.com>
To: <axboe@kernel.dk>, <hch@lst.de>, <martin.petersen@oracle.com>,
        <linux-block@vger.kernel.org>, <linux-nvme@lists.infradead.org>,
        <linux-scsi@vger.kernel.org>
CC: <sagi@grimberg.me>, Keith Busch <kbusch@kernel.org>,
        Kanchan Joshi
	<joshi.k@samsung.com>
Subject: [PATCHv5 6/9] scsi: use request to get integrity segments
Date: Fri, 13 Sep 2024 11:28:51 -0700
Message-ID: <20240913182854.2445457-7-kbusch@meta.com>
In-Reply-To: <20240913182854.2445457-1-kbusch@meta.com>
References: <20240913182854.2445457-1-kbusch@meta.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain

Series

block integrity merging and counting | expand

Commit Message

Keith Busch Sept. 13, 2024, 6:28 p.m. UTC

From: Keith Busch <kbusch@kernel.org>

The request tracks the integrity segments already, so no need to recount
the segments again.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Kanchan Joshi <joshi.k@samsung.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
---
 drivers/scsi/scsi_lib.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 3958a6d14bf45..c602b0af745ca 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1175,8 +1175,7 @@  blk_status_t scsi_alloc_sgtables(struct scsi_cmnd *cmd)
 			goto out_free_sgtables;
 		}
 
-		ivecs = blk_rq_count_integrity_sg(rq->q, rq->bio);
-
+		ivecs = rq->nr_integrity_segments;
 		if (sg_alloc_table_chained(&prot_sdb->table, ivecs,
 				prot_sdb->table.sgl,
 				SCSI_INLINE_PROT_SG_CNT)) {

[PATCHv5,6/9] scsi: use request to get integrity segments

Commit Message

Patch