On Fri, 2023-11-17 at 13:08 -0800, Douglas Anderson wrote:
> As of commit d9962b0d4202 ("r8152: Block future register access if
> register access fails") there is a race condition that can happen
> between the USB device reset thread and napi_enable() (not) getting
> called during rtl8152_open(). Specifically:
> * While rtl8152_open() is running we get a register access error
> that's _not_ -ENODEV and queue up a USB reset.
> * rtl8152_open() exits before calling napi_enable() due to any reason
> (including usb_submit_urb() returning an error).
>
> In that case:
> * Since the USB reset is perform in a separate thread asynchronously,
> it can run at anytime USB device lock is not held - even before
> rtl8152_open() has exited with an error and caused __dev_open() to
> clear the __LINK_STATE_START bit.
> * The rtl8152_pre_reset() will notice that the netif_running() returns
> true (since __LINK_STATE_START wasn't cleared) so it won't exit
> early.
> * rtl8152_pre_reset() will then hang in napi_disable() because
> napi_enable() was never called.
>
> We can fix the race by making sure that the r8152 reset routines don't
> run at the same time as we're opening the device. Specifically we need
> the reset routines in their entirety rely on the return value of
> netif_running(). The only way to reliably depend on that is for them
> to hold the rntl_lock() mutex for the duration of reset.
Acquiring the rtnl_lock in a callback and releasing it in a different
one, with the latter called depending on the configuration, looks
fragile and possibly prone to deadlock issues.
Have you tested your patch with lockdep enabled?
Can you instead acquire the rtnl lock only for pre_reset/post_rest and
in rtl8152_open() do something alike:
for (i = 0; i < MAX_WAIT; ++i) {
if (usb_lock_device_for_reset(udev, NULL))
goto error;
wait_again = udev->reset_in_progress;
usb_unlock_device(udev);
if (!wait_again)
break;
usleep(1);
}
if (i == MAX_WAIT)
goto error;
which should be more polite to other locks?
Thanks,
Paolo
