From: Marek Szyprowski <m.szyprowski@samsung.com>
To: Mathias Nyman <mathias.nyman@linux.intel.com>,
gregkh@linuxfoundation.org, stern@rowland.harvard.edu,
kishon@ti.com
Cc: hdegoede@redhat.com, chris.chiu@canonical.com,
linux-usb@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [RFT PATCH] usb: hub: Fix locking issues with address0_mutex
Date: Mon, 22 Nov 2021 13:27:16 +0100 [thread overview]
Message-ID: <22f12ed7-18f3-9800-3858-9738f9ccd1f2@samsung.com> (raw)
In-Reply-To: <20211122105003.1089218-1-mathias.nyman@linux.intel.com>
Hi,
On 22.11.2021 11:50, Mathias Nyman wrote:
> Fix the circular lock dependency and unbalanced unlock of addess0_mutex
> introduced when fixing an address0_mutex enumeration retry race in commit
> ae6dc22d2d1 ("usb: hub: Fix usb enumeration issue due to address0 race")
>
> Make sure locking order between port_dev->status_lock and address0_mutex
> is correct, and that address0_mutex is not unlocked in hub_port_connect
> "done:" codepath which may be reached without locking address0_mutex
>
> Fixes: 6ae6dc22d2d1 ("usb: hub: Fix usb enumeration issue due to address0 race")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
This fixes the issue I've reported here:
https://lore.kernel.org/all/f3bfcbc7-f701-c74a-09bd-6491d4c8d863@samsung.com/
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> drivers/usb/core/hub.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
> index 00c3506324e4..00070a8a6507 100644
> --- a/drivers/usb/core/hub.c
> +++ b/drivers/usb/core/hub.c
> @@ -5188,6 +5188,7 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
> struct usb_port *port_dev = hub->ports[port1 - 1];
> struct usb_device *udev = port_dev->child;
> static int unreliable_port = -1;
> + bool retry_locked;
>
> /* Disconnect any existing devices under this port */
> if (udev) {
> @@ -5244,10 +5245,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
>
> status = 0;
>
> - mutex_lock(hcd->address0_mutex);
> -
> for (i = 0; i < PORT_INIT_TRIES; i++) {
> -
> + usb_lock_port(port_dev);
> + mutex_lock(hcd->address0_mutex);
> + retry_locked = true;
> /* reallocate for each attempt, since references
> * to the previous one can escape in various ways
> */
> @@ -5255,6 +5256,8 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
> if (!udev) {
> dev_err(&port_dev->dev,
> "couldn't allocate usb_device\n");
> + mutex_unlock(hcd->address0_mutex);
> + usb_unlock_port(port_dev);
> goto done;
> }
>
> @@ -5276,13 +5279,13 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
> }
>
> /* reset (non-USB 3.0 devices) and get descriptor */
> - usb_lock_port(port_dev);
> status = hub_port_init(hub, udev, port1, i);
> - usb_unlock_port(port_dev);
> if (status < 0)
> goto loop;
>
> mutex_unlock(hcd->address0_mutex);
> + usb_unlock_port(port_dev);
> + retry_locked = false;
>
> if (udev->quirks & USB_QUIRK_DELAY_INIT)
> msleep(2000);
> @@ -5372,11 +5375,14 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
>
> loop_disable:
> hub_port_disable(hub, port1, 1);
> - mutex_lock(hcd->address0_mutex);
> loop:
> usb_ep0_reinit(udev);
> release_devnum(udev);
> hub_free_dev(udev);
> + if (retry_locked) {
> + mutex_unlock(hcd->address0_mutex);
> + usb_unlock_port(port_dev);
> + }
> usb_put_dev(udev);
> if ((status == -ENOTCONN) || (status == -ENOTSUPP))
> break;
> @@ -5399,8 +5405,6 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
> }
>
> done:
> - mutex_unlock(hcd->address0_mutex);
> -
> hub_port_disable(hub, port1, 1);
> if (hcd->driver->relinquish_port && !hub->hdev->parent) {
> if (status != -ENOTCONN && status != -ENODEV)
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
next prev parent reply other threads:[~2021-11-22 12:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 22:16 [PATCH] usb: hub: Fix usb enumeration issue due to address0 race Mathias Nyman
2021-11-16 8:22 ` Greg KH
2021-11-16 8:39 ` Mathias Nyman
[not found] ` <CGME20211118111915eucas1p2cf4a502442e7259c6c347daf0d87259e@eucas1p2.samsung.com>
2021-11-18 11:19 ` Marek Szyprowski
2021-11-18 13:50 ` Mathias Nyman
2021-11-22 10:44 ` Mathias Nyman
2021-11-22 10:50 ` [RFT PATCH] usb: hub: Fix locking issues with address0_mutex Mathias Nyman
2021-11-22 12:27 ` Marek Szyprowski [this message]
2021-11-23 9:18 ` Mathias Nyman
2021-11-22 15:41 ` Hans de Goede
2021-11-23 9:31 ` 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=22f12ed7-18f3-9800-3858-9738f9ccd1f2@samsung.com \
--to=m.szyprowski@samsung.com \
--cc=chris.chiu@canonical.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=kishon@ti.com \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@linux.intel.com \
--cc=stable@vger.kernel.org \
--cc=stern@rowland.harvard.edu \
/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).