The branch main has been updated by glebius:
URL:
https://cgit.FreeBSD.org/src/commit/?id=74703901d8bbc3bc7a29df648bc3c131c87393c2
commit 74703901d8bbc3bc7a29df648bc3c131c87393c2
Author: Gleb Smirnoff <gleb...@freebsd.org>
AuthorDate: 2022-07-04 19:40:51 +0000
Commit: Gleb Smirnoff <gleb...@freebsd.org>
CommitDate: 2022-07-04 19:40:51 +0000
tcp: use a TCP flag to check if connection has been close(2)d
The flag SS_NOFDREF is a private flag of the socket layer. It also
is supposed to be read with SOCK_LOCK(), which we don't own here.
Reviewed by: rrs, tuexen
Differential revision: https://reviews.freebsd.org/D35663
---
sys/netinet/tcp_input.c | 3 +--
sys/netinet/tcp_stacks/bbr.c | 54 ++++++++++++++++---------------------------
sys/netinet/tcp_stacks/rack.c | 29 ++++++++++-------------
sys/netinet/tcp_usrreq.c | 1 +
sys/netinet/tcp_var.h | 2 +-
5 files changed, 35 insertions(+), 54 deletions(-)
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index a51e62616bea..f2d4f56ac582 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -2315,8 +2315,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct
socket *so,
* If new data are received on a connection after the
* user processes are gone, then RST the other end.
*/
- if ((so->so_state & SS_NOFDREF) &&
- tp->t_state > TCPS_CLOSE_WAIT && tlen) {
+ if ((tp->t_flags & TF_CLOSED) && tlen) {
if ((s = tcp_log_addrs(inc, th, NULL, NULL))) {
log(LOG_DEBUG, "%s; %s: %s: Received %d bytes of data "
"after socket was closed, "
diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c
index 67d0b7a5c64c..6278bb228c4f 100644
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -9493,15 +9493,12 @@ bbr_do_fin_wait_1(struct mbuf *m, struct tcphdr *th,
struct socket *so,
/*
* If new data are received on a connection after the user processes
* are gone, then RST the other end.
+ * We call a new function now so we might continue and setup
+ * to reset at all data being ack'd.
*/
- if ((so->so_state & SS_NOFDREF) && tlen) {
- /*
- * We call a new function now so we might continue and setup
- * to reset at all data being ack'd.
- */
- if (bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
- return (1);
- }
+ if ((tp->t_flags & TF_CLOSED) && tlen &&
+ bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
+ return (1);
/*
* If last ACK falls within this segment's sequence numbers, record
* its timestamp. NOTE: 1) That the test incorporates suggestions
@@ -9620,15 +9617,12 @@ bbr_do_closing(struct mbuf *m, struct tcphdr *th,
struct socket *so,
/*
* If new data are received on a connection after the user processes
* are gone, then RST the other end.
+ * We call a new function now so we might continue and setup
+ * to reset at all data being ack'd.
*/
- if ((so->so_state & SS_NOFDREF) && tlen) {
- /*
- * We call a new function now so we might continue and setup
- * to reset at all data being ack'd.
- */
- if (bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
- return (1);
- }
+ if ((tp->t_flags & TF_CLOSED) && tlen &&
+ bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
+ return (1);
/*
* If last ACK falls within this segment's sequence numbers, record
* its timestamp. NOTE: 1) That the test incorporates suggestions
@@ -9733,15 +9727,12 @@ bbr_do_lastack(struct mbuf *m, struct tcphdr *th,
struct socket *so,
/*
* If new data are received on a connection after the user processes
* are gone, then RST the other end.
+ * We call a new function now so we might continue and setup
+ * to reset at all data being ack'd.
*/
- if ((so->so_state & SS_NOFDREF) && tlen) {
- /*
- * We call a new function now so we might continue and setup
- * to reset at all data being ack'd.
- */
- if (bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
- return (1);
- }
+ if ((tp->t_flags & TF_CLOSED) && tlen &&
+ bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
+ return (1);
/*
* If last ACK falls within this segment's sequence numbers, record
* its timestamp. NOTE: 1) That the test incorporates suggestions
@@ -9850,17 +9841,12 @@ bbr_do_fin_wait_2(struct mbuf *m, struct tcphdr *th,
struct socket *so,
* If new data are received on a connection after the user processes
* are gone, then we may RST the other end depending on the outcome
* of bbr_check_data_after_close.
+ * We call a new function now so we might continue and setup
+ * to reset at all data being ack'd.
*/
- if ((so->so_state & SS_NOFDREF) &&
- tlen) {
- /*
- * We call a new function now so we might continue and setup
- * to reset at all data being ack'd.
- */
- if (bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
- return (1);
- }
- INP_WLOCK_ASSERT(tp->t_inpcb);
+ if (tp->t_state > TCPS_CLOSE_WAIT && tlen &&
+ bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
+ return (1);
/*
* If last ACK falls within this segment's sequence numbers, record
* its timestamp. NOTE: 1) That the test incorporates suggestions
diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
index 3b40138d0fd5..ff43fbd02de2 100644
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -11855,10 +11855,9 @@ rack_do_fin_wait_1(struct mbuf *m, struct tcphdr *th,
struct socket *so,
* If new data are received on a connection after the user processes
* are gone, then RST the other end.
*/
- if ((so->so_state & SS_NOFDREF) && tlen) {
- if (rack_check_data_after_close(m, tp, &tlen, th, so))
- return (1);
- }
+ if ((tp->t_flags & TF_CLOSED) && tlen &&
+ rack_check_data_after_close(m, tp, &tlen, th, so))
+ return (1);
/*
* If last ACK falls within this segment's sequence numbers, record
* its timestamp. NOTE: 1) That the test incorporates suggestions
@@ -11983,10 +11982,9 @@ rack_do_closing(struct mbuf *m, struct tcphdr *th,
struct socket *so,
* If new data are received on a connection after the user processes
* are gone, then RST the other end.
*/
- if ((so->so_state & SS_NOFDREF) && tlen) {
- if (rack_check_data_after_close(m, tp, &tlen, th, so))
- return (1);
- }
+ if ((tp->t_flags & TF_CLOSED) && tlen &&
+ rack_check_data_after_close(m, tp, &tlen, th, so))
+ return (1);
/*
* If last ACK falls within this segment's sequence numbers, record
* its timestamp. NOTE: 1) That the test incorporates suggestions
@@ -12097,10 +12095,9 @@ rack_do_lastack(struct mbuf *m, struct tcphdr *th,
struct socket *so,
* If new data are received on a connection after the user processes
* are gone, then RST the other end.
*/
- if ((so->so_state & SS_NOFDREF) && tlen) {
- if (rack_check_data_after_close(m, tp, &tlen, th, so))
- return (1);
- }
+ if ((tp->t_flags & TF_CLOSED) && tlen &&
+ rack_check_data_after_close(m, tp, &tlen, th, so))
+ return (1);
/*
* If last ACK falls within this segment's sequence numbers, record
* its timestamp. NOTE: 1) That the test incorporates suggestions
@@ -12212,11 +12209,9 @@ rack_do_fin_wait_2(struct mbuf *m, struct tcphdr *th,
struct socket *so,
* If new data are received on a connection after the user processes
* are gone, then RST the other end.
*/
- if ((so->so_state & SS_NOFDREF) &&
- tlen) {
- if (rack_check_data_after_close(m, tp, &tlen, th, so))
- return (1);
- }
+ if ((tp->t_flags & TF_CLOSED) && tlen &&
+ rack_check_data_after_close(m, tp, &tlen, th, so))
+ return (1);
/*
* If last ACK falls within this segment's sequence numbers, record
* its timestamp. NOTE: 1) That the test incorporates suggestions
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index e05ef963375c..6e4171bd1264 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1406,6 +1406,7 @@ tcp_usr_close(struct socket *so)
if (!(inp->inp_flags & INP_TIMEWAIT) &&
!(inp->inp_flags & INP_DROPPED)) {
tp = intotcpcb(inp);
+ tp->t_flags |= TF_CLOSED;
TCPDEBUG1();
tcp_disconnect(tp);
TCPDEBUG2(PRU_CLOSE);
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index be9ff06f3a85..6d6c711f25b7 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -524,7 +524,7 @@ tcp_unlock_or_drop(struct tcpcb *tp, int tcp_output_retval)
#define TF_FORCEDATA 0x00800000 /* force out a byte */
#define TF_TSO 0x01000000 /* TSO enabled on this
connection */
#define TF_TOE 0x02000000 /* this connection is offloaded
*/
-#define TF_UNUSED0 0x04000000 /* unused */
+#define TF_CLOSED 0x04000000 /* close(2) called on socket */
#define TF_UNUSED1 0x08000000 /* unused */
#define TF_LRD 0x10000000 /* Lost Retransmission
Detection */
#define TF_CONGRECOVERY 0x20000000 /* congestion recovery mode */
