Cancel sync commands if a TX failure occurs
Subsystems (2)
cover Cancel sync commands if a TX failure occurs
It was reported that userspace could hang for 10s after resuming due to btusb hitting the internal timeout when sending the firmware.
In this case, the bluetooth dongle disappeared right after resume due to the thinkpad_acpi rfkill being blocked. This causes the USB device to disappear, however the bluetooth stack does not handle the corresponding ENODEV errors and instead waits for a timeout to happen.
To avoid blocking everything for such a long time, the synchronous command has to finish immediately after an ENODEV error occurs. This requires further error handling, which this patchset adds by building on top of the existing cancellation infrastructure for synchronous commands.
Note that this just adds basic error handling in order to quickly abort the initialization routine in case the device disappears at that time. Additional error handling such as calling hci_reset_dev might be sensible in some cases.
Benjamin Berg (4):
Bluetooth: Reset more state when cancelling a sync command
Bluetooth: Add new hci_tx_error function
Bluetooth: hci_core: Signal TX failure if sending a frame failed
Bluetooth: btusb: Signal URB errors as TX failure
drivers/bluetooth/btusb.c | 16 ++++++++++++---- include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_core.c | 9 +++++++++ net/bluetooth/hci_request.c | 5 +++++ 4 files changed, 27 insertions(+), 4 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/4 Bluetooth: Reset more state when cancelling a sync command
From: Benjamin Berg <[email protected]>
Resetting the timers and cmd_cnt means that we assume the device will be in a good state after the sync command finishes. Without this a chain of synchronous commands might get stuck if one of them is cancelled.
--- net/bluetooth/hci_request.c | 5 +++++ 1 file changed, 5 insertions(+)
net/bluetooth/hci_request.c +5 -0
@@ -122,6 +122,11 @@ void hci_req_sync_cancel(struct hci_dev *hdev, int 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); } }
Signature · 1 line
2.31.1
Luiz Augusto von Dentz
maintainerRe: [PATCH 1/4] Bluetooth: Reset more state when cancelling a sync command
Hi Benjamin,
Quoted 29 lines · Benjamin Berg
From: Benjamin Berg <[email protected]>
Resetting the timers and
cmd_cntmeans that we assume the device will be in a good state after the sync command finishes. Without this a chain of synchronous commands might get stuck if one of them is cancelled.Signed-off-by Benjamin Berg <[email protected]>--- net/bluetooth/hci_request.c | 5 +++++ 1 file changed, 5 insertions(+)net/bluetooth/hci_request.c +5
-1@@ -122,6 +122,11 @@ void hci_req_sync_cancel(struct hci_dev *hdev, int 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); } } --
Quoted 1 line
2.31.1
Are you going to provide updates on this set? Or you are waiting for more feedback on how to proceed?
Signature · 1 line
Luiz Augusto von Dentz
PATCH 2/4 Bluetooth: Add new hci_tx_error function
In reply to Benjamin BergFrom: Benjamin Berg <[email protected]>
Currently this function only cancels any synchronous operation that might be ongoing. Adding this function allows aborting synchronous commands in case of low level TX/RX issues. A common example for this is that the device has been removed.
--- include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_core.c | 7 +++++++ 2 files changed, 8 insertions(+)
include/net/bluetooth/hci_core.h +1 -0
@@ -1267,6 +1267,7 @@ void hci_release_dev(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); +void hci_tx_error (struct hci_dev *hdev,int err);int hci_recv_frame (struct hci_dev *hdev,struct sk_buff *skb);int hci_recv_diag (struct hci_dev *hdev,struct sk_buff *skb); __printf(2, 3) void hci_set_hw_info(struct hci_dev *hdev, const char *fmt, ...);
net/bluetooth/hci_core.c +7 -0
@@ -4069,6 +4069,13 @@ int hci_reset_dev(struct hci_dev *hdev) }EXPORT_SYMBOL (hci_reset_dev); +/* Reset HCI device */ +void hci_tx_error (struct hci_dev *hdev,int err) +{ +hci_req_sync_cancel (hdev, err); +} +EXPORT_SYMBOL (hci_tx_error); +/* Receive frame from HCI drivers */ int hci_recv_frame (struct hci_dev *hdev,struct sk_buff *skb) {
Signature · 1 line
2.31.1
Luiz Augusto von Dentz
maintainerRe: [PATCH 2/4] Bluetooth: Add new hci_tx_error function
Hi Benjamin,
Quoted 31 lines · Benjamin Berg
From: Benjamin Berg <[email protected]>
Currently this function only cancels any synchronous operation that might be ongoing. Adding this function allows aborting synchronous commands in case of low level TX/RX issues. A common example for this is that the device has been removed.
Signed-off-by Benjamin Berg <[email protected]>--- include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_core.c | 7 +++++++ 2 files changed, 8 insertions(+)include/net/bluetooth/hci_core.h +1
-0@@ -1267,6 +1267,7 @@ void hci_release_dev(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); +void hci_tx_error (struct hci_dev *hdev,int err);int hci_recv_frame (struct hci_dev *hdev,struct sk_buff *skb);int hci_recv_diag (struct hci_dev *hdev,struct sk_buff *skb); __printf(2, 3) void hci_set_hw_info(struct hci_dev *hdev, const char *fmt, ...);net/bluetooth/hci_core.c +0
-0
net/bluetooth/hci_core.c int hci_reset_dev(struct hci_dev *hdev) · line 4077
Quoted 9 lines
net/bluetooth/hci_core.c +6
-0@@ -4069,6 +4069,13 @@ int hci_reset_dev(struct hci_dev *hdev) }EXPORT_SYMBOL (hci_reset_dev); +/* Reset HCI device */ +void hci_tx_error (struct hci_dev *hdev,int err) +{ +hci_req_sync_cancel (hdev, err); +} +EXPORT_SYMBOL (hci_tx_error);
I think we might be better off having such functionality exposed by hci_sync.h since that should be accessible by driver nowadays, at least that seems cleaner than having to introduce yet another public function in hci_core.h just to interface with the likes of hci_req_sync_cancel, that said we are also deprecating hci_request.h in favor of hci_sync.h so we might as well move the likes of hci_req_sync_cancel to hci_sync.h renaming it to hci_cmd_sync_cancel so it is inline with naming we are using in hci_sync.h.
Quoted 6 lines
net/bluetooth/hci_core.c +0
-1/* Receive frame from HCI drivers */ int hci_recv_frame (struct hci_dev *hdev,struct sk_buff *skb) { --2.31.1
Signature · 1 line
Luiz Augusto von Dentz
PATCH 3/4 Bluetooth: hci_core: Signal TX failure if sending a frame failed
In reply to Benjamin BergFrom: Benjamin Berg <[email protected]>
Call the hci_tx_error handler in case a frame cannot be send.
--- net/bluetooth/hci_core.c | 2 ++ 1 file changed, 2 insertions(+)
net/bluetooth/hci_core.c +2 -0
@@ -4200,6 +4200,8 @@ static void hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)if (err <0 ) {bt_dev_err (hdev,"sending frame failed (%d)" , err);kfree_skb (skb); + +hci_tx_error (hdev, -err); } }
Signature · 1 line
2.31.1
Luiz Augusto von Dentz
maintainerRe: [PATCH 3/4] Bluetooth: hci_core: Signal TX failure if sending a frame failed
Hi Benjamin,
Quoted 15 lines · Benjamin Berg
From: Benjamin Berg <[email protected]>
Call the
hci_tx_errorhandler in case a frame cannot be send.Signed-off-by Benjamin Berg <[email protected]>--- net/bluetooth/hci_core.c | 2 ++ 1 file changed, 2 insertions(+)net/bluetooth/hci_core.c +0
-0
net/bluetooth/hci_core.c static void hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb) · line 4204
Quoted 5 lines
net/bluetooth/hci_core.c +2
-0@@ -4200,6 +4200,8 @@ static void hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)if (err <0 ) {bt_dev_err (hdev,"sending frame failed (%d)" , err);kfree_skb (skb); + +hci_tx_error (hdev, -err);
Either we do this here by calling directly hci_cmd_sync_cancel like I suggested previously or perhaps we should have the error returned by hci_send_frame otherwise the current thread still has to wait to get the error from req_result which perhaps is not necessary if we already got a proper error here just return it so the thread doesn't even need to sleep.
Quoted 6 lines
net/bluetooth/hci_core.c +0
-1} } --2.31.1
Signature · 1 line
Luiz Augusto von Dentz
Re: [PATCH 3/4] Bluetooth: hci_core: Signal TX failure if sending a frame failed
Hi Luiz,
Quoted 22 lines · Luiz Augusto von Dentz
Hi Benjamin,
Quoted 19 lines · Benjamin Berg
From: Benjamin Berg <[email protected]>
Call the
hci_tx_errorhandler in case a frame cannot be send.Signed-off-by Benjamin Berg <[email protected]>--- net/bluetooth/hci_core.c | 2 ++ 1 file changed, 2 insertions(+)net/bluetooth/hci_core.c +1
-0@@ -4200,6 +4200,8 @@ static void hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)if (err <0 ) {bt_dev_err (hdev,"sending frame failed (%d)" , err);kfree_skb (skb); +
Quoted 8 lines
net/bluetooth/hci_core.c static void hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb) · line 4204
Quoted 1 line
net/bluetooth/hci_core.c +1
-0+hci_tx_error (hdev, -err);Either we do this here by calling directly
hci_cmd_sync_cancellike I suggested previously or perhaps we should have the error returned byhci_send_frameotherwise the current thread still has to wait to get the error fromreq_resultwhich perhaps is not necessary if we already got a proper error here just return it so the thread doesn't even need to sleep.
Yes, returning the error is a good idea.
I think that means doing the cancellation from hci_cmd_work. As I understand it, the frame is sent from the main workqueue so we are not avoiding the context switches for now. But that may well change in the future.
Benjamin
Quoted 8 lines
Quoted 6 lines
net/bluetooth/hci_core.c +0
-1} } --2.31.1
PATCH 4/4 Bluetooth: btusb: Signal URB errors as TX failure
In reply to Benjamin BergFrom: Benjamin Berg <[email protected]>
Call the TX failure handler when transmission of URBs fail. This is done both for failures to send an URB and also when the interrupt URB used to retrieve a response fails.
This approach is sufficient to quickly deal with certain errors such as a device being disconnected while synchronous commands are done during initialization.
--- drivers/bluetooth/btusb.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/bluetooth/btusb.c +12 -4
@@ -924,6 +924,8 @@ static void btusb_intr_complete(struct urb *urb)if (err != -EPERM && err != -ENODEV )bt_dev_err (hdev,"urb %p failed to resubmit (%d)" , urb, -err); +if (err != -EPERM ) +hci_tx_error (hdev, -err);usb_unanchor_urb (urb); } }
@@ -967,6 +969,8 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags)if (err != -EPERM && err != -ENODEV )bt_dev_err (hdev,"urb %p submission failed (%d)" , urb, -err); +if (err != -EPERM ) +hci_tx_error (hdev, -err);usb_unanchor_urb (urb); }
@@ -1322,10 +1326,12 @@ static void btusb_tx_complete(struct urb *urb)if (!test_bit (HCI_RUNNING , &hdev->flags)) goto done; -if (!urb->status) +if (!urb->status) { hdev->stat.byte_tx += urb->transfer_buffer_length; -else + }else { +hci_tx_error (hdev, -urb->status); hdev->stat.err_tx++; + } done:spin_lock_irqsave (&data->txlock, flags);
@@ -1348,10 +1354,12 @@ static void btusb_isoc_tx_complete(struct urb *urb)if (!test_bit (HCI_RUNNING , &hdev->flags)) goto done; -if (!urb->status) +if (!urb->status) { hdev->stat.byte_tx += urb->transfer_buffer_length; -else + }else { +hci_tx_error (hdev, -urb->status); hdev->stat.err_tx++; + } done:kfree (urb->setup_packet);
Signature · 1 line
2.31.1
Luiz Augusto von Dentz
maintainerRe: [PATCH 4/4] Bluetooth: btusb: Signal URB errors as TX failure
Hi Benjamin,
Quoted 40 lines · Benjamin Berg
From: Benjamin Berg <[email protected]>
Call the TX failure handler when transmission of URBs fail. This is done both for failures to send an URB and also when the interrupt URB used to retrieve a response fails.
This approach is sufficient to quickly deal with certain errors such as a device being disconnected while synchronous commands are done during initialization.
Signed-off-by Benjamin Berg <[email protected]>--- drivers/bluetooth/btusb.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)drivers/bluetooth/btusb.c +4
-0@@ -924,6 +924,8 @@ static void btusb_intr_complete(struct urb *urb)if (err != -EPERM && err != -ENODEV )bt_dev_err (hdev,"urb %p failed to resubmit (%d)" , urb, -err); +if (err != -EPERM ) +hci_tx_error (hdev, -err);usb_unanchor_urb (urb); } }@@ -967,6 +969,8 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags)if (err != -EPERM && err != -ENODEV )bt_dev_err (hdev,"urb %p submission failed (%d)" , urb, -err); +if (err != -EPERM ) +hci_tx_error (hdev, -err);usb_unanchor_urb (urb); }@@ -1322,10 +1326,12 @@ static void btusb_tx_complete(struct urb *urb)if (!test_bit (HCI_RUNNING , &hdev->flags))
drivers/bluetooth/btusb.c static void btusb_tx_complete(struct urb *urb) · line 1334
Quoted 10 lines
drivers/bluetooth/btusb.c +4
-2goto done; -if (!urb->status) +if (!urb->status) { hdev->stat.byte_tx += urb->transfer_buffer_length; -else + }else { +hci_tx_error (hdev, -urb->status); hdev->stat.err_tx++; + }
Looks like we are reusing the btusb_tx_complete for all endpoints but the likes of hci_tx_error/hci_cmd_sync_cancel only applies to commands (e.g: alloc_ctrl_urb), perhaps there is a way to detect if this is actually a control urb or not so we can skip this for bulk transfers, or actually if a bulk transfer fails we may actually need to resend depending if the error is recoverable since the bulk transfers can actually contain fragments rather than the entire packet, but I'd leave that for another patch since it is probably not what you are trying to fix in this set.
Quoted 20 lines
drivers/bluetooth/btusb.c +4
-3done:spin_lock_irqsave (&data->txlock, flags);@@ -1348,10 +1354,12 @@ static void btusb_isoc_tx_complete(struct urb *urb)if (!test_bit (HCI_RUNNING , &hdev->flags)) goto done; -if (!urb->status) +if (!urb->status) { hdev->stat.byte_tx += urb->transfer_buffer_length; -else + }else { +hci_tx_error (hdev, -urb->status); hdev->stat.err_tx++; + } done:kfree (urb->setup_packet); --2.31.1
Signature · 1 line
Luiz Augusto von Dentz