Skip to content

Commit e6d85a7

Browse files
sowminivMukesh Kacker
authored andcommitted
RDS-TCP: Reset tcp callbacks if re-using an outgoing socket in rds_tcp_accept_one()
Orabug: 22012202 Backport of upstream commit 241b271 ("RDS-TCP: Reset tcp callbacks if re-using an outgoing socket in rds_tcp_accept_one()") Consider the following "duelling syn" sequence between two peers A and B: A B SYN1 --> <-- SYN2 SYN2ACK --> Note that the SYN/ACK has already been sent out by TCP before rds_tcp_accept_one() gets invoked as part of callbacks. If the inet_addr(A) is numerically less than inet_addr(B), the arbitration scheme in rds_tcp_accept_one() will prefer the TCP connection triggered by SYN1, and will send a CLOSE for the SYN2 (just after the SYN2ACK was sent). Since B also follows the same arbitration scheme, it will send the SYN-ACK for SYN1 that will set up a healthy ESTABLISHED connection on both sides. B will also get a CLOSE for SYN2, which should result in the cleanup of the TCP state machine for SYN2, but it should not trigger any stale RDS-TCP callbacks (such as ->writespace, ->state_change etc), that would disrupt the progress of the SYN2 based RDS-TCP connection. Thus the arbitration scheme in rds_tcp_accept_one() should restore rds_tcp callbacks for the winner before setting them up for the new accept socket, and also make sure that conn->c_outgoing is set to 0 so that we do not trigger any reconnect attempts on the passive side of the tcp socket in the future, in conformance with commit c82ac7e ("net/rds: RDS-TCP: only initiate reconnect attempt on outgoing TCP socket.") Signed-off-by: Sowmini Varadhan <[email protected]> Acked-by: Santosh Shilimkar <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 8a2c912 commit e6d85a7

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

net/rds/tcp_listen.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ int rds_tcp_accept_one(struct socket *sock)
124124
new_sock = NULL;
125125
ret = 0;
126126
goto out;
127+
} else if (rs_tcp->t_sock) {
128+
rds_tcp_restore_callbacks(rs_tcp->t_sock, rs_tcp);
129+
conn->c_outgoing = 0;
127130
}
128131

129132
rds_conn_transition(conn, RDS_CONN_DOWN, RDS_CONN_CONNECTING);

0 commit comments

Comments
 (0)