[v4,10/14] Bluetooth: Handle MSFT avdtp open event

Message ID	20211119082027.12809-10-kiran.k@intel.com (mailing list archive)
State	Changes Requested
Headers	show Return-Path: <linux-bluetooth-owner@kernel.org> From: Kiran K <kiran.k@intel.com> To: linux-bluetooth@vger.kernel.org Cc: ravishankar.srivatsa@intel.com, chethan.tumkur.narayan@intel.com, luiz.von.dentz@intel.com, Kiran K <kiran.k@intel.com> Subject: [PATCH v4 10/14] Bluetooth: Handle MSFT avdtp open event Date: Fri, 19 Nov 2021 13:50:23 +0530 Message-Id: <20211119082027.12809-10-kiran.k@intel.com> In-Reply-To: <20211119082027.12809-1-kiran.k@intel.com> References: <20211119082027.12809-1-kiran.k@intel.com> Precedence: bulk
Series	[v4,01/14] Bluetooth: Refactor code to read supported codecs in getsockopt \| expand [v4,01/14] Bluetooth: Refactor code to read supported codecs in getsockopt [v4,02/14] Bluetooth: Support reading of codecs supported over l2cap socket [v4,03/14] Bluetooth: btintel: cache offload use case data [v4,04/14] Bluetooth: Pass transport type in get_data_path_id [v4,05/14] Bluetooth: btintel: Add support to fetch data path id for a2dp offload [v4,06/14] Bluetooth: Remove unused member in struct hci_vnd_codec_v2 [v4,07/14] Bluetooth: Read Output codec capabilities [v4,08/14] Bluetooth: Implement MSFT avdtp open command [v4,09/14] Bluetooth: Handle MSFT avdtp open event [v4,10/14] Bluetooth: Handle MSFT avdtp open event [v4,11/14] Bluetooth: Implment MSFT avdtp start command [v4,12/14] Bluetooth: Implment MSFT avdtp suspend command [v4,13/14] Bluetooth: Implment MSFT avdtp close command [v4,14/14] Bluetooth: Add MSFT a2dp offload codec under experimental flag

