Bluetooth: af_bluetooth: Make BT_PKT_STATUS generic
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/2 Bluetooth: af_bluetooth: Make BT_PKT_STATUS generic
From: Luiz Augusto von Dentz <[email protected]>
This makes the handling of BT_PKT_STATUS more generic so it can be reused by sockets other than SCO like BT_DEFER_SETUP, etc.
--- include/net/bluetooth/bluetooth.h | 8 +++----- include/net/bluetooth/sco.h | 2 -- net/bluetooth/af_bluetooth.c | 8 ++++++-- net/bluetooth/hci_core.c | 2 +- net/bluetooth/sco.c | 22 ++++------------------ 5 files changed, 14 insertions(+), 28 deletions(-)
include/net/bluetooth/bluetooth.h +3 -5
@@ -386,6 +386,7 @@ struct bt_sock {enum {BT_SK_DEFER_SETUP ,BT_SK_SUSPEND , +BT_SK_PKT_STATUS };struct bt_sock_list {
@@ -432,10 +433,6 @@ struct l2cap_ctrl {struct l2cap_chan *chan; }; -struct sco_ctrl { -u8 pkt_status; -}; -struct hci_dev ;typedef void (*hci_req_complete_t )(struct hci_dev *hdev,u8 status,u16 opcode);
@@ -466,9 +463,9 @@ struct bt_skb_cb {u8 force_active;u16 expect; u8 incoming:1; + u8 pkt_status:2;union {struct l2cap_ctrl l2cap; -struct sco_ctrl sco;struct hci_ctrl hci;struct mgmt_ctrl mgmt;struct scm_creds creds;
@@ -477,6 +474,7 @@ struct bt_skb_cb {#define bt_cb (skb) ((struct bt_skb_cb *)((skb)->cb))#define hci_skb_pkt_type (skb) bt_cb((skb))->pkt_type +#define hci_skb_pkt_status (skb) bt_cb((skb))->pkt_status#define hci_skb_expect (skb) bt_cb((skb))->expect#define hci_skb_opcode (skb) bt_cb((skb))->hci.opcode#define hci_skb_event (skb) bt_cb((skb))->hci.req_event
include/net/bluetooth/sco.h +0 -2
@@ -46,6 +46,4 @@ struct sco_conninfo { __u8 dev_class[3]; }; -#define SCO_CMSG_PKT_STATUS 0x01 -#endif /* __SCO_H */
net/bluetooth/af_bluetooth.c +6 -2
@@ -333,8 +333,12 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,bt_sk (sk)->skb_msg_name (skb, msg->msg_name, &msg->msg_namelen); -if (bt_sk (sk)->skb_put_cmsg) -bt_sk (sk)->skb_put_cmsg (skb, msg, sk); +if (test_bit (BT_SK_PKT_STATUS , &bt_sk (sk)->flags)) { +u8 pkt_status =hci_skb_pkt_status (skb); + +put_cmsg (msg,SOL_BLUETOOTH ,BT_SCM_PKT_STATUS , +sizeof (pkt_status), &pkt_status); + } }skb_free_datagram (sk, skb);
net/bluetooth/hci_core.c +1 -1
@@ -3895,7 +3895,7 @@ static void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb)if (conn) {/* Send to upper protocol */ -bt_cb (skb)->sco.pkt_status = flags &0x03 ; +hci_skb_pkt_status (skb) = flags &0x03 ;sco_recv_scodata (conn, skb);return ; }else {
net/bluetooth/sco.c +4 -18
@@ -68,7 +68,6 @@ struct sco_pinfo {bdaddr_t dst;__u32 flags;__u16 setting; -__u8 cmsg_mask;struct bt_codec codec;struct sco_conn *conn; };
@@ -471,15 +470,6 @@ static void sco_sock_close(struct sock *sk)release_sock (sk); } -static void sco_skb_put_cmsg (struct sk_buff *skb,struct msghdr *msg, -struct sock *sk) -{ -if (sco_pi (sk)->cmsg_mask &SCO_CMSG_PKT_STATUS ) -put_cmsg (msg,SOL_BLUETOOTH ,BT_SCM_PKT_STATUS , -sizeof (bt_cb (skb)->sco.pkt_status), - &bt_cb (skb)->sco.pkt_status); -} -static void sco_sock_init (struct sock *sk,struct sock *parent) {BT_DBG ("sk %p" , sk);
@@ -488,8 +478,6 @@ static void sco_sock_init(struct sock *sk, struct sock *parent) sk->sk_type = parent->sk_type;bt_sk (sk)->flags =bt_sk (parent)->flags;security_sk_clone (parent, sk); - }else { -bt_sk (sk)->skb_put_cmsg = sco_skb_put_cmsg; } }
@@ -907,9 +895,9 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, }if (opt) -sco_pi (sk)->cmsg_mask |=SCO_CMSG_PKT_STATUS ; +set_bit (BT_SK_PKT_STATUS , &bt_sk (sk)->flags);else -sco_pi (sk)->cmsg_mask &=SCO_CMSG_PKT_STATUS ; +clear_bit (BT_SK_PKT_STATUS , &bt_sk (sk)->flags);break ;case BT_CODEC :
@@ -1040,7 +1028,6 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname,int len, err =0 ;struct bt_voice voice;u32 phys; -int pkt_status;int buf_len;struct codec_list *c;u8 num_codecs, i,__user *ptr;
@@ -1094,9 +1081,8 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname,break ;case BT_PKT_STATUS : - pkt_status = (sco_pi (sk)->cmsg_mask &SCO_CMSG_PKT_STATUS ); - -if (put_user (pkt_status, (int __user *)optval)) +if (put_user (test_bit (BT_SK_PKT_STATUS , &bt_sk (sk)->flags), + (int __user *)optval)) err = -EFAULT ;break ;
Signature · 1 line
2.40.1
Luiz Augusto von Dentz
maintainerPATCH 2/2 Bluetooth: ISO: Add support for BT_PKT_STATUS
From: Luiz Augusto von Dentz <[email protected]>
This adds support for BT_PKT_STATUS socketopt by setting BT_SK_PKT_STATUS. Then upon receiving an ISO packet the code would attempt to store the Packet_Status_Flag to hci_skb_pkt_status which is then forward to userspace in the form of BT_SCM_PKT_STATUS whenever BT_PKT_STATUS has been enabled/set.
--- net/bluetooth/iso.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
net/bluetooth/iso.c +20 -0
@@ -1288,6 +1288,18 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,clear_bit (BT_SK_DEFER_SETUP , &bt_sk (sk)->flags);break ; +case BT_PKT_STATUS : +if (copy_from_sockptr (&opt, optval,sizeof (u32))) { + err = -EFAULT ; +break ; + } + +if (opt) +set_bit (BT_SK_PKT_STATUS , &bt_sk (sk)->flags); +else +clear_bit (BT_SK_PKT_STATUS , &bt_sk (sk)->flags); +break ; +case BT_ISO_QOS :if (sk->sk_state !=BT_OPEN && sk->sk_state !=BT_BOUND && sk->sk_state !=BT_CONNECT2 ) {
@@ -1373,6 +1385,12 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname,break ; +case BT_PKT_STATUS : +if (put_user (test_bit (BT_SK_PKT_STATUS , &bt_sk (sk)->flags), + (int __user *)optval)) + err = -EFAULT ; +break ; +case BT_ISO_QOS : qos =iso_sock_get_qos (sk);
@@ -1767,6 +1785,7 @@ void iso_recv(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)if (len == skb->len) {/* Complete frame received */ +hci_skb_pkt_status (skb) = flags &0x03 ;iso_recv_frame (conn, skb);return ; }
@@ -1788,6 +1807,7 @@ void iso_recv(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)if (!conn->rx_skb) goto drop; +hci_skb_pkt_status (conn->rx_skb) = flags &0x03 ;skb_copy_from_linear_data (skb,skb_put (conn->rx_skb, skb->len), skb->len); conn->rx_len = len - skb->len;
Signature · 1 line
2.40.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=765461
---Test result---
Test Summary:
CheckPatch PASS 2.03 seconds GitLint PASS 0.66 seconds SubjectPrefix PASS 0.24 seconds BuildKernel PASS 33.21 seconds CheckAllWarning PASS 35.81 seconds CheckSparse WARNING 40.71 seconds CheckSmatch WARNING 113.41 seconds BuildKernel32 PASS 31.61 seconds TestRunnerSetup PASS 479.01 seconds TestRunner_l2cap-tester PASS 22.34 seconds TestRunner_iso-tester PASS 39.90 seconds TestRunner_bnep-tester PASS 10.06 seconds TestRunner_mgmt-tester PASS 211.52 seconds TestRunner_rfcomm-tester PASS 15.32 seconds TestRunner_sco-tester PASS 16.21 seconds TestRunner_ioctl-tester PASS 16.96 seconds TestRunner_mesh-tester PASS 12.55 seconds TestRunner_smp-tester PASS 13.74 seconds TestRunner_userchan-tester PASS 10.56 seconds IncrementalBuild PASS 35.20 seconds
Details
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:net/bluetooth/af_bluetooth.c:223:25: warning: context imbalance in 'bt_accept_enqueue' - different lock contexts for basic blocknet/bluetooth/sco.c: note: in included file:./include/net/bluetooth/hci_core.h:150:35: warning: array of flexible structures
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:net/bluetooth/sco.c: note: in included file:./include/net/bluetooth/hci_core.h:150:35: warning: array of flexible structures
---
Regards,
Linux Bluetooth
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 8 lines · On Thu, 13 Jul 2023 15:42:38 -0700 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
This makes the handling of
BT_PKT_STATUSmore generic so it can be reused by sockets other than SCO likeBT_DEFER_SETUP, etc.Signed-off-by Luiz Augusto von Dentz <[email protected]>[...]
Here is the summary with links:
- [1/2] Bluetooth: af_bluetooth: Make BT_PKT_STATUS generic
https://git.kernel.org/bluetooth/bluetooth-next/c/259181ff5785 - [2/2] Bluetooth: ISO: Add support for BT_PKT_STATUS https://git.kernel.org/bluetooth/bluetooth-next/c/7b36a4f78004
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html