[-next] Bluetooth: btusb: Do not call kfree_skb() under spin_lock_irqsave()

Commit Message

Jinjie Ruan Aug. 23, 2023, 3:46 a.m. UTC

It is not allowed to call kfree_skb() from hardware interrupt
context or with hardware interrupts being disabled.
So replace kfree_skb() with dev_kfree_skb_irq() under
spin_lock_irqsave(). Compile tested only.

Fixes: baac6276c0a9 ("Bluetooth: btusb: handle mSBC audio over USB Endpoints")
Signed-off-by: Jinjie Ruan <[e-mail]>
---
 drivers/bluetooth/btusb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

[e-mail] Aug. 23, 2023, 4:45 a.m. UTC | #1

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=778416

---Test result---

Test Summary:
CheckPatch                    PASS      2.85 seconds
GitLint                       PASS      0.34 seconds
SubjectPrefix                 PASS      0.10 seconds
BuildKernel                   PASS      43.27 seconds
CheckAllWarning               PASS      47.99 seconds
CheckSparse                   PASS      54.20 seconds
CheckSmatch                   PASS      148.09 seconds
BuildKernel32                 PASS      43.00 seconds
TestRunnerSetup               PASS      650.12 seconds
TestRunner_l2cap-tester       PASS      37.65 seconds
TestRunner_iso-tester         PASS      86.17 seconds
TestRunner_bnep-tester        PASS      15.61 seconds
TestRunner_mgmt-tester        FAIL      272.34 seconds
TestRunner_rfcomm-tester      PASS      22.86 seconds
TestRunner_sco-tester         PASS      26.37 seconds
TestRunner_ioctl-tester       PASS      25.81 seconds
TestRunner_mesh-tester        PASS      20.55 seconds
TestRunner_smp-tester         PASS      20.60 seconds
TestRunner_userchan-tester    PASS      16.39 seconds
IncrementalBuild              PASS      40.19 seconds

Details
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 497, Passed: 496 (99.8%), Failed: 1, Not Run: 0

Failed Test Cases
LL Privacy - Unpair 1                                Timed out    2.104 seconds


---
Regards,
Linux Bluetooth

[e-mail] Aug. 23, 2023, 11:50 p.m. UTC | #2

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Wed, 23 Aug 2023 11:46:37 +0800 you wrote:
> It is not allowed to call kfree_skb() from hardware interrupt
> context or with hardware interrupts being disabled.
> So replace kfree_skb() with dev_kfree_skb_irq() under
> spin_lock_irqsave(). Compile tested only.
> 
> Fixes: baac6276c0a9 ("Bluetooth: btusb: handle mSBC audio over USB Endpoints")
> Signed-off-by: Jinjie Ruan <[e-mail]>
> 
> [...]

Here is the summary with links:
  - [-next] Bluetooth: btusb: Do not call kfree_skb() under spin_lock_irqsave()
    https://git.kernel.org/bluetooth/bluetooth-next/c/feed554a67ab

You are awesome, thank you!

Patch

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 1bb3b09013b0..52309ece6145 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2162,7 +2162,7 @@  static int btusb_switch_alt_setting(struct hci_dev *hdev, int new_alts)
 		 * alternate setting.
 		 */
 		spin_lock_irqsave(&data->rxlock, flags);
-		kfree_skb(data->sco_skb);
+		dev_kfree_skb_irq(data->sco_skb);
 		data->sco_skb = NULL;
 		spin_unlock_irqrestore(&data->rxlock, flags);