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.dev>,
<linux-scsi@vger.kernel.org>, <linuxarm@huawei.com>,
John Garry <john.garry@huawei.com>
Subject: [PATCH v6 6/6] ata: libata-scsi: Cap ata_device->max_sectors according to shost->max_sectors
Date: Thu, 14 Jul 2022 19:15:29 +0800 [thread overview]
Message-ID: <1657797329-98541-7-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1657797329-98541-1-git-send-email-john.garry@huawei.com>
ATA devices (struct ata_device) have a max_sectors field which is
configured internally in libata. This is then used to (re)configure the
associated sdev request queue max_sectors value from how it is earlier set
in __scsi_init_queue(). In __scsi_init_queue() the max_sectors value is set
according to shost limits, which includes host DMA mapping limits.
Cap the ata_device max_sectors according to shost->max_sectors to respect
this shost limit.
Signed-off-by: John Garry <john.garry@huawei.com>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
---
drivers/ata/libata-scsi.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 86dbb1cdfabd..24a43d540d9f 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1060,6 +1060,7 @@ int ata_scsi_dev_config(struct scsi_device *sdev, struct ata_device *dev)
dev->flags |= ATA_DFLAG_NO_UNLOAD;
/* configure max sectors */
+ dev->max_sectors = min(dev->max_sectors, sdev->host->max_sectors);
blk_queue_max_hw_sectors(q, dev->max_sectors);
if (dev->class == ATA_DEV_ATAPI) {
--
2.35.3
next prev parent reply other threads:[~2022-07-14 11:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-14 11:15 [PATCH v6 0/6] DMA mapping changes for SCSI core John Garry
2022-07-14 11:15 ` [PATCH v6 1/6] dma-mapping: Add dma_opt_mapping_size() John Garry
2022-07-14 11:15 ` [PATCH v6 2/6] dma-iommu: Add iommu_dma_opt_mapping_size() John Garry
2022-07-14 11:15 ` [PATCH v6 3/6] scsi: core: Cap shost max_sectors according to DMA limits only once John Garry
2022-07-14 11:15 ` [PATCH v6 4/6] scsi: sd: Allow max_sectors be capped at DMA optimal size limit John Garry
2022-07-18 10:47 ` Damien Le Moal
2022-07-19 7:05 ` John Garry
2022-07-19 7:10 ` Christoph Hellwig
2022-07-19 9:10 ` John Garry
2022-07-19 9:17 ` Christoph Hellwig
2022-07-19 2:30 ` Martin K. Petersen
2022-07-14 11:15 ` [PATCH v6 5/6] scsi: scsi_transport_sas: Cap shost opt_sectors according to DMA optimal limit John Garry
2022-07-18 10:47 ` Damien Le Moal
2022-07-14 11:15 ` John Garry [this message]
2022-07-19 4:06 ` [PATCH v6 0/6] DMA mapping changes for SCSI core 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=1657797329-98541-7-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=damien.lemoal@opensource.wdc.com \
--cc=hch@lst.de \
--cc=iommu@lists.linux.dev \
--cc=jejb@linux.ibm.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;
as well as URLs for NNTP newsgroup(s).