Merge branch 'ipv6-cleanups' (4361eb66) · Commits · e / devices / android_kernel_samsung_universal8895

include/linux/netdevice.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2083,7 +2083,7 @@ void __dev_remove_pack(struct packet_type *pt);
	void dev_add_offload(struct packet_offload *po);		void dev_add_offload(struct packet_offload *po);
	void dev_remove_offload(struct packet_offload *po);		void dev_remove_offload(struct packet_offload *po);

	struct net_device dev_get_by_flags_rcu(struct net net, unsigned short flags,		struct net_device __dev_get_by_flags(struct net net, unsigned short flags,
	unsigned short mask);		unsigned short mask);
	struct net_device dev_get_by_name(struct net net, const char *name);		struct net_device dev_get_by_name(struct net net, const char *name);
	struct net_device dev_get_by_name_rcu(struct net net, const char *name);		struct net_device dev_get_by_name_rcu(struct net net, const char *name);

include/net/addrconf.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -202,7 +202,7 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex,
	const struct in6_addr *addr);		const struct in6_addr *addr);
	void ipv6_sock_ac_close(struct sock *sk);		void ipv6_sock_ac_close(struct sock *sk);

	int ipv6_dev_ac_inc(struct net_device dev, const struct in6_addr addr);		int __ipv6_dev_ac_inc(struct inet6_dev idev, const struct in6_addr addr);
	int __ipv6_dev_ac_dec(struct inet6_dev idev, const struct in6_addr addr);		int __ipv6_dev_ac_dec(struct inet6_dev idev, const struct in6_addr addr);
	bool ipv6_chk_acast_addr(struct net net, struct net_device dev,		bool ipv6_chk_acast_addr(struct net net, struct net_device dev,
	const struct in6_addr *addr);		const struct in6_addr *addr);

net/core/dev.c

+8 −6

