Commit 782d86fe authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-sysctl-races-round2' 



Kuniyuki Iwashima says:

====================
sysctl: Fix data-races around ipv4_net_table (Round 2).

This series fixes data-races around 15 knobs after ip_default_ttl in
ipv4_net_table.

These two knobs are skipped.
  - ip_local_port_range is safe with its own lock.
  - ip_local_reserved_ports uses proc_do_large_bitmap(), which will need
    an additional lock and can be fixed later.

So, the next round will start with igmp_link_local_mcast_reports.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents db886979 2a85388f

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

+2 −1
Original line number Diff line number Diff line
@@ -10523,13 +10523,14 @@ static int mlxsw_sp_dscp_init(struct mlxsw_sp *mlxsw_sp) 
static int __mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp)

{

	struct net *net = mlxsw_sp_net(mlxsw_sp);

	bool usp = net->ipv4.sysctl_ip_fwd_update_priority;

	char rgcr_pl[MLXSW_REG_RGCR_LEN];

	u64 max_rifs;

	bool usp;



	if (!MLXSW_CORE_RES_VALID(mlxsw_sp->core, MAX_RIFS))

		return -EIO;

	max_rifs = MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_RIFS);

	usp = READ_ONCE(net->ipv4.sysctl_ip_fwd_update_priority);



	mlxsw_reg_rgcr_pack(rgcr_pl, true, true);

	mlxsw_reg_rgcr_max_router_interfaces_set(rgcr_pl, max_rifs);

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

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

			ip_rt_put(rt);

		} else {

			set_tun->ttl = net->ipv4.sysctl_ip_default_ttl;

			set_tun->ttl = READ_ONCE(net->ipv4.sysctl_ip_default_ttl);

		}

	}

include/net/inet_hashtables.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static inline bool inet_sk_bound_dev_eq(struct net *net, int bound_dev_if, 
					int dif, int sdif)

{

#if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV)

	return inet_bound_dev_eq(!!net->ipv4.sysctl_tcp_l3mdev_accept,

	return inet_bound_dev_eq(!!READ_ONCE(net->ipv4.sysctl_tcp_l3mdev_accept),

				 bound_dev_if, dif, sdif);

#else

	return inet_bound_dev_eq(true, bound_dev_if, dif, sdif);

include/net/inet_sock.h

+5 −4
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk) 


static inline u32 inet_request_mark(const struct sock *sk, struct sk_buff *skb)

{

	if (!sk->sk_mark && sock_net(sk)->ipv4.sysctl_tcp_fwmark_accept)

	if (!sk->sk_mark &&

	    READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_fwmark_accept))

		return skb->mark;



	return sk->sk_mark;
@@ -120,7 +121,7 @@ static inline int inet_request_bound_dev_if(const struct sock *sk, 
#ifdef CONFIG_NET_L3_MASTER_DEV

	struct net *net = sock_net(sk);



	if (!bound_dev_if && net->ipv4.sysctl_tcp_l3mdev_accept)

	if (!bound_dev_if && READ_ONCE(net->ipv4.sysctl_tcp_l3mdev_accept))

		return l3mdev_master_ifindex_by_index(net, skb->skb_iif);

#endif
@@ -132,7 +133,7 @@ static inline int inet_sk_bound_l3mdev(const struct sock *sk) 
#ifdef CONFIG_NET_L3_MASTER_DEV

	struct net *net = sock_net(sk);



	if (!net->ipv4.sysctl_tcp_l3mdev_accept)

	if (!READ_ONCE(net->ipv4.sysctl_tcp_l3mdev_accept))

		return l3mdev_master_ifindex_by_index(net,

						      sk->sk_bound_dev_if);

#endif
@@ -374,7 +375,7 @@ static inline bool inet_get_convert_csum(struct sock *sk) 
static inline bool inet_can_nonlocal_bind(struct net *net,

					  struct inet_sock *inet)

{

	return net->ipv4.sysctl_ip_nonlocal_bind ||

	return READ_ONCE(net->ipv4.sysctl_ip_nonlocal_bind) ||

		inet->freebind || inet->transparent;

}

include/net/ip.h

+2 −2
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ void ipfrag_init(void); 
void ip_static_sysctl_init(void);



#define IP4_REPLY_MARK(net, mark) \

	((net)->ipv4.sysctl_fwmark_reflect ? (mark) : 0)

	(READ_ONCE((net)->ipv4.sysctl_fwmark_reflect) ? (mark) : 0)



static inline bool ip_is_fragment(const struct iphdr *iph)

{
@@ -446,7 +446,7 @@ static inline unsigned int ip_dst_mtu_maybe_forward(const struct dst_entry *dst, 
	struct net *net = dev_net(dst->dev);

	unsigned int mtu;



	if (net->ipv4.sysctl_ip_fwd_use_pmtu ||

	if (READ_ONCE(net->ipv4.sysctl_ip_fwd_use_pmtu) ||

	    ip_mtu_locked(dst) ||

	    !forwarding) {

		mtu = rt->rt_pmtu;