Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 959d10f6 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64bea46e

include/linux/igmp.h

+2 −0
Original line number Diff line number Diff line
@@ -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 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_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 int ip_mc_source(int add, int omode, struct sock *sk,

net/ipv4/igmp.c

+34 −18
Original line number Diff line number Diff line
@@ -1849,30 +1849,25 @@ static void ip_mc_clear_src(struct ip_mc_list *pmc) 
	pmc->sfcount[MCAST_EXCLUDE] = 1;

}





/*

 * Join a multicast group

 */

int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)

int __ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr)

{

	int err;

	__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 inet_sock *inet = inet_sk(sk);

	struct net *net = sock_net(sk);

	int ifindex;

	int count = 0;

	int err;



	ASSERT_RTNL();



	if (!ipv4_is_multicast(addr))

		return -EINVAL;



	rtnl_lock();



	in_dev = ip_mc_find_dev(net, imr);



	if (!in_dev) {

		iml = NULL;

		err = -ENODEV;

		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);

	err = 0;

done:

	rtnl_unlock();

	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);



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;

}



/*

 *	Ask a socket to leave a group.

 */



int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)

int __ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)

{

	struct inet_sock *inet = inet_sk(sk);

	struct ip_mc_socklist *iml;
@@ -1940,7 +1944,8 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr) 
	u32 ifindex;

	int ret = -EADDRNOTAVAIL;



	rtnl_lock();

	ASSERT_RTNL();



	in_dev = ip_mc_find_dev(net, imr);

	if (!in_dev) {

		ret = -ENODEV;
@@ -1964,14 +1969,25 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr) 
		*imlp = iml->next_rcu;



		ip_mc_dec_group(in_dev, group);

		rtnl_unlock();



		/* decrease mem now to avoid the memleak warning */

		atomic_sub(sizeof(*iml), &sk->sk_omem_alloc);

		kfree_rcu(iml, rcu);

		return 0;

	}

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();



	return ret;

}

EXPORT_SYMBOL(ip_mc_leave_group);