Commit 9f780efa authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ipv6-devconf-lockless' 



Eric Dumazet says:

====================
ipv6: lockless accesses to devconf

- First patch puts in a cacheline_group the fields used in fast paths.

- Annotate all data races around idev->cnf fields.

- Last patch in this series removes RTNL use for RTM_GETNETCONF dumps.

v3: addressed Jakub Kicinski feedback in addrconf_disable_ipv6()
    Added tags from Jiri and Florian.

v2: addressed Jiri Pirko feedback
 - Added "ipv6: addrconf_disable_ipv6() optimizations"
   and "ipv6: addrconf_disable_policy() optimization"
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 65f5dd4f 2a02f837

drivers/net/ethernet/netronome/nfp/flower/action.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ nfp_fl_set_tun(struct nfp_app *app, struct nfp_fl_set_tun *set_tun, 
			set_tun->ttl = ip6_dst_hoplimit(dst);

			dst_release(dst);

		} else {

			set_tun->ttl = net->ipv6.devconf_all->hop_limit;

			set_tun->ttl = READ_ONCE(net->ipv6.devconf_all->hop_limit);

		}

#endif

	} else {

drivers/net/usb/cdc_mbim.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static void do_neigh_solicit(struct usbnet *dev, u8 *buf, u16 tci) 
	in6_dev = in6_dev_get(netdev);

	if (!in6_dev)

		goto out;

	is_router = !!in6_dev->cnf.forwarding;

	is_router = !!READ_ONCE(in6_dev->cnf.forwarding);

	in6_dev_put(in6_dev);



	/* ipv6_stub != NULL if in6_dev_get returned an inet6_dev */

include/linux/ipv6.h

+9 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#define _IPV6_H



#include <uapi/linux/ipv6.h>

#include <linux/cache.h>



#define ipv6_optlen(p)  (((p)->hdrlen+1) << 3)

#define ipv6_authlen(p) (((p)->hdrlen+2) << 2)
@@ -10,9 +11,16 @@ 
 * This structure contains configuration options per IPv6 link.

 */

struct ipv6_devconf {

	__s32		forwarding;

	/* RX & TX fastpath fields. */

	__cacheline_group_begin(ipv6_devconf_read_txrx);

	__s32		disable_ipv6;

	__s32		hop_limit;

	__s32		mtu6;

	__s32		forwarding;

	__s32		disable_policy;

	__s32		proxy_ndp;

	__cacheline_group_end(ipv6_devconf_read_txrx);



	__s32		accept_ra;

	__s32		accept_redirects;

	__s32		autoconf;
@@ -45,7 +53,6 @@ struct ipv6_devconf { 
	__s32		accept_ra_rt_info_max_plen;

#endif

#endif

	__s32		proxy_ndp;

	__s32		accept_source_route;

	__s32		accept_ra_from_local;

#ifdef CONFIG_IPV6_OPTIMISTIC_DAD
@@ -55,7 +62,6 @@ struct ipv6_devconf { 
#ifdef CONFIG_IPV6_MROUTE

	atomic_t	mc_forwarding;

#endif

	__s32		disable_ipv6;

	__s32		drop_unicast_in_l2_multicast;

	__s32		accept_dad;

	__s32		force_tllao;
@@ -76,7 +82,6 @@ struct ipv6_devconf { 
#endif

	__u32		enhanced_dad;

	__u32		addr_gen_mode;

	__s32		disable_policy;

	__s32           ndisc_tclass;

	__s32		rpl_seg_enabled;

	__u32		ioam6_id;

include/net/addrconf.h

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static inline bool ip6_ignore_linkdown(const struct net_device *dev) 
	if (unlikely(!idev))

		return true;



	return !!idev->cnf.ignore_routes_with_linkdown;

	return !!READ_ONCE(idev->cnf.ignore_routes_with_linkdown);

}



void inet6_ifa_finish_destroy(struct inet6_ifaddr *ifp);

include/net/ip6_route.h

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static inline unsigned int ip6_dst_mtu_maybe_forward(const struct dst_entry *dst 
	rcu_read_lock();

	idev = __in6_dev_get(dst->dev);

	if (idev)

		mtu = idev->cnf.mtu6;

		mtu = READ_ONCE(idev->cnf.mtu6);

	rcu_read_unlock();



out: