From: Greg KH <gregkh@linuxfoundation.org>
To: Tejas Joglekar <Tejas.Joglekar@synopsys.com>
Cc: linux-usb@vger.kernel.org,
Chunfeng Yun <chunfeng.yun@mediatek.com>,
Fredrik Noring <noring@nocrew.org>,
Mathias Nyman <mathias.nyman@intel.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Raul E Rangel <rrangel@chromium.org>,
Laurentiu Tudor <laurentiu.tudor@nxp.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
John Youn <John.Youn@synopsys.com>
Subject: Re: [RESENDING RFC PATCH 4/4] usb: xhci: Use temporary buffer to consolidate SG
Date: Fri, 27 Mar 2020 10:27:59 +0100 [thread overview]
Message-ID: <20200327092759.GA1693819@kroah.com> (raw)
In-Reply-To: <5f7605b9f4cd2d6de4f0ef7d25be9a99d92c5aee.1585297723.git.joglekar@synopsys.com>
On Fri, Mar 27, 2020 at 02:23:46PM +0530, Tejas Joglekar wrote:
> The Synopsys xHC has an internal TRB cache of size TRB_CACHE_SIZE for
> each endpoint. The default value for TRB_CACHE_SIZE is 16 for SS and 8
> for HS. The controller loads and updates the TRB cache from the transfer
> ring in system memory whenever the driver issues a start transfer or
> update transfer command.
>
> For chained TRBs, the Synopsys xHC requires that the total amount of
> bytes for all TRBs loaded in the TRB cache be greater than or equal to 1
> MPS. Or the chain ends within the TRB cache (with a last TRB).
>
> If this requirement is not met, the controller will not be able to send
> or receive a packet and it will hang causing a driver timeout and error.
Sounds like broken hardware, or is this requirement in the xhci spec?
>
> This can be a problem if a class driver queues SG requests with many
> small-buffer entries. The XHCI driver will create a chained TRB for each
> entry which may trigger this issue.
>
> This patch adds logic to the XHCI driver to detect and prevent this from
> happening.
>
> For every (TRB_CACHE_SIZE - 2), we check the total buffer size of
> the SG list and if the last window of (TRB_CACHE_SIZE - 2) SG list length
> and we don't make up at least 1 MPS, we create a temporary buffer to
> consolidate full SG list into the buffer.
>
> We check at (TRB_CACHE_SIZE - 2) window because it is possible that there
> would be a link and/or event data TRB that take up to 2 of the cache
> entries.
>
> We discovered this issue with devices on other platforms but have not
> yet come across any device that triggers this on Linux. But it could be
> a real problem now or in the future. All it takes is N number of small
> chained TRBs. And other instances of the Synopsys IP may have smaller
> values for the TRB_CACHE_SIZE which would exacerbate the problem.
>
> Signed-off-by: Tejas Joglekar <joglekar@synopsys.com>
> ---
>
> Resending as 'umlaut' in email are not accepted by some servers.
>
> drivers/usb/core/hcd.c | 8 +++
> drivers/usb/host/xhci-ring.c | 2 +-
> drivers/usb/host/xhci.c | 128 +++++++++++++++++++++++++++++++++++++++++++
> drivers/usb/host/xhci.h | 4 ++
> 4 files changed, 141 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
> index aa45840d8273..fdd257a2b8a6 100644
> --- a/drivers/usb/core/hcd.c
> +++ b/drivers/usb/core/hcd.c
> @@ -1459,6 +1459,14 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,
> return -EINVAL;
> }
>
> + /*
> + * If SG is consolidate into single buffer
> + * return early
I do not understand this comment.
> + */
> + if ((urb->transfer_flags &
> + URB_DMA_MAP_SINGLE))
> + return ret;
Why? Isn't this now going to affect other host controllers (like all of
them?)
> +
> n = dma_map_sg(
> hcd->self.sysdev,
> urb->sg,
> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
> index a78787bb5133..2fad9474912a 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -3291,7 +3291,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
>
> full_len = urb->transfer_buffer_length;
> /* If we have scatter/gather list, we use it. */
> - if (urb->num_sgs) {
> + if (urb->num_sgs && !(urb->transfer_flags & URB_DMA_MAP_SINGLE)) {
> num_sgs = urb->num_mapped_sgs;
> sg = urb->sg;
> addr = (u64) sg_dma_address(sg);
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index fe38275363e0..94fddbd06179 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -1256,6 +1256,109 @@ EXPORT_SYMBOL_GPL(xhci_resume);
>
> /*-------------------------------------------------------------------------*/
>
> +static int xhci_map_temp_buffer(struct usb_hcd *hcd, struct urb *urb)
> +{
> + void *temp;
> + int ret = 0;
> + unsigned int len;
> + unsigned int buf_len;
> + enum dma_data_direction dir;
> + struct xhci_hcd *xhci;
> +
> + xhci = hcd_to_xhci(hcd);
> + dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
> + buf_len = urb->transfer_buffer_length;
> +
> + temp = kzalloc_node(buf_len, GFP_ATOMIC,
> + dev_to_node(hcd->self.sysdev));
> + if (!temp) {
> + xhci_warn(xhci, "Failed to create temp buffer, HC may fail\n");
Didn't kzalloc just warn before this?
And isn't this whole thing going to cause a lot more memory allocations
per submission than before?
> + return -ENOMEM;
> + }
> +
> + if (usb_urb_dir_out(urb)) {
> + len = sg_pcopy_to_buffer(urb->sg, urb->num_sgs,
> + temp, buf_len, 0);
> + if (len != buf_len)
> + xhci_warn(xhci, "Wrong temp buffer write length\n");
How could this happen? And if it does, why spam the kernel log about it
and yet not return an error?
> + }
> +
> + urb->transfer_buffer = temp;
> + urb->transfer_dma = dma_map_single(hcd->self.sysdev,
> + urb->transfer_buffer,
> + urb->transfer_buffer_length,
> + dir);
> + if (dma_mapping_error(hcd->self.sysdev,
> + urb->transfer_dma)) {
> + xhci_err(xhci, "dma mapping error\n");
Again, didn't dma_mapping_error() spit out a message?
> + ret = -EAGAIN;
> + kfree(temp);
> + } else {
> + urb->transfer_flags |= URB_DMA_MAP_SINGLE;
> + }
> +
> + return ret;
> +}
thanks,
greg k-h
next prev parent reply other threads:[~2020-03-27 9:28 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 8:52 [RESENDING RFC PATCH 0/4] Add logic to consolidate TRBs for Synopsys xHC Tejas Joglekar
2020-03-27 8:34 ` [RFC PATCH 1/4] dt-bindings: usb: Add snps,consolidate-sgl & consolidate-sgl Tejas Joglekar
2020-03-27 9:41 ` [RESENDING RFC " Tejas Joglekar
2020-03-27 9:54 ` Greg KH
2020-03-27 10:11 ` Tejas Joglekar
2020-03-27 10:24 ` Greg KH
2020-03-27 10:28 ` Tejas Joglekar
2020-04-05 1:45 ` Rob Herring
2020-04-14 10:09 ` Tejas Joglekar
2020-04-16 8:22 ` Felipe Balbi
2020-04-16 16:37 ` Tejas Joglekar
2020-04-17 11:44 ` Mathias Nyman
2020-03-27 8:35 ` [RFC PATCH 2/4] usb: xhci: Set quirk for XHCI_CONSOLIDATE_SG_LIST Tejas Joglekar
2020-03-27 9:42 ` [RESENDING RFC " Tejas Joglekar
2020-03-27 8:35 ` [RFC PATCH 3/4] usb: dwc3: Add device property consolidate-sgl Tejas Joglekar
2020-03-27 9:42 ` [RESENDING RFC " Tejas Joglekar
2020-03-27 8:53 ` [RESENDING RFC PATCH 4/4] usb: xhci: Use temporary buffer to consolidate SG Tejas Joglekar
2020-03-27 9:27 ` Greg KH [this message]
2020-03-27 10:05 ` Tejas Joglekar
2020-03-27 10:22 ` Greg KH
2020-03-27 11:25 ` Mathias Nyman
2020-03-27 15:38 ` Raul Rangel
2020-03-27 9:28 ` [RESENDING RFC PATCH 0/4] Add logic to consolidate TRBs for Synopsys xHC Greg KH
2020-03-27 9:43 ` Tejas Joglekar
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=20200327092759.GA1693819@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=John.Youn@synopsys.com \
--cc=Tejas.Joglekar@synopsys.com \
--cc=bigeasy@linutronix.de \
--cc=chunfeng.yun@mediatek.com \
--cc=laurentiu.tudor@nxp.com \
--cc=linux-usb@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=mathias.nyman@intel.com \
--cc=noring@nocrew.org \
--cc=rrangel@chromium.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).