summaryrefslogtreecommitdiff
path: root/include/net/ndisc.h
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2019-11-06 01:11:51 +0300
committerDavid S. Miller <davem@davemloft.net>2019-11-07 03:14:48 +0300
commit25c7a6d1f90e208ec27ca854b1381ed39842ec57 (patch)
treea645c406ef309589a1c6f851ca1ba761575a00b4 /include/net/ndisc.h
parent3828a93f5cfdf5d8a4ff9dead741e9a2871ff57b (diff)
downloadlinux-25c7a6d1f90e208ec27ca854b1381ed39842ec57.tar.xz
net: avoid potential false sharing in neighbor related code
There are common instances of the following construct : if (n->confirmed != now) n->confirmed = now; A C compiler could legally remove the conditional. Use READ_ONCE()/WRITE_ONCE() to avoid this problem. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ndisc.h')
-rw-r--r--include/net/ndisc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index b2f715ca0567..b5ebeb3b0de0 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -414,8 +414,8 @@ static inline void __ipv6_confirm_neigh(struct net_device *dev,
unsigned long now = jiffies;
/* avoid dirtying neighbour */
- if (n->confirmed != now)
- n->confirmed = now;
+ if (READ_ONCE(n->confirmed) != now)
+ WRITE_ONCE(n->confirmed, now);
}
rcu_read_unlock_bh();
}
@@ -431,8 +431,8 @@ static inline void __ipv6_confirm_neigh_stub(struct net_device *dev,
unsigned long now = jiffies;
/* avoid dirtying neighbour */
- if (n->confirmed != now)
- n->confirmed = now;
+ if (READ_ONCE(n->confirmed) != now)
+ WRITE_ONCE(n->confirmed, now);
}
rcu_read_unlock_bh();
}