Re: [PATCH 5.10 157/236] Bluetooth: Move shutdown callback before flushing tx and rx queue

Sasha Levin
2021-09-16T00:56:16Z

On Wed, Sep 15, 2021 at 07:32:38AM -0700, Guenter Roeck wrote:
>On Wed, Sep 15, 2021 at 01:18:43PM +0200, Pavel Machek wrote:
>> Hi!
>>
>> > [ Upstream commit 0ea53674d07fb6db2dd7a7ec2fdc85a12eb246c2 ]
>>
>> Upstream commit is okay...
>>
>> > So move the shutdown callback before flushing TX/RX queue to resolve the
>> > issue.
>>
>> ...but something went wrong in stable. This is not moving code, this
>> is duplicating it:
>>
>> > --- a/net/bluetooth/hci_core.c
>> > +++ b/net/bluetooth/hci_core.c
>> > @@ -1726,6 +1726,14 @@ int hci_dev_do_close(struct hci_dev *hdev)
>> > hci_request_cancel_all(hdev);
>> > hci_req_sync_lock(hdev);
>> >
>> > + if (!hci_dev_test_flag(hdev, HCI_UNREGISTER) &&
>> > + !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &&
>> > + test_bit(HCI_UP, &hdev->flags)) {
>> > + /* Execute vendor specific shutdown routine */
>> > + if (hdev->shutdown)
>> > + hdev->shutdown(hdev);
>> > + }
>> > +
>> > if (!test_and_clear_bit(HCI_UP, &hdev->flags)) {
>> > cancel_delayed_work_sync(&hdev->cmd_timer);
>> > hci_req_sync_unlock(hdev);
>>
>> And yes, we end up with 2 copies in 5.10.
>>
>
>Same problem in v5.4.y, unfortunately.

Ugh, odd - it wasn't manually backported :/

I'll drop it.

--
Thanks,
Sasha