struct stream_sock (aka struct sock shrink-me-harder)
Subsystems (12)
RFC 1/1 struct stream_sock (aka struct sock shrink-me-harder)
Hi Dave,
It compiles, boots, survives some testing, but is incomplete yet in
the old protos that I have to convert to per protocol slabcaches, which will also allow us to get rid of sk_protinfo.
Some cases are more tricky, like bluetooth, that uses both per
protocol slabcache _and_ sk->sk_protinfo, probably the best thing to do in this case is to make bluetooth use sk->sk_prot, and that is what I plan to do eventually to all families, to get rid of sk->sk_slab (i.e. when all families use sk->sk_prot we can just use sk->sk_prot->slab).
I think that besides the savings per struct sock instance on
non stream/seqpacket protos this makes things clearer by separating the stream stuff from the bare struct sock that is needed for all familes.
Anyway, what do you think? Any member in struct stream_sock that
should not have been moved from struct sock?
Best Regards,
- Arnaldo
You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.
===================================================================
[email protected], 2004-12-15 20:31:22-02:00, [email protected]
[SOCK] move stream specific stuff from struct sock to struct stream_sock
[root@oldpandora ~]# diff -u before after
--- before 2004-12-15 05:13:13.000000000 -0200
+++ after 2004-12-15 05:13:21.000000000 -0200
@@ -1,8 +1,8 @@
-rawv6_sock 640 -udpv6_sock 608 +rawv6_sock 608 +udpv6_sock 576 tcpv6_sock 1120 unix_sock 384 -raw_sock 480 -udp_sock 480 +raw_sock 448 +udp_sock 448
tcp_sock 1024
-sock 320
+sock 288
[root@oldpandora ~]#
Enough said? :-)
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
include/linux/atmdev.h | 18 ++ include/linux/ip.h | 7 - include/linux/ipv6.h | 34 ++--- include/linux/tcp.h | 11 + include/linux/udp.h | 9 - include/net/af_unix.h | 2 include/net/ax25.h | 15 ++ include/net/bluetooth/bluetooth.h | 13 + include/net/dn.h | 14 +- include/net/sctp/sctp.h | 23 ++- include/net/sock.h | 204 ------------------------------ include/net/stream_sock.h | 252 ++++++++++++++++++++++++++++++++++++++ include/net/tcp.h | 22 +-- include/net/tcp_ecn.h | 6 net/atm/common.c | 48 ++++--- net/atm/signaling.c | 6 net/atm/svc.c | 4 net/ax25/af_ax25.c | 55 ++++---- net/ax25/ax25_in.c | 13 - net/bluetooth/af_bluetooth.c | 7 - net/bluetooth/l2cap.c | 14 +- net/bluetooth/rfcomm/sock.c | 14 +- net/bluetooth/sco.c | 9 - net/core/sock.c | 24 ++- net/core/stream.c | 35 ++--- net/decnet/af_decnet.c | 8 - net/decnet/dn_nsp_in.c | 6 net/decnet/dn_nsp_out.c | 2 net/ipv4/af_inet.c | 14 +- net/ipv4/ip_output.c | 19 +- net/ipv4/tcp.c | 47 +++---- net/ipv4/tcp_diag.c | 4 net/ipv4/tcp_input.c | 30 ++-- net/ipv4/tcp_ipv4.c | 19 +- net/ipv4/tcp_minisocks.c | 13 + net/ipv4/tcp_output.c | 57 ++++---- net/ipv4/tcp_timer.c | 6 net/ipv6/af_inet6.c | 3 net/ipv6/ip6_output.c | 20 +-- net/ipv6/tcp_ipv6.c | 24 +-- net/irda/af_irda.c | 6 net/llc/af_llc.c | 3 net/netrom/af_netrom.c | 11 - net/rose/af_rose.c | 11 - net/sctp/associola.c | 4 net/sctp/endpointola.c | 2 net/sctp/sm_statefuns.c | 2 net/sctp/socket.c | 10 - net/unix/af_unix.c | 16 +- net/wanrouter/af_wanpipe.c | 4 net/x25/af_x25.c | 11 - 51 files changed, 694 insertions(+), 517 deletions(-)
include/linux/atmdev.h +15 -3
@@ -11,6 +11,8 @@#include <linux/atmapi.h> #include <linux/atm.h> #include <linux/atmioc.h> +#include <net/sock.h> +#include <net/stream_sock.h> #define ESI_LEN 6
@@ -30,9 +32,6 @@#define ATM_DS3_PCR (8000*12)/* DS3: 12 cells in a 125 usec time slot */ -#define atm_sk (__sk) ((struct atm_vcc *)(__sk)->sk_protinfo) -#define ATM_SD (s) (atm_sk((s)->sk)) -#define __AAL_STAT_ITEMS \ __HANDLE_ITEM(tx);/* TX okay */ \
@@ -310,6 +309,19 @@/* by CLIP and sch_atm. */ }; +struct atm_sock { +struct sock sk; +struct stream_sock *pssk; +struct stream_sock ssk; +struct atm_vcc vcc; +}; + +static inline struct atm_vcc *atm_sk (const struct sock *sk) +{ +return &((struct atm_sock *)sk)->vcc; +} + +#define ATM_SD (s) (atm_sk((s)->sk))struct atm_dev_addr {struct sockaddr_atmsvc addr;/* ATM address */
include/linux/ip.h +4 -3
@@ -150,11 +150,12 @@/* WARNING: don't change the layout of the members in inet_sock! */ struct inet_sock { -struct sock sk; +struct sock sk; +struct stream_sock *pssk;#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) -struct ipv6_pinfo *pinet6; +struct ipv6_pinfo *pinet6;#endif -struct inet_opt inet; +struct inet_opt inet; };static inline struct inet_opt *inet_sk (const struct sock *__sk)
include/linux/ipv6.h +19 -15
@@ -256,27 +256,31 @@/* WARNING: don't change the layout of the members in {raw,udp,tcp}6_sock! */ struct raw6_sock { -struct sock sk; -struct ipv6_pinfo *pinet6; -struct inet_opt inet; -struct raw6_opt raw6; -struct ipv6_pinfo inet6; +struct sock sk; +struct stream_sock *pssk; +struct ipv6_pinfo *pinet6; +struct inet_opt inet; +struct raw6_opt raw6; +struct ipv6_pinfo inet6; };struct udp6_sock { -struct sock sk; -struct ipv6_pinfo *pinet6; -struct inet_opt inet; -struct udp_opt udp; -struct ipv6_pinfo inet6; +struct sock sk; +struct stream_sock *pssk; +struct ipv6_pinfo *pinet6; +struct inet_opt inet; +struct udp_opt udp; +struct ipv6_pinfo inet6; };struct tcp6_sock { -struct sock sk; -struct ipv6_pinfo *pinet6; -struct inet_opt inet; -struct tcp_opt tcp; -struct ipv6_pinfo inet6; +struct sock sk; +struct stream_sock *pssk; +struct ipv6_pinfo *pinet6; +struct inet_opt inet; +struct tcp_opt tcp; +struct stream_sock ssk; +struct ipv6_pinfo inet6; };static inline struct ipv6_pinfo *inet6_sk (const struct sock *__sk)
include/linux/tcp.h +7 -4
@@ -196,6 +196,7 @@#include <linux/skbuff.h> #include <linux/ip.h> #include <net/sock.h> +#include <net/stream_sock.h> /* This defines a selective acknowledgement block. */ struct tcp_sack_block {
@@ -440,12 +441,14 @@/* WARNING: don't change the layout of the members in tcp_sock! */ struct tcp_sock { -struct sock sk; +struct sock sk; +struct stream_sock *pssk;#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) -struct ipv6_pinfo *pinet6; +struct ipv6_pinfo *pinet6;#endif -struct inet_opt inet; -struct tcp_opt tcp; +struct inet_opt inet; +struct tcp_opt tcp; +struct stream_sock ssk; };static inline struct tcp_opt *tcp_sk (const struct sock *__sk)
include/linux/udp.h +5 -4
@@ -53,12 +53,13 @@/* WARNING: don't change the layout of the members in udp_sock! */ struct udp_sock { -struct sock sk; +struct sock sk; +struct stream_sock *pssk;#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) -struct ipv6_pinfo *pinet6; +struct ipv6_pinfo *pinet6;#endif -struct inet_opt inet; -struct udp_opt udp; +struct inet_opt inet; +struct udp_opt udp; };static inline struct udp_opt *udp_sk (const struct sock *__sk)
include/net/af_unix.h +2 -0
@@ -62,6 +62,8 @@struct unix_sock {/* WARNING: sk has to be the first member */ struct sock sk; +struct stream_sock *pssk; +struct stream_sock ssk;struct unix_address *addr;struct dentry *dentry;struct vfsmount *mnt;
include/net/ax25.h +14 -1
@@ -12,6 +12,8 @@#include <linux/timer.h> #include <linux/list.h> #include <asm/atomic.h> +#include <net/sock.h> +#include <net/stream_sock.h> #define AX25_T1CLAMPLO 1#define AX25_T1CLAMPHI (30 * HZ)
@@ -203,7 +205,17 @@atomic_t refcount; } ax25_cb; -#define ax25_sk (__sk) ((ax25_cb *)(__sk)->sk_protinfo) +struct ax25_sock { +struct sock sk; +struct stream_sock *pssk; +struct stream_sock ssk; +struct ax25_cb cb; +}; + +static inline struct ax25_cb *ax25_sk (const struct sock *sk) +{ +return &((struct ax25_sock *)sk)->cb; +}#define ax25_for_each (__ax25, node, list) \ hlist_for_each_entry(__ax25, node, list, ax25_node)
@@ -230,6 +242,7 @@extern void ax25_send_to_raw (ax25_address *,struct sk_buff *,int );extern void ax25_destroy_socket (ax25_cb *);extern ax25_cb *ax25_create_cb (void ); +extern void ax25_init_cb (ax25_cb *ax25);extern void ax25_fillin_cb (ax25_cb *,ax25_dev *);extern int ax25_create (struct socket *,int );extern struct sock *ax25_make_new (struct sock *,struct ax25_dev *);
include/net/bluetooth/bluetooth.h +8 -5
@@ -30,6 +30,7 @@#include <linux/list.h> #include <linux/poll.h> #include <net/sock.h> +#include <net/stream_sock.h> #ifndef AF_BLUETOOTH #define AF_BLUETOOTH 31
@@ -111,11 +112,13 @@#define bt_sk (__sk) ((struct bt_sock *) __sk)struct bt_sock { -struct sock sk; -bdaddr_t src; -bdaddr_t dst; -struct list_head accept_q; -struct sock *parent; +struct sock sk; +struct stream_sock *pssk; +struct stream_sock ssk; +bdaddr_t src; +bdaddr_t dst; +struct list_head accept_q; +struct sock *parent; };struct bt_sock_list {
include/net/dn.h +13 -1
@@ -2,6 +2,7 @@#define _NET_DN_H#include <linux/dn.h> +#include <net/stream_sock.h> #include <asm/byteorder.h> typedef unsigned short dn_address ;
@@ -133,7 +134,18 @@ }; -#define DN_SK (__sk) ((struct dn_scp *)(__sk)->sk_protinfo) +/* WARNING: don't change the layout of the members in tcp_sock! */ +struct decnet_sock { +struct sock sk; +struct stream_sock *pssk; +struct dn_scp scp; +struct stream_sock ssk; +}; + +static inline struct dn_scp *DN_SK (const struct sock *sk) +{ +return &((struct decnet_sock *)sk)->scp; +}/* * src,dst : Source and Destination DECnet addresses
include/net/sctp/sctp.h +14 -9
@@ -88,6 +88,7 @@#include <asm/uaccess.h> #include <asm/page.h> #include <net/sock.h> +#include <net/stream_sock.h> #include <net/snmp.h> #include <net/sctp/structs.h> #include <net/sctp/constants.h>
@@ -584,21 +585,25 @@/* WARNING: Do not change the layout of the members in sctp_sock! */ struct sctp_sock { -struct sock sk; +struct sock sk; +struct stream_sock *pssk;#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) -struct ipv6_pinfo *pinet6; +struct ipv6_pinfo *pinet6;#endif /* CONFIG_IPV6 */ -struct inet_opt inet; -struct sctp_opt sctp; +struct inet_opt inet; +struct sctp_opt sctp; +struct stream_sock ssk; };#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE )struct sctp6_sock { -struct sock sk; -struct ipv6_pinfo *pinet6; -struct inet_opt inet; -struct sctp_opt sctp; -struct ipv6_pinfo inet6; +struct sock sk; +struct stream_sock *pssk; +struct ipv6_pinfo *pinet6; +struct inet_opt inet; +struct sctp_opt sctp; +struct stream_sock ssk; +struct ipv6_pinfo inet6; };#endif /* CONFIG_IPV6 */
include/net/sock.h +1 -203
283 lines not on this page · raw message
include/net/stream_sock.h new file +252 -0
252 lines not on this page · raw message
include/net/tcp.h +13 -9
@@ -32,6 +32,7 @@#include <linux/percpu.h> #include <net/checksum.h> #include <net/sock.h> +#include <net/stream_sock.h> #include <net/snmp.h> #include <net/ip.h> #if defined(CONFIG_IPV6 ) || defined (CONFIG_IPV6_MODULE )
@@ -1457,7 +1458,7 @@extern void tcp_set_skb_tso_segs (struct sk_buff *,unsigned int ); -/* This checks if the data bearing packet SKB (usually sk->sk_send_head) +/* This checks if the data bearing packet SKB (usually sk_ssk(sk)->ssk_send_head) * should be put on the wire right now. */ static __inline__ int tcp_snd_test(const struct tcp_opt *tp,
@@ -1523,7 +1524,7 @@ unsigned cur_mss, int nonagle) { -struct sk_buff *skb = sk->sk_send_head; +struct sk_buff *skb =sk_ssk (sk)->ssk_send_head;if (skb) {if (!tcp_skb_is_last (sk, skb))
@@ -1543,7 +1544,7 @@ static __inline__ int tcp_may_send_now(struct sock *sk, struct tcp_opt *tp) { - struct sk_buff *skb = sk->sk_send_head; + struct sk_buff *skb = sk_ssk(sk)->ssk_send_head; return (skb && tcp_snd_test(tp, skb, tcp_current_mss(sk, 1),
@@ -1951,10 +1952,12 @@static inline void tcp_v4_setup_caps (struct sock *sk,struct dst_entry *dst) { - sk->sk_route_caps = dst->dev->features; -if (sk->sk_route_caps &NETIF_F_TSO ) { -if (sk->sk_no_largesend || dst->header_len) - sk->sk_route_caps &= ~NETIF_F_TSO ; +struct stream_sock *ssk =sk_ssk (sk); + + ssk->ssk_route_caps = dst->dev->features; +if (ssk->ssk_route_caps &NETIF_F_TSO ) { +if (ssk->ssk_no_largesend || dst->header_len) + ssk->ssk_route_caps &= ~NETIF_F_TSO ; } }
@@ -1963,13 +1966,14 @@static inline int tcp_use_frto (const struct sock *sk) {const struct tcp_opt *tp =tcp_sk (sk); +const struct stream_sock *ssk =sk_ssk (sk);/* F-RTO must be activated in sysctl and there must be some * unsent new data, and the advertised window should allow * sending it. */ -return (sysctl_tcp_frto && sk->sk_send_head && - !after (TCP_SKB_CB (sk->sk_send_head)->end_seq, +return (sysctl_tcp_frto && ssk->ssk_send_head && + !after (TCP_SKB_CB (ssk->ssk_send_head)->end_seq, tp->snd_una + tp->snd_wnd)); }
include/net/tcp_ecn.h +4 -2
@@ -30,11 +30,13 @@static __inline__void TCP_ECN_send_syn (struct sock *sk,struct tcp_opt *tp,struct sk_buff *skb) { +struct stream_sock *ssk =sk_ssk (sk); + tp->ecn_flags =0 ; -if (sysctl_tcp_ecn && !(sk->sk_route_caps &NETIF_F_TSO )) { +if (sysctl_tcp_ecn && !(ssk->ssk_route_caps &NETIF_F_TSO )) {TCP_SKB_CB (skb)->flags |=TCPCB_FLAG_ECE |TCPCB_FLAG_CWR ; tp->ecn_flags =TCP_ECN_OK ; - sk->sk_no_largesend =1 ; + ssk->ssk_no_largesend =1 ; } }
net/atm/common.c +29 -19
102 lines not on this page · raw message
net/atm/signaling.c +3 -3
@@ -133,13 +133,13 @@ vcc = *(struct atm_vcc **) &msg->listen_vcc;DPRINTK ("as_indicate!!!\n" );lock_sock (vcc->sk); -if (vcc->sk->sk_ack_backlog == - vcc->sk->sk_max_ack_backlog) { +if (sk_ssk (vcc->sk)->ssk_ack_backlog == +sk_ssk (vcc->sk)->ssk_max_ack_backlog) {sigd_enq (NULL ,as_reject,vcc,NULL ,NULL );dev_kfree_skb (skb); goto as_indicate_complete; } - vcc->sk->sk_ack_backlog++; +sk_ssk (vcc->sk)->ssk_ack_backlog++;skb_queue_tail (&vcc->sk->sk_receive_queue, skb);DPRINTK ("waking vcc->sk->sk_sleep 0x%p\n" , vcc->sk->sk_sleep); vcc->sk->sk_state_change (vcc->sk);
net/atm/svc.c +2 -2
@@ -320,7 +320,7 @@ goto out; }set_bit (ATM_VF_LISTEN ,&vcc->flags); - vcc->sk->sk_max_ack_backlog = backlog >0 ? backlog : +sk_ssk (vcc->sk)->ssk_max_ack_backlog = backlog >0 ? backlog :ATM_BACKLOG_DEFAULT ; error = -sk->sk_err; out:
@@ -387,7 +387,7 @@ error =vcc_connect (newsock, msg->pvc.sap_addr.itf, msg->pvc.sap_addr.vpi, msg->pvc.sap_addr.vci);dev_kfree_skb (skb); - old_vcc->sk->sk_ack_backlog--; +sk_ssk (old_vcc->sk)->ssk_ack_backlog--;if (error) {sigd_enq2 (NULL ,as_reject,old_vcc,NULL ,NULL , &old_vcc->qos,error);
net/ax25/af_ax25.c +33 -22
119 lines not on this page · raw message
net/ax25/ax25_in.c +4 -9
@@ -356,7 +356,7 @@if (sk !=NULL ) {bh_lock_sock (sk); -if (sk->sk_ack_backlog == sk->sk_max_ack_backlog || +if (sk_ssk (sk)->ssk_ack_backlog ==sk_ssk (sk)->ssk_max_ack_backlog || (make =ax25_make_new (sk, ax25_dev)) ==NULL ) {if (mine)ax25_return_dm (dev, &src, &dest, &dp);
@@ -373,7 +373,7 @@ make->sk_state =TCP_ESTABLISHED ; - sk->sk_ack_backlog++; +sk_ssk (sk)->ssk_ack_backlog++;bh_unlock_sock (sk); }else {if (!mine) {
@@ -381,13 +381,8 @@return 0 ; } -if ((ax25 =ax25_create_cb ()) ==NULL ) { -ax25_return_dm (dev, &src, &dest, &dp); -kfree_skb (skb); -return 0 ; - } - -ax25_fillin_cb (ax25, ax25_dev); +ax25_init_cb (ax25_sk (sk)); +ax25_fillin_cb (ax25_sk (sk), ax25_dev); } ax25->source_addr = dest;
net/bluetooth/af_bluetooth.c +5 -2
@@ -127,6 +127,9 @@ sk->sk_protinfo = pi; } +if (sock->type ==SOCK_STREAM ) + ssk_set_pointer(sk, struct bt_sock, ssk); +sock_init_data (sock, sk);INIT_LIST_HEAD (&bt_sk (sk)->accept_q);
@@ -161,7 +164,7 @@sock_hold (sk);list_add_tail (&bt_sk (sk)->accept_q, &bt_sk (parent)->accept_q);bt_sk (sk)->parent = parent; - parent->sk_ack_backlog++; +sk_ssk (parent)->ssk_ack_backlog++; }EXPORT_SYMBOL (bt_accept_enqueue);
@@ -170,7 +173,7 @@BT_DBG ("sk %p state %d" , sk, sk->sk_state);list_del_init (&bt_sk (sk)->accept_q); -bt_sk (sk)->parent->sk_ack_backlog--; +sk_ssk (bt_sk (sk)->parent)->ssk_ack_backlog--;bt_sk (sk)->parent =NULL ;sock_put (sk); }
net/bluetooth/l2cap.c +8 -6
@@ -604,8 +604,8 @@ goto done; } - sk->sk_max_ack_backlog = backlog; - sk->sk_ack_backlog =0 ; +sk_ssk (sk)->ssk_max_ack_backlog = backlog; +sk_ssk (sk)->ssk_ack_backlog =0 ; sk->sk_state =BT_LISTEN ; done:
@@ -892,8 +892,9 @@l2cap_sock_clear_timer (sk);__l2cap_sock_close (sk,0 ); -if (sock_flag (sk,SOCK_LINGER ) && sk->sk_lingertime) - err =bt_sock_wait_state (sk,BT_CLOSED , sk->sk_lingertime); +if (sock_flag (sk,SOCK_LINGER ) &&sk_ssk (sk)->ssk_lingertime) + err =bt_sock_wait_state (sk,BT_CLOSED , +sk_ssk (sk)->ssk_lingertime); }release_sock (sk);return err;
@@ -1406,8 +1407,9 @@ result =L2CAP_CR_NO_MEM ;/* Check for backlog size */ -if (parent->sk_ack_backlog > parent->sk_max_ack_backlog) { -BT_DBG ("backlog full %d" , parent->sk_ack_backlog); +if (sk_ssk (parent)->ssk_ack_backlog > +sk_ssk (parent)->ssk_max_ack_backlog) { +BT_DBG ("backlog full %d" ,sk_ssk (parent)->ssk_ack_backlog); goto response; }
net/bluetooth/rfcomm/sock.c +8 -6
@@ -428,8 +428,8 @@ goto done; } - sk->sk_max_ack_backlog = backlog; - sk->sk_ack_backlog =0 ; +sk_ssk (sk)->ssk_max_ack_backlog = backlog; +sk_ssk (sk)->ssk_ack_backlog =0 ; sk->sk_state =BT_LISTEN ; done:
@@ -739,8 +739,9 @@ sk->sk_shutdown =SHUTDOWN_MASK ;__rfcomm_sock_close (sk); -if (sock_flag (sk,SOCK_LINGER ) && sk->sk_lingertime) - err =bt_sock_wait_state (sk,BT_CLOSED , sk->sk_lingertime); +if (sock_flag (sk,SOCK_LINGER ) &&sk_ssk (sk)->ssk_lingertime) + err =bt_sock_wait_state (sk,BT_CLOSED , +sk_ssk (sk)->ssk_lingertime); }release_sock (sk);return err;
@@ -783,8 +784,9 @@return 0 ;/* Check for backlog size */ -if (parent->sk_ack_backlog > parent->sk_max_ack_backlog) { -BT_DBG ("backlog full %d" , parent->sk_ack_backlog); +if (sk_ssk (parent)->ssk_ack_backlog > +sk_ssk (parent)->ssk_max_ack_backlog) { +BT_DBG ("backlog full %d" ,sk_ssk (parent)->ssk_ack_backlog); goto done; }
net/bluetooth/sco.c +5 -4
@@ -540,8 +540,8 @@ goto done; } - sk->sk_max_ack_backlog = backlog; - sk->sk_ack_backlog =0 ; +sk_ssk (sk)->ssk_max_ack_backlog = backlog; +sk_ssk (sk)->ssk_ack_backlog =0 ; sk->sk_state =BT_LISTEN ; done:
@@ -733,9 +733,10 @@sco_sock_close (sk); -if (sock_flag (sk,SOCK_LINGER ) && sk->sk_lingertime) { +if (sock_flag (sk,SOCK_LINGER ) &&sk_ssk (sk)->ssk_lingertime) {lock_sock (sk); - err =bt_sock_wait_state (sk,BT_CLOSED , sk->sk_lingertime); + err =bt_sock_wait_state (sk,BT_CLOSED , +sk_ssk (sk)->ssk_lingertime);release_sock (sk); }
net/core/sock.c +15 -9
@@ -307,7 +307,8 @@break ;case SO_LINGER : -if (optlen<sizeof (ling)) { +if (sk->sk_type ==SOCK_STREAM || + optlen <sizeof (ling)) { ret = -EINVAL ;/* 1003.1g */ break ; }
@@ -320,10 +321,10 @@else {#if (BITS_PER_LONG ==32 )if (ling.l_linger >=MAX_SCHEDULE_TIMEOUT /HZ ) - sk->sk_lingertime =MAX_SCHEDULE_TIMEOUT ; +sk_ssk (sk)->ssk_lingertime =MAX_SCHEDULE_TIMEOUT ; else#endif - sk->sk_lingertime = ling.l_linger *HZ ; +sk_ssk (sk)->ssk_lingertime = ling.l_linger *HZ ;sock_set_flag (sk,SOCK_LINGER ); }break ;
@@ -513,9 +514,11 @@break ;case SO_LINGER : +if (sk->sk_type !=SOCK_STREAM ) +return -EINVAL ; lv =sizeof (v.ling); v.ling.l_onoff = !!sock_flag (sk,SOCK_LINGER ); - v.ling.l_linger = sk->sk_lingertime /HZ ; + v.ling.l_linger =sk_ssk (sk)->ssk_lingertime /HZ ;break ;case SO_BSDCOMPAT :
@@ -1156,8 +1159,6 @@skb_queue_head_init (&sk->sk_write_queue);skb_queue_head_init (&sk->sk_error_queue); - sk->sk_send_head =NULL ; -init_timer (&sk->sk_timer); sk->sk_allocation =GFP_KERNEL ;
@@ -1184,13 +1185,18 @@ sk->sk_error_report = sock_def_error_report; sk->sk_destruct = sock_def_destruct; - sk->sk_sndmsg_page =NULL ; - sk->sk_sndmsg_off =0 ; +if (sk->sk_type ==SOCK_STREAM ) { +struct stream_sock *ssk =sk_ssk (sk); + + ssk->ssk_send_head =NULL ; + ssk->ssk_sndmsg_page =NULL ; + ssk->ssk_sndmsg_off =0 ; + ssk->ssk_write_pending =0 ; + } sk->sk_peercred.pid =0 ; sk->sk_peercred.uid =-1 ; sk->sk_peercred.gid =-1 ; - sk->sk_write_pending =0 ; sk->sk_rcvlowat =1 ; sk->sk_rcvtimeo =MAX_SCHEDULE_TIMEOUT ; sk->sk_sndtimeo =MAX_SCHEDULE_TIMEOUT ;
net/core/stream.c +19 -16
@@ -64,13 +64,13 @@return sock_intr_errno (*timeo_p);prepare_to_wait (sk->sk_sleep, &wait,TASK_INTERRUPTIBLE ); - sk->sk_write_pending++; +sk_ssk (sk)->ssk_write_pending++;if (sk_wait_event (sk, timeo_p, !((1 << sk->sk_state) & ~(TCPF_ESTABLISHED |TCPF_CLOSE_WAIT ))))break ;finish_wait (sk->sk_sleep, &wait); - sk->sk_write_pending--; +sk_ssk (sk)->ssk_write_pending--; }return 0 ; }
@@ -136,10 +136,10 @@break ;set_bit (SOCK_NOSPACE , &sk->sk_socket->flags); - sk->sk_write_pending++; +sk_ssk (sk)->ssk_write_pending++;sk_wait_event (sk, ¤t_timeo,sk_stream_memory_free (sk) && vm_wait); - sk->sk_write_pending--; +sk_ssk (sk)->ssk_write_pending--;if (vm_wait) { vm_wait -= current_timeo;
@@ -173,7 +173,7 @@struct sock *sk = skb->sk;atomic_sub (skb->truesize, &sk->sk_rmem_alloc); - sk->sk_forward_alloc += skb->truesize; +sk_ssk (sk)->ssk_forward_alloc += skb->truesize; }EXPORT_SYMBOL (sk_stream_rfree);
@@ -191,10 +191,12 @@void __sk_stream_mem_reclaim (struct sock *sk) { -if (sk->sk_forward_alloc >=SK_STREAM_MEM_QUANTUM ) { -atomic_sub (sk->sk_forward_alloc /SK_STREAM_MEM_QUANTUM , +struct stream_sock *ssk =sk_ssk (sk); + +if (ssk->ssk_forward_alloc >=SK_STREAM_MEM_QUANTUM ) { +atomic_sub (ssk->ssk_forward_alloc /SK_STREAM_MEM_QUANTUM , sk->sk_prot->memory_allocated); - sk->sk_forward_alloc &=SK_STREAM_MEM_QUANTUM -1 ; + ssk->ssk_forward_alloc &=SK_STREAM_MEM_QUANTUM -1 ;if (*sk->sk_prot->memory_pressure && (atomic_read (sk->sk_prot->memory_allocated) < sk->sk_prot->sysctl_mem[0 ]))
@@ -207,8 +209,9 @@int sk_stream_mem_schedule (struct sock *sk,int size,int kind) {int amt =sk_stream_pages (size); +struct stream_sock *ssk =sk_ssk (sk); - sk->sk_forward_alloc += amt *SK_STREAM_MEM_QUANTUM ; + ssk->ssk_forward_alloc += amt *SK_STREAM_MEM_QUANTUM ;atomic_add (amt, sk->sk_prot->memory_allocated);/* Under limit. */
@@ -231,14 +234,14 @@if (kind) {if (atomic_read (&sk->sk_rmem_alloc) < sk->sk_prot->sysctl_rmem[0 ])return 1 ; - }else if (sk->sk_wmem_queued < sk->sk_prot->sysctl_wmem[0 ]) + }else if (ssk->ssk_wmem_queued < sk->sk_prot->sysctl_wmem[0 ])return 1 ;if (!*sk->sk_prot->memory_pressure || sk->sk_prot->sysctl_mem[2 ] >atomic_read (sk->sk_prot->sockets_allocated) * -sk_stream_pages (sk->sk_wmem_queued + +sk_stream_pages (ssk->ssk_wmem_queued +atomic_read (&sk->sk_rmem_alloc) + - sk->sk_forward_alloc)) + ssk->ssk_forward_alloc))return 1 ; suppress_allocation:
@@ -249,12 +252,12 @@/* Fail only if socket is _under_ its sndbuf. * In this case we cannot block, so that we have to fail. */ -if (sk->sk_wmem_queued + size >= sk->sk_sndbuf) +if (ssk->ssk_wmem_queued + size >= sk->sk_sndbuf)return 1 ; }/* Alas. Undo changes. */ - sk->sk_forward_alloc -= amt *SK_STREAM_MEM_QUANTUM ; + ssk->ssk_forward_alloc -= amt *SK_STREAM_MEM_QUANTUM ;atomic_sub (amt, sk->sk_prot->memory_allocated);return 0 ; }
@@ -275,8 +278,8 @@/* Account for returned memory. */ sk_stream_mem_reclaim (sk); -BUG_TRAP (!sk->sk_wmem_queued); -BUG_TRAP (!sk->sk_forward_alloc); +BUG_TRAP (!sk_ssk (sk)->ssk_wmem_queued); +BUG_TRAP (!sk_ssk (sk)->ssk_forward_alloc);/* It is _impossible_ for the backlog to contain anything * when we get here. All user references to this socket
net/decnet/af_decnet.c +4 -4
@@ -942,7 +942,7 @@ fl.proto =DNPROTO_NSP ;if (dn_route_output_sock (&sk->sk_dst_cache, &fl, sk, flags) <0 ) goto out; - sk->sk_route_caps = sk->sk_dst_cache->dev->features; +sk_ssk (sk)->ssk_route_caps = sk->sk_dst_cache->dev->features; sock->state =SS_CONNECTING ; scp->state =DN_CI ; scp->segsize_loc =dst_path_metric (sk->sk_dst_cache,RTAX_ADVMSS );
@@ -1080,7 +1080,7 @@ } cb =DN_SKB_CB (skb); - sk->sk_ack_backlog--; +sk_ssk (sk)->ssk_ack_backlog--; newsk =dn_alloc_sock (newsock, sk->sk_allocation);if (newsk ==NULL ) {release_sock (sk);
@@ -1268,8 +1268,8 @@if ((DN_SK (sk)->state !=DN_O ) || (sk->sk_state ==TCP_LISTEN )) goto out; - sk->sk_max_ack_backlog = backlog; - sk->sk_ack_backlog =0 ; +sk_ssk (sk)->ssk_max_ack_backlog = backlog; +sk_ssk (sk)->ssk_ack_backlog =0 ; sk->sk_state =TCP_LISTEN ; err =0 ;dn_rehash_sock (sk);
net/decnet/dn_nsp_in.c +4 -2
@@ -324,12 +324,14 @@static void dn_nsp_conn_init (struct sock *sk,struct sk_buff *skb) { -if (sk->sk_ack_backlog >= sk->sk_max_ack_backlog) { +struct stream_sock *ssk =sk_ssk (sk); + +if (ssk->ssk_ack_backlog >= ssk->ssk_max_ack_backlog) {kfree_skb (skb);return ; } - sk->sk_ack_backlog++; + ssk->ssk_ack_backlog++;skb_queue_tail (&sk->sk_receive_queue, skb); sk->sk_state_change (sk); }
net/decnet/dn_nsp_out.c +1 -1
@@ -99,7 +99,7 @@ fl.proto =DNPROTO_NSP ;if (dn_route_output_sock (&sk->sk_dst_cache, &fl, sk,0 ) ==0 ) { dst =sk_dst_get (sk); - sk->sk_route_caps = dst->dev->features; +sk_ssk (sk)->ssk_route_caps = dst->dev->features; goto try_again; }
net/ipv4/af_inet.c +9 -5
@@ -148,8 +148,8 @@BUG_TRAP (!atomic_read (&sk->sk_rmem_alloc));BUG_TRAP (!atomic_read (&sk->sk_wmem_alloc)); -BUG_TRAP (!sk->sk_wmem_queued); -BUG_TRAP (!sk->sk_forward_alloc); +BUG_TRAP (!(sk->sk_type ==SOCK_STREAM &&sk_ssk (sk)->ssk_wmem_queued)); +BUG_TRAP (!(sk->sk_type ==SOCK_STREAM &&sk_ssk (sk)->ssk_forward_alloc));if (inet->opt)kfree (inet->opt);
@@ -215,7 +215,7 @@if (err) goto out; } - sk->sk_max_ack_backlog = backlog; +sk_ssk (sk)->ssk_max_ack_backlog = backlog; err =0 ; out:
@@ -308,9 +308,13 @@ inet->id =0 ; -sock_init_data (sock, sk);sk_set_owner (sk, sk->sk_prot->owner); +if (sock->type ==SOCK_STREAM ) + ssk_set_pointer(sk, struct tcp_sock, ssk); + +sock_init_data (sock, sk); + sk->sk_destruct = inet_sock_destruct; sk->sk_family =PF_INET ; sk->sk_protocol = protocol;
@@ -375,7 +379,7 @@ timeout =0 ;if (sock_flag (sk,SOCK_LINGER ) && !(current->flags &PF_EXITING )) - timeout = sk->sk_lingertime; + timeout =sk_ssk (sk)->ssk_lingertime; sock->sk =NULL ; sk->sk_prot->close (sk, timeout); }
net/ipv4/ip_output.c +11 -8
@@ -747,8 +747,10 @@ inet->cork.fragsize = mtu =dst_pmtu (&rt->u.dst); inet->cork.rt = rt; inet->cork.length =0 ; - sk->sk_sndmsg_page =NULL ; - sk->sk_sndmsg_off =0 ; +if (sk->sk_type ==SOCK_STREAM ) { +sk_ssk (sk)->ssk_sndmsg_page =NULL ; +sk_ssk (sk)->ssk_sndmsg_off =0 ; + }if ((exthdrlen = rt->u.dst.header_len) !=0 ) { length += exthdrlen; transhdrlen += exthdrlen;
@@ -914,8 +916,9 @@ }else {int i =skb_shinfo (skb)->nr_frags;skb_frag_t *frag = &skb_shinfo (skb)->frags[i-1 ]; -struct page *page = sk->sk_sndmsg_page; -int off = sk->sk_sndmsg_off; +struct stream_sock *ssk =sk_ssk (sk); +struct page *page = ssk->ssk_sndmsg_page; +int off = ssk->ssk_sndmsg_off;unsigned int left;if (page && (left =PAGE_SIZE - off) >0 ) {
@@ -927,7 +930,7 @@ goto error; }get_page (page); -skb_fill_page_desc (skb, i, page, sk->sk_sndmsg_off,0 ); +skb_fill_page_desc (skb, i, page, ssk->ssk_sndmsg_off,0 ); frag = &skb_shinfo (skb)->frags[i]; } }else if (i <MAX_SKB_FRAGS ) {
@@ -938,8 +941,8 @@ err = -ENOMEM ; goto error; } - sk->sk_sndmsg_page = page; - sk->sk_sndmsg_off =0 ; + ssk->ssk_sndmsg_page = page; + ssk->ssk_sndmsg_off =0 ;skb_fill_page_desc (skb, i, page,0 ,0 ); frag = &skb_shinfo (skb)->frags[i];
@@ -953,7 +956,7 @@ err = -EFAULT ; goto error; } - sk->sk_sndmsg_off += copy; + ssk->ssk_sndmsg_off += copy; frag->size += copy; skb->len += copy; skb->data_len += copy;
net/ipv4/tcp.c +25 -22
153 lines not on this page · raw message
net/ipv4/tcp_diag.c +2 -2
@@ -158,8 +158,8 @@if (minfo) { minfo->tcpdiag_rmem =atomic_read (&sk->sk_rmem_alloc); - minfo->tcpdiag_wmem = sk->sk_wmem_queued; - minfo->tcpdiag_fmem = sk->sk_forward_alloc; + minfo->tcpdiag_wmem =sk_ssk (sk)->ssk_wmem_queued; + minfo->tcpdiag_fmem =sk_ssk (sk)->ssk_forward_alloc; minfo->tcpdiag_tmem =atomic_read (&sk->sk_wmem_alloc); }
net/ipv4/tcp_input.c +16 -14
@@ -962,6 +962,7 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_una) { struct tcp_opt *tp = tcp_sk(sk); +struct stream_sock *ssk =sk_ssk (sk);unsigned char *ptr = ack_skb->h.raw +TCP_SKB_CB (ack_skb)->sacked;struct tcp_sack_block *sp = (struct tcp_sack_block *)(ptr+2 );int num_sacks = (ptr[1 ] -TCPOLEN_SACK_BASE )>>3 ;
@@ -973,9 +974,9 @@/* So, SACKs for already sent large segments will be lost. * Not good, but alternative is to resegment the queue. */ -if (sk->sk_route_caps &NETIF_F_TSO ) { - sk->sk_route_caps &= ~NETIF_F_TSO ; - sk->sk_no_largesend =1 ; +if (ssk->ssk_route_caps &NETIF_F_TSO ) { + ssk->ssk_route_caps &= ~NETIF_F_TSO ; + ssk->ssk_no_largesend =1 ; tp->mss_cache = tp->mss_cache_std; }
@@ -2435,7 +2436,7 @@__s32 seq_rtt =-1 ;while ((skb =skb_peek (&sk->sk_write_queue)) && - skb != sk->sk_send_head) { + skb !=sk_ssk (sk)->ssk_send_head) {struct tcp_skb_cb *scb =TCP_SKB_CB (skb);__u8 sacked = scb->sacked;
@@ -2529,7 +2530,7 @@/* Was it a usable window open? */ -if (!after (TCP_SKB_CB (sk->sk_send_head)->end_seq, +if (!after (TCP_SKB_CB (sk_ssk (sk)->ssk_send_head)->end_seq, tp->snd_una + tp->snd_wnd)) { tp->backoff =0 ;tcp_clear_xmit_timer (sk,TCP_TIME_PROBE0 );
@@ -2967,7 +2968,7 @@* being used to time the probes, and is probably far higher than * it needs to be for normal retransmission. */ -if (sk->sk_send_head) +if (sk_ssk (sk)->ssk_send_head)tcp_ack_probe (sk);return 1 ;
@@ -3943,7 +3944,7 @@/* When incoming ACK allowed to free some skb from write_queue, -* we remember this event in flag sk->sk_queue_shrunk and wake up socket +* we remember this event in flag sk_ssk(sk)->ssk_queue_shrunk and wake up socket * on the exit from tcp input handler. * * PROBLEM: sndbuf expansion does not work well with largesend.
@@ -3971,8 +3972,8 @@static inline void tcp_check_space (struct sock *sk) { -if (sk->sk_queue_shrunk) { - sk->sk_queue_shrunk =0 ; +if (sk_ssk (sk)->ssk_queue_shrunk) { +sk_ssk (sk)->ssk_queue_shrunk =0 ;if (sk->sk_socket &&test_bit (SOCK_NOSPACE , &sk->sk_socket->flags))tcp_new_space (sk);
@@ -3991,7 +3992,7 @@static __inline__void tcp_data_snd_check (struct sock *sk) { -struct sk_buff *skb = sk->sk_send_head; +struct sk_buff *skb =sk_ssk (sk)->ssk_send_head;if (skb !=NULL )__tcp_data_snd_check (sk, skb);
@@ -4337,7 +4338,7 @@tcp_rcv_rtt_measure_ts (tp, skb); -if ((int )skb->truesize > sk->sk_forward_alloc) +if ((int )skb->truesize >sk_ssk (sk)->ssk_forward_alloc) goto step5;NET_INC_STATS_BH (LINUX_MIB_TCPHPHITS );
@@ -4515,7 +4516,7 @@TCP_ECN_rcv_synack (tp, th);if (tp->ecn_flags&TCP_ECN_OK ) - sk->sk_no_largesend =1 ; +sk_ssk (sk)->ssk_no_largesend =1 ; tp->snd_wl1 =TCP_SKB_CB (skb)->seq;tcp_ack (sk, skb,FLAG_SLOWPATH );
@@ -4585,7 +4586,8 @@sk_wake_async (sk,0 ,POLL_OUT ); } -if (sk->sk_write_pending || tp->defer_accept || tp->ack.pingpong) { +if (sk_ssk (sk)->ssk_write_pending || + tp->defer_accept || tp->ack.pingpong) {/* Save one ACK. Data will be ready after * several ticks, if write_pending is set. *
@@ -4653,7 +4655,7 @@TCP_ECN_rcv_syn (tp, th);if (tp->ecn_flags&TCP_ECN_OK ) - sk->sk_no_largesend =1 ; +sk_ssk (sk)->ssk_no_largesend =1 ;tcp_sync_mss (sk, tp->pmtu_cookie);tcp_initialize_rcv_mss (sk);
net/ipv4/tcp_ipv4.c +10 -9
@@ -359,8 +359,8 @@ lock = &tcp_lhash_lock;tcp_listen_wlock (); }else { - list = &tcp_ehash[(sk->sk_hashent =tcp_sk_hashfn (sk))].chain; - lock = &tcp_ehash[sk->sk_hashent].lock; + list = &tcp_ehash[(sk_ssk (sk)->ssk_hashent =tcp_sk_hashfn (sk))].chain; + lock = &tcp_ehash[sk_ssk (sk)->ssk_hashent].lock;write_lock (lock); }__sk_add_node (sk, list);
@@ -391,7 +391,7 @@tcp_listen_wlock (); lock = &tcp_lhash_lock; }else { -struct tcp_ehash_bucket *head = &tcp_ehash[sk->sk_hashent]; +struct tcp_ehash_bucket *head = &tcp_ehash[sk_ssk (sk)->ssk_hashent]; lock = &head->lock;write_lock_bh (&head->lock); }
@@ -612,7 +612,7 @@* in hash table socket with a funny identity. */ inet->num = lport; inet->sport =htons (lport); - sk->sk_hashent = hash; +sk_ssk (sk)->ssk_hashent = hash;BUG_TRAP (sk_unhashed (sk));__sk_add_node (sk, &head->chain);sock_prot_inc_use (sk->sk_prot);
@@ -864,7 +864,7 @@/* This unhashes the socket and releases the local port, if necessary. */ tcp_set_state (sk,TCP_CLOSE );ip_rt_put (rt); - sk->sk_route_caps =0 ; +sk_ssk (sk)->ssk_route_caps =0 ; inet->dport =0 ;return err; }
@@ -1954,7 +1954,7 @@ }/* Routing failed... */ - sk->sk_route_caps =0 ; +sk_ssk (sk)->ssk_route_caps =0 ; if (!sysctl_ip_dynaddr || sk->sk_state != TCP_SYN_SENT ||
@@ -2095,6 +2095,7 @@int tcp_v4_destroy_sock (struct sock *sk) {struct tcp_opt *tp =tcp_sk (sk); +struct stream_sock *ssk =sk_ssk (sk);tcp_clear_xmit_timers (sk);
@@ -2114,9 +2115,9 @@/* * If sendmsg cached page exists, toss it. */ -if (sk->sk_sndmsg_page) { -__free_page (sk->sk_sndmsg_page); - sk->sk_sndmsg_page =NULL ; +if (ssk->ssk_sndmsg_page) { +__free_page (ssk->ssk_sndmsg_page); + ssk->ssk_sndmsg_page =NULL ; }atomic_dec (&tcp_sockets_allocated);
net/ipv4/tcp_minisocks.c +7 -6
@@ -294,7 +294,7 @@*/ static void __tcp_tw_hashdance (struct sock *sk,struct tcp_tw_bucket *tw) { -struct tcp_ehash_bucket *ehead = &tcp_ehash[sk->sk_hashent]; +struct tcp_ehash_bucket *ehead = &tcp_ehash[sk_ssk (sk)->ssk_hashent];struct tcp_bind_hashbucket *bhead;/* Step 1: Put TW into bind hash. Original socket stays there too.
@@ -354,7 +354,7 @@ tw->tw_rcv_wscale = tp->rcv_wscale;atomic_set (&tw->tw_refcnt,1 ); - tw->tw_hashent = sk->sk_hashent; + tw->tw_hashent =sk_ssk (sk)->ssk_hashent; tw->tw_rcv_nxt = tp->rcv_nxt; tw->tw_snd_nxt = tp->snd_nxt; tw->tw_rcv_wnd =tcp_receive_window (tp);
@@ -695,6 +695,7 @@memcpy (newsk, sk,sizeof (struct tcp_sock )); newsk->sk_state =TCP_SYN_RECV ; + ssk_set_pointer(newsk, struct tcp_sock, ssk);/* SANITY */ sk_node_init (&newsk->sk_node);
@@ -712,13 +713,13 @@atomic_set (&newsk->sk_wmem_alloc,0 );skb_queue_head_init (&newsk->sk_write_queue);atomic_set (&newsk->sk_omem_alloc,0 ); - newsk->sk_wmem_queued =0 ; - newsk->sk_forward_alloc =0 ; +sk_ssk (newsk)->ssk_wmem_queued =0 ; +sk_ssk (newsk)->ssk_forward_alloc =0 ;sock_reset_flag (newsk,SOCK_DONE ); newsk->sk_userlocks = sk->sk_userlocks & ~SOCK_BINDPORT_LOCK ; newsk->sk_backlog.head = newsk->sk_backlog.tail =NULL ; - newsk->sk_send_head =NULL ; +sk_ssk (newsk)->ssk_send_head =NULL ;rwlock_init (&newsk->sk_callback_lock);skb_queue_head_init (&newsk->sk_error_queue); newsk->sk_write_space = sk_stream_write_space;
@@ -839,7 +840,7 @@ newtp->mss_clamp = req->mss;TCP_ECN_openreq_child (newtp, req);if (newtp->ecn_flags&TCP_ECN_OK ) - newsk->sk_no_largesend =1 ; +sk_ssk (newsk)->ssk_no_largesend =1 ;tcp_ca_init (newtp);
net/ipv4/tcp_output.c +33 -24
160 lines not on this page · raw message
net/ipv4/tcp_timer.c +3 -3
@@ -114,7 +114,7 @@ orphans <<=1 ;if (orphans >= sysctl_tcp_max_orphans || - (sk->sk_wmem_queued >SOCK_MIN_SNDBUF && + (sk_ssk (sk)->ssk_wmem_queued >SOCK_MIN_SNDBUF &&atomic_read (&tcp_memory_allocated) > sysctl_tcp_mem[2 ])) {if (net_ratelimit ())printk (KERN_INFO "Out of socket memory\n" );
@@ -271,7 +271,7 @@struct tcp_opt *tp =tcp_sk (sk);int max_probes; -if (tcp_get_pcount (&tp->packets_out) || !sk->sk_send_head) { +if (tcp_get_pcount (&tp->packets_out) || !sk_ssk (sk)->ssk_send_head) { tp->probes_out =0 ;return ; }
@@ -608,7 +608,7 @@ elapsed =keepalive_time_when (tp);/* It is alive without keepalive 8) */ -if (tcp_get_pcount (&tp->packets_out) || sk->sk_send_head) +if (tcp_get_pcount (&tp->packets_out) ||sk_ssk (sk)->ssk_send_head) goto resched; elapsed = tcp_time_stamp - tp->rcv_tstamp;
net/ipv6/af_inet6.c +3 -0
@@ -173,6 +173,9 @@if (sk ==NULL ) goto out; +if (sock->type ==SOCK_STREAM ) + ssk_set_pointer(sk, struct tcp6_sock, ssk); +sock_init_data (sock, sk); sk->sk_prot = answer_prot;sk_set_owner (sk, sk->sk_prot->owner);
net/ipv6/ip6_output.c +12 -8
@@ -847,8 +847,10 @@ np->cork.hop_limit = hlimit; inet->cork.fragsize = mtu =dst_pmtu (&rt->u.dst); inet->cork.length =0 ; - sk->sk_sndmsg_page =NULL ; - sk->sk_sndmsg_off =0 ; +if (sk->sk_type ==SOCK_STREAM ) { +sk_ssk (sk)->ssk_sndmsg_page =NULL ; +sk_ssk (sk)->ssk_sndmsg_off =0 ; + } exthdrlen = rt->u.dst.header_len + (opt ? opt->opt_flen :0 ); length += exthdrlen; transhdrlen += exthdrlen;
@@ -1028,8 +1030,9 @@ }else {int i =skb_shinfo (skb)->nr_frags;skb_frag_t *frag = &skb_shinfo (skb)->frags[i-1 ]; -struct page *page = sk->sk_sndmsg_page; -int off = sk->sk_sndmsg_off; +struct stream_sock *ssk =sk_ssk (sk); +struct page *page = ssk->ssk_sndmsg_page; +int off = ssk->ssk_sndmsg_off;unsigned int left;if (page && (left =PAGE_SIZE - off) >0 ) {
@@ -1041,7 +1044,8 @@ goto error; }get_page (page); -skb_fill_page_desc (skb, i, page, sk->sk_sndmsg_off,0 ); +skb_fill_page_desc (skb, i, page, + ssk->ssk_sndmsg_off,0 ); frag = &skb_shinfo (skb)->frags[i]; } }else if (i <MAX_SKB_FRAGS ) {
@@ -1052,8 +1056,8 @@ err = -ENOMEM ; goto error; } - sk->sk_sndmsg_page = page; - sk->sk_sndmsg_off =0 ; + ssk->ssk_sndmsg_page = page; + ssk->ssk_sndmsg_off =0 ;skb_fill_page_desc (skb, i, page,0 ,0 ); frag = &skb_shinfo (skb)->frags[i];
@@ -1067,7 +1071,7 @@ err = -EFAULT ; goto error; } - sk->sk_sndmsg_off += copy; + ssk->ssk_sndmsg_off += copy; frag->size += copy; skb->len += copy; skb->data_len += copy;
net/ipv6/tcp_ipv6.c +13 -11
@@ -220,9 +220,11 @@ lock = &tcp_lhash_lock;tcp_listen_wlock (); }else { - sk->sk_hashent =tcp_v6_sk_hashfn (sk); - list = &tcp_ehash[sk->sk_hashent].chain; - lock = &tcp_ehash[sk->sk_hashent].lock; +struct stream_sock *ssk =sk_ssk (sk); + + ssk->ssk_hashent =tcp_v6_sk_hashfn (sk); + list = &tcp_ehash[ssk->ssk_hashent].chain; + lock = &tcp_ehash[ssk->ssk_hashent].lock;write_lock (lock); }
@@ -492,7 +494,7 @@ unique:BUG_TRAP (sk_unhashed (sk));__sk_add_node (sk, &head->chain); - sk->sk_hashent = hash; +sk_ssk (sk)->ssk_hashent = hash;sock_prot_inc_use (sk->sk_prot);write_unlock_bh (&head->lock);
@@ -695,7 +697,7 @@ inet->rcv_saddr =LOOPBACK4_IPV6 ;ip6_dst_store (sk, dst,NULL ); - sk->sk_route_caps = dst->dev->features & +sk_ssk (sk)->ssk_route_caps = dst->dev->features & ~(NETIF_F_IP_CSUM |NETIF_F_TSO ); tp->ext_header_len =0 ;
@@ -729,7 +731,7 @@__sk_dst_reset (sk); failure: inet->dport =0 ; - sk->sk_route_caps =0 ; +sk_ssk (sk)->ssk_route_caps =0 ;return err; }
@@ -1386,7 +1388,7 @@#endif ip6_dst_store (newsk, dst,NULL ); - newsk->sk_route_caps = dst->dev->features & +sk_ssk (newsk)->ssk_route_caps = dst->dev->features & ~(NETIF_F_IP_CSUM |NETIF_F_TSO ); newtcp6sk = (struct tcp6_sock *)newsk;
@@ -1776,7 +1778,7 @@ err =ip6_dst_lookup (sk, &dst, &fl);if (err) { - sk->sk_route_caps =0 ; +sk_ssk (sk)->ssk_route_caps =0 ;return err; }if (final_p)
@@ -1789,7 +1791,7 @@ }ip6_dst_store (sk, dst,NULL ); - sk->sk_route_caps = dst->dev->features & +sk_ssk (sk)->ssk_route_caps = dst->dev->features & ~(NETIF_F_IP_CSUM |NETIF_F_TSO );tcp_sk (sk)->ext2_header_len = dst->header_len; }
@@ -1837,13 +1839,13 @@ipv6_addr_copy (&fl.fl6_dst, final_p);if ((err =xfrm_lookup (&dst, &fl, sk,0 )) <0 ) { - sk->sk_route_caps =0 ; +sk_ssk (sk)->ssk_route_caps =0 ;dst_release (dst);return err; }ip6_dst_store (sk, dst,NULL ); - sk->sk_route_caps = dst->dev->features & +sk_ssk (sk)->ssk_route_caps = dst->dev->features & ~(NETIF_F_IP_CSUM |NETIF_F_TSO );tcp_sk (sk)->ext2_header_len = dst->header_len; }
net/irda/af_irda.c +3 -3
@@ -760,8 +760,8 @@return -EOPNOTSUPP ;if (sk->sk_state !=TCP_LISTEN ) { - sk->sk_max_ack_backlog = backlog; - sk->sk_state =TCP_LISTEN ; +sk_ssk (sk)->ssk_max_ack_backlog = backlog; + sk->sk_state =TCP_LISTEN ;return 0 ; }
@@ -937,7 +937,7 @@ skb->sk =NULL ; skb->destructor =NULL ;kfree_skb (skb); - sk->sk_ack_backlog--; +sk_ssk (sk)->ssk_ack_backlog--; newsock->state =SS_CONNECTED ;
net/llc/af_llc.c +0 -3
@@ -464,9 +464,7 @@ rc =0 ;if (!(unsigned )backlog)/* BSDism */ backlog =1 ; - sk->sk_max_ack_backlog = backlog;if (sk->sk_state !=TCP_LISTEN ) { - sk->sk_ack_backlog =0 ; sk->sk_state =TCP_LISTEN ; } sk->sk_socket->flags |= __SO_ACCEPTCON;
@@ -648,7 +646,6 @@/* put original socket back into a clean listen state. */ sk->sk_state =TCP_LISTEN ; - sk->sk_ack_backlog--; skb->sk =NULL ;dprintk ("%s: ok success on %02X, client on %02X\n" , __FUNCTION__,llc_sk (sk)->addr.sllc_sap, newllc->daddr.lsap);
net/netrom/af_netrom.c +6 -5
@@ -406,8 +406,8 @@lock_sock (sk);if (sk->sk_state !=TCP_LISTEN ) {memset (&nr_sk (sk)->user_addr,0 ,AX25_ADDR_LEN ); - sk->sk_max_ack_backlog = backlog; - sk->sk_state =TCP_LISTEN ; +sk_ssk (sk)->ssk_max_ack_backlog = backlog; + sk->sk_state =TCP_LISTEN ;release_sock (sk);return 0 ; }
@@ -806,7 +806,7 @@/* Now attach up the new socket */ kfree_skb (skb); - sk->sk_ack_backlog--; +sk_ssk (sk)->ssk_ack_backlog--; newsock->sk = newsk; out:
@@ -939,7 +939,8 @@ user = (ax25_address *)(skb->data +21 ); -if (!sk || sk->sk_ack_backlog == sk->sk_max_ack_backlog || +if (!sk ||sk_ssk (sk)->ssk_ack_backlog == +sk_ssk (sk)->ssk_max_ack_backlog || (make =nr_make_new (sk)) ==NULL ) {nr_transmit_refusal (skb,0 );if (sk)
@@ -992,7 +993,7 @@ nr_make->vr =0 ; nr_make->vl =0 ; nr_make->state =NR_STATE_3 ; - sk->sk_ack_backlog++; +sk_ssk (sk)->ssk_ack_backlog++;nr_insert_socket (make);
net/rose/af_rose.c +6 -5
@@ -497,8 +497,8 @@memset (&rose->dest_addr,0 ,ROSE_ADDR_LEN );memset (&rose->dest_call,0 ,AX25_ADDR_LEN );memset (rose->dest_digis,0 ,AX25_ADDR_LEN *ROSE_MAX_DIGIS ); - sk->sk_max_ack_backlog = backlog; - sk->sk_state =TCP_LISTEN ; +sk_ssk (sk)->ssk_max_ack_backlog = backlog; + sk->sk_state =TCP_LISTEN ;return 0 ; }
@@ -888,7 +888,7 @@/* Now attach up the new socket */ skb->sk =NULL ;kfree_skb (skb); - sk->sk_ack_backlog--; +sk_ssk (sk)->ssk_ack_backlog--; newsock->sk = newsk; out:
@@ -954,7 +954,8 @@/* * We can't accept the Call Request. */ -if (!sk || sk->sk_ack_backlog == sk->sk_max_ack_backlog || +if (!sk ||sk_ssk (sk)->ssk_ack_backlog == +sk_ssk (sk)->ssk_max_ack_backlog || (make =rose_make_new (sk)) ==NULL ) {rose_transmit_clear_request (neigh, lci,ROSE_NETWORK_CONGESTION ,120 );return 0 ;
@@ -994,7 +995,7 @@ make_rose->va =0 ; make_rose->vr =0 ; make_rose->vl =0 ; - sk->sk_ack_backlog++; +sk_ssk (sk)->ssk_ack_backlog++;rose_insert_socket (make);
net/sctp/associola.c +2 -2
@@ -310,7 +310,7 @@/* Decrement the backlog value for a TCP-style listening socket. */ if (sctp_style (sk,TCP ) &&sctp_sstate (sk,LISTENING )) - sk->sk_ack_backlog--; +sk_ssk (sk)->ssk_ack_backlog--;/* Mark as dead, so other users can know this structure is * going away.
@@ -915,7 +915,7 @@/* Decrement the backlog value for a TCP-style socket. */ if (sctp_style (oldsk,TCP )) - oldsk->sk_ack_backlog--; +sk_ssk (oldsk)->ssk_ack_backlog--;/* Release references to the old endpoint and the sock. */ sctp_endpoint_put (assoc->ep);
net/sctp/endpointola.c +1 -1
@@ -171,7 +171,7 @@/* Increment the backlog value for a TCP-style listening socket. */ if (sctp_style (sk,TCP ) &&sctp_sstate (sk,LISTENING )) - sk->sk_ack_backlog++; +sk_ssk (sk)->ssk_ack_backlog++; }/* Free the endpoint structure. Delay cleanup until
net/sctp/sm_statefuns.c +1 -1
@@ -216,7 +216,7 @@*/ if (!sctp_sstate (sk,LISTENING ) || (sctp_style (sk,TCP ) && - (sk->sk_ack_backlog >= sk->sk_max_ack_backlog))) + (sk_ssk (sk)->ssk_ack_backlog >=sk_ssk (sk)->ssk_max_ack_backlog)))return sctp_sf_tabort_8_4_8 (ep, asoc, type, arg, commands);/* 3.1 A packet containing an INIT chunk MUST have a zero Verification
net/sctp/socket.c +5 -5
@@ -143,7 +143,7 @@ *((struct sctp_chunk **)(chunk->skb->cb)) = chunk; asoc->sndbuf_used +=SCTP_DATA_SNDSIZE (chunk); - sk->sk_wmem_queued +=SCTP_DATA_SNDSIZE (chunk); +sk_ssk (sk)->ssk_wmem_queued +=SCTP_DATA_SNDSIZE (chunk); }/* Verify that this is a valid address. */
@@ -976,7 +976,7 @@sctp_association_free (asoc); }else if (sock_flag (sk,SOCK_LINGER ) && - !sk->sk_lingertime) + !sk_ssk (sk)->ssk_lingertime)sctp_primitive_ABORT (asoc,NULL );else sctp_primitive_SHUTDOWN (asoc,NULL );
@@ -3853,7 +3853,7 @@return -EAGAIN ; } sk->sk_state =SCTP_SS_LISTENING ; - sk->sk_max_ack_backlog = backlog; +sk_ssk (sk)->ssk_max_ack_backlog = backlog;sctp_hash_endpoint (ep);return 0 ; }
@@ -4321,7 +4321,7 @@ asoc = chunk->asoc; sk = asoc->base.sk; asoc->sndbuf_used -=SCTP_DATA_SNDSIZE (chunk); - sk->sk_wmem_queued -=SCTP_DATA_SNDSIZE (chunk); +sk_ssk (sk)->ssk_wmem_queued -=SCTP_DATA_SNDSIZE (chunk);__sctp_write_space (asoc);sctp_association_put (asoc);
@@ -4415,7 +4415,7 @@ {int amt =0 ; - amt = sk->sk_sndbuf - sk->sk_wmem_queued; + amt = sk->sk_sndbuf -sk_ssk (sk)->ssk_wmem_queued;if (amt <0 ) amt =0 ;return amt;
net/unix/af_unix.c +9 -7
@@ -430,10 +430,10 @@unix_state_wlock (sk);if (sk->sk_state !=TCP_CLOSE && sk->sk_state !=TCP_LISTEN ) goto out_unlock; -if (backlog > sk->sk_max_ack_backlog) +if (backlog >sk_ssk (sk)->ssk_max_ack_backlog)wake_up_interruptible_all (&u->peer_wait); - sk->sk_max_ack_backlog = backlog; - sk->sk_state =TCP_LISTEN ; +sk_ssk (sk)->ssk_max_ack_backlog = backlog; + sk->sk_state =TCP_LISTEN ;/* set credentials so connect can copy them */ sk->sk_peercred.pid = current->tgid; sk->sk_peercred.uid = current->euid;
@@ -547,11 +547,13 @@atomic_inc (&unix_nr_socks); + ssk_set_pointer(sk, struct unix_sock, ssk); +sk_ssk (sk)->ssk_max_ack_backlog = sysctl_unix_max_dgram_qlen; +sock_init_data (sock,sk);sk_set_owner (sk,THIS_MODULE ); sk->sk_write_space = unix_write_space; - sk->sk_max_ack_backlog = sysctl_unix_max_dgram_qlen; sk->sk_destruct = unix_sock_destructor; u =unix_sk (sk); u->dentry =NULL ;
@@ -922,7 +924,7 @@ sched = !sock_flag (other,SOCK_DEAD ) && !(other->sk_shutdown &RCV_SHUTDOWN ) && (skb_queue_len (&other->sk_receive_queue) > - other->sk_max_ack_backlog); +sk_ssk (other)->ssk_max_ack_backlog);unix_state_runlock (other);
@@ -995,7 +997,7 @@ goto out_unlock;if (skb_queue_len (&other->sk_receive_queue) > - other->sk_max_ack_backlog) { +sk_ssk (other)->ssk_max_ack_backlog) { err = -EAGAIN ;if (!timeo) goto out_unlock;
@@ -1364,7 +1366,7 @@if (unix_peer (other) != sk && (skb_queue_len (&other->sk_receive_queue) > - other->sk_max_ack_backlog)) { +sk_ssk (other)->ssk_max_ack_backlog)) {if (!timeo) { err = -EAGAIN ; goto out_unlock;
net/wanrouter/af_wanpipe.c +0 -4
@@ -415,7 +415,6 @@ sll->sll_halen =0 ; skb->dev = dev; - sk->sk_ack_backlog++;/* We must do this manually, since the sock_queue_rcv_skb() * function sets the skb->dev to NULL. However, we use
@@ -425,7 +424,6 @@wanpipe_unlink_driver (newsk);wanpipe_kill_sock_irq (newsk); - --sk->sk_ack_backlog;return -ENOMEM ; }
@@ -1519,7 +1517,6 @@ sk->sk_family =PF_WANPIPE ;wp_sk (sk)->num = protocol; sk->sk_state =WANSOCK_DISCONNECTED ; - sk->sk_ack_backlog =0 ; sk->sk_bound_dev_if =0 ;atomic_inc (&wanpipe_socks_nr);
@@ -2427,7 +2424,6 @@ newsk->sk_sleep = &newsock->wait;/* Now attach up the new socket */ - sk->sk_ack_backlog--; newsock->sk = newsk;kfree_skb (skb);
net/x25/af_x25.c +6 -5
@@ -423,8 +423,8 @@if (sk->sk_state !=TCP_LISTEN ) {memset (&x25_sk (sk)->dest_addr,0 ,X25_ADDR_LEN ); - sk->sk_max_ack_backlog = backlog; - sk->sk_state =TCP_LISTEN ; +sk_ssk (sk)->ssk_max_ack_backlog = backlog; + sk->sk_state =TCP_LISTEN ; rc =0 ; }
@@ -776,7 +776,7 @@/* Now attach up the new socket */ skb->sk =NULL ;kfree_skb (skb); - sk->sk_ack_backlog--; +sk_ssk (sk)->ssk_ack_backlog--; newsock->sk = newsk; newsock->state =SS_CONNECTED ; rc =0 ;
@@ -835,7 +835,8 @@/* * We can't accept the Call Request. */ -if (!sk || sk->sk_ack_backlog == sk->sk_max_ack_backlog) +if (!sk ||sk_ssk (sk)->ssk_ack_backlog == +sk_ssk (sk)->ssk_max_ack_backlog) goto out_clear_request;/*
@@ -886,7 +887,7 @@ makex25->state =X25_STATE_3 ; - sk->sk_ack_backlog++; +sk_ssk (sk)->ssk_ack_backlog++;x25_insert_socket (make);