diff options
| author | Eric Dumazet <edumazet@google.com> | 2021-11-15 20:02:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-11-16 14:10:34 +0100 |
| commit | 7b6a893a5991f5e8a56795155ae86333b03080b7 (patch) | |
| tree | b4b56acb67359121477091e1512aacb6016a570a /net/ipv4/tcp_input.c | |
| parent | tcp: annotate data-races on tp->segs_in and tp->data_segs_in (diff) | |
| download | linux-7b6a893a5991f5e8a56795155ae86333b03080b7.tar.xz linux-7b6a893a5991f5e8a56795155ae86333b03080b7.zip | |
tcp: annotate races around tp->urg_data
tcp_poll() and tcp_ioctl() are reading tp->urg_data without socket lock
owned.
Also, it is faster to first check tp->urg_data in tcp_poll(),
then tp->urg_seq == tp->copied_seq, because tp->urg_seq is
located in a different/cold cache line.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 246ab7b5e857..5ee07a337652 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5591,7 +5591,7 @@ static void tcp_check_urg(struct sock *sk, const struct tcphdr *th) } } - tp->urg_data = TCP_URG_NOTYET; + WRITE_ONCE(tp->urg_data, TCP_URG_NOTYET); WRITE_ONCE(tp->urg_seq, ptr); /* Disable header prediction. */ @@ -5617,7 +5617,7 @@ static void tcp_urg(struct sock *sk, struct sk_buff *skb, const struct tcphdr *t u8 tmp; if (skb_copy_bits(skb, ptr, &tmp, 1)) BUG(); - tp->urg_data = TCP_URG_VALID | tmp; + WRITE_ONCE(tp->urg_data, TCP_URG_VALID | tmp); if (!sock_flag(sk, SOCK_DEAD)) sk->sk_data_ready(sk); } |