[PATCH 10/15] scsi: change to use blk_rq_nr_integrity_segments() instead of blk_rq_count_integrity_sg()

Jinyoung CHOI
2023-05-03T10:20:45Z

In the block layer, the number of segments is recorded in the request.
It is already divided into separate segments based on hw information.
Therefore, there is no need to count again.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Martin K. Petersen <martin.petersen@oracle.com>

Signed-off-by: Jinyoung Choi <j-young.choi@samsung.com>
---
drivers/scsi/scsi_lib.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 89cf21345e1a..5d67b6f6854e 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1006,8 +1006,9 @@ static inline bool scsi_cmd_needs_dma_drain(struct scsi_device *sdev,
static blk_status_t scsi_alloc_integrity_sgtables(struct scsi_cmnd *cmd)
{
struct request *rq = scsi_cmd_to_rq(cmd);
+ unsigned short nr_integrity_segs = blk_rq_nr_integrity_segments(rq);
struct scsi_data_buffer *prot_sdb = cmd->prot_sdb;
- int count, ivecs;
+ int count;

if (WARN_ON_ONCE(!prot_sdb)) {
/*
@@ -1018,9 +1019,7 @@ static blk_status_t scsi_alloc_integrity_sgtables(struct scsi_cmnd *cmd)
return BLK_STS_IOERR;
}

- ivecs = blk_rq_count_integrity_sg(rq->q, rq->bio);
-
- if (sg_alloc_table_chained(&prot_sdb->table, ivecs,
+ if (sg_alloc_table_chained(&prot_sdb->table, nr_integrity_segs,
prot_sdb->table.sgl,
SCSI_INLINE_PROT_SG_CNT)) {
return BLK_STS_RESOURCE;
@@ -1028,10 +1027,7 @@ static blk_status_t scsi_alloc_integrity_sgtables(struct scsi_cmnd *cmd)

count = blk_rq_map_integrity_sg(rq->q, rq->bio, prot_sdb->table.sgl);

- BUG_ON(count > ivecs);
- BUG_ON(count > queue_max_integrity_segments(rq->q));
-
- cmd->prot_sdb = prot_sdb;
+ BUG_ON(count > prot_sdb->table.nents);
cmd->prot_sdb->table.nents = count;

return BLK_STS_OK;
--
2.34.1