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

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

inet: add IPv6 support to sk_ehashfn() 



Intent is to converge IPv4 & IPv6 inet_hash functions to
factorize code.

IPv4 sockets initialize sk_rcv_saddr and sk_v6_daddr
in this patch, thanks to new sk_daddr_set() and sk_rcv_saddr_set()
helpers.

__inet6_hash can now use sk_ehashfn() instead of a private
inet6_sk_ehashfn() and will simply use __inet_hash() in a
following patch.

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

include/net/inet_hashtables.h

+19 −0
Original line number Original line Diff line number Diff line
@@ -384,6 +384,25 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo, 
}

}





u32 sk_ehashfn(const struct sock *sk);

u32 sk_ehashfn(const struct sock *sk);

u32 inet6_ehashfn(const struct net *net,

		  const struct in6_addr *laddr, const u16 lport,

		  const struct in6_addr *faddr, const __be16 fport);



static inline void sk_daddr_set(struct sock *sk, __be32 addr)

{

	sk->sk_daddr = addr; /* alias of inet_daddr */

#if IS_ENABLED(CONFIG_IPV6)

	ipv6_addr_set_v4mapped(addr, &sk->sk_v6_daddr);

#endif

}



static inline void sk_rcv_saddr_set(struct sock *sk, __be32 addr)

{

	sk->sk_rcv_saddr = addr; /* alias of inet_rcv_saddr */

#if IS_ENABLED(CONFIG_IPV6)

	ipv6_addr_set_v4mapped(addr, &sk->sk_v6_rcv_saddr);

#endif

}





int __inet_hash_connect(struct inet_timewait_death_row *death_row,

int __inet_hash_connect(struct inet_timewait_death_row *death_row,

			struct sock *sk, u32 port_offset,

			struct sock *sk, u32 port_offset,

net/dccp/ipv4.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -89,10 +89,9 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 




	if (inet->inet_saddr == 0)

	if (inet->inet_saddr == 0)

		inet->inet_saddr = fl4->saddr;

		inet->inet_saddr = fl4->saddr;

	inet->inet_rcv_saddr = inet->inet_saddr;

	sk_rcv_saddr_set(sk, inet->inet_saddr);



	inet->inet_dport = usin->sin_port;

	inet->inet_dport = usin->sin_port;

	inet->inet_daddr = daddr;

	sk_daddr_set(sk, daddr);





	inet_csk(sk)->icsk_ext_hdr_len = 0;

	inet_csk(sk)->icsk_ext_hdr_len = 0;

	if (inet_opt)

	if (inet_opt)
@@ -408,8 +407,8 @@ struct sock *dccp_v4_request_recv_sock(struct sock *sk, struct sk_buff *skb, 




	newinet		   = inet_sk(newsk);

	newinet		   = inet_sk(newsk);

	ireq		   = inet_rsk(req);

	ireq		   = inet_rsk(req);

	newinet->inet_daddr	= ireq->ir_rmt_addr;

	sk_daddr_set(newsk, ireq->ir_rmt_addr);

	newinet->inet_rcv_saddr = ireq->ir_loc_addr;

	sk_rcv_saddr_set(newsk, ireq->ir_loc_addr);

	newinet->inet_saddr	= ireq->ir_loc_addr;

	newinet->inet_saddr	= ireq->ir_loc_addr;

	newinet->inet_opt	= ireq->opt;

	newinet->inet_opt	= ireq->opt;

	ireq->opt	   = NULL;

	ireq->opt	   = NULL;

net/dccp/ipv6.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -470,11 +470,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, 




		memcpy(newnp, np, sizeof(struct ipv6_pinfo));

		memcpy(newnp, np, sizeof(struct ipv6_pinfo));





		ipv6_addr_set_v4mapped(newinet->inet_daddr, &newsk->sk_v6_daddr);

		newnp->saddr = newsk->sk_v6_rcv_saddr;



		ipv6_addr_set_v4mapped(newinet->inet_saddr, &newnp->saddr);



		newsk->sk_v6_rcv_saddr = newnp->saddr;





		inet_csk(newsk)->icsk_af_ops = &dccp_ipv6_mapped;

		inet_csk(newsk)->icsk_af_ops = &dccp_ipv6_mapped;

		newsk->sk_backlog_rcv = dccp_v4_do_rcv;

		newsk->sk_backlog_rcv = dccp_v4_do_rcv;
@@ -917,9 +913,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
			sk->sk_backlog_rcv = dccp_v6_do_rcv;

			sk->sk_backlog_rcv = dccp_v6_do_rcv;

			goto failure;

			goto failure;

		}

		}

		ipv6_addr_set_v4mapped(inet->inet_saddr, &np->saddr);

		np->saddr = sk->sk_v6_rcv_saddr;

		ipv6_addr_set_v4mapped(inet->inet_rcv_saddr, &sk->sk_v6_rcv_saddr);



		return err;

		return err;

	}

	}

