Commit 055202b1 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

ipmr: use READ_ONCE() to read net->ipv[46].ipmr_seq 



mr_call_vif_notifiers() and mr_call_mfc_notifiers() already
uses WRITE_ONCE() on the write side.

Using RTNL to protect the reads seems a big hammer.

Constify 'struct net' argument of ip6mr_rules_seq_read()
and ipmr_rules_seq_read().

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/20241009184405.3752829-5-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e60ea454

net/ipv4/ipmr.c

+3 −5
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static int ipmr_rules_dump(struct net *net, struct notifier_block *nb, 
	return fib_rules_dump(net, nb, RTNL_FAMILY_IPMR, extack);

}



static unsigned int ipmr_rules_seq_read(struct net *net)

static unsigned int ipmr_rules_seq_read(const struct net *net)

{

	return fib_rules_seq_read(net, RTNL_FAMILY_IPMR);

}
@@ -346,7 +346,7 @@ static int ipmr_rules_dump(struct net *net, struct notifier_block *nb, 
	return 0;

}



static unsigned int ipmr_rules_seq_read(struct net *net)

static unsigned int ipmr_rules_seq_read(const struct net *net)

{

	return 0;

}
@@ -3037,9 +3037,7 @@ static const struct net_protocol pim_protocol = { 


static unsigned int ipmr_seq_read(struct net *net)

{

	ASSERT_RTNL();



	return net->ipv4.ipmr_seq + ipmr_rules_seq_read(net);

	return READ_ONCE(net->ipv4.ipmr_seq) + ipmr_rules_seq_read(net);

}



static int ipmr_dump(struct net *net, struct notifier_block *nb,

net/ipv6/ip6mr.c

+3 −5
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int ip6mr_rules_dump(struct net *net, struct notifier_block *nb, 
	return fib_rules_dump(net, nb, RTNL_FAMILY_IP6MR, extack);

}



static unsigned int ip6mr_rules_seq_read(struct net *net)

static unsigned int ip6mr_rules_seq_read(const struct net *net)

{

	return fib_rules_seq_read(net, RTNL_FAMILY_IP6MR);

}
@@ -335,7 +335,7 @@ static int ip6mr_rules_dump(struct net *net, struct notifier_block *nb, 
	return 0;

}



static unsigned int ip6mr_rules_seq_read(struct net *net)

static unsigned int ip6mr_rules_seq_read(const struct net *net)

{

	return 0;

}
@@ -1262,9 +1262,7 @@ static int ip6mr_device_event(struct notifier_block *this, 


static unsigned int ip6mr_seq_read(struct net *net)

{

	ASSERT_RTNL();



	return net->ipv6.ipmr_seq + ip6mr_rules_seq_read(net);

	return READ_ONCE(net->ipv6.ipmr_seq) + ip6mr_rules_seq_read(net);

}



static int ip6mr_dump(struct net *net, struct notifier_block *nb,