iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udp: Simplify __udp*_lib_mcast_deliver.

Browse Source 
Switch to using sk_nulls_for_each which shortens the code and makes it
easier to update.

Signed-off-by: David Held <drheld@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Held 2014-07-15 23:28:31 -04:00 committed by David S. Miller
parent 3e1c0f0b06
commit 5cf3d46192
2 changed files with 48 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
net/ipv4/udp.c
View File

@ -594,26 +594,6 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
return true; return true;
} }
static inline struct sock *udp_v4_mcast_next(struct net *net, struct sock *sk,
__be16 loc_port, __be32 loc_addr,
__be16 rmt_port, __be32 rmt_addr,
int dif)
{
struct hlist_nulls_node *node;
unsigned short hnum = ntohs(loc_port);
sk_nulls_for_each_from(sk, node) {
if (__udp_is_mcast_sock(net, sk,
loc_port, loc_addr,
rmt_port, rmt_addr,
dif, hnum))
goto found;
}
sk = NULL;
found:
return sk;
}
/* /*
* This routine is called by the ICMP module when it gets some * This routine is called by the ICMP module when it gets some
* sort of error condition. If err < 0 then the socket should * sort of error condition. If err < 0 then the socket should
@ -1667,23 +1647,23 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
struct udp_table *udptable) struct udp_table *udptable)
{ {
struct sock *sk, *stack[256 / sizeof(struct sock *)]; struct sock *sk, *stack[256 / sizeof(struct sock *)];
struct udp_hslot *hslot = udp_hashslot(udptable, net, ntohs(uh->dest)); struct hlist_nulls_node *node;
int dif; unsigned short hnum = ntohs(uh->dest);
struct udp_hslot *hslot = udp_hashslot(udptable, net, hnum);
int dif = skb->dev->ifindex;
unsigned int i, count = 0; unsigned int i, count = 0;
spin_lock(&hslot->lock); spin_lock(&hslot->lock);
sk = sk_nulls_head(&hslot->head); sk_nulls_for_each(sk, node, &hslot->head) {
dif = skb->dev->ifindex; if (__udp_is_mcast_sock(net, sk,
sk = udp_v4_mcast_next(net, sk, uh->dest, daddr, uh->source, saddr, dif); uh->dest, daddr,
while (sk) { uh->source, saddr,
stack[count++] = sk; dif, hnum)) {
sk = udp_v4_mcast_next(net, sk_nulls_next(sk), uh->dest, if (unlikely(count == ARRAY_SIZE(stack))) {
daddr, uh->source, saddr, dif); flush_stack(stack, count, skb, ~0);
if (unlikely(count == ARRAY_SIZE(stack))) { count = 0;
if (!sk) }
break; stack[count++] = sk;
flush_stack(stack, count, skb, ~0);
count = 0;
} }
} }
/* /*

86
net/ipv6/udp.c
View File

@ -702,43 +702,26 @@ drop:
return -1; return -1;
} }
static struct sock *udp_v6_mcast_next(struct net *net, struct sock *sk, static bool __udp_v6_is_mcast_sock(struct net *net, struct sock *sk,
__be16 loc_port, const struct in6_addr *loc_addr, __be16 loc_port, const struct in6_addr *loc_addr,
__be16 rmt_port, const struct in6_addr *rmt_addr, __be16 rmt_port, const struct in6_addr *rmt_addr,
int dif) int dif, unsigned short hnum)
{ {
struct hlist_nulls_node *node; struct inet_sock *inet = inet_sk(sk);
unsigned short num = ntohs(loc_port);
sk_nulls_for_each_from(sk, node) { if (!net_eq(sock_net(sk), net))
struct inet_sock *inet = inet_sk(sk); return false;
if (!net_eq(sock_net(sk), net)) if (udp_sk(sk)->udp_port_hash != hnum ||
continue; sk->sk_family != PF_INET6 ||
(inet->inet_dport && inet->inet_dport != rmt_port) ||
if (udp_sk(sk)->udp_port_hash == num && (!ipv6_addr_any(&sk->sk_v6_daddr) &&
sk->sk_family == PF_INET6) { !ipv6_addr_equal(&sk->sk_v6_daddr, rmt_addr)) ||
if (inet->inet_dport) { (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
if (inet->inet_dport != rmt_port) return false;
continue; if (!inet6_mc_check(sk, loc_addr, rmt_addr))
} return false;
if (!ipv6_addr_any(&sk->sk_v6_daddr) && return true;
!ipv6_addr_equal(&sk->sk_v6_daddr, rmt_addr))
continue;
if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)
continue;
if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) {
if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, loc_addr))
continue;
}
if (!inet6_mc_check(sk, loc_addr, rmt_addr))
continue;
return sk;
}
}
return NULL;
} }
static void flush_stack(struct sock **stack, unsigned int count, static void flush_stack(struct sock **stack, unsigned int count,
@ -787,28 +770,27 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
{ {
struct sock *sk, *stack[256 / sizeof(struct sock *)]; struct sock *sk, *stack[256 / sizeof(struct sock *)];
const struct udphdr *uh = udp_hdr(skb); const struct udphdr *uh = udp_hdr(skb);
struct udp_hslot *hslot = udp_hashslot(udptable, net, ntohs(uh->dest)); struct hlist_nulls_node *node;
int dif; unsigned short hnum = ntohs(uh->dest);
struct udp_hslot *hslot = udp_hashslot(udptable, net, hnum);
int dif = inet6_iif(skb);
unsigned int i, count = 0; unsigned int i, count = 0;
spin_lock(&hslot->lock); spin_lock(&hslot->lock);
sk = sk_nulls_head(&hslot->head); sk_nulls_for_each(sk, node, &hslot->head) {
dif = inet6_iif(skb); if (__udp_v6_is_mcast_sock(net, sk,
sk = udp_v6_mcast_next(net, sk, uh->dest, daddr, uh->source, saddr, dif); uh->dest, daddr,
while (sk) { uh->source, saddr,
/* If zero checksum and no_check is not on for dif, hnum) &&
* the socket then skip it. /* If zero checksum and no_check is not on for
*/ * the socket then skip it.
if (uh->check || udp_sk(sk)->no_check6_rx) */
(uh->check || udp_sk(sk)->no_check6_rx)) {
if (unlikely(count == ARRAY_SIZE(stack))) {
flush_stack(stack, count, skb, ~0);
count = 0;
}
stack[count++] = sk; stack[count++] = sk;
sk = udp_v6_mcast_next(net, sk_nulls_next(sk), uh->dest, daddr,
uh->source, saddr, dif);
if (unlikely(count == ARRAY_SIZE(stack))) {
if (!sk)
break;
flush_stack(stack, count, skb, ~0);
count = 0;
} }
} }
/* /*