net/bluetooth/mgmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
From: Chun-Yi Lee <jlee@suse.com>
Since the d883a4669a1de be introduced in v6.4, bluetooth daemon
got the following failed message of MGMT_OP_REMOVE_ADV_MONITOR
command when controller is power-off:
bluetoothd[20976]:
src/adapter.c:reset_adv_monitors_complete() Failed to reset Adv
Monitors: Failed>
Normally this situation is happened when the bluetoothd deamon
be started manually after system booting. Which means that
bluetoothd received MGMT_EV_INDEX_ADDED event after kernel
runs hci_power_off().
Base on doc/mgmt-api.txt, the MGMT_OP_REMOVE_ADV_MONITOR command
can be used when the controller is not powered. This patch changes
the code in remove_adv_monitor() to use hci_cmd_sync_submit()
instead of hci_cmd_sync_queue().
Fixes: d883a4669a1de ("Bluetooth: hci_sync: Only allow hci_cmd_sync_queue if running")
Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Cc: Manish Mandlik <mmandlik@google.com>
Cc: Archie Pusaka <apusaka@chromium.org>
Cc: Miao-chen Chou <mcchou@chromium.org>
Signed-off-by: Chun-Yi Lee <jlee@suse.com>
---
net/bluetooth/mgmt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 32ed6e9245a3..21962969411d 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -5475,7 +5475,7 @@ static int remove_adv_monitor(struct sock *sk, struct hci_dev *hdev,
goto unlock;
}
- err = hci_cmd_sync_queue(hdev, mgmt_remove_adv_monitor_sync, cmd,
+ err = hci_cmd_sync_submit(hdev, mgmt_remove_adv_monitor_sync, cmd,
mgmt_remove_adv_monitor_complete);
if (err) {
--
2.35.3
Dear Chun-Yi, Thank you for your patch. Am 24.04.24 um 15:59 schrieb Lee, Chun-Yi: > From: Chun-Yi Lee <jlee@suse.com> Please use imperative mood in the commit message summary: Use hci_cmd_sync_submit() when removing Adv Monitor > Since the d883a4669a1de be introduced in v6.4, bluetooth daemon > got the following failed message of MGMT_OP_REMOVE_ADV_MONITOR > command when controller is power-off: Maybe: Since commit d883a4669a1de, present since Linux v6.4, the daemon bluetoothd logs the failure below, if the command MGMT_OP_REMOVE_ADV_MONITOR is sent when the controller is powered off. > bluetoothd[20976]: > src/adapter.c:reset_adv_monitors_complete() Failed to reset Adv > Monitors: Failed> Please make this one line and indent it with four spaces. > Normally this situation is happened when the bluetoothd deamon 1. happen*s* 2. d*ae*mon > be started manually after system booting. Which means that is started > bluetoothd received MGMT_EV_INDEX_ADDED event after kernel receive*s* > runs hci_power_off(). > > Base on doc/mgmt-api.txt, the MGMT_OP_REMOVE_ADV_MONITOR command Base*d* > can be used when the controller is not powered. This patch changes “This patch …” is redundant. Use: Change the code … > the code in remove_adv_monitor() to use hci_cmd_sync_submit() > instead of hci_cmd_sync_queue(). Please document the test setup. > Fixes: d883a4669a1de ("Bluetooth: hci_sync: Only allow hci_cmd_sync_queue if running") > Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > Cc: Manish Mandlik <mmandlik@google.com> > Cc: Archie Pusaka <apusaka@chromium.org> > Cc: Miao-chen Chou <mcchou@chromium.org> > Signed-off-by: Chun-Yi Lee <jlee@suse.com> > --- > net/bluetooth/mgmt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c > index 32ed6e9245a3..21962969411d 100644 > --- a/net/bluetooth/mgmt.c > +++ b/net/bluetooth/mgmt.c > @@ -5475,7 +5475,7 @@ static int remove_adv_monitor(struct sock *sk, struct hci_dev *hdev, > goto unlock; > } > > - err = hci_cmd_sync_queue(hdev, mgmt_remove_adv_monitor_sync, cmd, > + err = hci_cmd_sync_submit(hdev, mgmt_remove_adv_monitor_sync, cmd, > mgmt_remove_adv_monitor_complete); > > if (err) { Kind regards, Paul
Hi Paul, Thanks for your review. I will follow your suggestion to update my v2 patch. Joey Lee On Wed, Apr 24, 2024 at 04:13:09PM +0200, Paul Menzel wrote: > Dear Chun-Yi, > > > Thank you for your patch. > > Am 24.04.24 um 15:59 schrieb Lee, Chun-Yi: > > From: Chun-Yi Lee <jlee@suse.com> > > Please use imperative mood in the commit message summary: > > Use hci_cmd_sync_submit() when removing Adv Monitor > > > Since the d883a4669a1de be introduced in v6.4, bluetooth daemon > > got the following failed message of MGMT_OP_REMOVE_ADV_MONITOR > > command when controller is power-off: > > Maybe: > > Since commit d883a4669a1de, present since Linux v6.4, the daemon bluetoothd > logs the failure below, if the command MGMT_OP_REMOVE_ADV_MONITOR is sent > when the controller is powered off. > > > bluetoothd[20976]: > > src/adapter.c:reset_adv_monitors_complete() Failed to reset Adv > > Monitors: Failed> > > Please make this one line and indent it with four spaces. > > > Normally this situation is happened when the bluetoothd deamon > > 1. happen*s* > 2. d*ae*mon > > > be started manually after system booting. Which means that > > is started > > > bluetoothd received MGMT_EV_INDEX_ADDED event after kernel > > receive*s* > > > runs hci_power_off(). > > > > Base on doc/mgmt-api.txt, the MGMT_OP_REMOVE_ADV_MONITOR command > > Base*d* > > > can be used when the controller is not powered. This patch changes > > “This patch …” is redundant. Use: Change the code … > > > the code in remove_adv_monitor() to use hci_cmd_sync_submit() > > instead of hci_cmd_sync_queue(). > > Please document the test setup. > > > Fixes: d883a4669a1de ("Bluetooth: hci_sync: Only allow hci_cmd_sync_queue if running") > > Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > Cc: Manish Mandlik <mmandlik@google.com> > > Cc: Archie Pusaka <apusaka@chromium.org> > > Cc: Miao-chen Chou <mcchou@chromium.org> > > Signed-off-by: Chun-Yi Lee <jlee@suse.com> > > --- > > net/bluetooth/mgmt.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c > > index 32ed6e9245a3..21962969411d 100644 > > --- a/net/bluetooth/mgmt.c > > +++ b/net/bluetooth/mgmt.c > > @@ -5475,7 +5475,7 @@ static int remove_adv_monitor(struct sock *sk, struct hci_dev *hdev, > > goto unlock; > > } > > - err = hci_cmd_sync_queue(hdev, mgmt_remove_adv_monitor_sync, cmd, > > + err = hci_cmd_sync_submit(hdev, mgmt_remove_adv_monitor_sync, cmd, > > mgmt_remove_adv_monitor_complete); > > if (err) { > > > Kind regards, > > Paul
On Wed, 24 Apr 2024 15:59:03 +0200, Lee, Chun-Yi wrote: > > From: Chun-Yi Lee <jlee@suse.com> > > Since the d883a4669a1de be introduced in v6.4, bluetooth daemon > got the following failed message of MGMT_OP_REMOVE_ADV_MONITOR > command when controller is power-off: > > bluetoothd[20976]: > src/adapter.c:reset_adv_monitors_complete() Failed to reset Adv > Monitors: Failed> > > Normally this situation is happened when the bluetoothd deamon > be started manually after system booting. Which means that > bluetoothd received MGMT_EV_INDEX_ADDED event after kernel > runs hci_power_off(). > > Base on doc/mgmt-api.txt, the MGMT_OP_REMOVE_ADV_MONITOR command > can be used when the controller is not powered. This patch changes > the code in remove_adv_monitor() to use hci_cmd_sync_submit() > instead of hci_cmd_sync_queue(). > > Fixes: d883a4669a1de ("Bluetooth: hci_sync: Only allow hci_cmd_sync_queue if running") > Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > Cc: Manish Mandlik <mmandlik@google.com> > Cc: Archie Pusaka <apusaka@chromium.org> > Cc: Miao-chen Chou <mcchou@chromium.org> > Signed-off-by: Chun-Yi Lee <jlee@suse.com> Is it a same issue tracked in https://github.com/bluez/bluez/issues/809 ?? thanks, Takashi > --- > net/bluetooth/mgmt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c > index 32ed6e9245a3..21962969411d 100644 > --- a/net/bluetooth/mgmt.c > +++ b/net/bluetooth/mgmt.c > @@ -5475,7 +5475,7 @@ static int remove_adv_monitor(struct sock *sk, struct hci_dev *hdev, > goto unlock; > } > > - err = hci_cmd_sync_queue(hdev, mgmt_remove_adv_monitor_sync, cmd, > + err = hci_cmd_sync_submit(hdev, mgmt_remove_adv_monitor_sync, cmd, > mgmt_remove_adv_monitor_complete); > > if (err) { > -- > 2.35.3 > >
Hi Takashi, Thanks for your reviewing and comment! On Wed, Apr 24, 2024 at 04:02:37PM +0200, Takashi Iwai wrote: > On Wed, 24 Apr 2024 15:59:03 +0200, > Lee, Chun-Yi wrote: > > > > From: Chun-Yi Lee <jlee@suse.com> > > > > Since the d883a4669a1de be introduced in v6.4, bluetooth daemon > > got the following failed message of MGMT_OP_REMOVE_ADV_MONITOR > > command when controller is power-off: > > > > bluetoothd[20976]: > > src/adapter.c:reset_adv_monitors_complete() Failed to reset Adv > > Monitors: Failed> > > > > Normally this situation is happened when the bluetoothd deamon > > be started manually after system booting. Which means that > > bluetoothd received MGMT_EV_INDEX_ADDED event after kernel > > runs hci_power_off(). > > > > Base on doc/mgmt-api.txt, the MGMT_OP_REMOVE_ADV_MONITOR command > > can be used when the controller is not powered. This patch changes > > the code in remove_adv_monitor() to use hci_cmd_sync_submit() > > instead of hci_cmd_sync_queue(). > > > > Fixes: d883a4669a1de ("Bluetooth: hci_sync: Only allow hci_cmd_sync_queue if running") > > Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > Cc: Manish Mandlik <mmandlik@google.com> > > Cc: Archie Pusaka <apusaka@chromium.org> > > Cc: Miao-chen Chou <mcchou@chromium.org> > > Signed-off-by: Chun-Yi Lee <jlee@suse.com> > > Is it a same issue tracked in > https://github.com/bluez/bluez/issues/809 > ?? It's similar problem but for different MGMT command. The above issue and patch are against MGMT_OP_ADD_UUID/ MGMT_OP_REMOVE_UUID. My patch is against MGMT_OP_REMOVE_ADV_MONITOR command. Thanks Joey Lee > > > thanks, > > Takashi > > > --- > > net/bluetooth/mgmt.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c > > index 32ed6e9245a3..21962969411d 100644 > > --- a/net/bluetooth/mgmt.c > > +++ b/net/bluetooth/mgmt.c > > @@ -5475,7 +5475,7 @@ static int remove_adv_monitor(struct sock *sk, struct hci_dev *hdev, > > goto unlock; > > } > > > > - err = hci_cmd_sync_queue(hdev, mgmt_remove_adv_monitor_sync, cmd, > > + err = hci_cmd_sync_submit(hdev, mgmt_remove_adv_monitor_sync, cmd, > > mgmt_remove_adv_monitor_complete); > > > > if (err) { > > -- > > 2.35.3 > > > >
© 2016 - 2024 Red Hat, Inc.