All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	<linux-scsi@vger.kernel.org>, <liyihang6@hisilicon.com>,
	<chenxiang66@hisilicon.com>, <thunder.leizhen@huawei.com>,
	John Garry <john.garry@huawei.com>
Subject: [PATCH 4/4] libata-scsi: Cap ata_device->max_sectors according to shost->max_sectors
Date: Fri, 20 May 2022 16:23:23 +0800	[thread overview]
Message-ID: <1653035003-70312-5-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1653035003-70312-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>
---
 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 06c9d90238d9..25fe89791641 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1036,6 +1036,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.26.2


WARNING: multiple messages have this Message-ID (diff)
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,
	liyihang6@hisilicon.com, linux-kernel@vger.kernel.org,
	linux-ide@vger.kernel.org, iommu@lists.linux-foundation.org
Subject: [PATCH 4/4] libata-scsi: Cap ata_device->max_sectors according to shost->max_sectors
Date: Fri, 20 May 2022 16:23:23 +0800	[thread overview]
Message-ID: <1653035003-70312-5-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1653035003-70312-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>
---
 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 06c9d90238d9..25fe89791641 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1036,6 +1036,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.26.2

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

  parent reply	other threads:[~2022-05-20  8:29 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-20  8:23 [PATCH 0/4] DMA mapping changes for SCSI core John Garry
2022-05-20  8:23 ` John Garry via iommu
2022-05-20  8:23 ` [PATCH 1/4] dma-mapping: Add dma_opt_mapping_size() John Garry
2022-05-20  8:23   ` John Garry via iommu
2022-05-20 23:32   ` Damien Le Moal
2022-05-20 23:32     ` Damien Le Moal via iommu
2022-05-20  8:23 ` [PATCH 2/4] dma-iommu: Add iommu_dma_opt_mapping_size() John Garry
2022-05-20  8:23   ` John Garry via iommu
2022-05-20 23:33   ` Damien Le Moal
2022-05-20 23:33     ` Damien Le Moal via iommu
2022-05-23  7:01     ` John Garry via iommu
2022-05-23  7:01       ` John Garry
2022-05-23  7:32       ` Damien Le Moal
2022-05-23  7:32         ` Damien Le Moal via iommu
2022-05-23  7:34   ` Damien Le Moal via iommu
2022-05-23  7:34     ` Damien Le Moal
2022-05-20  8:23 ` [PATCH 3/4] scsi: core: Cap shost max_sectors according to DMA optimum mapping limits John Garry
2022-05-20  8:23   ` John Garry via iommu
2022-05-20 23:30   ` Damien Le Moal
2022-05-20 23:30     ` Damien Le Moal via iommu
2022-05-23  6:53     ` John Garry via iommu
2022-05-23  6:53       ` John Garry
2022-05-23  7:33       ` Damien Le Moal
2022-05-23  7:33         ` Damien Le Moal via iommu
2022-05-20  8:23 ` John Garry [this message]
2022-05-20  8:23   ` [PATCH 4/4] libata-scsi: Cap ata_device->max_sectors according to shost->max_sectors John Garry via iommu
2022-05-20 23:34   ` Damien Le Moal
2022-05-20 23:34     ` Damien Le Moal via iommu
2022-05-22 13:13 ` [PATCH 0/4] DMA mapping changes for SCSI core Christoph Hellwig
2022-05-22 13:13   ` Christoph Hellwig
2022-05-22 22:22   ` Damien Le Moal
2022-05-22 22:22     ` Damien Le Moal via iommu
2022-05-23 12:00     ` John Garry
2022-05-23 12:00       ` John Garry via iommu
2022-05-24  2:41   ` Martin K. Petersen
2022-05-24  2:41     ` Martin K. Petersen
2022-05-20 21:43 [PATCH 3/4] scsi: core: Cap shost max_sectors according to DMA optimum mapping limits kernel test robot
2022-05-23 11:08 ` Dan Carpenter
2022-05-23 11:08 ` Dan Carpenter
2022-05-23 11:08 ` Dan Carpenter
2022-05-23 11:56 ` John Garry
2022-05-23 11:56   ` John Garry
2022-05-23 11:56   ` John Garry via iommu

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=1653035003-70312-5-git-send-email-john.garry@huawei.com \
    --to=john.garry@huawei.com \
    --cc=chenxiang66@hisilicon.com \
    --cc=damien.lemoal@opensource.wdc.com \
    --cc=hch@lst.de \
    --cc=iommu@lists.linux-foundation.org \
    --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=liyihang6@hisilicon.com \
    --cc=m.szyprowski@samsung.com \
    --cc=martin.petersen@oracle.com \
    --cc=robin.murphy@arm.com \
    --cc=thunder.leizhen@huawei.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.