Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed53d0ab authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: shrink struct sock and request_sock by 8 bytes 



One 32bit hole is following skc_refcnt, use it.
skc_incoming_cpu can also be an union for request_sock rcv_wnd.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e5eb54d

include/net/request_sock.h

+2 −3
Original line number Diff line number Diff line
@@ -51,15 +51,14 @@ struct request_sock { 
#define rsk_refcnt			__req_common.skc_refcnt

#define rsk_hash			__req_common.skc_hash

#define rsk_listener			__req_common.skc_listener

#define rsk_window_clamp		__req_common.skc_window_clamp

#define rsk_rcv_wnd			__req_common.skc_rcv_wnd



	struct request_sock		*dl_next;

	u16				mss;

	u8				num_retrans; /* number of retransmits */

	u8				cookie_ts:1; /* syncookie: encode tcpopts in timestamp */

	u8				num_timeout:7; /* number of timeouts */

	/* The following two fields can be easily recomputed I think -AK */

	u32				window_clamp; /* window clamp at creation time */

	u32				rcv_wnd;	  /* rcv_wnd offered first time */

	u32				ts_recent;

	struct timer_list		rsk_timer;

	const struct request_sock_ops	*rsk_ops;

include/net/sock.h

+9 −5
Original line number Diff line number Diff line
@@ -226,11 +226,18 @@ struct sock_common { 
		struct hlist_nulls_node skc_nulls_node;

	};

	int			skc_tx_queue_mapping;

	union {

		int		skc_incoming_cpu;

		u32		skc_rcv_wnd;

	};



	atomic_t		skc_refcnt;

	/* private: */

	int                     skc_dontcopy_end[0];

	union {

		u32		skc_rxhash;

		u32		skc_window_clamp;

	};

	/* public: */

};
@@ -287,7 +294,6 @@ struct cg_proto; 
  *	@sk_rcvlowat: %SO_RCVLOWAT setting

  *	@sk_rcvtimeo: %SO_RCVTIMEO setting

  *	@sk_sndtimeo: %SO_SNDTIMEO setting

  *	@sk_rxhash: flow hash received from netif layer

  *	@sk_txhash: computed flow hash for use on transmit

  *	@sk_filter: socket filtering instructions

  *	@sk_timer: sock cleanup timer
@@ -346,6 +352,7 @@ struct sock { 
#define sk_cookie		__sk_common.skc_cookie

#define sk_incoming_cpu		__sk_common.skc_incoming_cpu

#define sk_flags		__sk_common.skc_flags

#define sk_rxhash		__sk_common.skc_rxhash



	socket_lock_t		sk_lock;

	struct sk_buff_head	sk_receive_queue;
@@ -365,9 +372,6 @@ struct sock { 
	} sk_backlog;

#define sk_rmem_alloc sk_backlog.rmem_alloc

	int			sk_forward_alloc;

#ifdef CONFIG_RPS

	__u32			sk_rxhash;

#endif



	__u32			sk_txhash;

#ifdef CONFIG_NET_RX_BUSY_POLL

net/ipv4/syncookies.c

+2 −2
Original line number Diff line number Diff line
@@ -382,10 +382,10 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) 
	}



	/* Try to redo what tcp_v4_send_synack did. */

	req->window_clamp = tp->window_clamp ? :dst_metric(&rt->dst, RTAX_WINDOW);

	req->rsk_window_clamp = tp->window_clamp ? :dst_metric(&rt->dst, RTAX_WINDOW);



	tcp_select_initial_window(tcp_full_space(sk), req->mss,

				  &req->rcv_wnd, &req->window_clamp,

				  &req->rsk_rcv_wnd, &req->rsk_window_clamp,

				  ireq->wscale_ok, &rcv_wscale,

				  dst_metric(&rt->dst, RTAX_INITRWND));

net/ipv4/tcp_input.c

+1 −1
Original line number Diff line number Diff line
@@ -6022,7 +6022,7 @@ static void tcp_openreq_init(struct request_sock *req, 
{

	struct inet_request_sock *ireq = inet_rsk(req);



	req->rcv_wnd = 0;		/* So that tcp_send_synack() knows! */

	req->rsk_rcv_wnd = 0;		/* So that tcp_send_synack() knows! */

	req->cookie_ts = 0;

	tcp_rsk(req)->rcv_isn = TCP_SKB_CB(skb)->seq;

	tcp_rsk(req)->rcv_nxt = TCP_SKB_CB(skb)->seq + 1;

net/ipv4/tcp_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ static void tcp_v4_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb, 
	 */

	tcp_v4_send_ack(skb, (sk->sk_state == TCP_LISTEN) ?

			tcp_rsk(req)->snt_isn + 1 : tcp_sk(sk)->snd_nxt,

			tcp_rsk(req)->rcv_nxt, req->rcv_wnd,

			tcp_rsk(req)->rcv_nxt, req->rsk_rcv_wnd,

			tcp_time_stamp,

			req->ts_recent,

			0,