From: Ikjoon Jang <ikjn@chromium.org>
To: Tao Wang <wat@codeaurora.org>
Cc: Mathias Nyman <mathias.nyman@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"open list:USB XHCI DRIVER" <linux-usb@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] usb: xhci-ring: set all cancelled_td's cancel_status to TD_CLEARING_CACHE
Date: Fri, 13 Aug 2021 15:25:12 +0800 [thread overview]
Message-ID: <CAATdQgDWPqoSyPxQpvdhupjWVKHDy6SqBy2kgitNLjaioPRviQ@mail.gmail.com> (raw)
In-Reply-To: <1628822604-29239-1-git-send-email-wat@codeaurora.org>
Hi,
On Fri, Aug 13, 2021 at 10:44 AM Tao Wang <wat@codeaurora.org> wrote:
>
> USB SSD may fail to unmount if disconnect during data transferring.
>
> it stuck in usb_kill_urb() due to urb use_count will not become zero,
> this means urb giveback is not happen.
> in xhci_handle_cmd_set_deq() will giveback urb if td's cancel_status
> equal to TD_CLEARING_CACHE,
> but in xhci_invalidate_cancelled_tds(), only last canceled td's
> cancel_status change to TD_CLEARING_CACHE,
> thus giveback only happen to last urb.
>
> this change set all cancelled_td's cancel_status to TD_CLEARING_CACHE
> rather than the last one, so all urb can giveback.
>
> Signed-off-by: Tao Wang <wat@codeaurora.org>
> ---
> drivers/usb/host/xhci-ring.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
> index 8fea44b..c7dd7c0 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -960,19 +960,19 @@ static int xhci_invalidate_cancelled_tds(struct xhci_virt_ep *ep)
> td_to_noop(xhci, ring, td, false);
> td->cancel_status = TD_CLEARED;
> }
> - }
> - if (cached_td) {
> - cached_td->cancel_status = TD_CLEARING_CACHE;
> -
> - err = xhci_move_dequeue_past_td(xhci, slot_id, ep->ep_index,
> - cached_td->urb->stream_id,
> - cached_td);
> - /* Failed to move past cached td, try just setting it noop */
> - if (err) {
> - td_to_noop(xhci, ring, cached_td, false);
> - cached_td->cancel_status = TD_CLEARED;
> + if (cached_td) {
> + cached_td->cancel_status = TD_CLEARING_CACHE;
> +
> + err = xhci_move_dequeue_past_td(xhci, slot_id, ep->ep_index,
> + cached_td->urb->stream_id,
> + cached_td);
> + /* Failed to move past cached td, try just setting it noop */
> + if (err) {
> + td_to_noop(xhci, ring, cached_td, false);
> + cached_td->cancel_status = TD_CLEARED;
> + }
> + cached_td = NULL;
> }
> - cached_td = NULL;
I think we can call xhci_move_dequeue_past_td() just once to
the last halted && cancelled TD in a ring.
But that might need to compare two TDs to see which one is
the latter, I'm not sure how to do this well. :-/
if (!cached_td || cached_td < td)
cached_td = td;
> }
> return 0;
> }
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
next prev parent reply other threads:[~2021-08-13 7:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-13 2:43 [PATCH] usb: xhci-ring: set all cancelled_td's cancel_status to TD_CLEARING_CACHE Tao Wang
2021-08-13 7:25 ` Ikjoon Jang [this message]
2021-08-13 8:44 ` wat
2021-08-13 9:09 ` Mathias Nyman
2021-08-13 10:00 ` wat
2021-08-13 13:47 ` [RFT PATCH] xhci: fix failure to give back some cached cancelled URBs Mathias Nyman
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=CAATdQgDWPqoSyPxQpvdhupjWVKHDy6SqBy2kgitNLjaioPRviQ@mail.gmail.com \
--to=ikjn@chromium.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=wat@codeaurora.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.