Context	Check	Description
tedd_an/checkpatch	fail	[v4,10/14] Bluetooth: Handle MSFT avdtp open event\WARNING:SPACING: Unnecessary space before function pointer arguments #117: FILE: include/net/bluetooth/l2cap.h:672: + void (avdtp_wakeup) (struct l2cap_chan chan, total: 0 errors, 1 warnings, 0 checks, 201 lines checked NOTE: For some of the reported defects, checkpatch may be able to mechanically convert to the typical style using --fix or --fix-inplace. /github/workspace/src/12628471.patch has style problems, please review. NOTE: Ignored message types: UNKNOWN_COMMIT_ID NOTE: If any of the errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.
tedd_an/gitlint	success	Gitlint PASS

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 6d5580316493..fb204f0089d5 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -317,6 +317,7 @@ struct bt_sock { struct list_head accept_q; struct sock *parent; unsigned long flags; + u16 avdtp_handle; void (*skb_msg_name)(struct sk_buff *, void *, int *); void (*skb_put_cmsg)(struct sk_buff *, struct msghdr *, struct sock *); }; @@ -324,6 +325,7 @@ struct bt_sock { enum { BT_SK_DEFER_SETUP, BT_SK_SUSPEND, + BT_SK_AVDTP_PEND, }; struct bt_sock_list { @@ -346,6 +348,7 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait); int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo); int bt_sock_wait_ready(struct sock *sk, unsigned long flags); +int bt_sock_wait_for_avdtp_hndl(struct sock *sk, unsigned long timeo); void bt_accept_enqueue(struct sock *parent, struct sock *sk, bool bh); void bt_accept_unlink(struct sock *sk); diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 54fae19f3758..2aeab94a30b7 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -348,6 +348,7 @@ enum { #define HCI_POWER_OFF_TIMEOUT msecs_to_jiffies(5000) /* 5 seconds */ #define HCI_LE_CONN_TIMEOUT msecs_to_jiffies(20000) /* 20 seconds */ #define HCI_LE_AUTOCONN_TIMEOUT msecs_to_jiffies(4000) /* 4 seconds */ +#define MSFT_AVDTP_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */ /* HCI data types */ #define HCI_COMMAND_PKT 0x01 diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 3c4f550e5a8b..62705273d2eb 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -669,6 +669,8 @@ struct l2cap_ops { unsigned long len, int nb); int (*filter) (struct l2cap_chan * chan, struct sk_buff *skb); + void (*avdtp_wakeup) (struct l2cap_chan *chan, + u8 status, u16 handle); }; struct l2cap_conn { @@ -1001,6 +1003,8 @@ void __l2cap_physical_cfm(struct l2cap_chan *chan, int result); struct l2cap_conn *l2cap_conn_get(struct l2cap_conn *conn); void l2cap_conn_put(struct l2cap_conn *conn); +void l2cap_avdtp_wakeup(struct l2cap_conn *conn, u16 dcid, u8 status, + u16 handle); int l2cap_register_user(struct l2cap_conn *conn, struct l2cap_user *user); void l2cap_unregister_user(struct l2cap_conn *conn, struct l2cap_user *user); diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 1661979b6a6e..62bfd88d05b2 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -607,6 +607,42 @@ int bt_sock_wait_ready(struct sock *sk, unsigned long flags) } EXPORT_SYMBOL(bt_sock_wait_ready); +/* This function expects the sk lock to be held when called */ +int bt_sock_wait_for_avdtp_hndl(struct sock *sk, unsigned long timeo) +{ + DECLARE_WAITQUEUE(wait, current); + int err = 0; + + BT_DBG("sk %p", sk); + + add_wait_queue(sk_sleep(sk), &wait); + set_current_state(TASK_INTERRUPTIBLE); + while (test_bit(BT_SK_AVDTP_PEND, &bt_sk(sk)->flags)) { + if (!timeo) { + err = -EINPROGRESS; + break; + } + + if (signal_pending(current)) { + err = sock_intr_errno(timeo); + break; + } + + release_sock(sk); + timeo = schedule_timeout(timeo); + lock_sock(sk); + set_current_state(TASK_INTERRUPTIBLE); + + err = sock_error(sk); + if (err) + break; + } + __set_current_state(TASK_RUNNING); + remove_wait_queue(sk_sleep(sk), &wait); + return err; +} +EXPORT_SYMBOL(bt_sock_wait_for_avdtp_hndl); + #ifdef CONFIG_PROC_FS static void *bt_seq_start(struct seq_file *seq, loff_t *pos) __acquires(seq->private->l->lock) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 4f8f37599962..32b69c9432aa 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -8507,6 +8507,21 @@ int __init l2cap_init(void) return 0; } +void l2cap_avdtp_wakeup(struct l2cap_conn *conn, u16 cid, u8 status, + u16 handle) +{ + struct l2cap_chan *chan; + + chan = l2cap_get_chan_by_dcid(conn, cid); + + if (!chan) + return; + + chan->ops->avdtp_wakeup(chan, status, handle); + + l2cap_chan_unlock(chan); +} + void l2cap_exit(void) { debugfs_remove(l2cap_debugfs); diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 6f8d8c189b41..c50c22ae6731 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -1167,7 +1167,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, break; } - err = msft_avdtp_cmd(hdev, chan, optval, optlen); + err = msft_avdtp_cmd(hdev, chan, optval, optlen, sk); hci_dev_put(hdev); break; @@ -1758,6 +1758,19 @@ static int l2cap_sock_filter(struct l2cap_chan *chan, struct sk_buff *skb) return 0; } +static void l2cap_sock_avdtp_wakeup(struct l2cap_chan *chan, u8 status, + u16 handle) +{ + struct sock *sk = chan->data; + + if (test_bit(BT_SK_AVDTP_PEND, &bt_sk(sk)->flags)) { + bt_sk(sk)->avdtp_handle = handle; + sk->sk_err = -bt_to_errno(status); + clear_bit(BT_SK_AVDTP_PEND, &bt_sk(sk)->flags); + sk->sk_state_change(sk); + } +} + static const struct l2cap_ops l2cap_chan_ops = { .name = "L2CAP Socket Interface", .new_connection = l2cap_sock_new_connection_cb, @@ -1774,6 +1787,7 @@ static const struct l2cap_ops l2cap_chan_ops = { .get_peer_pid = l2cap_sock_get_peer_pid_cb, .alloc_skb = l2cap_sock_alloc_skb_cb, .filter = l2cap_sock_filter, + .avdtp_wakeup = l2cap_sock_avdtp_wakeup, }; static void l2cap_sock_destruct(struct sock *sk) diff --git a/net/bluetooth/msft.c b/net/bluetooth/msft.c index 5953127b3521..aca5cac7a87f 100644 --- a/net/bluetooth/msft.c +++ b/net/bluetooth/msft.c @@ -844,7 +844,8 @@ bool msft_curve_validity(struct hci_dev *hdev) static int msft_avdtp_open(struct hci_dev *hdev, struct l2cap_chan *chan, - struct msft_cp_avdtp *cmd) + struct msft_cp_avdtp *cmd, + struct sock *sk) { struct msft_cp_avdtp_open *open_cmd; struct hci_media_service_caps *caps; @@ -874,14 +875,18 @@ static int msft_avdtp_open(struct hci_dev *hdev, hci_send_cmd(hdev, MSFT_OP_AVDTP, sizeof(*open_cmd) + cmd->len, open_cmd); + set_bit(BT_SK_AVDTP_PEND, &bt_sk(sk)->flags); /* wait until we get avdtp handle or timeout */ + err = bt_sock_wait_for_avdtp_hndl(sk, MSFT_AVDTP_TIMEOUT); + fail: kfree(open_cmd); return err; } int msft_avdtp_cmd(struct hci_dev *hdev, struct l2cap_chan *chan, - sockptr_t optval, int optlen) + sockptr_t optval, int optlen, + struct sock *sk) { int err = 0; struct msft_cp_avdtp *cmd; @@ -910,7 +915,7 @@ int msft_avdtp_cmd(struct hci_dev *hdev, struct l2cap_chan *chan, err = -EINVAL; break; } - err = msft_avdtp_open(hdev, chan, cmd); + err = msft_avdtp_open(hdev, chan, cmd, sk); break; default: @@ -928,6 +933,7 @@ static void msft_cc_avdtp_open(struct hci_dev *hdev, struct sk_buff *skb) struct msft_rp_avdtp_open *rp; struct msft_cp_avdtp_open *sent; struct hci_conn *hconn; + struct l2cap_conn *conn; if (skb->len < sizeof(*rp)) return; @@ -941,7 +947,11 @@ static void msft_cc_avdtp_open(struct hci_dev *hdev, struct sk_buff *skb) if (!hconn) return; + conn = hconn->l2cap_data; + /* wake up the task waiting on avdtp handle */ + l2cap_avdtp_wakeup(conn, le16_to_cpu(sent->dcid), rp->status, + rp->status ? 0 : __le16_to_cpu(rp->avdtp_handle)); } void msft_cc_avdtp(struct hci_dev *hdev, struct sk_buff *skb) diff --git a/net/bluetooth/msft.h b/net/bluetooth/msft.h index ba26c43431dc..9e25fb28450c 100644 --- a/net/bluetooth/msft.h +++ b/net/bluetooth/msft.h @@ -81,5 +81,5 @@ static inline bool msft_curve_validity(struct hci_dev *hdev) #endif int msft_avdtp_cmd(struct hci_dev *hdev, struct l2cap_chan *chan, - sockptr_t optval, int optlen); + sockptr_t optval, int optlen, struct sock *sk); void msft_cc_avdtp(struct hci_dev *hdev, struct sk_buff *skb);

[v4,10/14] Bluetooth: Handle MSFT avdtp open event

Checks

Commit Message

Patch