sock: annotate data-races around prot->memory_pressure
Subsystems (4)
PATCH 1/1 sock: annotate data-races around prot->memory_pressure
*prot->memory_pressure is read/writen locklessly, we need to add proper annotations.
A recent commit added a new race, it is time to audit all accesses.
Fixes 2d0c88e84e48 ("sock: Fix misuse of sk_under_memory_pressure()")
Fixes 4d93df0abd50 ("[SCTP]: Rewrite of sctp buffer management code")
Signed-off-by Eric Dumazet <[email protected]>
Cc Abel Wu <[email protected]>
Cc Shakeel Butt <[email protected]>
--- include/net/sock.h | 7 ++++--- net/sctp/socket.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
include/net/sock.h +4 -3
@@ -1323,6 +1323,7 @@ struct proto {/* * Pressure flag: try to collapse. * Technical note: it is used by multiple contexts non atomically. +* Make sure to use READ_ONCE()/WRITE_ONCE() for all reads/writes. * All the __sk_mem_schedule() is of this nature: accounting * is strict, actions are advisory and have some latency. */
@@ -1423,7 +1424,7 @@ static inline bool sk_has_memory_pressure(const struct sock *sk)static inline bool sk_under_global_memory_pressure (const struct sock *sk) {return sk->sk_prot->memory_pressure && - !!*sk->sk_prot->memory_pressure; + !!READ_ONCE (*sk->sk_prot->memory_pressure); }static inline bool sk_under_memory_pressure (const struct sock *sk)
@@ -1435,7 +1436,7 @@ static inline bool sk_under_memory_pressure(const struct sock *sk) mem_cgroup_under_socket_pressure(sk->sk_memcg))return true; -return !!*sk->sk_prot->memory_pressure; +return !!READ_ONCE (*sk->sk_prot->memory_pressure); } static inline long
@@ -1512,7 +1513,7 @@ proto_memory_pressure(struct proto *prot) {if (!prot->memory_pressure)return false; -return !!*prot->memory_pressure; +return !!READ_ONCE (*prot->memory_pressure); }
net/sctp/socket.c +1 -1
@@ -99,7 +99,7 @@ struct percpu_counter sctp_sockets_allocated;static void sctp_enter_memory_pressure (struct sock *sk) { - sctp_memory_pressure =1 ; +WRITE_ONCE (sctp_memory_pressure,1 ); }
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Quoted 11 lines · Eric Dumazet
*prot->memory_pressureis read/writen locklessly, we need to add proper annotations.A recent commit added a new race, it is time to audit all accesses.
Fixes 2d0c88e84e48 ("sock: Fix misuse of sk_under_memory_pressure()")Fixes 4d93df0abd50 ("[SCTP]: Rewrite of sctp buffer management code")Signed-off-by Eric Dumazet <[email protected]>Cc Abel Wu <[email protected]>Cc Shakeel Butt <[email protected]>
Reviewed-by Shakeel Butt <[email protected]>
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 5 lines · On Fri, 18 Aug 2023 01:51:32 +0000 you wrote:
*prot->memory_pressureis read/writen locklessly, we need to add proper annotations.A recent commit added a new race, it is time to audit all accesses.
Quoted 7 lines
Fixes 2d0c88e84e48 ("sock: Fix misuse of sk_under_memory_pressure()")Fixes 4d93df0abd50 ("[SCTP]: Rewrite of sctp buffer management code")Signed-off-by Eric Dumazet <[email protected]>Cc Abel Wu <[email protected]>Cc Shakeel Butt <[email protected]>[...]
Here is the summary with links:
- [net] sock: annotate data-races around prot->memory_pressure
https://git.kernel.org/netdev/net/c/76f33296d2e0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html