Bluetooth: Consolidate code around sk_alloc into a helper function
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/3 Bluetooth: Consolidate code around sk_alloc into a helper function
From: Luiz Augusto von Dentz <[email protected]>
This consolidates code around sk_alloc into bt_sock_alloc which does take care of common initialization.
--- include/net/bluetooth/bluetooth.h | 2 ++ net/bluetooth/af_bluetooth.c | 21 +++++++++++++++++++++ net/bluetooth/bnep/sock.c | 10 +--------- net/bluetooth/hci_sock.c | 10 ++-------- net/bluetooth/iso.c | 10 +--------- net/bluetooth/l2cap_sock.c | 10 +--------- net/bluetooth/rfcomm/sock.c | 13 +++---------- net/bluetooth/sco.c | 10 +--------- 8 files changed, 32 insertions(+), 54 deletions(-)
include/net/bluetooth/bluetooth.h +2 -0
@@ -400,6 +400,8 @@ int bt_sock_register(int proto, const struct net_proto_family *ops);void bt_sock_unregister (int proto);void bt_sock_link (struct bt_sock_list *l,struct sock *s);void bt_sock_unlink (struct bt_sock_list *l,struct sock *s); +struct sock *bt_sock_alloc (struct net *net,struct socket *sock, +struct proto *prot,int proto,gfp_t prio,int kern);int bt_sock_recvmsg (struct socket *sock,struct msghdr *msg,size_t len,int flags); int bt_sock_stream_recvmsg(struct socket *sock, struct msghdr *msg,
net/bluetooth/af_bluetooth.c +21 -0
@@ -140,6 +140,27 @@ static int bt_sock_create(struct net *net, struct socket *sock, int proto,return err; } +struct sock *bt_sock_alloc (struct net *net,struct socket *sock, +struct proto *prot,int proto,gfp_t prio,int kern) +{ +struct sock *sk; + + sk =sk_alloc (net,PF_BLUETOOTH , prio, prot, kern); +if (!sk) +return NULL ; + +sock_init_data (sock, sk); +INIT_LIST_HEAD (&bt_sk (sk)->accept_q); + +sock_reset_flag (sk,SOCK_ZAPPED ); + + sk->sk_protocol = proto; + sk->sk_state =BT_OPEN ; + +return sk; +} +EXPORT_SYMBOL (bt_sock_alloc); +void bt_sock_link (struct bt_sock_list *l,struct sock *sk) {write_lock (&l->lock);
net/bluetooth/bnep/sock.c +1 -9
@@ -205,21 +205,13 @@ static int bnep_sock_create(struct net *net, struct socket *sock, int protocol,if (sock->type !=SOCK_RAW )return -ESOCKTNOSUPPORT ; - sk =sk_alloc (net,PF_BLUETOOTH ,GFP_ATOMIC , &bnep_proto, kern); + sk =bt_sock_alloc (net, sock, &bnep_proto, protocol,GFP_ATOMIC , kern);if (!sk)return -ENOMEM ; -sock_init_data (sock, sk); - sock->ops = &bnep_sock_ops; - sock->state =SS_UNCONNECTED ; -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = protocol; - sk->sk_state =BT_OPEN ; -bt_sock_link (&bnep_sk_list, sk);return 0 ; }
net/bluetooth/hci_sock.c +2 -8
@@ -2143,18 +2143,12 @@ static int hci_sock_create(struct net *net, struct socket *sock, int protocol, sock->ops = &hci_sock_ops; - sk =sk_alloc (net,PF_BLUETOOTH ,GFP_ATOMIC , &hci_sk_proto, kern); + sk =bt_sock_alloc (net, sock, &hci_sk_proto, protocol,GFP_ATOMIC , + kern);if (!sk)return -ENOMEM ; -sock_init_data (sock, sk); - -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = protocol; - sock->state =SS_UNCONNECTED ; - sk->sk_state =BT_OPEN ; sk->sk_destruct = hci_sock_destruct;bt_sock_link (&hci_sk_list, sk);
net/bluetooth/iso.c +1 -9
@@ -725,21 +725,13 @@ static struct sock *iso_sock_alloc(struct net *net, struct socket *sock, {struct sock *sk; - sk =sk_alloc (net,PF_BLUETOOTH , prio, &iso_proto, kern); + sk =bt_sock_alloc (net, sock, &iso_proto, proto, prio, kern);if (!sk)return NULL ; -sock_init_data (sock, sk); -INIT_LIST_HEAD (&bt_sk (sk)->accept_q); - sk->sk_destruct = iso_sock_destruct; sk->sk_sndtimeo =ISO_CONN_TIMEOUT ; -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = proto; - sk->sk_state =BT_OPEN ; -/* Set address type as public as default src address is BDADDR_ANY */ iso_pi (sk)->src_type =BDADDR_LE_PUBLIC ;
net/bluetooth/l2cap_sock.c +1 -9
@@ -1856,21 +1856,13 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,struct sock *sk;struct l2cap_chan *chan; - sk =sk_alloc (net,PF_BLUETOOTH , prio, &l2cap_proto, kern); + sk =bt_sock_alloc (net, sock, &l2cap_proto, proto, prio, kern);if (!sk)return NULL ; -sock_init_data (sock, sk); -INIT_LIST_HEAD (&bt_sk (sk)->accept_q); - sk->sk_destruct = l2cap_sock_destruct; sk->sk_sndtimeo =L2CAP_CONN_TIMEOUT ; -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = proto; - sk->sk_state =BT_OPEN ; - chan =l2cap_chan_create ();if (!chan) {sk_free (sk);
net/bluetooth/rfcomm/sock.c +3 -10
@@ -268,18 +268,16 @@ static struct proto rfcomm_proto = { .obj_size = sizeof(struct rfcomm_pinfo) }; -static struct sock *rfcomm_sock_alloc (struct net *net,struct socket *sock,int proto,gfp_t prio,int kern) +static struct sock *rfcomm_sock_alloc (struct net *net,struct socket *sock, +int proto,gfp_t prio,int kern) {struct rfcomm_dlc *d;struct sock *sk; - sk =sk_alloc (net,PF_BLUETOOTH , prio, &rfcomm_proto, kern); + sk =bt_sock_alloc (net, sock, &rfcomm_proto, proto, prio, kern);if (!sk)return NULL ; -sock_init_data (sock, sk); -INIT_LIST_HEAD (&bt_sk (sk)->accept_q); - d =rfcomm_dlc_alloc (prio);if (!d) {sk_free (sk);
@@ -298,11 +296,6 @@ static struct sock *rfcomm_sock_alloc(struct net *net, struct socket *sock, int sk->sk_sndbuf =RFCOMM_MAX_CREDITS *RFCOMM_DEFAULT_MTU *10 ; sk->sk_rcvbuf =RFCOMM_MAX_CREDITS *RFCOMM_DEFAULT_MTU *10 ; -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = proto; - sk->sk_state =BT_OPEN ; -bt_sock_link (&rfcomm_sk_list, sk);BT_DBG ("sk %p" , sk);
net/bluetooth/sco.c +1 -9
@@ -503,21 +503,13 @@ static struct sock *sco_sock_alloc(struct net *net, struct socket *sock, {struct sock *sk; - sk =sk_alloc (net,PF_BLUETOOTH , prio, &sco_proto, kern); + sk =bt_sock_alloc (net, sock, &sco_proto, proto, prio, kern);if (!sk)return NULL ; -sock_init_data (sock, sk); -INIT_LIST_HEAD (&bt_sk (sk)->accept_q); - sk->sk_destruct = sco_sock_destruct; sk->sk_sndtimeo =SCO_CONN_TIMEOUT ; -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = proto; - sk->sk_state =BT_OPEN ; -sco_pi (sk)->setting =BT_VOICE_CVSD_16BIT ;sco_pi (sk)->codec.id =BT_CODEC_CVSD ;sco_pi (sk)->codec.cid =0xffff ;
Signature · 1 line
2.40.1
Luiz Augusto von Dentz
maintainerPATCH 2/3 Bluetooth: Init sk_peer_* on bt_sock_alloc
From: Luiz Augusto von Dentz <[email protected]>
This makes sure peer information is always available via sock when using bt_sock_alloc.
--- net/bluetooth/af_bluetooth.c | 8 ++++++++ net/bluetooth/hidp/sock.c | 10 +--------- net/bluetooth/l2cap_sock.c | 19 ------------------- 3 files changed, 9 insertions(+), 28 deletions(-)
net/bluetooth/af_bluetooth.c +8 -0
@@ -157,6 +157,14 @@ struct sock *bt_sock_alloc(struct net *net, struct socket *sock, sk->sk_protocol = proto; sk->sk_state =BT_OPEN ; +if (!kern) { +/* Init peer information so it can be properly monitored */ +spin_lock (&sk->sk_peer_lock); + sk->sk_peer_pid =get_pid (task_tgid (current)); + sk->sk_peer_cred =get_current_cred (); +spin_unlock (&sk->sk_peer_lock); + } +return sk; }EXPORT_SYMBOL (bt_sock_alloc);
net/bluetooth/hidp/sock.c +1 -9
@@ -256,21 +256,13 @@ static int hidp_sock_create(struct net *net, struct socket *sock, int protocol,if (sock->type !=SOCK_RAW )return -ESOCKTNOSUPPORT ; - sk =sk_alloc (net,PF_BLUETOOTH ,GFP_ATOMIC , &hidp_proto, kern); + sk =bt_sock_alloc (net, sock, &hidp_proto, protocol,GFP_ATOMIC , kern);if (!sk)return -ENOMEM ; -sock_init_data (sock, sk); - sock->ops = &hidp_sock_ops; - sock->state =SS_UNCONNECTED ; -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = protocol; - sk->sk_state =BT_OPEN ; -bt_sock_link (&hidp_sk_list, sk);return 0 ;
net/bluetooth/l2cap_sock.c +0 -19
@@ -177,21 +177,6 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)return err; } -static void l2cap_sock_init_pid (struct sock *sk) -{ -struct l2cap_chan *chan =l2cap_pi (sk)->chan; - -/* Only L2CAP_MODE_EXT_FLOWCTL ever need to access the PID in order to -* group the channels being requested. -*/ -if (chan->mode !=L2CAP_MODE_EXT_FLOWCTL ) -return ; - -spin_lock (&sk->sk_peer_lock); - sk->sk_peer_pid =get_pid (task_tgid (current)); -spin_unlock (&sk->sk_peer_lock); -} -static int l2cap_sock_connect (struct socket *sock,struct sockaddr *addr,int alen,int flags) {
@@ -267,8 +252,6 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, chan->mode != L2CAP_MODE_EXT_FLOWCTL) chan->mode =L2CAP_MODE_LE_FLOWCTL ; -l2cap_sock_init_pid (sk); - err =l2cap_chan_connect (chan, la.l2_psm,__le16_to_cpu (la.l2_cid), &la.l2_bdaddr, la.l2_bdaddr_type);if (err)
@@ -324,8 +307,6 @@ static int l2cap_sock_listen(struct socket *sock, int backlog) goto done; } -l2cap_sock_init_pid (sk); - sk->sk_max_ack_backlog = backlog; sk->sk_ack_backlog =0 ;
Signature · 1 line
2.40.1
Luiz Augusto von Dentz
maintainerPATCH 3/3 Bluetooth: hci_sock: Forward credentials to monitor
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This stores scm_creds into hci_skb_cb so they can be properly forwarded to the likes of btmon which is then able to print information about the process who is originating the traffic:
bluetoothd[35]: @ MGMT Command: Rea.. (0x0001) plen 0 {0x0001}
@ MGMT Event: Command Complete (0x0001) plen 6 {0x0001}
Read Management Version Information (0x0001) plen 3
--- include/net/bluetooth/bluetooth.h | 1 + net/bluetooth/hci_sock.c | 60 +++++++++++++++++++++++++++++-- 2 files changed, 59 insertions(+), 2 deletions(-)
include/net/bluetooth/bluetooth.h +1 -0
@@ -471,6 +471,7 @@ struct bt_skb_cb {struct sco_ctrl sco;struct hci_ctrl hci;struct mgmt_ctrl mgmt; +struct scm_creds creds; }; };#define bt_cb (skb) ((struct bt_skb_cb *)((skb)->cb))
net/bluetooth/hci_sock.c +58 -2
122 lines not on this page · raw message
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=751132
---Test result---
Test Summary:
CheckPatch PASS 3.53 seconds GitLint PASS 0.89 seconds SubjectPrefix PASS 0.32 seconds BuildKernel PASS 32.46 seconds CheckAllWarning PASS 35.03 seconds CheckSparse WARNING 40.09 seconds CheckSmatch WARNING 109.47 seconds BuildKernel32 PASS 31.02 seconds TestRunnerSetup PASS 445.53 seconds TestRunner_l2cap-tester PASS 17.24 seconds TestRunner_iso-tester PASS 22.16 seconds TestRunner_bnep-tester PASS 5.71 seconds TestRunner_mgmt-tester PASS 116.58 seconds TestRunner_rfcomm-tester PASS 9.20 seconds TestRunner_sco-tester PASS 8.51 seconds TestRunner_ioctl-tester PASS 9.77 seconds TestRunner_mesh-tester PASS 7.22 seconds TestRunner_smp-tester PASS 8.29 seconds TestRunner_userchan-tester PASS 5.97 seconds IncrementalBuild PASS 62.26 seconds
Details
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:net/bluetooth/af_bluetooth.c:207: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 structuresnet/bluetooth/af_bluetooth.c:207:25: warning: context imbalance in 'bt_accept_enqueue' - different lock contexts for basic block
##############################
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