Original line number	Original line	Diff line number	Diff line
	@@ -897,23 +897,25 @@ struct net_device dev_getfirstbyhwtype(struct net net, unsigned short type)
	EXPORT_SYMBOL(dev_getfirstbyhwtype);		EXPORT_SYMBOL(dev_getfirstbyhwtype);

	/**		/**
	* dev_get_by_flags_rcu - find any device with given flags		* __dev_get_by_flags - find any device with given flags
	* @net: the applicable net namespace		* @net: the applicable net namespace
	* @if_flags: IFF_* values		* @if_flags: IFF_* values
	* @mask: bitmask of bits in if_flags to check		* @mask: bitmask of bits in if_flags to check
	*		*
	* Search for any interface with the given flags. Returns NULL if a device		* Search for any interface with the given flags. Returns NULL if a device
	* is not found or a pointer to the device. Must be called inside		* is not found or a pointer to the device. Must be called inside
	* rcu_read_lock(), and result refcount is unchanged.		* rtnl_lock(), and result refcount is unchanged.
	*/		*/

	struct net_device dev_get_by_flags_rcu(struct net net, unsigned short if_flags,		struct net_device __dev_get_by_flags(struct net net, unsigned short if_flags,
	unsigned short mask)		unsigned short mask)
	{		{
	struct net_device dev, ret;		struct net_device dev, ret;

			ASSERT_RTNL();

	ret = NULL;		ret = NULL;
	for_each_netdev_rcu(net, dev) {		for_each_netdev(net, dev) {
	if (((dev->flags ^ if_flags) & mask) == 0) {		if (((dev->flags ^ if_flags) & mask) == 0) {
	ret = dev;		ret = dev;
	break;		break;
	@@ -921,7 +923,7 @@ struct net_device dev_get_by_flags_rcu(struct net net, unsigned short if_flags
	}		}
	return ret;		return ret;
	}		}
	EXPORT_SYMBOL(dev_get_by_flags_rcu);		EXPORT_SYMBOL(__dev_get_by_flags);

	/**		/**
	* dev_valid_name - check if name is okay for network device		* dev_valid_name - check if name is okay for network device

net/ipv6/addrconf.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1725,7 +1725,7 @@ static void addrconf_join_anycast(struct inet6_ifaddr *ifp)
	ipv6_addr_prefix(&addr, &ifp->addr, ifp->prefix_len);		ipv6_addr_prefix(&addr, &ifp->addr, ifp->prefix_len);
	if (ipv6_addr_any(&addr))		if (ipv6_addr_any(&addr))
	return;		return;
	ipv6_dev_ac_inc(ifp->idev->dev, &addr);		__ipv6_dev_ac_inc(ifp->idev, &addr);
	}		}

	/* caller must hold RTNL */		/* caller must hold RTNL */

net/ipv6/anycast.c

+51 −57

Original line number	Original line	Diff line number	Diff line
	@@ -46,10 +46,6 @@

	static int ipv6_dev_ac_dec(struct net_device dev, const struct in6_addr addr);		static int ipv6_dev_ac_dec(struct net_device dev, const struct in6_addr addr);

	/* Big ac list lock for all the sockets */
	static DEFINE_SPINLOCK(ipv6_sk_ac_lock);


	/*		/*
	* socket join an anycast group		* socket join an anycast group
	*/		*/
	@@ -78,7 +74,6 @@ int ipv6_sock_ac_join(struct sock sk, int ifindex, const struct in6_addr addr)
	pac->acl_addr = *addr;		pac->acl_addr = *addr;

	rtnl_lock();		rtnl_lock();
	rcu_read_lock();
	if (ifindex == 0) {		if (ifindex == 0) {
	struct rt6_info *rt;		struct rt6_info *rt;

	@@ -91,11 +86,11 @@ int ipv6_sock_ac_join(struct sock sk, int ifindex, const struct in6_addr addr)
	goto error;		goto error;
	} else {		} else {
	/* router, no matching interface: just pick one */		/* router, no matching interface: just pick one */
	dev = dev_get_by_flags_rcu(net, IFF_UP,		dev = __dev_get_by_flags(net, IFF_UP,
	IFF_UP \| IFF_LOOPBACK);		IFF_UP \| IFF_LOOPBACK);
	}		}
	} else		} else
	dev = dev_get_by_index_rcu(net, ifindex);		dev = __dev_get_by_index(net, ifindex);

	if (dev == NULL) {		if (dev == NULL) {
	err = -ENODEV;		err = -ENODEV;
	@@ -127,17 +122,14 @@ int ipv6_sock_ac_join(struct sock sk, int ifindex, const struct in6_addr addr)
	goto error;		goto error;
	}		}

	err = ipv6_dev_ac_inc(dev, addr);		err = __ipv6_dev_ac_inc(idev, addr);
	if (!err) {		if (!err) {
	spin_lock_bh(&ipv6_sk_ac_lock);
	pac->acl_next = np->ipv6_ac_list;		pac->acl_next = np->ipv6_ac_list;
	np->ipv6_ac_list = pac;		np->ipv6_ac_list = pac;
	spin_unlock_bh(&ipv6_sk_ac_lock);
	pac = NULL;		pac = NULL;
	}		}

	error:		error:
	rcu_read_unlock();
	rtnl_unlock();		rtnl_unlock();
	if (pac)		if (pac)
	sock_kfree_s(sk, pac, sizeof(*pac));		sock_kfree_s(sk, pac, sizeof(*pac));
	@@ -154,7 +146,7 @@ int ipv6_sock_ac_drop(struct sock sk, int ifindex, const struct in6_addr addr)
	struct ipv6_ac_socklist pac, prev_pac;		struct ipv6_ac_socklist pac, prev_pac;
	struct net *net = sock_net(sk);		struct net *net = sock_net(sk);

	spin_lock_bh(&ipv6_sk_ac_lock);		rtnl_lock();
	prev_pac = NULL;		prev_pac = NULL;
	for (pac = np->ipv6_ac_list; pac; pac = pac->acl_next) {		for (pac = np->ipv6_ac_list; pac; pac = pac->acl_next) {
	if ((ifindex == 0 \|\| pac->acl_ifindex == ifindex) &&		if ((ifindex == 0 \|\| pac->acl_ifindex == ifindex) &&
	@@ -163,7 +155,7 @@ int ipv6_sock_ac_drop(struct sock sk, int ifindex, const struct in6_addr addr)
	prev_pac = pac;		prev_pac = pac;
	}		}
	if (!pac) {		if (!pac) {
	spin_unlock_bh(&ipv6_sk_ac_lock);		rtnl_unlock();
	return -ENOENT;		return -ENOENT;
	}		}
	if (prev_pac)		if (prev_pac)
	@@ -171,14 +163,9 @@ int ipv6_sock_ac_drop(struct sock sk, int ifindex, const struct in6_addr addr)
	else		else
	np->ipv6_ac_list = pac->acl_next;		np->ipv6_ac_list = pac->acl_next;

	spin_unlock_bh(&ipv6_sk_ac_lock);		dev = __dev_get_by_index(net, pac->acl_ifindex);

	rtnl_lock();
	rcu_read_lock();
	dev = dev_get_by_index_rcu(net, pac->acl_ifindex);
	if (dev)		if (dev)
	ipv6_dev_ac_dec(dev, &pac->acl_addr);		ipv6_dev_ac_dec(dev, &pac->acl_addr);
	rcu_read_unlock();
	rtnl_unlock();		rtnl_unlock();

	sock_kfree_s(sk, pac, sizeof(*pac));		sock_kfree_s(sk, pac, sizeof(*pac));
	@@ -196,19 +183,16 @@ void ipv6_sock_ac_close(struct sock *sk)
	if (!np->ipv6_ac_list)		if (!np->ipv6_ac_list)
	return;		return;

	spin_lock_bh(&ipv6_sk_ac_lock);		rtnl_lock();
	pac = np->ipv6_ac_list;		pac = np->ipv6_ac_list;
	np->ipv6_ac_list = NULL;		np->ipv6_ac_list = NULL;
	spin_unlock_bh(&ipv6_sk_ac_lock);

	prev_index = 0;		prev_index = 0;
	rtnl_lock();
	rcu_read_lock();
	while (pac) {		while (pac) {
	struct ipv6_ac_socklist *next = pac->acl_next;		struct ipv6_ac_socklist *next = pac->acl_next;

	if (pac->acl_ifindex != prev_index) {		if (pac->acl_ifindex != prev_index) {
	dev = dev_get_by_index_rcu(net, pac->acl_ifindex);		dev = __dev_get_by_index(net, pac->acl_ifindex);
	prev_index = pac->acl_ifindex;		prev_index = pac->acl_ifindex;
	}		}
	if (dev)		if (dev)
	@@ -216,10 +200,14 @@ void ipv6_sock_ac_close(struct sock *sk)
	sock_kfree_s(sk, pac, sizeof(*pac));		sock_kfree_s(sk, pac, sizeof(*pac));
	pac = next;		pac = next;
	}		}
	rcu_read_unlock();
	rtnl_unlock();		rtnl_unlock();
	}		}

			static void aca_get(struct ifacaddr6 *aca)
			{
			atomic_inc(&aca->aca_refcnt);
			}

	static void aca_put(struct ifacaddr6 *ac)		static void aca_put(struct ifacaddr6 *ac)
	{		{
	if (atomic_dec_and_test(&ac->aca_refcnt)) {		if (atomic_dec_and_test(&ac->aca_refcnt)) {
	@@ -229,23 +217,40 @@ static void aca_put(struct ifacaddr6 *ac)
	}		}
	}		}

			static struct ifacaddr6 aca_alloc(struct rt6_info rt,
			const struct in6_addr *addr)
			{
			struct inet6_dev *idev = rt->rt6i_idev;
			struct ifacaddr6 *aca;

			aca = kzalloc(sizeof(*aca), GFP_ATOMIC);
			if (aca == NULL)
			return NULL;

			aca->aca_addr = *addr;
			in6_dev_hold(idev);
			aca->aca_idev = idev;
			aca->aca_rt = rt;
			aca->aca_users = 1;
			/* aca_tstamp should be updated upon changes */
			aca->aca_cstamp = aca->aca_tstamp = jiffies;
			atomic_set(&aca->aca_refcnt, 1);
			spin_lock_init(&aca->aca_lock);

			return aca;
			}

	/*		/*
	* device anycast group inc (add if not found)		* device anycast group inc (add if not found)
	*/		*/
	int ipv6_dev_ac_inc(struct net_device dev, const struct in6_addr addr)		int __ipv6_dev_ac_inc(struct inet6_dev idev, const struct in6_addr addr)
	{		{
	struct ifacaddr6 *aca;		struct ifacaddr6 *aca;
	struct inet6_dev *idev;
	struct rt6_info *rt;		struct rt6_info *rt;
	int err;		int err;

	ASSERT_RTNL();		ASSERT_RTNL();

	idev = in6_dev_get(dev);

	if (idev == NULL)
	return -EINVAL;

	write_lock_bh(&idev->lock);		write_lock_bh(&idev->lock);
	if (idev->dead) {		if (idev->dead) {
	err = -ENODEV;		err = -ENODEV;
	@@ -260,46 +265,35 @@ int ipv6_dev_ac_inc(struct net_device dev, const struct in6_addr addr)
	}		}
	}		}

	/*
	* not found: create a new one.
	*/

	aca = kzalloc(sizeof(struct ifacaddr6), GFP_ATOMIC);

	if (aca == NULL) {
	err = -ENOMEM;
	goto out;
	}

	rt = addrconf_dst_alloc(idev, addr, true);		rt = addrconf_dst_alloc(idev, addr, true);
	if (IS_ERR(rt)) {		if (IS_ERR(rt)) {
	kfree(aca);
	err = PTR_ERR(rt);		err = PTR_ERR(rt);
	goto out;		goto out;
	}		}
			aca = aca_alloc(rt, addr);
	aca->aca_addr = *addr;		if (aca == NULL) {
	aca->aca_idev = idev;		ip6_rt_put(rt);
	aca->aca_rt = rt;		err = -ENOMEM;
	aca->aca_users = 1;		goto out;
	/* aca_tstamp should be updated upon changes */		}
	aca->aca_cstamp = aca->aca_tstamp = jiffies;
	atomic_set(&aca->aca_refcnt, 2);
	spin_lock_init(&aca->aca_lock);

	aca->aca_next = idev->ac_list;		aca->aca_next = idev->ac_list;
	idev->ac_list = aca;		idev->ac_list = aca;

			/* Hold this for addrconf_join_solict() below before we unlock,
			* it is already exposed via idev->ac_list.
			*/
			aca_get(aca);
	write_unlock_bh(&idev->lock);		write_unlock_bh(&idev->lock);

	ip6_ins_rt(rt);		ip6_ins_rt(rt);

	addrconf_join_solict(dev, &aca->aca_addr);		addrconf_join_solict(idev->dev, &aca->aca_addr);

	aca_put(aca);		aca_put(aca);
	return 0;		return 0;
	out:		out:
	write_unlock_bh(&idev->lock);		write_unlock_bh(&idev->lock);
	in6_dev_put(idev);
	return err;		return err;
	}		}

	@@ -341,7 +335,7 @@ int __ipv6_dev_ac_dec(struct inet6_dev idev, const struct in6_addr addr)
	return 0;		return 0;
	}		}

	/* called with rcu_read_lock() */		/* called with rtnl_lock() */
	static int ipv6_dev_ac_dec(struct net_device dev, const struct in6_addr addr)		static int ipv6_dev_ac_dec(struct net_device dev, const struct in6_addr addr)
	{		{
	struct inet6_dev *idev = __in6_dev_get(dev);		struct inet6_dev *idev = __in6_dev_get(dev);