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

tcp: annotate lockless accesses to sk->sk_err_soft

This field can be read/written without lock synchronization.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 731b73db
...@@ -3874,7 +3874,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) ...@@ -3874,7 +3874,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
/* We passed data and got it acked, remove any soft error /* We passed data and got it acked, remove any soft error
* log. Something worked... * log. Something worked...
*/ */
sk->sk_err_soft = 0; WRITE_ONCE(sk->sk_err_soft, 0);
icsk->icsk_probes_out = 0; icsk->icsk_probes_out = 0;
tp->rcv_tstamp = tcp_jiffies32; tp->rcv_tstamp = tcp_jiffies32;
if (!prior_packets) if (!prior_packets)
......
...@@ -361,7 +361,7 @@ void tcp_v4_mtu_reduced(struct sock *sk) ...@@ -361,7 +361,7 @@ void tcp_v4_mtu_reduced(struct sock *sk)
* for the case, if this connection will not able to recover. * for the case, if this connection will not able to recover.
*/ */
if (mtu < dst_mtu(dst) && ip_dont_fragment(sk, dst)) if (mtu < dst_mtu(dst) && ip_dont_fragment(sk, dst))
sk->sk_err_soft = EMSGSIZE; WRITE_ONCE(sk->sk_err_soft, EMSGSIZE);
mtu = dst_mtu(dst); mtu = dst_mtu(dst);
...@@ -602,7 +602,7 @@ int tcp_v4_err(struct sk_buff *skb, u32 info) ...@@ -602,7 +602,7 @@ int tcp_v4_err(struct sk_buff *skb, u32 info)
tcp_done(sk); tcp_done(sk);
} else { } else {
sk->sk_err_soft = err; WRITE_ONCE(sk->sk_err_soft, err);
} }
goto out; goto out;
} }
...@@ -628,7 +628,7 @@ int tcp_v4_err(struct sk_buff *skb, u32 info) ...@@ -628,7 +628,7 @@ int tcp_v4_err(struct sk_buff *skb, u32 info)
sk->sk_err = err; sk->sk_err = err;
sk_error_report(sk); sk_error_report(sk);
} else { /* Only an error on timeout */ } else { /* Only an error on timeout */
sk->sk_err_soft = err; WRITE_ONCE(sk->sk_err_soft, err);
} }
out: out:
......
...@@ -67,7 +67,7 @@ u32 tcp_clamp_probe0_to_user_timeout(const struct sock *sk, u32 when) ...@@ -67,7 +67,7 @@ u32 tcp_clamp_probe0_to_user_timeout(const struct sock *sk, u32 when)
static void tcp_write_err(struct sock *sk) static void tcp_write_err(struct sock *sk)
{ {
sk->sk_err = sk->sk_err_soft ? : ETIMEDOUT; sk->sk_err = READ_ONCE(sk->sk_err_soft) ? : ETIMEDOUT;
sk_error_report(sk); sk_error_report(sk);
tcp_write_queue_purge(sk); tcp_write_queue_purge(sk);
...@@ -110,7 +110,7 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset) ...@@ -110,7 +110,7 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset)
shift++; shift++;
/* If some dubious ICMP arrived, penalize even more. */ /* If some dubious ICMP arrived, penalize even more. */
if (sk->sk_err_soft) if (READ_ONCE(sk->sk_err_soft))
shift++; shift++;
if (tcp_check_oom(sk, shift)) { if (tcp_check_oom(sk, shift)) {
...@@ -146,7 +146,7 @@ static int tcp_orphan_retries(struct sock *sk, bool alive) ...@@ -146,7 +146,7 @@ static int tcp_orphan_retries(struct sock *sk, bool alive)
int retries = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_orphan_retries); /* May be zero. */ int retries = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_orphan_retries); /* May be zero. */
/* We know from an ICMP that something is wrong. */ /* We know from an ICMP that something is wrong. */
if (sk->sk_err_soft && !alive) if (READ_ONCE(sk->sk_err_soft) && !alive)
retries = 0; retries = 0;
/* However, if socket sent something recently, select some safe /* However, if socket sent something recently, select some safe
......
...@@ -497,8 +497,9 @@ static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, ...@@ -497,8 +497,9 @@ static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
sk_error_report(sk); /* Wake people up to see the error (see connect in sock.c) */ sk_error_report(sk); /* Wake people up to see the error (see connect in sock.c) */
tcp_done(sk); tcp_done(sk);
} else } else {
sk->sk_err_soft = err; WRITE_ONCE(sk->sk_err_soft, err);
}
goto out; goto out;
case TCP_LISTEN: case TCP_LISTEN:
break; break;
...@@ -514,9 +515,9 @@ static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, ...@@ -514,9 +515,9 @@ static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
if (!sock_owned_by_user(sk) && np->recverr) { if (!sock_owned_by_user(sk) && np->recverr) {
sk->sk_err = err; sk->sk_err = err;
sk_error_report(sk); sk_error_report(sk);
} else } else {
sk->sk_err_soft = err; WRITE_ONCE(sk->sk_err_soft, err);
}
out: out:
bh_unlock_sock(sk); bh_unlock_sock(sk);
sock_put(sk); sock_put(sk);
......
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