Commit 4d54d865 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'listener-sock-const' 



Eric Dumazet says:

====================
dccp/tcp: constify listener sock

Another patch bomb to prepare lockless TCP/DCCP LISTEN handling.

SYNACK retransmits are built and sent without listener socket
being locked. Soon, initial SYNACK packets will have same property.

This series makes sure we did not something wrong with this model,
by adding a const qualifier in all the paths taken from synack building
and transmit, for IPv4/IPv6 and TCP/dccp.

The only potential problem was the rewrite of ecn bits for connections
with DCTCP as congestion module, but this was a very minor one.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6ea29da1 1b70e977

include/net/dst.h

+5 −4
Original line number Diff line number Diff line
@@ -489,7 +489,8 @@ struct flowi; 
#ifndef CONFIG_XFRM

static inline struct dst_entry *xfrm_lookup(struct net *net,

					    struct dst_entry *dst_orig,

					    const struct flowi *fl, struct sock *sk,

					    const struct flowi *fl,

					    const struct sock *sk,

					    int flags)

{

	return dst_orig;
@@ -498,7 +499,7 @@ static inline struct dst_entry *xfrm_lookup(struct net *net, 
static inline struct dst_entry *xfrm_lookup_route(struct net *net,

						  struct dst_entry *dst_orig,

						  const struct flowi *fl,

						  struct sock *sk,

						  const struct sock *sk,

						  int flags)

{

	return dst_orig;
@@ -511,11 +512,11 @@ static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst) 


#else

struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig,

			      const struct flowi *fl, struct sock *sk,

			      const struct flowi *fl, const struct sock *sk,

			      int flags);



struct dst_entry *xfrm_lookup_route(struct net *net, struct dst_entry *dst_orig,

				    const struct flowi *fl, struct sock *sk,

				    const struct flowi *fl, const struct sock *sk,

				    int flags);



/* skb attached with this dst needs transformation if dst->xfrm is valid */

include/net/inet6_connection_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct sockaddr; 
int inet6_csk_bind_conflict(const struct sock *sk,

			    const struct inet_bind_bucket *tb, bool relax);



struct dst_entry *inet6_csk_route_req(struct sock *sk, struct flowi6 *fl6,

struct dst_entry *inet6_csk_route_req(const struct sock *sk, struct flowi6 *fl6,

				      const struct request_sock *req);



struct request_sock *inet6_csk_search_req(struct sock *sk,

include/net/inet_connection_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ int inet_csk_bind_conflict(const struct sock *sk, 
			   const struct inet_bind_bucket *tb, bool relax);

int inet_csk_get_port(struct sock *sk, unsigned short snum);



struct dst_entry *inet_csk_route_req(struct sock *sk, struct flowi4 *fl4,

struct dst_entry *inet_csk_route_req(const struct sock *sk, struct flowi4 *fl4,

				     const struct request_sock *req);

struct dst_entry *inet_csk_route_child_sock(struct sock *sk, struct sock *newsk,

					    const struct request_sock *req);

include/net/ip.h

+6 −4
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ int igmp_mc_init(void); 
 *	Functions provided by ip.c

 */



int ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk,

int ip_build_and_send_pkt(struct sk_buff *skb, const struct sock *sk,

			  __be32 saddr, __be32 daddr,

			  struct ip_options_rcu *opt);

int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
@@ -282,10 +282,12 @@ int ip_decrease_ttl(struct iphdr *iph) 
}



static inline

int ip_dont_fragment(struct sock *sk, struct dst_entry *dst)

int ip_dont_fragment(const struct sock *sk, const struct dst_entry *dst)

{

	return  inet_sk(sk)->pmtudisc == IP_PMTUDISC_DO ||

		(inet_sk(sk)->pmtudisc == IP_PMTUDISC_WANT &&

	u8 pmtudisc = READ_ONCE(inet_sk(sk)->pmtudisc);



	return  pmtudisc == IP_PMTUDISC_DO ||

		(pmtudisc == IP_PMTUDISC_WANT &&

		 !(dst_metric_locked(dst, RTAX_MTU)));

}

include/net/ipv6.h

+2 −2
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ int ip6_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb); 
/*

 *	upper-layer output functions

 */

int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,

int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,

	     struct ipv6_txoptions *opt, int tclass);



int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr);
@@ -849,7 +849,7 @@ static inline struct sk_buff *ip6_finish_skb(struct sock *sk) 


int ip6_dst_lookup(struct net *net, struct sock *sk, struct dst_entry **dst,

		   struct flowi6 *fl6);

struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,

struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,

				      const struct in6_addr *final_dst);

struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,

					 const struct in6_addr *final_dst);

CRA Git | Maintained and supported by SUSTech CRA and CCSE