hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: add tcp_done_with_error() helper

Browse Source 
[ Upstream commit 5e514f1cba090e1c8fff03e92a175eccfe46305f ]

tcp_reset() ends with a sequence that is carefuly ordered.

We need to fix [e]poll bugs in the following patches,
it makes sense to use a common helper.

Suggested-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Link: https://lore.kernel.org/r/20240528125253.1966136-2-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 853c3bd7b791 ("tcp: fix race in tcp_write_err()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric Dumazet 2024-05-28 12:52:50 +00:00 committed by Greg Kroah-Hartman
parent a4391e546b
commit 11ba88ab2b
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/tcp.h
View File

@ -633,6 +633,7 @@ void tcp_skb_collapse_tstamp(struct sk_buff *skb,
/* tcp_input.c */ /* tcp_input.c */
void tcp_rearm_rto(struct sock *sk); void tcp_rearm_rto(struct sock *sk);
void tcp_synack_rtt_meas(struct sock *sk, struct request_sock *req); void tcp_synack_rtt_meas(struct sock *sk, struct request_sock *req);
void tcp_done_with_error(struct sock *sk, int err);
void tcp_reset(struct sock *sk, struct sk_buff *skb); void tcp_reset(struct sock *sk, struct sk_buff *skb);
void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp, struct sk_buff *skb); void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp, struct sk_buff *skb);
void tcp_fin(struct sock *sk); void tcp_fin(struct sock *sk);

2
net/ipv4/tcp.c
View File

@ -589,7 +589,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
*/ */
mask |= EPOLLOUT | EPOLLWRNORM; mask |= EPOLLOUT | EPOLLWRNORM;
} }
/* This barrier is coupled with smp_wmb() in tcp_reset() */ /* This barrier is coupled with smp_wmb() in tcp_done_with_error() */
smp_rmb(); smp_rmb();
if (READ_ONCE(sk->sk_err) || if (READ_ONCE(sk->sk_err) ||
!skb_queue_empty_lockless(&sk->sk_error_queue)) !skb_queue_empty_lockless(&sk->sk_error_queue))

32
net/ipv4/tcp_input.c
View File

@ -4356,9 +4356,26 @@ static inline bool tcp_sequence(const struct tcp_sock *tp, u32 seq, u32 end_seq)
!after(seq, tp->rcv_nxt + tcp_receive_window(tp)); !after(seq, tp->rcv_nxt + tcp_receive_window(tp));
} }
void tcp_done_with_error(struct sock *sk, int err)
{
/* This barrier is coupled with smp_rmb() in tcp_poll() */
WRITE_ONCE(sk->sk_err, err);
smp_wmb();
tcp_write_queue_purge(sk);
tcp_done(sk);
if (!sock_flag(sk, SOCK_DEAD))
sk_error_report(sk);
}
EXPORT_SYMBOL(tcp_done_with_error);
/* When we get a reset we do this. */ /* When we get a reset we do this. */
void tcp_reset(struct sock *sk, struct sk_buff *skb) void tcp_reset(struct sock *sk, struct sk_buff *skb)
{ {
int err;
trace_tcp_receive_reset(sk); trace_tcp_receive_reset(sk);
/* mptcp can't tell us to ignore reset pkts, /* mptcp can't tell us to ignore reset pkts,
@ -4370,24 +4387,17 @@ void tcp_reset(struct sock *sk, struct sk_buff *skb)
/* We want the right error as BSD sees it (and indeed as we do). */ /* We want the right error as BSD sees it (and indeed as we do). */
switch (sk->sk_state) { switch (sk->sk_state) {
case TCP_SYN_SENT: case TCP_SYN_SENT:
WRITE_ONCE(sk->sk_err, ECONNREFUSED); err = ECONNREFUSED;
break; break;
case TCP_CLOSE_WAIT: case TCP_CLOSE_WAIT:
WRITE_ONCE(sk->sk_err, EPIPE); err = EPIPE;
break; break;
case TCP_CLOSE: case TCP_CLOSE:
return; return;
default: default:
WRITE_ONCE(sk->sk_err, ECONNRESET); err = ECONNRESET;
} }
/* This barrier is coupled with smp_rmb() in tcp_poll() */ tcp_done_with_error(sk, err);
smp_wmb();
tcp_write_queue_purge(sk);
tcp_done(sk);
if (!sock_flag(sk, SOCK_DEAD))
sk_error_report(sk);
} }
/* /*