From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Fredrik Noring <noring@nocrew.org>
Cc: Christoph Hellwig <hch@lst.de>, linux-usb@vger.kernel.org
Subject: Re: [PATCH] USB: Fix incorrect DMA allocations for local memory pool drivers
Date: Tue, 10 Dec 2019 12:22:10 +0100 [thread overview]
Message-ID: <20191210112210.GA3774386@kroah.com> (raw)
In-Reply-To: <20191130165055.GA46622@sx9>
On Sat, Nov 30, 2019 at 05:50:55PM +0100, Fredrik Noring wrote:
> Fix commit 7b81cb6bddd2 ("usb: add a HCD_DMA flag instead of
> guestimating DMA capabilities") where local memory USB drivers
> erroneously allocate DMA memory instead of pool memory, causing
>
> OHCI Unrecoverable Error, disabled
> HC died; cleaning up
>
> The order between hcd_uses_dma() and hcd->localmem_pool is now
> arranged as in hcd_buffer_alloc() and hcd_buffer_free(), with the
> test for hcd->localmem_pool placed first.
>
> As an alternative, one might consider adjusting hcd_uses_dma() with
>
> static inline bool hcd_uses_dma(struct usb_hcd *hcd)
> {
> - return IS_ENABLED(CONFIG_HAS_DMA) && (hcd->driver->flags & HCD_DMA);
> + return IS_ENABLED(CONFIG_HAS_DMA) &&
> + (hcd->driver->flags & HCD_DMA) &&
> + (hcd->localmem_pool == NULL);
> }
>
> One can also consider unsetting HCD_DMA for local memory pool drivers.
>
> Fixes: 7b81cb6bddd2 ("usb: add a HCD_DMA flag instead of guestimating DMA capabilities")
> Cc: stable <stable@vger.kernel.org>
> Signed-off-by: Fredrik Noring <noring@nocrew.org>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> ---
> drivers/usb/core/hcd.c | 42 +++++++++++++++++-----------------
> drivers/usb/storage/scsiglue.c | 3 ++-
> 2 files changed, 23 insertions(+), 22 deletions(-)
This patch doesn't apply against 5.5-rc1, can you refresh it and resend?
thanks,
greg k-h
next prev parent reply other threads:[~2019-12-10 11:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-30 16:50 [PATCH] USB: Fix incorrect DMA allocations for local memory pool drivers Fredrik Noring
2019-12-03 7:39 ` Christoph Hellwig
2019-12-03 16:54 ` Fredrik Noring
2019-12-03 8:12 ` Johan Hovold
2019-12-03 16:55 ` Fredrik Noring
2019-12-10 11:22 ` Greg Kroah-Hartman [this message]
2019-12-10 17:29 ` [PATCH v2] " Fredrik Noring
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=20191210112210.GA3774386@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=linux-usb@vger.kernel.org \
--cc=noring@nocrew.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).