6 files changed, 8 insertions, 8 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index c31a9ed86d5a..8f9adcfac41b 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -954,8 +954,8 @@ static inline void sk_incoming_cpu_update(struct sock *sk)
 {
         int cpu = raw_smp_processor_id();
 
-        if (unlikely(sk->sk_incoming_cpu != cpu))
-                sk->sk_incoming_cpu = cpu;
+        if (unlikely(READ_ONCE(sk->sk_incoming_cpu) != cpu))
+                WRITE_ONCE(sk->sk_incoming_cpu, cpu);
 }
 
 static inline void sock_rps_record_flow_hash(__u32 hash)
diff --git a/net/core/sock.c b/net/core/sock.c
index b8e758bcb6ad..ac78a570e43a 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1127,7 +1127,7 @@ set_rcvbuf:
                 break;
                 }
         case SO_INCOMING_CPU:
-                sk->sk_incoming_cpu = val;
+                WRITE_ONCE(sk->sk_incoming_cpu, val);
                 break;
 
         case SO_CNX_ADVICE:
@@ -1476,7 +1476,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                 break;
 
         case SO_INCOMING_CPU:
-                v.val = sk->sk_incoming_cpu;
+                v.val = READ_ONCE(sk->sk_incoming_cpu);
                 break;
 
         case SO_MEMINFO:
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 97824864e40d..83fb00153018 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -240,7 +240,7 @@ static inline int compute_score(struct sock *sk, struct net *net,
                         return -1;
 
                 score = sk->sk_family == PF_INET ? 2 : 1;
-                if (sk->sk_incoming_cpu == raw_smp_processor_id())
+                if (READ_ONCE(sk->sk_incoming_cpu) == raw_smp_processor_id())
                         score++;
         }
         return score;
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index d1ed160af202..1d58ce829dca 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -388,7 +388,7 @@ static int compute_score(struct sock *sk, struct net *net,
                 return -1;
         score += 4;
 
-        if (sk->sk_incoming_cpu == raw_smp_processor_id())
+        if (READ_ONCE(sk->sk_incoming_cpu) == raw_smp_processor_id())
                 score++;
         return score;
 }
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index cf60fae9533b..fbe9d4295eac 100644
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -105,7 +105,7 @@ static inline int compute_score(struct sock *sk, struct net *net,
                         return -1;
 
                 score = 1;
-                if (sk->sk_incoming_cpu == raw_smp_processor_id())
+                if (READ_ONCE(sk->sk_incoming_cpu) == raw_smp_processor_id())
                         score++;
         }
         return score;
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 6324d3a8cb53..9fec580c968e 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -135,7 +135,7 @@ static int compute_score(struct sock *sk, struct net *net,
                 return -1;
         score++;
 
-        if (sk->sk_incoming_cpu == raw_smp_processor_id())
+        if (READ_ONCE(sk->sk_incoming_cpu) == raw_smp_processor_id())
                 score++;
 
         return score;