Linux IOMMU Development
 help / color / mirror / Atom feed
From: John Garry via iommu <iommu@lists.linux-foundation.org>
To: <damien.lemoal@opensource.wdc.com>, <joro@8bytes.org>,
	<will@kernel.org>,  <jejb@linux.ibm.com>,
	<martin.petersen@oracle.com>, <hch@lst.de>,
	<m.szyprowski@samsung.com>, <robin.murphy@arm.com>
Cc: linux-scsi@vger.kernel.org, linux-doc@vger.kernel.org,
	linuxarm@huawei.com, iommu@lists.linux.dev,
	linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org,
	iommu@lists.linux-foundation.org
Subject: [PATCH v4 3/5] scsi: core: Cap shost max_sectors according to DMA mapping limits only once
Date: Mon, 27 Jun 2022 23:25:19 +0800	[thread overview]
Message-ID: <1656343521-62897-4-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1656343521-62897-1-git-send-email-john.garry@huawei.com>

The shost->max_sectors is repeatedly capped according to the host DMA
mapping limit for each sdev in __scsi_init_queue(). This is unnecessary, so
set only once when adding the host.

Signed-off-by: John Garry <john.garry@huawei.com>
---
 drivers/scsi/hosts.c    | 5 +++++
 drivers/scsi/scsi_lib.c | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 8352f90d997d..d04bd2c7c9f1 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -236,6 +236,11 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev,
 
 	shost->dma_dev = dma_dev;
 
+	if (dma_dev->dma_mask) {
+		shost->max_sectors = min_t(unsigned int, shost->max_sectors,
+				dma_max_mapping_size(dma_dev) >> SECTOR_SHIFT);
+	}
+
 	error = scsi_mq_setup_tags(shost);
 	if (error)
 		goto fail;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 6ffc9e4258a8..6ce8acea322a 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1884,10 +1884,6 @@ void __scsi_init_queue(struct Scsi_Host *shost, struct request_queue *q)
 		blk_queue_max_integrity_segments(q, shost->sg_prot_tablesize);
 	}
 
-	if (dev->dma_mask) {
-		shost->max_sectors = min_t(unsigned int, shost->max_sectors,
-				dma_max_mapping_size(dev) >> SECTOR_SHIFT);
-	}
 	blk_queue_max_hw_sectors(q, shost->max_sectors);
 	blk_queue_segment_boundary(q, shost->dma_boundary);
 	dma_set_seg_boundary(dev, shost->dma_boundary);
-- 
2.35.3

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

WARNING: multiple messages have this Message-ID (diff)
From: John Garry <john.garry@huawei.com>
To: <damien.lemoal@opensource.wdc.com>, <joro@8bytes.org>,
	<will@kernel.org>, <jejb@linux.ibm.com>,
	<martin.petersen@oracle.com>, <hch@lst.de>,
	<m.szyprowski@samsung.com>, <robin.murphy@arm.com>
Cc: <linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-ide@vger.kernel.org>, <iommu@lists.linux-foundation.org>,
	<iommu@lists.linux.dev>, <linux-scsi@vger.kernel.org>,
	<linuxarm@huawei.com>, John Garry <john.garry@huawei.com>
Subject: [PATCH v4 3/5] scsi: core: Cap shost max_sectors according to DMA mapping limits only once
Date: Mon, 27 Jun 2022 23:25:19 +0800	[thread overview]
Message-ID: <1656343521-62897-4-git-send-email-john.garry@huawei.com> (raw)
Message-ID: <20220627152519.iaSwmym6VLhQVkYiccgwcQ7UHUgAlLkF42jEwxedbYM@z> (raw)
In-Reply-To: <1656343521-62897-1-git-send-email-john.garry@huawei.com>

The shost->max_sectors is repeatedly capped according to the host DMA
mapping limit for each sdev in __scsi_init_queue(). This is unnecessary, so
set only once when adding the host.

Signed-off-by: John Garry <john.garry@huawei.com>
---
 drivers/scsi/hosts.c    | 5 +++++
 drivers/scsi/scsi_lib.c | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 8352f90d997d..d04bd2c7c9f1 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -236,6 +236,11 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev,
 
 	shost->dma_dev = dma_dev;
 
