Commit fe11fdcb authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: annotate data-races around sk->sk_reserved_mem

sk_getsockopt() runs locklessly. This means sk->sk_reserved_mem
can be read while other threads are changing its value.

Add missing annotations where they are needed.

Fixes: 2bb2f5fb ("net: add new socket option SO_RESERVE_MEM")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Wei Wang <weiwan@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7938cd15
...@@ -1007,7 +1007,7 @@ static void sock_release_reserved_memory(struct sock *sk, int bytes) ...@@ -1007,7 +1007,7 @@ static void sock_release_reserved_memory(struct sock *sk, int bytes)
bytes = round_down(bytes, PAGE_SIZE); bytes = round_down(bytes, PAGE_SIZE);
WARN_ON(bytes > sk->sk_reserved_mem); WARN_ON(bytes > sk->sk_reserved_mem);
sk->sk_reserved_mem -= bytes; WRITE_ONCE(sk->sk_reserved_mem, sk->sk_reserved_mem - bytes);
sk_mem_reclaim(sk); sk_mem_reclaim(sk);
} }
...@@ -1044,7 +1044,8 @@ static int sock_reserve_memory(struct sock *sk, int bytes) ...@@ -1044,7 +1044,8 @@ static int sock_reserve_memory(struct sock *sk, int bytes)
} }
sk->sk_forward_alloc += pages << PAGE_SHIFT; sk->sk_forward_alloc += pages << PAGE_SHIFT;
sk->sk_reserved_mem += pages << PAGE_SHIFT; WRITE_ONCE(sk->sk_reserved_mem,
sk->sk_reserved_mem + (pages << PAGE_SHIFT));
return 0; return 0;
} }
...@@ -1973,7 +1974,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname, ...@@ -1973,7 +1974,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname,
break; break;
case SO_RESERVE_MEM: case SO_RESERVE_MEM:
v.val = sk->sk_reserved_mem; v.val = READ_ONCE(sk->sk_reserved_mem);
break; break;
case SO_TXREHASH: case SO_TXREHASH:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment