hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

igmp: add __ip_mc_{join|leave}_group() 

There is a need to perform igmp join/leave operations while RTNL is
held.

Make ip_mc_{join|leave}_group() wrappers around
__ip_mc_{join|leave}_group() to avoid the proliferation of work queues.

For example, vxlan_igmp_join() could possibly be removed.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2015-02-17 03:19:24 -08:00 committed by David S. Miller
parent 64bea46e3f
commit 959d10f6bb
2 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/igmp.h
View File

@ -111,7 +111,9 @@ struct ip_mc_list {
extern int ip_check_mc_rcu(struct in_device *dev, __be32 mc_addr, __be32 src_addr, u16 proto); extern int ip_check_mc_rcu(struct in_device *dev, __be32 mc_addr, __be32 src_addr, u16 proto);
extern int igmp_rcv(struct sk_buff *); extern int igmp_rcv(struct sk_buff *);
extern int __ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr);
extern int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr); extern int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr);
extern int __ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr);
extern int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr); extern int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr);
extern void ip_mc_drop_socket(struct sock *sk); extern void ip_mc_drop_socket(struct sock *sk);
extern int ip_mc_source(int add, int omode, struct sock *sk, extern int ip_mc_source(int add, int omode, struct sock *sk,

52
net/ipv4/igmp.c
View File

@ -1849,30 +1849,25 @@ static void ip_mc_clear_src(struct ip_mc_list *pmc)
pmc->sfcount[MCAST_EXCLUDE] = 1; pmc->sfcount[MCAST_EXCLUDE] = 1;
} }
int __ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr)
/*
* Join a multicast group
*/
int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
{ {
int err;
__be32 addr = imr->imr_multiaddr.s_addr; __be32 addr = imr->imr_multiaddr.s_addr;
struct ip_mc_socklist *iml = NULL, *i; struct ip_mc_socklist *iml, *i;
struct in_device *in_dev; struct in_device *in_dev;
struct inet_sock *inet = inet_sk(sk); struct inet_sock *inet = inet_sk(sk);
struct net *net = sock_net(sk); struct net *net = sock_net(sk);
int ifindex; int ifindex;
int count = 0; int count = 0;
int err;
ASSERT_RTNL();
if (!ipv4_is_multicast(addr)) if (!ipv4_is_multicast(addr))
return -EINVAL; return -EINVAL;
rtnl_lock();
in_dev = ip_mc_find_dev(net, imr); in_dev = ip_mc_find_dev(net, imr);
if (!in_dev) { if (!in_dev) {
iml = NULL;
err = -ENODEV; err = -ENODEV;
goto done; goto done;
} }
@ -1900,9 +1895,22 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
ip_mc_inc_group(in_dev, addr); ip_mc_inc_group(in_dev, addr);
err = 0; err = 0;
done: done:
rtnl_unlock();
return err; return err;
} }
EXPORT_SYMBOL(__ip_mc_join_group);
/* Join a multicast group
*/
int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr)
{
int ret;
rtnl_lock();
ret = __ip_mc_join_group(sk, imr);
rtnl_unlock();
return ret;
}
EXPORT_SYMBOL(ip_mc_join_group); EXPORT_SYMBOL(ip_mc_join_group);
static int ip_mc_leave_src(struct sock *sk, struct ip_mc_socklist *iml, static int ip_mc_leave_src(struct sock *sk, struct ip_mc_socklist *iml,
@ -1925,11 +1933,7 @@ static int ip_mc_leave_src(struct sock *sk, struct ip_mc_socklist *iml,
return err; return err;
} }
/* int __ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
* Ask a socket to leave a group.
*/
int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
{ {
struct inet_sock *inet = inet_sk(sk); struct inet_sock *inet = inet_sk(sk);
struct ip_mc_socklist *iml; struct ip_mc_socklist *iml;
@ -1940,7 +1944,8 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
u32 ifindex; u32 ifindex;
int ret = -EADDRNOTAVAIL; int ret = -EADDRNOTAVAIL;
rtnl_lock(); ASSERT_RTNL();
in_dev = ip_mc_find_dev(net, imr); in_dev = ip_mc_find_dev(net, imr);
if (!in_dev) { if (!in_dev) {
ret = -ENODEV; ret = -ENODEV;
@ -1964,14 +1969,25 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
*imlp = iml->next_rcu; *imlp = iml->next_rcu;
ip_mc_dec_group(in_dev, group); ip_mc_dec_group(in_dev, group);
rtnl_unlock();
/* decrease mem now to avoid the memleak warning */ /* decrease mem now to avoid the memleak warning */
atomic_sub(sizeof(*iml), &sk->sk_omem_alloc); atomic_sub(sizeof(*iml), &sk->sk_omem_alloc);
kfree_rcu(iml, rcu); kfree_rcu(iml, rcu);
return 0; return 0;
} }
out: out:
return ret;
}
EXPORT_SYMBOL(__ip_mc_leave_group);
int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
{
int ret;
rtnl_lock();
ret = __ip_mc_leave_group(sk, imr);
rtnl_unlock(); rtnl_unlock();
return ret; return ret;
} }
EXPORT_SYMBOL(ip_mc_leave_group); EXPORT_SYMBOL(ip_mc_leave_group);