scsi: vmw_pscsi: use sg helper to iterate over scatterlist [Linux 5.3]

This Linux kernel change "scsi: vmw_pscsi: use sg helper to iterate over scatterlist" is included in the Linux 5.3 release. This change is authored by Ming Lei <ming.lei [at] redhat.com> on Tue Jun 18 09:37:42 2019 +0800. The commit for this change in Linux stable tree is cf9648c (patch).

scsi: vmw_pscsi: use sg helper to iterate over scatterlist

Unlike the legacy I/O path, scsi-mq preallocates a large array to hold
the scatterlist for each request. This static allocation can consume
substantial amounts of memory on modern controllers which support a
large number of concurrently outstanding requests.

To facilitate a switch to a smaller static allocation combined with a
dynamic allocation for requests that need it, we need to make sure all
SCSI drivers handle chained scatterlists correctly.

Convert remaining drivers that directly dereference the scatterlist
array to using the iterator functions.

[mkp: clarified commit message]

Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

There are 2 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/scsi/vmw_pvscsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index ecee4b3..d71abd4 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -335,7 +335,7 @@ static void pvscsi_create_sg(struct pvscsi_ctx *ctx,
    BUG_ON(count > PVSCSI_MAX_NUM_SG_ENTRIES_PER_SEGMENT);

    sge = &ctx->sgl->sge[0];
-   for (i = 0; i < count; i++, sg++) {
+   for (i = 0; i < count; i++, sg = sg_next(sg)) {
        sge[i].addr   = sg_dma_address(sg);
        sge[i].length = sg_dma_len(sg);
        sge[i].flags  = 0;

Leave a Reply

Your email address will not be published. Required fields are marked *