Skip to contentSkip to conversation

net: prevent load/store tearing on sk->sk_stamp

PATCH In review Eric Dumazet 3 participants 4 messages Nov 5, 2019 – Nov 6, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: prevent load/store tearing on sk->sk_stamp

Add a couple of READ_ONCE() and WRITE_ONCE() to prevent load-tearing and store-tearing in sock_read_timestamp() and sock_write_timestamp()

This might prevent another KCSAN report.

Fixes 3a0ed3e96197 ("sock: Make sock->sk_stamp thread-safe")
Cc Deepa Dinamani <[email protected]>
---
 include/net/sock.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/net/sock.h +2 -2
index 8f9adcfac41bea7e46062851a25c042261323679..718e62fbe869db3ee7e8994bd1bfd559ab9c61c7 100644
@@ -2342,7 +2342,7 @@ static inline ktime_t sock_read_timestamp(struct sock *sk)
 
 	return kt;
 #else
-	return sk->sk_stamp;
+	return READ_ONCE(sk->sk_stamp);
 #endif
 }
 
@@ -2353,7 +2353,7 @@ static inline void sock_write_timestamp(struct sock *sk, ktime_t kt)
 	sk->sk_stamp = kt;
 	write_sequnlock(&sk->sk_stamp_seq);
 #else
-	sk->sk_stamp = kt;
+	WRITE_ONCE(sk->sk_stamp, kt);
 #endif
 }
 
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
Acked-by on v1 1/1
#1 lore raw
Quoted 37 lines · Eric Dumazet

Add a couple of READ_ONCE() and WRITE_ONCE() to prevent load-tearing and store-tearing in sock_read_timestamp() and sock_write_timestamp()

This might prevent another KCSAN report.

Fixes 3a0ed3e96197 ("sock: Make sock->sk_stamp thread-safe")
Cc Deepa Dinamani <[email protected]>
---
 include/net/sock.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/net/sock.h +2 -3
index 8f9adcfac41bea7e46062851a25c042261323679..718e62fbe869db3ee7e8994bd1bfd559ab9c61c7 100644
@@ -2342,7 +2342,7 @@ static inline ktime_t sock_read_timestamp(struct sock *sk)
 
        return kt;
 #else
-       return sk->sk_stamp;
+       return READ_ONCE(sk->sk_stamp);
 #endif
 }
 
@@ -2353,7 +2353,7 @@ static inline void sock_write_timestamp(struct sock *sk, ktime_t kt)
        sk->sk_stamp = kt;
        write_sequnlock(&sk->sk_stamp_seq);
 #else
-       sk->sk_stamp = kt;
+       WRITE_ONCE(sk->sk_stamp, kt);
 #endif
 }
 
--
Quoted 1 line

2.24.0.rc1.363.gb1bccd3e3d-goog

I do not see any harm with this. Does it cause performance degradation?

-Deepa

#2 lore raw
Quoted 2 lines · Deepa Dinamani

I do not see any harm with this. Does it cause performance degradation?

It does not change compiler output, at least for common GCC versions.

It would change things if a hypothetical caller would do for example :

ktime_t res;

res = sock_read_timestamp(sk);
res = sock_read_timestamp(sk);

Since without the READ_ONCE(), compiler could remove the first instance.

Quoted 3 lines

-Deepa

maintainer
#3 lore raw
In reply to Eric Dumazet

From: Eric Dumazet <[email protected]>
Date: Mon, 4 Nov 2019 21:38:43 -0800

Quoted 8 lines

Add a couple of READ_ONCE() and WRITE_ONCE() to prevent load-tearing and store-tearing in sock_read_timestamp() and sock_write_timestamp()

This might prevent another KCSAN report.

Fixes 3a0ed3e96197 ("sock: Make sock->sk_stamp thread-safe")

Applied and queued up for -stable.