Commit ba6aac15 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by David S. Miller
Browse files

udp: Access &udp_table via net. 



We will soon introduce an optional per-netns hash table
for UDP.

This means we cannot use udp_table directly in most places.

Instead, access it via net->ipv4.udp_table.

The access will be valid only while initialising udp_table
itself and creating/destroying each netns.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 478aee5d

net/core/filter.c

+2 −2
Original line number Diff line number Diff line
@@ -6432,7 +6432,7 @@ static struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple, 
		else

			sk = __udp4_lib_lookup(net, src4, tuple->ipv4.sport,

					       dst4, tuple->ipv4.dport,

					       dif, sdif, &udp_table, NULL);

					       dif, sdif, net->ipv4.udp_table, NULL);

#if IS_ENABLED(CONFIG_IPV6)

	} else {

		struct in6_addr *src6 = (struct in6_addr *)&tuple->ipv6.saddr;
@@ -6448,7 +6448,7 @@ static struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple, 
							    src6, tuple->ipv6.sport,

							    dst6, tuple->ipv6.dport,

							    dif, sdif,

							    &udp_table, NULL);

							    net->ipv4.udp_table, NULL);

#endif

	}

net/ipv4/udp.c

+13 −10
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static struct sock *udp4_lookup_run_bpf(struct net *net, 
	struct sock *sk, *reuse_sk;

	bool no_reuseport;



	if (udptable != &udp_table)

	if (udptable != net->ipv4.udp_table)

		return NULL; /* only UDP is supported */



	no_reuseport = bpf_sk_lookup_run_v4(net, IPPROTO_UDP, saddr, sport,
@@ -553,10 +553,11 @@ struct sock *udp4_lib_lookup_skb(const struct sk_buff *skb, 
				 __be16 sport, __be16 dport)

{

	const struct iphdr *iph = ip_hdr(skb);

	struct net *net = dev_net(skb->dev);



	return __udp4_lib_lookup(dev_net(skb->dev), iph->saddr, sport,

	return __udp4_lib_lookup(net, iph->saddr, sport,

				 iph->daddr, dport, inet_iif(skb),

				 inet_sdif(skb), &udp_table, NULL);

				 inet_sdif(skb), net->ipv4.udp_table, NULL);

}



/* Must be called under rcu_read_lock().
@@ -569,7 +570,7 @@ struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport, 
	struct sock *sk;



	sk = __udp4_lib_lookup(net, saddr, sport, daddr, dport,

			       dif, 0, &udp_table, NULL);

			       dif, 0, net->ipv4.udp_table, NULL);

	if (sk && !refcount_inc_not_zero(&sk->sk_refcnt))

		sk = NULL;

	return sk;
@@ -807,7 +808,7 @@ int __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable) 


int udp_err(struct sk_buff *skb, u32 info)

{

	return __udp4_lib_err(skb, info, &udp_table);

	return __udp4_lib_err(skb, info, dev_net(skb->dev)->ipv4.udp_table);

}



/*
@@ -2524,13 +2525,14 @@ static struct sock *__udp4_lib_mcast_demux_lookup(struct net *net, 
						  __be16 rmt_port, __be32 rmt_addr,

						  int dif, int sdif)

{

	struct udp_table *udptable = net->ipv4.udp_table;

	unsigned short hnum = ntohs(loc_port);

	struct sock *sk, *result;

	struct udp_hslot *hslot;

	unsigned int slot;



	slot = udp_hashfn(net, hnum, udp_table.mask);

	hslot = &udp_table.hash[slot];

	slot = udp_hashfn(net, hnum, udptable->mask);

	hslot = &udptable->hash[slot];



	/* Do not bother scanning a too big list */

	if (hslot->count > 10)
@@ -2558,6 +2560,7 @@ static struct sock *__udp4_lib_demux_lookup(struct net *net, 
					    __be16 rmt_port, __be32 rmt_addr,

					    int dif, int sdif)

{

	struct udp_table *udptable = net->ipv4.udp_table;

	INET_ADDR_COOKIE(acookie, rmt_addr, loc_addr);

	unsigned short hnum = ntohs(loc_port);

	unsigned int hash2, slot2;
@@ -2566,8 +2569,8 @@ static struct sock *__udp4_lib_demux_lookup(struct net *net, 
	struct sock *sk;



	hash2 = ipv4_portaddr_hash(net, loc_addr, hnum);

	slot2 = hash2 & udp_table.mask;

	hslot2 = &udp_table.hash2[slot2];

	slot2 = hash2 & udptable->mask;

	hslot2 = &udptable->hash2[slot2];

	ports = INET_COMBINED_PORTS(rmt_port, hnum);



	udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) {
@@ -2649,7 +2652,7 @@ int udp_v4_early_demux(struct sk_buff *skb) 


int udp_rcv(struct sk_buff *skb)

{

	return __udp4_lib_rcv(skb, &udp_table, IPPROTO_UDP);

	return __udp4_lib_rcv(skb, dev_net(skb->dev)->ipv4.udp_table, IPPROTO_UDP);

}



void udp_destroy_sock(struct sock *sk)

net/ipv4/udp_diag.c

+3 −3
Original line number Diff line number Diff line
@@ -147,13 +147,13 @@ static void udp_dump(struct udp_table *table, struct sk_buff *skb, 
static void udp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,

			  const struct inet_diag_req_v2 *r)

{

	udp_dump(&udp_table, skb, cb, r);

	udp_dump(sock_net(cb->skb->sk)->ipv4.udp_table, skb, cb, r);

}



static int udp_diag_dump_one(struct netlink_callback *cb,

			     const struct inet_diag_req_v2 *req)

{

	return udp_dump_one(&udp_table, cb, req);

	return udp_dump_one(sock_net(cb->skb->sk)->ipv4.udp_table, cb, req);

}



static void udp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
@@ -225,7 +225,7 @@ static int __udp_diag_destroy(struct sk_buff *in_skb, 
static int udp_diag_destroy(struct sk_buff *in_skb,

			    const struct inet_diag_req_v2 *req)

{

	return __udp_diag_destroy(in_skb, req, &udp_table);

	return __udp_diag_destroy(in_skb, req, sock_net(in_skb->sk)->ipv4.udp_table);

}



static int udplite_diag_destroy(struct sk_buff *in_skb,

net/ipv4/udp_offload.c

+3 −2
Original line number Diff line number Diff line
@@ -600,10 +600,11 @@ static struct sock *udp4_gro_lookup_skb(struct sk_buff *skb, __be16 sport, 
					__be16 dport)

{

	const struct iphdr *iph = skb_gro_network_header(skb);

	struct net *net = dev_net(skb->dev);



	return __udp4_lib_lookup(dev_net(skb->dev), iph->saddr, sport,

	return __udp4_lib_lookup(net, iph->saddr, sport,

				 iph->daddr, dport, inet_iif(skb),

				 inet_sdif(skb), &udp_table, NULL);

				 inet_sdif(skb), net->ipv4.udp_table, NULL);

}



INDIRECT_CALLABLE_SCOPE

net/ipv6/udp.c

+11 −8
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static inline struct sock *udp6_lookup_run_bpf(struct net *net, 
	struct sock *sk, *reuse_sk;

	bool no_reuseport;



	if (udptable != &udp_table)

	if (udptable != net->ipv4.udp_table)

		return NULL; /* only UDP is supported */



	no_reuseport = bpf_sk_lookup_run_v6(net, IPPROTO_UDP, saddr, sport,
@@ -298,10 +298,11 @@ struct sock *udp6_lib_lookup_skb(const struct sk_buff *skb, 
				 __be16 sport, __be16 dport)

{

	const struct ipv6hdr *iph = ipv6_hdr(skb);

	struct net *net = dev_net(skb->dev);



	return __udp6_lib_lookup(dev_net(skb->dev), &iph->saddr, sport,

	return __udp6_lib_lookup(net, &iph->saddr, sport,

				 &iph->daddr, dport, inet6_iif(skb),

				 inet6_sdif(skb), &udp_table, NULL);

				 inet6_sdif(skb), net->ipv4.udp_table, NULL);

}



/* Must be called under rcu_read_lock().
@@ -314,7 +315,7 @@ struct sock *udp6_lib_lookup(struct net *net, const struct in6_addr *saddr, __be 
	struct sock *sk;



	sk =  __udp6_lib_lookup(net, saddr, sport, daddr, dport,

				dif, 0, &udp_table, NULL);

				dif, 0, net->ipv4.udp_table, NULL);

	if (sk && !refcount_inc_not_zero(&sk->sk_refcnt))

		sk = NULL;

	return sk;
@@ -689,7 +690,8 @@ static __inline__ int udpv6_err(struct sk_buff *skb, 
				struct inet6_skb_parm *opt, u8 type,

				u8 code, int offset, __be32 info)

{

	return __udp6_lib_err(skb, opt, type, code, offset, info, &udp_table);

	return __udp6_lib_err(skb, opt, type, code, offset, info,

			      dev_net(skb->dev)->ipv4.udp_table);

}



static int udpv6_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb)
@@ -1063,6 +1065,7 @@ static struct sock *__udp6_lib_demux_lookup(struct net *net, 
			__be16 rmt_port, const struct in6_addr *rmt_addr,

			int dif, int sdif)

{

	struct udp_table *udptable = net->ipv4.udp_table;

	unsigned short hnum = ntohs(loc_port);

	unsigned int hash2, slot2;

	struct udp_hslot *hslot2;
@@ -1070,8 +1073,8 @@ static struct sock *__udp6_lib_demux_lookup(struct net *net, 
	struct sock *sk;



	hash2 = ipv6_portaddr_hash(net, loc_addr, hnum);

	slot2 = hash2 & udp_table.mask;

	hslot2 = &udp_table.hash2[slot2];

	slot2 = hash2 & udptable->mask;

	hslot2 = &udptable->hash2[slot2];

	ports = INET_COMBINED_PORTS(rmt_port, hnum);



	udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) {
@@ -1127,7 +1130,7 @@ void udp_v6_early_demux(struct sk_buff *skb) 


INDIRECT_CALLABLE_SCOPE int udpv6_rcv(struct sk_buff *skb)

{

	return __udp6_lib_rcv(skb, &udp_table, IPPROTO_UDP);

	return __udp6_lib_rcv(skb, dev_net(skb->dev)->ipv4.udp_table, IPPROTO_UDP);

}



/*