* [PATCH 2/2] Bluetooth: Unregister suspend with userchannel
2022-06-02 16:46 [PATCH 1/2] Bluetooth: Fix index added after unregister Abhishek Pandit-Subedi
@ 2022-06-02 16:46 ` Abhishek Pandit-Subedi
2022-06-02 17:26 ` [1/2] Bluetooth: Fix index added after unregister bluez.test.bot
2022-06-05 4:50 ` [PATCH 1/2] " patchwork-bot+bluetooth
2 siblings, 0 replies; 4+ messages in thread
From: Abhishek Pandit-Subedi @ 2022-06-02 16:46 UTC (permalink / raw)
To: linux-bluetooth, marcel, luiz.dentz
Cc: Abhishek Pandit-Subedi, David S. Miller, Eric Dumazet,
Jakub Kicinski, Johan Hedberg, Paolo Abeni, linux-kernel, netdev
From: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
When HCI_USERCHANNEL is used, unregister the suspend notifier when
binding and register when releasing. The userchannel socket should be
left alone after open is completed.
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
---
Currently, the suspend notifier is harmless when used since no traffic
is actually passed to controller with HCI_USERCHANNEL. When I suspend,
all I see is the MGMT Controller Suspended and Controller Resumed
events. However, for correctness, I've opted to unregister the suspend
notifier entirely when using HCI_USERCHANNEL (similar to how the
HCI_QUIRK_NO_SUSPEND_NOTIFIER works).
The alternative to this approach would be to always keep the notifier
registered and exit early in hci_suspend_notifier. Please let me know
which you prefer.
Tested on ChromeOS kernel and compiled with allmodconfig on
bluetooth-next.
include/net/bluetooth/hci_core.h | 2 ++
net/bluetooth/hci_core.c | 33 ++++++++++++++++++++++++--------
net/bluetooth/hci_sock.c | 3 +++
3 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 5a52a2018b56..5b92a9abe141 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1289,6 +1289,8 @@ void hci_free_dev(struct hci_dev *hdev);
int hci_register_dev(struct hci_dev *hdev);
void hci_unregister_dev(struct hci_dev *hdev);
void hci_release_dev(struct hci_dev *hdev);
+int hci_register_suspend_notifier(struct hci_dev *hdev);
+int hci_unregister_suspend_notifier(struct hci_dev *hdev);
int hci_suspend_dev(struct hci_dev *hdev);
int hci_resume_dev(struct hci_dev *hdev);
int hci_reset_dev(struct hci_dev *hdev);
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 5abb2ca5b129..ab647a63830d 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2639,12 +2639,8 @@ int hci_register_dev(struct hci_dev *hdev)
hci_sock_dev_event(hdev, HCI_DEV_REG);
hci_dev_hold(hdev);
- if (!test_bit(HCI_QUIRK_NO_SUSPEND_NOTIFIER, &hdev->quirks)) {
- hdev->suspend_notifier.notifier_call = hci_suspend_notifier;
- error = register_pm_notifier(&hdev->suspend_notifier);
- if (error)
- goto err_wqueue;
- }
+ if (hci_register_suspend_notifier(hdev))
+ goto err_wqueue;
queue_work(hdev->req_workqueue, &hdev->power_on);
@@ -2677,8 +2673,7 @@ void hci_unregister_dev(struct hci_dev *hdev)
hci_cmd_sync_clear(hdev);
- if (!test_bit(HCI_QUIRK_NO_SUSPEND_NOTIFIER, &hdev->quirks))
- unregister_pm_notifier(&hdev->suspend_notifier);
+ hci_unregister_suspend_notifier(hdev);
msft_unregister(hdev);
@@ -2742,6 +2737,28 @@ void hci_release_dev(struct hci_dev *hdev)
}
EXPORT_SYMBOL(hci_release_dev);
+int hci_register_suspend_notifier(struct hci_dev *hdev)
+{
+ int ret = 0;
+
+ if (!test_bit(HCI_QUIRK_NO_SUSPEND_NOTIFIER, &hdev->quirks)) {
+ hdev->suspend_notifier.notifier_call = hci_suspend_notifier;
+ ret = register_pm_notifier(&hdev->suspend_notifier);
+ }
+
+ return ret;
+}
+
+int hci_unregister_suspend_notifier(struct hci_dev *hdev)
+{
+ int ret = 0;
+
+ if (!test_bit(HCI_QUIRK_NO_SUSPEND_NOTIFIER, &hdev->quirks))
+ ret = unregister_pm_notifier(&hdev->suspend_notifier);
+
+ return ret;
+}
+
/* Suspend HCI device */
int hci_suspend_dev(struct hci_dev *hdev)
{
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index bd8358b44aa4..0d015d4a8e41 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -887,6 +887,7 @@ static int hci_sock_release(struct socket *sock)
*/
hci_dev_do_close(hdev);
hci_dev_clear_flag(hdev, HCI_USER_CHANNEL);
+ hci_register_suspend_notifier(hdev);
mgmt_index_added(hdev);
}
@@ -1215,6 +1216,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,
}
mgmt_index_removed(hdev);
+ hci_unregister_suspend_notifier(hdev);
err = hci_dev_open(hdev->id);
if (err) {
@@ -1229,6 +1231,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,
err = 0;
} else {
hci_dev_clear_flag(hdev, HCI_USER_CHANNEL);
+ hci_register_suspend_notifier(hdev);
mgmt_index_added(hdev);
hci_dev_put(hdev);
goto done;
--
2.36.1.255.ge46751e96f-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] Bluetooth: Fix index added after unregister
2022-06-02 16:46 [PATCH 1/2] Bluetooth: Fix index added after unregister Abhishek Pandit-Subedi
2022-06-02 16:46 ` [PATCH 2/2] Bluetooth: Unregister suspend with userchannel Abhishek Pandit-Subedi
2022-06-02 17:26 ` [1/2] Bluetooth: Fix index added after unregister bluez.test.bot
@ 2022-06-05 4:50 ` patchwork-bot+bluetooth
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+bluetooth @ 2022-06-05 4:50 UTC (permalink / raw)
To: Abhishek Pandit-Subedi
Cc: linux-bluetooth, marcel, luiz.dentz, abhishekpandit, davem,
edumazet, kuba, johan.hedberg, pabeni, linux-kernel, netdev
Hello:
This series was applied to bluetooth/bluetooth-next.git (master)
by Marcel Holtmann <marcel@holtmann.org>:
On Thu, 2 Jun 2022 09:46:49 -0700 you wrote:
> From: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
>
> When a userchannel socket is released, we should check whether the hdev
> is already unregistered before sending out an IndexAdded.
>
> Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
>
> [...]
Here is the summary with links:
- [1/2] Bluetooth: Fix index added after unregister
https://git.kernel.org/bluetooth/bluetooth-next/c/8d4b73539cca
- [2/2] Bluetooth: Unregister suspend with userchannel
https://git.kernel.org/bluetooth/bluetooth-next/c/d6bb2a91f95b
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread