public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <20240913182854.2445457-7-kbusch@meta.com> (raw)
In-Reply-To: <20240913182854.2445457-1-kbusch@meta.com>

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)) {
-- 
2.43.5


  parent reply	other threads:[~2024-09-13 18:29 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-13 18:28 [PATCHv5 0/9] block integrity merging and counting Keith Busch
2024-09-13 18:28 ` [PATCHv5 1/9] blk-mq: unconditional nr_integrity_segments Keith Busch
2024-09-13 18:28 ` [PATCHv5 2/9] blk-mq: set the nr_integrity_segments from bio Keith Busch
2024-09-13 18:28 ` [PATCHv5 3/9] blk-integrity: properly account for segments Keith Busch
2024-09-13 18:28 ` [PATCHv5 4/9] blk-integrity: consider entire bio list for merging Keith Busch
2024-09-14  7:30   ` Christoph Hellwig
2024-09-14 16:51     ` Keith Busch
2024-09-16  6:44       ` Christoph Hellwig
2024-09-16  8:40         ` Keith Busch
2024-09-13 18:28 ` [PATCHv5 5/9] block: provide a request helper for user integrity segments Keith Busch
2024-09-13 18:28 ` Keith Busch [this message]
2024-09-13 18:28 ` [PATCHv5 7/9] nvme-rdma: use request to get " Keith Busch
2024-09-13 18:28 ` [PATCHv5 8/9] block: unexport blk_rq_count_integrity_sg Keith Busch
2024-09-13 18:28 ` [PATCHv5 9/9] blk-integrity: improved sg segment mapping Keith Busch
2024-09-13 18:37 ` [PATCHv5 0/9] block integrity merging and counting Jens Axboe

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=20240913182854.2445457-7-kbusch@meta.com \
    --to=kbusch@meta.com \
    --cc=axboe@kernel.dk \
    --cc=hch@lst.de \
    --cc=joshi.k@samsung.com \
    --cc=kbusch@kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=sagi@grimberg.me \
    /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