tcp: annotate tp->urg_seq lockless reads
There two places where we fetch tp->urg_seq while this field can change from IRQ or other cpu. We need to add READ_ONCE() annotations, and also make sure write side use corresponding WRITE_ONCE() to avoid store-tearing. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
e0d694d638
Коммит
d9b55bf7b6
|
@ -546,7 +546,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
|
|||
(state != TCP_SYN_RECV || rcu_access_pointer(tp->fastopen_rsk))) {
|
||||
int target = sock_rcvlowat(sk, 0, INT_MAX);
|
||||
|
||||
if (tp->urg_seq == READ_ONCE(tp->copied_seq) &&
|
||||
if (READ_ONCE(tp->urg_seq) == READ_ONCE(tp->copied_seq) &&
|
||||
!sock_flag(sk, SOCK_URGINLINE) &&
|
||||
tp->urg_data)
|
||||
target++;
|
||||
|
@ -607,7 +607,8 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)
|
|||
unlock_sock_fast(sk, slow);
|
||||
break;
|
||||
case SIOCATMARK:
|
||||
answ = tp->urg_data && tp->urg_seq == READ_ONCE(tp->copied_seq);
|
||||
answ = tp->urg_data &&
|
||||
READ_ONCE(tp->urg_seq) == READ_ONCE(tp->copied_seq);
|
||||
break;
|
||||
case SIOCOUTQ:
|
||||
if (sk->sk_state == TCP_LISTEN)
|
||||
|
|
|
@ -5356,7 +5356,7 @@ static void tcp_check_urg(struct sock *sk, const struct tcphdr *th)
|
|||
}
|
||||
|
||||
tp->urg_data = TCP_URG_NOTYET;
|
||||
tp->urg_seq = ptr;
|
||||
WRITE_ONCE(tp->urg_seq, ptr);
|
||||
|
||||
/* Disable header prediction. */
|
||||
tp->pred_flags = 0;
|
||||
|
|
Загрузка…
Ссылка в новой задаче