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

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

inet: includes a sock_common in request_sock 



TCP listener refactoring, part 5 :

We want to be able to insert request sockets (SYN_RECV) into main
ehash table instead of the per listener hash table to allow RCU
lookups and remove listener lock contention.

This patch includes the needed struct sock_common in front
of struct request_sock

This means there is no more inet6_request_sock IPv6 specific
structure.

Following inet_request_sock fields were renamed as they became
macros to reference fields from struct sock_common.
Prefix ir_ was chosen to avoid name collisions.

loc_port   -> ir_loc_port
loc_addr   -> ir_loc_addr
rmt_addr   -> ir_rmt_addr
rmt_port   -> ir_rmt_port
iif        -> ir_iif

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

include/linux/ipv6.h

+2 −24
Original line number Diff line number Diff line
@@ -115,16 +115,8 @@ static inline int inet6_iif(const struct sk_buff *skb) 
	return IP6CB(skb)->iif;

}



struct inet6_request_sock {

	struct in6_addr		loc_addr;

	struct in6_addr		rmt_addr;

	struct sk_buff		*pktopts;

	int			iif;

};



struct tcp6_request_sock {

	struct tcp_request_sock	  tcp6rsk_tcp;

	struct inet6_request_sock tcp6rsk_inet6;

};



struct ipv6_mc_socklist;
@@ -264,26 +256,12 @@ static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk) 
	return inet_sk(__sk)->pinet6;

}



static inline struct inet6_request_sock *

			inet6_rsk(const struct request_sock *rsk)

{

	return (struct inet6_request_sock *)(((u8 *)rsk) +

					     inet_rsk(rsk)->inet6_rsk_offset);

}



static inline u32 inet6_rsk_offset(struct request_sock *rsk)

{

	return rsk->rsk_ops->obj_size - sizeof(struct inet6_request_sock);

}



static inline struct request_sock *inet6_reqsk_alloc(struct request_sock_ops *ops)

{

	struct request_sock *req = reqsk_alloc(ops);



	if (req != NULL) {

		inet_rsk(req)->inet6_rsk_offset = inet6_rsk_offset(req);

		inet6_rsk(req)->pktopts = NULL;

	}

	if (req)

		inet_rsk(req)->pktopts = NULL;



	return req;

}

include/net/inet_sock.h

+9 −7
Original line number Diff line number Diff line
@@ -70,13 +70,14 @@ struct ip_options_data { 


struct inet_request_sock {

	struct request_sock	req;

#if IS_ENABLED(CONFIG_IPV6)

	u16			inet6_rsk_offset;

#endif

	__be16			loc_port;

	__be32			loc_addr;

	__be32			rmt_addr;

	__be16			rmt_port;

#define ir_loc_addr		req.__req_common.skc_rcv_saddr

#define ir_rmt_addr		req.__req_common.skc_daddr

#define ir_loc_port		req.__req_common.skc_num

#define ir_rmt_port		req.__req_common.skc_dport

#define ir_v6_rmt_addr		req.__req_common.skc_v6_daddr

#define ir_v6_loc_addr		req.__req_common.skc_v6_rcv_saddr

#define ir_iif			req.__req_common.skc_bound_dev_if



	kmemcheck_bitfield_begin(flags);

	u16			snd_wscale : 4,

				rcv_wscale : 4,
@@ -88,6 +89,7 @@ struct inet_request_sock { 
				no_srccheck: 1;

	kmemcheck_bitfield_end(flags);

	struct ip_options_rcu	*opt;

	struct sk_buff		*pktopts;

};



static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk)

include/net/request_sock.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ int inet_rtx_syn_ack(struct sock *parent, struct request_sock *req); 
/* struct request_sock - mini sock to represent a connection request

 */

struct request_sock {

	struct sock_common		__req_common;

	struct request_sock		*dl_next;

	u16				mss;

	u8				num_retrans; /* number of retransmits */

include/net/tcp.h

+2 −2
Original line number Diff line number Diff line
@@ -1109,8 +1109,8 @@ static inline void tcp_openreq_init(struct request_sock *req, 
	ireq->wscale_ok = rx_opt->wscale_ok;

	ireq->acked = 0;

	ireq->ecn_ok = 0;

	ireq->rmt_port = tcp_hdr(skb)->source;

	ireq->loc_port = tcp_hdr(skb)->dest;

	ireq->ir_rmt_port = tcp_hdr(skb)->source;

	ireq->ir_loc_port = tcp_hdr(skb)->dest;

}



void tcp_enter_memory_pressure(struct sock *sk);

net/dccp/ipv4.c

+9 −9
Original line number Diff line number Diff line
@@ -409,9 +409,9 @@ struct sock *dccp_v4_request_recv_sock(struct sock *sk, struct sk_buff *skb, 


	newinet		   = inet_sk(newsk);

	ireq		   = inet_rsk(req);

	newinet->inet_daddr	= ireq->rmt_addr;

	newinet->inet_rcv_saddr = ireq->loc_addr;

	newinet->inet_saddr	= ireq->loc_addr;

	newinet->inet_daddr	= ireq->ir_rmt_addr;

	newinet->inet_rcv_saddr = ireq->ir_loc_addr;

	newinet->inet_saddr	= ireq->ir_loc_addr;

	newinet->inet_opt	= ireq->opt;

	ireq->opt	   = NULL;

	newinet->mc_index  = inet_iif(skb);
@@ -516,10 +516,10 @@ static int dccp_v4_send_response(struct sock *sk, struct request_sock *req) 
		const struct inet_request_sock *ireq = inet_rsk(req);

		struct dccp_hdr *dh = dccp_hdr(skb);



		dh->dccph_checksum = dccp_v4_csum_finish(skb, ireq->loc_addr,

							      ireq->rmt_addr);

		err = ip_build_and_send_pkt(skb, sk, ireq->loc_addr,

					    ireq->rmt_addr,

		dh->dccph_checksum = dccp_v4_csum_finish(skb, ireq->ir_loc_addr,

							      ireq->ir_rmt_addr);

		err = ip_build_and_send_pkt(skb, sk, ireq->ir_loc_addr,

					    ireq->ir_rmt_addr,

					    ireq->opt);

		err = net_xmit_eval(err);

	}
@@ -641,8 +641,8 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
		goto drop_and_free;



	ireq = inet_rsk(req);

	ireq->loc_addr = ip_hdr(skb)->daddr;

	ireq->rmt_addr = ip_hdr(skb)->saddr;

	ireq->ir_loc_addr = ip_hdr(skb)->daddr;

	ireq->ir_rmt_addr = ip_hdr(skb)->saddr;



	/*

	 * Step 3: Process LISTEN state