diff options
| author | Eric Dumazet <edumazet@google.com> | 2014-06-12 16:13:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-13 15:39:24 -0700 |
| commit | 63c6f81cdde58c41da62a8d8a209592e42a0203e (patch) | |
| tree | 4cc5ca8299a5a4bc1b7ec09baaea25864159cdb7 /net | |
| parent | 2853af6a2ea1a8ed09b09dd4fb578e7f435e8d34 (diff) | |
| download | linux-63c6f81cdde58c41da62a8d8a209592e42a0203e.tar.gz linux-63c6f81cdde58c41da62a8d8a209592e42a0203e.tar.bz2 linux-63c6f81cdde58c41da62a8d8a209592e42a0203e.zip | |
udp: ipv4: do not waste time in __udp4_lib_mcast_demux_lookup
Its too easy to add thousand of UDP sockets on a particular bucket,
and slow down an innocent multicast receiver.
Early demux is supposed to be an optimization, we should avoid spending
too much time in it.
It is interesting to note __udp4_lib_demux_lookup() only tries to
match first socket in the chain.
10 is the threshold we already have in __udp4_lib_lookup() to switch
to secondary hash.
Fixes: 421b3885bf6d5 ("udp: ipv4: Add udp early demux")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: David Held <drheld@google.com>
Cc: Shawn Bohrer <sbohrer@rgmadvisors.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/udp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 185ed3e59802..d92f94b7e402 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1861,6 +1861,10 @@ static struct sock *__udp4_lib_mcast_demux_lookup(struct net *net, unsigned int count, slot = udp_hashfn(net, hnum, udp_table.mask); struct udp_hslot *hslot = &udp_table.hash[slot]; + /* Do not bother scanning a too big list */ + if (hslot->count > 10) + return NULL; + rcu_read_lock(); begin: count = 0; |