iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: annotate lockless access to tcp_memory_pressure

Browse Source 
[ Upstream commit 1f142c17d19a5618d5a633195a46f2c8be9bf232 ]

tcp_memory_pressure is read without holding any lock,
and its value could be changed on other cpus.

Use READ_ONCE() to annotate these lockless reads.

The write side is already using atomic ops.

Fixes: b8da51ebb1aa ("tcp: introduce tcp_under_memory_pressure()")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric Dumazet 2019-10-09 15:10:15 -07:00 committed by Greg Kroah-Hartman
parent 681c8c92c4
commit a8e920b220
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/tcp.h
View File

@ -289,7 +289,7 @@ static inline bool tcp_under_memory_pressure(const struct sock *sk)
mem_cgroup_under_socket_pressure(sk->sk_memcg))
return true;
return tcp_memory_pressure;
return READ_ONCE(tcp_memory_pressure);
}
/*
* The next routines deal with comparing 32 bit unsigned ints

4
net/ipv4/tcp.c
View File

@ -328,7 +328,7 @@ void tcp_enter_memory_pressure(struct sock *sk)
{
unsigned long val;
if (tcp_memory_pressure)
if (READ_ONCE(tcp_memory_pressure))
return;
val = jiffies;
@ -343,7 +343,7 @@ void tcp_leave_memory_pressure(struct sock *sk)
{
unsigned long val;
if (!tcp_memory_pressure)
if (!READ_ONCE(tcp_memory_pressure))
return;
val = xchg(&tcp_memory_pressure, 0);
if (val)