From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Sebastian Ott <sebott@linux.ibm.com>,
Sagi Grimberg <sagi@grimberg.me>,
Max Gurtovoy <maxg@mellanox.com>,
Bart Van Assche <bvanassche@acm.org>,
Ulf Hansson <ulf.hansson@linaro.org>,
Alan Stern <stern@rowland.harvard.edu>,
Oliver Neukum <oneukum@suse.com>,
linux-block@vger.kernel.org, linux-rdma@vger.kernel.org,
linux-mmc@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-scsi@vger.kernel.org, megaraidlinux.pdl@broadcom.com,
MPT-FusionLinux.pdl@broadcom.com, linux-hyperv@vger.kernel.org,
linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net,
linux-kernel@vger.kernel.org
Subject: [PATCH 13/13] uas: set virt_boundary_mask in the scsi host
Date: Wed, 5 Jun 2019 21:08:36 +0200 [thread overview]
Message-ID: <20190605190836.32354-14-hch@lst.de> (raw)
In-Reply-To: <20190605190836.32354-1-hch@lst.de>
This ensures all proper DMA layer handling is taken care of by the
SCSI midlayer.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/usb/storage/uas.c | 36 ++++++++++++++++--------------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 047c5922618f..d20919e7bbf4 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -789,29 +789,9 @@ static int uas_slave_alloc(struct scsi_device *sdev)
{
struct uas_dev_info *devinfo =
(struct uas_dev_info *)sdev->host->hostdata;
- int maxp;
sdev->hostdata = devinfo;
- /*
- * We have two requirements here. We must satisfy the requirements
- * of the physical HC and the demands of the protocol, as we
- * definitely want no additional memory allocation in this path
- * ruling out using bounce buffers.
- *
- * For a transmission on USB to continue we must never send
- * a package that is smaller than maxpacket. Hence the length of each
- * scatterlist element except the last must be divisible by the
- * Bulk maxpacket value.
- * If the HC does not ensure that through SG,
- * the upper layer must do that. We must assume nothing
- * about the capabilities off the HC, so we use the most
- * pessimistic requirement.
- */
-
- maxp = usb_maxpacket(devinfo->udev, devinfo->data_in_pipe, 0);
- blk_queue_virt_boundary(sdev->request_queue, maxp - 1);
-
/*
* The protocol has no requirements on alignment in the strict sense.
* Controllers may or may not have alignment restrictions.
@@ -1004,6 +984,22 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id)
*/
shost->can_queue = devinfo->qdepth - 2;
+ /*
+ * We have two requirements here. We must satisfy the requirements of
+ * the physical HC and the demands of the protocol, as we definitely
+ * want no additional memory allocation in this path ruling out using
+ * bounce buffers.
+ *
+ * For a transmission on USB to continue we must never send a package
+ * that is smaller than maxpacket. Hence the length of each scatterlist
+ * element except the last must be divisible by the Bulk maxpacket
+ * value. If the HC does not ensure that through SG, the upper layer
+ * must do that. We must assume nothing about the capabilities off the
+ * HC, so we use the most pessimistic requirement.
+ */
+ shost->virt_boundary_mask =
+ usb_maxpacket(udev, devinfo->data_in_pipe, 0) - 1;
+
usb_set_intfdata(intf, shost);
result = scsi_add_host(shost, &intf->dev);
if (result)
--
2.20.1
next prev parent reply other threads:[~2019-06-05 19:09 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-05 19:08 properly communicate queue limits to the DMA layer Christoph Hellwig
2019-06-05 19:08 ` [PATCH 01/13] nvme-pci: don't limit DMA segement size Christoph Hellwig
2019-06-05 19:08 ` [PATCH 02/13] rsxx: don't call dma_set_max_seg_size Christoph Hellwig
2019-06-05 19:08 ` [PATCH 03/13] mtip32xx: also set max_segment_size in the device Christoph Hellwig
2019-06-05 19:08 ` [PATCH 04/13] mmc: " Christoph Hellwig
2019-06-05 19:08 ` [PATCH 05/13] scsi: add a host / host template field for the virt boundary Christoph Hellwig
2019-06-05 19:08 ` [PATCH 06/13] ufshcd: set max_segment_size in the scsi host template Christoph Hellwig
2019-06-05 19:08 ` [PATCH 07/13] storvsc: set virt_boundary_mask " Christoph Hellwig
2019-06-05 19:08 ` [PATCH 08/13] IB/iser: set virt_boundary_mask in the scsi host Christoph Hellwig
2019-06-05 20:22 ` Jason Gunthorpe
2019-06-05 23:35 ` Sagi Grimberg
2019-06-06 6:24 ` Christoph Hellwig
2019-06-06 12:59 ` Jason Gunthorpe
2019-06-06 14:19 ` Christoph Hellwig
2019-06-05 19:08 ` [PATCH 09/13] IB/srp: " Christoph Hellwig
2019-06-05 19:08 ` [PATCH 10/13] megaraid_sas: " Christoph Hellwig
2019-06-06 6:02 ` Hannes Reinecke
2019-06-06 6:41 ` Christoph Hellwig
2019-06-06 15:37 ` Kashyap Desai
2019-06-08 8:14 ` Christoph Hellwig
2019-06-13 19:58 ` Kashyap Desai
2019-06-17 8:44 ` Christoph Hellwig
2019-06-17 9:10 ` Kashyap Desai
2019-06-13 8:44 ` Christoph Hellwig
2019-06-13 20:04 ` Kashyap Desai
2019-06-05 19:08 ` [PATCH 11/13] mpt3sas: " Christoph Hellwig
2019-06-05 19:08 ` [PATCH 12/13] usb-storage: " Christoph Hellwig
2019-06-05 19:08 ` Christoph Hellwig [this message]
2019-06-05 19:17 ` properly communicate queue limits to the DMA layer Jens Axboe
2019-06-05 19:24 ` Christoph Hellwig
2019-06-07 5:52 ` Jens Axboe
2019-06-07 17:30 ` Martin K. Petersen
2019-06-08 8:10 ` Jens Axboe
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=20190605190836.32354-14-hch@lst.de \
--to=hch@lst.de \
--cc=MPT-FusionLinux.pdl@broadcom.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=maxg@mellanox.com \
--cc=megaraidlinux.pdl@broadcom.com \
--cc=oneukum@suse.com \
--cc=sagi@grimberg.me \
--cc=sebott@linux.ibm.com \
--cc=stern@rowland.harvard.edu \
--cc=ulf.hansson@linaro.org \
--cc=usb-storage@lists.one-eyed-alien.net \
/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).