Skip to contentSkip to conversation

kill bt_sock_alloc

PATCH In review Arnaldo Carvalho de Melo 4 participants 7 messages Mar 8, 2005 – Mar 10, 2005

Subsystems (3)
Networking Network drivers Bluetooth
lore
Share & tools
lore

Arnaldo Carvalho de Melo

author
#0 lore raw

PATCH 1/1 kill bt_sock_alloc

Hi,

Please take a look and if acceptable pull from:

bk://kernel.bkbits.net/acme/connection_sock-2.6

Best Regards,

- Arnaldo

author
#1 lore raw

Em Tue, Mar 08, 2005 at 06:49:37AM -0300, Arnaldo Carvalho de Melo escreveu:

Quoted 5 lines

Hi,

Please take a look and if acceptable pull from:

bk://kernel.bkbits.net/acme/connection_sock-2.6

Sorry, now with the patch attached.

- Arnaldo

===================================================================

[email protected], 2005-03-08 04:50:51-03:00, [email protected]
[BLUETOOTH] kill bt_sock_alloc

And make the derived socks have a struct bt_sock as its first member, so that the _pi() functions can just cast the struct sock pointer to its respective types, taking advantage of the fact that sk_alloc now use kmalloc when no slab is passed.

This is another step, close to the final one, to kill sk_protinfo and make further planed channges possible.

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by David S. Miller <[email protected]>
 include/net/bluetooth/bluetooth.h |    1 
 include/net/bluetooth/hci_core.h  |    3 +-
 include/net/bluetooth/l2cap.h     |    3 +-
 include/net/bluetooth/rfcomm.h    |    3 +-
 include/net/bluetooth/sco.h       |    3 +-
 net/bluetooth/af_bluetooth.c      |   43 --------------------------------------
 net/bluetooth/bnep/sock.c         |    8 +++++--
 net/bluetooth/hci_sock.c          |    7 +++++-
 net/bluetooth/hidp/sock.c         |    6 +++--
 net/bluetooth/l2cap.c             |    6 ++++-
 net/bluetooth/rfcomm/sock.c       |    7 ++++--
 net/bluetooth/sco.c               |    7 +++++-
 12 files changed, 40 insertions(+), 57 deletions(-)
include/net/bluetooth/bluetooth.h +0 -1
diff -Nru a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
@@ -125,7 +125,6 @@
 
 int  bt_sock_register(int proto, struct net_proto_family *ops);
 int  bt_sock_unregister(int proto);
-struct sock *bt_sock_alloc(struct socket *sock, int proto, int pi_size, int prio);
 void bt_sock_link(struct bt_sock_list *l, struct sock *s);
 void bt_sock_unlink(struct bt_sock_list *l, struct sock *s);
 int  bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len, int flags);
include/net/bluetooth/hci_core.h +2 -1
diff -Nru a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
@@ -595,8 +595,9 @@
 void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb);
 
 /* HCI info for socket */
-#define hci_pi(sk)	((struct hci_pinfo *)sk->sk_protinfo)
+#define hci_pi(sk)	((struct hci_pinfo *)sk)
 struct hci_pinfo {
+	struct bt_sock    bt;
 	struct hci_dev    *hdev;
 	struct hci_filter filter;
 	__u32             cmsg_mask;
include/net/bluetooth/l2cap.h +2 -1
diff -Nru a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
@@ -201,9 +201,10 @@
 };
 
 /* ----- L2CAP channel and socket info ----- */
