Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: annotate data-races around sk->sk_dst_pending_confirm

Browse source 
[ Upstream commit eb44ad4e635132754bfbcb18103f1dcb7058aedd ]

This field can be read or written without socket lock being held.

Add annotations to avoid load-store tearing.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric Dumazet 2023-09-21 20:28:18 +00:00 committed by Ksawlii
parent 73e064e9d2
commit 97e5946b3e
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/net/sock.h
View file

@ -2057,7 +2057,7 @@ static inline void __dst_negative_advice(struct sock *sk)
if (ndst != dst) { if (ndst != dst) {
rcu_assign_pointer(sk->sk_dst_cache, ndst); rcu_assign_pointer(sk->sk_dst_cache, ndst);
sk_tx_queue_clear(sk); sk_tx_queue_clear(sk);
sk->sk_dst_pending_confirm = 0; WRITE_ONCE(sk->sk_dst_pending_confirm, 0);
} }
} }
} }
@ -2074,7 +2074,7 @@ __sk_dst_set(struct sock *sk, struct dst_entry *dst)
struct dst_entry *old_dst; struct dst_entry *old_dst;
sk_tx_queue_clear(sk); sk_tx_queue_clear(sk);
sk->sk_dst_pending_confirm = 0; WRITE_ONCE(sk->sk_dst_pending_confirm, 0);
old_dst = rcu_dereference_protected(sk->sk_dst_cache, old_dst = rcu_dereference_protected(sk->sk_dst_cache,
lockdep_sock_is_held(sk)); lockdep_sock_is_held(sk));
rcu_assign_pointer(sk->sk_dst_cache, dst); rcu_assign_pointer(sk->sk_dst_cache, dst);
@ -2087,7 +2087,7 @@ sk_dst_set(struct sock *sk, struct dst_entry *dst)
struct dst_entry *old_dst; struct dst_entry *old_dst;
sk_tx_queue_clear(sk); sk_tx_queue_clear(sk);
sk->sk_dst_pending_confirm = 0; WRITE_ONCE(sk->sk_dst_pending_confirm, 0);
old_dst = xchg((__force struct dst_entry **)&sk->sk_dst_cache, dst); old_dst = xchg((__force struct dst_entry **)&sk->sk_dst_cache, dst);
dst_release(old_dst); dst_release(old_dst);
} }

2
net/core/sock.c
View file

@ -547,7 +547,7 @@ struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
if (dst && dst->obsolete && dst->ops->check(dst, cookie) == NULL) { if (dst && dst->obsolete && dst->ops->check(dst, cookie) == NULL) {
sk_tx_queue_clear(sk); sk_tx_queue_clear(sk);
sk->sk_dst_pending_confirm = 0; WRITE_ONCE(sk->sk_dst_pending_confirm, 0);
RCU_INIT_POINTER(sk->sk_dst_cache, NULL); RCU_INIT_POINTER(sk->sk_dst_cache, NULL);
dst_release(dst); dst_release(dst);
return NULL; return NULL;

2
net/ipv4/tcp_output.c
View file

@ -1327,7 +1327,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb,
skb_set_hash_from_sk(skb, sk); skb_set_hash_from_sk(skb, sk);
refcount_add(skb->truesize, &sk->sk_wmem_alloc); refcount_add(skb->truesize, &sk->sk_wmem_alloc);
skb_set_dst_pending_confirm(skb, sk->sk_dst_pending_confirm); skb_set_dst_pending_confirm(skb, READ_ONCE(sk->sk_dst_pending_confirm));
/* Build TCP header and checksum it. */ /* Build TCP header and checksum it. */
th = (struct tcphdr *)skb->data; th = (struct tcphdr *)skb->data;