linux-block.vger.kernel.org archive mirror
 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>, <sagi@grimberg.me>
Cc: Keith Busch <kbusch@kernel.org>
Subject: [PATCHv3 03/10] scsi: use request helper to get integrity segments
Date: Wed, 4 Sep 2024 08:25:58 -0700	[thread overview]
Message-ID: <20240904152605.4055570-4-kbusch@meta.com> (raw)
In-Reply-To: <20240904152605.4055570-1-kbusch@meta.com>

From: Keith Busch <kbusch@kernel.org>

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

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..dc1a1644cbc0c 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 = blk_rq_integrity_segments(rq);
 		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-04 15:26 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-04 15:25 [PATCHv3 00/10] block integrity merging and counting Keith Busch
2024-09-04 15:25 ` [PATCHv3 01/10] blk-mq: set the nr_integrity_segments from bio Keith Busch
2024-09-10 15:29   ` Christoph Hellwig
2024-09-04 15:25 ` [PATCHv3 02/10] block: provide helper for nr_integrity_segments Keith Busch
2024-09-10 15:30   ` Christoph Hellwig
2024-09-10 15:39     ` Keith Busch
2024-09-04 15:25 ` Keith Busch [this message]
2024-09-10 15:32   ` [PATCHv3 03/10] scsi: use request helper to get integrity segments Christoph Hellwig
2024-09-10 23:02     ` Keith Busch
2024-09-11  8:06       ` Christoph Hellwig
2024-09-04 15:25 ` [PATCHv3 04/10] nvme-rdma: " Keith Busch
2024-09-10 15:32   ` Christoph Hellwig
2024-09-04 15:26 ` [PATCHv3 05/10] block: unexport blk_rq_count_integrity_sg Keith Busch
2024-09-10 15:33   ` Christoph Hellwig
2024-09-04 15:26 ` [PATCHv3 06/10] blk-integrity: simplify counting segments Keith Busch
2024-09-10 15:41   ` Christoph Hellwig
2024-09-10 16:06     ` Keith Busch
2024-09-11  8:17       ` Christoph Hellwig
2024-09-11 15:28         ` Keith Busch
2024-09-12  7:01           ` Christoph Hellwig
2024-09-04 15:26 ` [PATCHv3 07/10] blk-integrity: simplify mapping sg Keith Busch
2024-09-10 15:43   ` Christoph Hellwig
2024-09-04 15:26 ` [PATCHv3 08/10] blk-integrity: remove inappropriate limit checks Keith Busch
2024-09-10 15:45   ` Christoph Hellwig
2024-09-10 16:21     ` Keith Busch
2024-09-11  8:18       ` Christoph Hellwig
2024-09-11 15:18         ` Keith Busch
2024-09-04 15:26 ` [PATCHv3 09/10] blk-integrity: consider entire bio list for merging Keith Busch
2024-09-10 15:48   ` Christoph Hellwig
2024-09-10 17:19     ` Keith Busch
2024-09-04 15:26 ` [PATCHv3 10/10] blk-merge: properly account for integrity segments Keith Busch
2024-09-06 11:28   ` Anuj Gupta
2024-09-10 15:49   ` Christoph Hellwig

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=20240904152605.4055570-4-kbusch@meta.com \
    --to=kbusch@meta.com \
    --cc=axboe@kernel.dk \
    --cc=hch@lst.de \
    --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;
as well as URLs for NNTP newsgroup(s).