-#define l2cap_pi(sk)   ((struct l2cap_pinfo *)sk->sk_protinfo)
+#define l2cap_pi(sk)   ((struct l2cap_pinfo *)sk)
 
 struct l2cap_pinfo {
+	struct bt_sock	bt;
 	__u16		psm;
 	__u16		dcid;
 	__u16		scid;
include/net/bluetooth/rfcomm.h +2 -1
diff -Nru a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
@@ -293,9 +293,10 @@
 #define RFCOMM_LM_RELIABLE	0x0010
 #define RFCOMM_LM_SECURE	0x0020
 
-#define rfcomm_pi(sk)   ((struct rfcomm_pinfo *)sk->sk_protinfo)
+#define rfcomm_pi(sk)   ((struct rfcomm_pinfo *)sk)
 
 struct rfcomm_pinfo {
+	struct bt_sock bt;
 	struct rfcomm_dlc   *dlc;
 	u8     channel;
 	u32    link_mode;
include/net/bluetooth/sco.h +2 -1
diff -Nru a/include/net/bluetooth/sco.h b/include/net/bluetooth/sco.h
@@ -68,9 +68,10 @@
 #define sco_conn_unlock(c)	spin_unlock(&c->lock);
 
 /* ----- SCO socket info ----- */
-#define sco_pi(sk)   ((struct sco_pinfo *)sk->sk_protinfo)
+#define sco_pi(sk)   ((struct sco_pinfo *)sk)
 
 struct sco_pinfo {
+	struct bt_sock	bt;
 	__u32		flags;
 	struct sco_conn	*conn;
 };
net/bluetooth/af_bluetooth.c +0 -43

67 lines not on this page · raw message

net/bluetooth/bnep/sock.c +6 -2
diff -Nru a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
@@ -176,17 +176,21 @@
 	if (sock->type != SOCK_RAW)
 		return -ESOCKTNOSUPPORT;
 
-	if (!(sk = bt_sock_alloc(sock, PF_BLUETOOTH, 0, GFP_KERNEL)))
+	if (!(sk = sk_alloc(PF_BLUETOOTH, GFP_KERNEL, sizeof(struct bt_sock), NULL)))
 		return -ENOMEM;
 
+	sock_init_data(sock, sk);
+	INIT_LIST_HEAD(&bt_sk(sk)->accept_q);
+
 	sk_set_owner(sk, THIS_MODULE);
 
 	sock->ops = &bnep_sock_ops;
 
 	sock->state  = SS_UNCONNECTED;
 
-	sk->sk_destruct = NULL;
+	sk->sk_zapped	= 0;
 	sk->sk_protocol = protocol;
+	sk->sk_state	= BT_OPEN;
 	return 0;
 }
net/bluetooth/hci_sock.c +6 -1
diff -Nru a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
@@ -601,9 +601,14 @@
 
 	sock->ops = &hci_sock_ops;
 
-	sk = bt_sock_alloc(sock, protocol, sizeof(struct hci_pinfo), GFP_KERNEL);
+	sk = sk_alloc(PF_BLUETOOTH, GFP_KERNEL, sizeof(struct hci_pinfo), NULL);
 	if (!sk)
 		return -ENOMEM;
+
+	sock_init_data(sock, sk);
+
+	sk->sk_zapped   = 0;
+	sk->sk_protocol = protocol;
 
 	sk_set_owner(sk, THIS_MODULE);
net/bluetooth/hidp/sock.c +4 -2
diff -Nru a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
@@ -173,17 +173,19 @@
 	if (sock->type != SOCK_RAW)
 		return -ESOCKTNOSUPPORT;
 
-	if (!(sk = bt_sock_alloc(sock, PF_BLUETOOTH, 0, GFP_KERNEL)))
+	if (!(sk = sk_alloc(PF_BLUETOOTH, GFP_KERNEL, sizeof(struct bt_sock), NULL)))
 		return -ENOMEM;
 
+	sock_init_data(sock, sk);
 	sk_set_owner(sk, THIS_MODULE);
 
 	sock->ops = &hidp_sock_ops;
 
 	sock->state = SS_UNCONNECTED;
 
-	sk->sk_destruct = NULL;
 	sk->sk_protocol = protocol;
+	sk->sk_zapped	= 0;
+	sk->sk_state	= BT_OPEN;
 
 	return 0;
 }
