mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-01 10:42:11 +00:00
net: ipv4: igmp: optimize ____ip_mc_inc_group() using mc_hash
The runtime cost of joining a single multicast group in the current implementation of ____ip_mc_inc_group grows linearly with the number of existing memberships. This is caused by the linear search for an existing group record in the multicast address list. This linear complexity results in quadratic complexity when successively adding memberships, which becomes a performance bottleneck when setting up large numbers of multicast memberships. If available, use the existing multicast hash map mc_hash to quickly search for an existing group membership record. This leads to near-constant complexity on the addition of a new multicast record, significantly improving performance for workloads involving many multicast memberships. On profiling with a loopback device, this patch presented a speedup of around 6 when successively setting up 2000 multicast groups using setsockopt without measurable drawbacks on smaller numbers of multicast groups. Signed-off-by: Jonas Rebmann <jre@pengutronix.de> Reviewed-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
2050327242
commit
69a3272d78
@ -1437,16 +1437,32 @@ static void ip_mc_hash_remove(struct in_device *in_dev,
|
||||
static void ____ip_mc_inc_group(struct in_device *in_dev, __be32 addr,
|
||||
unsigned int mode, gfp_t gfp)
|
||||
{
|
||||
struct ip_mc_list __rcu **mc_hash;
|
||||
struct ip_mc_list *im;
|
||||
|
||||
ASSERT_RTNL();
|
||||
|
||||
for_each_pmc_rtnl(in_dev, im) {
|
||||
if (im->multiaddr == addr) {
|
||||
im->users++;
|
||||
ip_mc_add_src(in_dev, &addr, mode, 0, NULL, 0);
|
||||
goto out;
|
||||
mc_hash = rtnl_dereference(in_dev->mc_hash);
|
||||
if (mc_hash) {
|
||||
u32 hash = hash_32((__force u32)addr, MC_HASH_SZ_LOG);
|
||||
|
||||
for (im = rtnl_dereference(mc_hash[hash]);
|
||||
im;
|
||||
im = rtnl_dereference(im->next_hash)) {
|
||||
if (im->multiaddr == addr)
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
for_each_pmc_rtnl(in_dev, im) {
|
||||
if (im->multiaddr == addr)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (im) {
|
||||
im->users++;
|
||||
ip_mc_add_src(in_dev, &addr, mode, 0, NULL, 0);
|
||||
goto out;
|
||||
}
|
||||
|
||||
im = kzalloc(sizeof(*im), gfp);
|
||||
|
Loading…
Reference in New Issue
Block a user