net/ipv4/inet_hashtables.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -36,9 +36,18 @@ static u32 inet_ehashfn(const struct net *net, const __be32 laddr, 
			      inet_ehash_secret + net_hash_mix(net));

			      inet_ehash_secret + net_hash_mix(net));

}

}







/* This function handles inet_sock, but also timewait and request sockets

 * for IPv4/IPv6.

 */

u32 sk_ehashfn(const struct sock *sk)

u32 sk_ehashfn(const struct sock *sk)

{

{

#if IS_ENABLED(CONFIG_IPV6)

	if (sk->sk_family == AF_INET6 &&

	    !ipv6_addr_v4mapped(&sk->sk_v6_daddr))

		return inet6_ehashfn(sock_net(sk),

				     &sk->sk_v6_rcv_saddr, sk->sk_num,

				     &sk->sk_v6_daddr, sk->sk_dport);

#endif

	return inet_ehashfn(sock_net(sk),

	return inet_ehashfn(sock_net(sk),

			    sk->sk_rcv_saddr, sk->sk_num,

			    sk->sk_rcv_saddr, sk->sk_num,

			    sk->sk_daddr, sk->sk_dport);

			    sk->sk_daddr, sk->sk_dport);

net/ipv4/tcp_ipv4.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -189,7 +189,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 




	if (!inet->inet_saddr)

	if (!inet->inet_saddr)

		inet->inet_saddr = fl4->saddr;

		inet->inet_saddr = fl4->saddr;

	inet->inet_rcv_saddr = inet->inet_saddr;

	sk_rcv_saddr_set(sk, inet->inet_saddr);





	if (tp->rx_opt.ts_recent_stamp && inet->inet_daddr != daddr) {

	if (tp->rx_opt.ts_recent_stamp && inet->inet_daddr != daddr) {

		/* Reset inherited state */

		/* Reset inherited state */
@@ -204,7 +204,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
		tcp_fetch_timewait_stamp(sk, &rt->dst);

		tcp_fetch_timewait_stamp(sk, &rt->dst);





	inet->inet_dport = usin->sin_port;

	inet->inet_dport = usin->sin_port;

	inet->inet_daddr = daddr;

	sk_daddr_set(sk, daddr);





	inet_csk(sk)->icsk_ext_hdr_len = 0;

	inet_csk(sk)->icsk_ext_hdr_len = 0;

	if (inet_opt)

	if (inet_opt)
@@ -1319,8 +1319,8 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb, 
	newtp		      = tcp_sk(newsk);

	newtp		      = tcp_sk(newsk);

	newinet		      = inet_sk(newsk);

	newinet		      = inet_sk(newsk);

	ireq		      = inet_rsk(req);

	ireq		      = inet_rsk(req);

	newinet->inet_daddr   = ireq->ir_rmt_addr;

	sk_daddr_set(newsk, ireq->ir_rmt_addr);

	newinet->inet_rcv_saddr = ireq->ir_loc_addr;

	sk_rcv_saddr_set(newsk, ireq->ir_loc_addr);

	newinet->inet_saddr	      = ireq->ir_loc_addr;

	newinet->inet_saddr	      = ireq->ir_loc_addr;

	inet_opt	      = ireq->opt;

	inet_opt	      = ireq->opt;

	rcu_assign_pointer(newinet->inet_opt, inet_opt);

	rcu_assign_pointer(newinet->inet_opt, inet_opt);