net/bluetooth/l2cap.c +5 -1
diff -Nru a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
@@ -374,10 +374,13 @@
 {
 	struct sock *sk;
 
-	sk = bt_sock_alloc(sock, proto, sizeof(struct l2cap_pinfo), prio);
+	sk = sk_alloc(PF_BLUETOOTH, prio, sizeof(struct l2cap_pinfo), NULL);
 	if (!sk)
 		return NULL;
 
+	sock_init_data(sock, sk);
+	INIT_LIST_HEAD(&bt_sk(sk)->accept_q);
+
 	sk_set_owner(sk, THIS_MODULE);
 
 	sk->sk_destruct = l2cap_sock_destruct;

@@ -385,6 +388,7 @@
 
 	sk->sk_protocol = proto;
 	sk->sk_state    = BT_OPEN;
+	sk->sk_zapped	= 0;
 
 	l2cap_sock_init_timer(sk);
net/bluetooth/rfcomm/sock.c +5 -2
diff -Nru a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
@@ -287,11 +287,13 @@
 	struct rfcomm_dlc *d;
 	struct sock *sk;
 
-	sk = bt_sock_alloc(sock, BTPROTO_RFCOMM, sizeof(struct rfcomm_pinfo), prio);
+	sk = sk_alloc(PF_BLUETOOTH, prio, sizeof(struct rfcomm_pinfo), NULL);
 	if (!sk)
 		return NULL;
 
+	sock_init_data(sock, sk);
 	sk_set_owner(sk, THIS_MODULE);
+	INIT_LIST_HEAD(&bt_sk(sk)->accept_q);
 
 	d = rfcomm_dlc_alloc(prio);
 	if (!d) {

@@ -311,7 +313,8 @@
 	sk->sk_rcvbuf   = RFCOMM_MAX_CREDITS * RFCOMM_DEFAULT_MTU * 10;
 
 	sk->sk_protocol = proto;
-	sk->sk_state    = BT_OPEN;
+	sk->sk_state	= BT_OPEN;
+	sk->sk_zapped	= 0;
 
 	bt_sock_link(&rfcomm_sk_list, sk);
net/bluetooth/sco.c +6 -1
diff -Nru a/net/bluetooth/sco.c b/net/bluetooth/sco.c
@@ -420,15 +420,20 @@
 {
 	struct sock *sk;
 
-	sk = bt_sock_alloc(sock, proto, sizeof(struct sco_pinfo), prio);
+	sk = sk_alloc(PF_BLUETOOTH, prio, sizeof(struct sco_pinfo), NULL);
 	if (!sk)
 		return NULL;
 
+	sock_init_data(sock, sk);
+	INIT_LIST_HEAD(&bt_sk(sk)->accept_q);
+
 	sk_set_owner(sk, THIS_MODULE);
 
 	sk->sk_destruct = sco_sock_destruct;
 	sk->sk_sndtimeo = SCO_CONN_TIMEOUT;
 	sk->sk_state    = BT_OPEN;
+	sk->sk_zapped   = 0;
+	sk->sk_protocol = proto;
 
 	sco_sock_init_timer(sk);
#2 lore raw
Quoted 10 lines · Arnaldo Carvalho de Melo

Em Tue, Mar 08, 2005 at 06:49:37AM -0300, Arnaldo Carvalho de Melo escreveu:

Quoted 5 lines

Hi,

Please take a look and if acceptable pull from:

bk://kernel.bkbits.net/acme/connection_sock-2.6

Sorry, now with the patch attached.

Looks good to me. Marcel I'd suggest for you to apply this patch. It helps in reducing overall size of the socket structures.

Thanks
Max

#3 lore raw
Quoted 7 lines · Max Krasnyansky
Quoted 6 lines · Arnaldo Carvalho de Melo

Em Tue, Mar 08, 2005 at 06:49:37AM -0300, Arnaldo Carvalho de Melo escreveu:

Quoted 4 lines

Hi,

Please take a look and if acceptable pull from:

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

bk://kernel.bkbits.net/acme/connection_sock-2.6

Sorry, now with the patch attached.

Looks good to me. Marcel I'd suggest for you to apply this patch. It helps in reducing overall size of the socket structures.

Please note that there are further space savings to tap into in the bt_sock class hierarchy, as not all of the bt_sock descendants needs things like bt_sock::accept_q, etc

And when the "kill sk_protinfo" series is finished, there will be further space savings, as the same bt_sock descendants that don't use accept_q will not need to have struct connection_sock in its definition.

Signature · 1 line
- Arnaldo
maintainer
#4 lore raw
In reply to Max Krasnyansky

Hi Max,

Quoted 4 lines
Quoted 1 line

Sorry, now with the patch attached.

Looks good to me. Marcel I'd suggest for you to apply this patch. It helps in reducing overall size of the socket structures.

I didn't got the time to review and test it. Will do that next week.

Regards

Marcel

author
#5 lore raw

Em Wed, Mar 09, 2005 at 07:24:13PM +0100, Marcel Holtmann escreveu:

Quoted 8 lines

Hi Max,

Quoted 4 lines
Quoted 1 line

Sorry, now with the patch attached.

Looks good to me. Marcel I'd suggest for you to apply this patch. It helps in reducing overall size of the socket structures.

I didn't got the time to review and test it. Will do that next week.

OK, take your time, but the changes are rather small, I left renaming all the _pinfo (l2cap_pinfo, for instance) to _sock (for consistency with all the other net families) to keep the patch small.

For now I'll work on doing this same change to the HAM radio protocols, coordinating with Ralf Baechle and then wait for your comments to finally kill sk_protinfo and move on to introduce struct connection_sock.

- Arnaldo

maintainer
#6 lore raw

Hi Arnaldo,

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

Looks good to me. Marcel I'd suggest for you to apply this patch. It helps in reducing overall size of the socket structures.

I didn't got the time to review and test it. Will do that next week.

OK, take your time, but the changes are rather small, I left renaming all the _pinfo (l2cap_pinfo, for instance) to _sock (for consistency with all the other net families) to keep the patch small.

the patch is fine so far, but you forgot to change cmtp/sock.c. Please do this and resend it.

Send a second patch on top this one which is doing the renaming from *_pinfo to *_sock. I am fine with the renaming, but I like to have this in two separate patches.

Quoted 3 lines

For now I'll work on doing this same change to the HAM radio protocols, coordinating with Ralf Baechle and then wait for your comments to finally kill sk_protinfo and move on to introduce struct connection_sock.

When doing this, please split these changes into patches for net/bluetooth/, net/bluetooth/rfcomm/ and net/bluetooth/*/.

Regards

Marcel