+	if (dma_dev->dma_mask) {
+		shost->max_sectors = min_t(unsigned int, shost->max_sectors,
+				dma_max_mapping_size(dma_dev) >> SECTOR_SHIFT);
+	}
+
 	error = scsi_mq_setup_tags(shost);
 	if (error)
 		goto fail;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 6ffc9e4258a8..6ce8acea322a 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1884,10 +1884,6 @@ void __scsi_init_queue(struct Scsi_Host *shost, struct request_queue *q)
 		blk_queue_max_integrity_segments(q, shost->sg_prot_tablesize);
 	}
 
-	if (dev->dma_mask) {
-		shost->max_sectors = min_t(unsigned int, shost->max_sectors,
-				dma_max_mapping_size(dev) >> SECTOR_SHIFT);
-	}
 	blk_queue_max_hw_sectors(q, shost->max_sectors);
 	blk_queue_segment_boundary(q, shost->dma_boundary);
 	dma_set_seg_boundary(dev, shost->dma_boundary);
-- 
2.35.3


  parent reply	other threads:[~2022-06-27 15:31 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-27 15:25 [PATCH v4 0/5] DMA mapping changes for SCSI core John Garry via iommu
2022-06-27 15:25 ` John Garry
2022-06-27 15:25 ` [PATCH v4 1/5] dma-mapping: Add dma_opt_mapping_size() John Garry via iommu
2022-06-27 15:25   ` John Garry
2022-06-28 11:23   ` Robin Murphy
2022-06-28 11:23     ` Robin Murphy
2022-06-28 11:27     ` John Garry via iommu
2022-06-28 11:27       ` John Garry
2022-06-29 11:57       ` John Garry via iommu
2022-06-29 11:57         ` John Garry
2022-06-27 15:25 ` [PATCH v4 2/5] dma-iommu: Add iommu_dma_opt_mapping_size() John Garry via iommu
2022-06-27 15:25   ` John Garry
2022-06-28 10:56   ` Robin Murphy
2022-06-28 10:56     ` Robin Murphy
2022-06-27 15:25 ` John Garry via iommu [this message]
2022-06-27 15:25   ` [PATCH v4 3/5] scsi: core: Cap shost max_sectors according to DMA mapping limits only once John Garry
2022-06-27 15:25 ` [PATCH v4 4/5] scsi: scsi_transport_sas: Cap shost max_sectors according to DMA optimal mapping limit John Garry via iommu
2022-06-27 15:25   ` John Garry
2022-06-27 15:25 ` [PATCH v4 5/5] libata-scsi: Cap ata_device->max_sectors according to shost->max_sectors John Garry via iommu
2022-06-27 15:25   ` John Garry
2022-06-27 23:24   ` Damien Le Moal via iommu
2022-06-27 23:24     ` Damien Le Moal
2022-06-28  7:54     ` John Garry via iommu
2022-06-28  7:54       ` John Garry
2022-06-28  9:14       ` Damien Le Moal via iommu
2022-06-28  9:14         ` Damien Le Moal
2022-06-28 11:33         ` John Garry via iommu
2022-06-28 11:33           ` John Garry
2022-06-29  5:40           ` Christoph Hellwig
2022-06-29  5:40             ` Christoph Hellwig
2022-06-29  5:58             ` Damien Le Moal via iommu
2022-06-29  5:58               ` Damien Le Moal
2022-06-29  7:43               ` John Garry via iommu
2022-06-29  7:43                 ` John Garry
2022-06-29  8:24                 ` Damien Le Moal via iommu
2022-06-29  8:24                   ` Damien Le Moal

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=1656343521-62897-4-git-send-email-john.garry@huawei.com \
    --to=iommu@lists.linux-foundation.org \
    --cc=damien.lemoal@opensource.wdc.com \
    --cc=hch@lst.de \
    --cc=iommu@lists.linux.dev \
    --cc=jejb@linux.ibm.com \
    --cc=john.garry@huawei.com \
    --cc=joro@8bytes.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=m.szyprowski@samsung.com \
    --cc=martin.petersen@oracle.com \
    --cc=robin.murphy@arm.com \
    --cc=will@kernel.org \
    /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