Bluetooth: hci_core: Cancel request on command timeout
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v3 1/1 Bluetooth: hci_core: Cancel request on command timeout
From: Luiz Augusto von Dentz <[email protected]>
If command has timed out call __hci_cmd_sync_cancel to notify the hci_req since it will inevitably cause a timeout.
This also rework the code around __hci_cmd_sync_cancel since it was wrongly assuming it needs to cancel timer as well, but sometimes the timers have not been started or in fact they already had timed out in which case they don't need to be cancel yet again.
--- include/net/bluetooth/hci_sync.h | 2 +- net/bluetooth/hci_core.c | 84 ++++++++++++++++++++++---------- net/bluetooth/hci_request.c | 2 +- net/bluetooth/hci_sync.c | 34 +++++++------ net/bluetooth/mgmt.c | 2 +- 5 files changed, 78 insertions(+), 46 deletions(-)
include/net/bluetooth/hci_sync.h +1 -1
@@ -42,7 +42,7 @@ int __hci_cmd_sync_status_sk(struct hci_dev *hdev, u16 opcode, u32 plen,void hci_cmd_sync_init (struct hci_dev *hdev);void hci_cmd_sync_clear (struct hci_dev *hdev);void hci_cmd_sync_cancel (struct hci_dev *hdev,int err); -void __hci_cmd_sync_cancel (struct hci_dev *hdev,int err); +void hci_cmd_sync_cancel_sync (struct hci_dev *hdev,int err);int hci_cmd_sync_submit (struct hci_dev *hdev,hci_cmd_sync_work_func_t func,void *data,hci_cmd_sync_work_destroy_t destroy);
net/bluetooth/hci_core.c +57 -27
116 lines not on this page · raw message
net/bluetooth/hci_request.c +1 -1
@@ -895,7 +895,7 @@ void hci_request_setup(struct hci_dev *hdev)void hci_request_cancel_all (struct hci_dev *hdev) { -__hci_cmd_sync_cancel (hdev,ENODEV ); +hci_cmd_sync_cancel_sync (hdev,ENODEV );cancel_interleave_scan (hdev); }
net/bluetooth/hci_sync.c +18 -16
@@ -584,22 +584,6 @@ void hci_cmd_sync_clear(struct hci_dev *hdev)mutex_unlock (&hdev->cmd_sync_work_lock); } -void __hci_cmd_sync_cancel (struct hci_dev *hdev,int err) -{ -bt_dev_dbg (hdev,"err 0x%2.2x" , err); - -if (hdev->req_status ==HCI_REQ_PEND ) { - hdev->req_result = err; - hdev->req_status =HCI_REQ_CANCELED ; - -cancel_delayed_work_sync (&hdev->cmd_timer); -cancel_delayed_work_sync (&hdev->ncmd_timer); -atomic_set (&hdev->cmd_cnt,1 ); - -wake_up_interruptible (&hdev->req_wait_q); - } -} -void hci_cmd_sync_cancel (struct hci_dev *hdev,int err) {bt_dev_dbg (hdev,"err 0x%2.2x" , err);
@@ -613,6 +597,24 @@ void hci_cmd_sync_cancel(struct hci_dev *hdev, int err) }EXPORT_SYMBOL (hci_cmd_sync_cancel); +/* Cancel ongoing command request synchronously: +* +* - Set result and mark status to HCI_REQ_CANCELED +* - Wakeup command sync thread +*/ +void hci_cmd_sync_cancel_sync (struct hci_dev *hdev,int err) +{ +bt_dev_dbg (hdev,"err 0x%2.2x" , err); + +if (hdev->req_status ==HCI_REQ_PEND ) { + hdev->req_result = err; + hdev->req_status =HCI_REQ_CANCELED ; + +wake_up_interruptible (&hdev->req_wait_q); + } +} +EXPORT_SYMBOL (hci_cmd_sync_cancel_sync); +/* Submit HCI command to be run in as cmd_sync_work: * * - hdev must _not_ be unregistered
net/bluetooth/mgmt.c +1 -1
@@ -1415,7 +1415,7 @@ static int set_powered(struct sock *sk, struct hci_dev *hdev, void *data,/* Cancel potentially blocking sync operation before power off */ if (cp->val ==0x00 ) { -__hci_cmd_sync_cancel (hdev, -EHOSTDOWN ); +hci_cmd_sync_cancel_sync (hdev, -EHOSTDOWN ); err =hci_cmd_sync_queue (hdev, set_powered_sync, cmd, mgmt_set_powered_complete); }else {
Signature · 1 line
2.43.0
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=816294
---Test result---
Test Summary:
CheckPatch PASS 1.07 seconds GitLint PASS 0.21 seconds SubjectPrefix PASS 0.07 seconds BuildKernel PASS 27.75 seconds CheckAllWarning PASS 30.35 seconds CheckSparse PASS 38.61 seconds CheckSmatch PASS 98.66 seconds BuildKernel32 PASS 26.77 seconds TestRunnerSetup PASS 431.00 seconds TestRunner_l2cap-tester PASS 22.77 seconds TestRunner_iso-tester PASS 44.80 seconds TestRunner_bnep-tester PASS 6.79 seconds TestRunner_mgmt-tester PASS 158.04 seconds TestRunner_rfcomm-tester PASS 10.71 seconds TestRunner_sco-tester PASS 14.30 seconds TestRunner_ioctl-tester PASS 11.69 seconds TestRunner_mesh-tester PASS 8.69 seconds TestRunner_smp-tester PASS 9.83 seconds TestRunner_userchan-tester PASS 7.11 seconds IncrementalBuild PASS 25.74 seconds
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 11 lines · On Thu, 11 Jan 2024 15:02:05 -0500 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
If command has timed out call
__hci_cmd_sync_cancelto notify thehci_reqsince it will inevitably cause a timeout.This also rework the code around
__hci_cmd_sync_cancelsince it was wrongly assuming it needs to cancel timer as well, but sometimes the timers have not been started or in fact they already had timed out in which case they don't need to be cancel yet again.[...]
Here is the summary with links:
- [v3] Bluetooth: hci_core: Cancel request on command timeout
https://git.kernel.org/bluetooth/bluetooth-next/c/711c35949648
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html