f1a8f402f1
This fixes the following deadlock introduced by 39a92a55be13
("bluetooth/l2cap: sync sock recv cb and release")
============================================
WARNING: possible recursive locking detected
6.10.0-rc3-g4029dba6b6f1 #6823 Not tainted
--------------------------------------------
kworker/u5:0/35 is trying to acquire lock:
ffff888002ec2510 (&chan->lock#2/1){+.+.}-{3:3}, at:
l2cap_sock_recv_cb+0x44/0x1e0
but task is already holding lock:
ffff888002ec2510 (&chan->lock#2/1){+.+.}-{3:3}, at:
l2cap_get_chan_by_scid+0xaf/0xd0
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(&chan->lock#2/1);
lock(&chan->lock#2/1);
*** DEADLOCK ***
May be due to missing lock nesting notation
3 locks held by kworker/u5:0/35:
#0: ffff888002b8a940 ((wq_completion)hci0#2){+.+.}-{0:0}, at:
process_one_work+0x750/0x930
#1: ffff888002c67dd0 ((work_completion)(&hdev->rx_work)){+.+.}-{0:0},
at: process_one_work+0x44e/0x930
#2: ffff888002ec2510 (&chan->lock#2/1){+.+.}-{3:3}, at:
l2cap_get_chan_by_scid+0xaf/0xd0
To fix the original problem this introduces l2cap_chan_lock at
l2cap_conless_channel to ensure that l2cap_sock_recv_cb is called with
chan->lock held.
Fixes: 89e856e124f9 ("bluetooth/l2cap: sync sock recv cb and release")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
159 lines
6.5 KiB
C
159 lines
6.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* BlueZ - Bluetooth protocol stack for Linux
|
|
*
|
|
* Copyright (C) 2021 Intel Corporation
|
|
*/
|
|
|
|
#define UINT_PTR(_handle) ((void *)((uintptr_t)_handle))
|
|
#define PTR_UINT(_ptr) ((uintptr_t)((void *)_ptr))
|
|
|
|
typedef int (*hci_cmd_sync_work_func_t)(struct hci_dev *hdev, void *data);
|
|
typedef void (*hci_cmd_sync_work_destroy_t)(struct hci_dev *hdev, void *data,
|
|
int err);
|
|
|
|
struct hci_cmd_sync_work_entry {
|
|
struct list_head list;
|
|
hci_cmd_sync_work_func_t func;
|
|
void *data;
|
|
hci_cmd_sync_work_destroy_t destroy;
|
|
};
|
|
|
|
struct adv_info;
|
|
/* Function with sync suffix shall not be called with hdev->lock held as they
|
|
* wait the command to complete and in the meantime an event could be received
|
|
* which could attempt to acquire hdev->lock causing a deadlock.
|
|
*/
|
|
struct sk_buff *__hci_cmd_sync(struct hci_dev *hdev, u16 opcode, u32 plen,
|
|
const void *param, u32 timeout);
|
|
struct sk_buff *hci_cmd_sync(struct hci_dev *hdev, u16 opcode, u32 plen,
|
|
const void *param, u32 timeout);
|
|
struct sk_buff *__hci_cmd_sync_ev(struct hci_dev *hdev, u16 opcode, u32 plen,
|
|
const void *param, u8 event, u32 timeout);
|
|
struct sk_buff *__hci_cmd_sync_sk(struct hci_dev *hdev, u16 opcode, u32 plen,
|
|
const void *param, u8 event, u32 timeout,
|
|
struct sock *sk);
|
|
int __hci_cmd_sync_status(struct hci_dev *hdev, u16 opcode, u32 plen,
|
|
const void *param, u32 timeout);
|
|
int __hci_cmd_sync_status_sk(struct hci_dev *hdev, u16 opcode, u32 plen,
|
|
const void *param, u8 event, u32 timeout,
|
|
struct sock *sk);
|
|
int hci_cmd_sync_status(struct hci_dev *hdev, u16 opcode, u32 plen,
|
|
const void *param, u32 timeout);
|
|
|
|
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_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);
|
|
int hci_cmd_sync_queue(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,
|
|
void *data, hci_cmd_sync_work_destroy_t destroy);
|
|
int hci_cmd_sync_queue_once(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,
|
|
void *data, hci_cmd_sync_work_destroy_t destroy);
|
|
struct hci_cmd_sync_work_entry *
|
|
hci_cmd_sync_lookup_entry(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,
|
|
void *data, hci_cmd_sync_work_destroy_t destroy);
|
|
void hci_cmd_sync_cancel_entry(struct hci_dev *hdev,
|
|
struct hci_cmd_sync_work_entry *entry);
|
|
bool hci_cmd_sync_dequeue(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,
|
|
void *data, hci_cmd_sync_work_destroy_t destroy);
|
|
bool hci_cmd_sync_dequeue_once(struct hci_dev *hdev,
|
|
hci_cmd_sync_work_func_t func, void *data,
|
|
hci_cmd_sync_work_destroy_t destroy);
|
|
|
|
int hci_update_eir_sync(struct hci_dev *hdev);
|
|
int hci_update_class_sync(struct hci_dev *hdev);
|
|
|
|
int hci_update_eir_sync(struct hci_dev *hdev);
|
|
int hci_update_class_sync(struct hci_dev *hdev);
|
|
int hci_update_name_sync(struct hci_dev *hdev);
|
|
int hci_write_ssp_mode_sync(struct hci_dev *hdev, u8 mode);
|
|
|
|
int hci_get_random_address(struct hci_dev *hdev, bool require_privacy,
|
|
bool use_rpa, struct adv_info *adv_instance,
|
|
u8 *own_addr_type, bdaddr_t *rand_addr);
|
|
|
|
int hci_update_random_address_sync(struct hci_dev *hdev, bool require_privacy,
|
|
bool rpa, u8 *own_addr_type);
|
|
|
|
int hci_update_scan_rsp_data_sync(struct hci_dev *hdev, u8 instance);
|
|
int hci_update_adv_data_sync(struct hci_dev *hdev, u8 instance);
|
|
int hci_update_adv_data(struct hci_dev *hdev, u8 instance);
|
|
int hci_schedule_adv_instance_sync(struct hci_dev *hdev, u8 instance,
|
|
bool force);
|
|
|
|
int hci_setup_ext_adv_instance_sync(struct hci_dev *hdev, u8 instance);
|
|
int hci_start_ext_adv_sync(struct hci_dev *hdev, u8 instance);
|
|
int hci_enable_ext_advertising_sync(struct hci_dev *hdev, u8 instance);
|
|
int hci_enable_advertising_sync(struct hci_dev *hdev);
|
|
int hci_enable_advertising(struct hci_dev *hdev);
|
|
|
|
int hci_start_per_adv_sync(struct hci_dev *hdev, u8 instance, u8 data_len,
|
|
u8 *data, u32 flags, u16 min_interval,
|
|
u16 max_interval, u16 sync_interval);
|
|
|
|
int hci_disable_per_advertising_sync(struct hci_dev *hdev, u8 instance);
|
|
|
|
int hci_remove_advertising_sync(struct hci_dev *hdev, struct sock *sk,
|
|
u8 instance, bool force);
|
|
int hci_disable_advertising_sync(struct hci_dev *hdev);
|
|
int hci_clear_adv_instance_sync(struct hci_dev *hdev, struct sock *sk,
|
|
u8 instance, bool force);
|
|
int hci_update_passive_scan_sync(struct hci_dev *hdev);
|
|
int hci_update_passive_scan(struct hci_dev *hdev);
|
|
int hci_read_rssi_sync(struct hci_dev *hdev, __le16 handle);
|
|
int hci_read_tx_power_sync(struct hci_dev *hdev, __le16 handle, u8 type);
|
|
int hci_write_sc_support_sync(struct hci_dev *hdev, u8 val);
|
|
int hci_read_clock_sync(struct hci_dev *hdev, struct hci_cp_read_clock *cp);
|
|
|
|
int hci_write_fast_connectable_sync(struct hci_dev *hdev, bool enable);
|
|
int hci_update_scan_sync(struct hci_dev *hdev);
|
|
int hci_update_scan(struct hci_dev *hdev);
|
|
|
|
int hci_write_le_host_supported_sync(struct hci_dev *hdev, u8 le, u8 simul);
|
|
int hci_remove_ext_adv_instance_sync(struct hci_dev *hdev, u8 instance,
|
|
struct sock *sk);
|
|
int hci_remove_ext_adv_instance(struct hci_dev *hdev, u8 instance);
|
|
struct sk_buff *hci_read_local_oob_data_sync(struct hci_dev *hdev, bool ext,
|
|
struct sock *sk);
|
|
|
|
int hci_reset_sync(struct hci_dev *hdev);
|
|
int hci_dev_open_sync(struct hci_dev *hdev);
|
|
int hci_dev_close_sync(struct hci_dev *hdev);
|
|
|
|
int hci_powered_update_sync(struct hci_dev *hdev);
|
|
int hci_set_powered_sync(struct hci_dev *hdev, u8 val);
|
|
|
|
int hci_update_discoverable_sync(struct hci_dev *hdev);
|
|
int hci_update_discoverable(struct hci_dev *hdev);
|
|
|
|
int hci_update_connectable_sync(struct hci_dev *hdev);
|
|
|
|
int hci_start_discovery_sync(struct hci_dev *hdev);
|
|
int hci_stop_discovery_sync(struct hci_dev *hdev);
|
|
|
|
int hci_suspend_sync(struct hci_dev *hdev);
|
|
int hci_resume_sync(struct hci_dev *hdev);
|
|
|
|
struct hci_conn;
|
|
|
|
int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, u8 reason);
|
|
|
|
int hci_le_create_cis_sync(struct hci_dev *hdev);
|
|
|
|
int hci_le_remove_cig_sync(struct hci_dev *hdev, u8 handle);
|
|
|
|
int hci_le_terminate_big_sync(struct hci_dev *hdev, u8 handle, u8 reason);
|
|
|
|
int hci_le_big_terminate_sync(struct hci_dev *hdev, u8 handle);
|
|
|
|
int hci_le_pa_terminate_sync(struct hci_dev *hdev, u16 handle);
|
|
|
|
int hci_connect_acl_sync(struct hci_dev *hdev, struct hci_conn *conn);
|
|
|
|
int hci_connect_le_sync(struct hci_dev *hdev, struct hci_conn *conn);
|
|
|
|
int hci_cancel_connect_sync(struct hci_dev *hdev, struct hci_conn *conn);
|