Skip to contentSkip to conversation

RDS: TCP: rds_tcp_accept_one() should transition socket from RESETTING to UP

PATCH Applied Sowmini Varadhan 3 participants 3 messages Jun 17, 2016 – Jun 18, 2016

Subsystems (3)
Networking Network drivers RDS - reliable datagram sockets
lore
Share & tools
lore

Sowmini Varadhan

author
#0 lore raw

PATCH 1/1 RDS: TCP: rds_tcp_accept_one() should transition socket from RESETTING to UP

The state of the rds_connection after rds_tcp_reset_callbacks() would be RDS_CONN_RESETTING and this is the value that should be passed by rds_tcp_accept_one() to rds_connect_path_complete() to transition the socket to RDS_CONN_UP.

Fixes b5c21c0947c1 ("RDS: TCP: fix race windows in send-path quiescence

by rds_tcp_accept_one()")

Signed-off-by Sowmini Varadhan <[email protected]>
---
 net/rds/tcp_listen.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
net/rds/tcp_listen.c +1 -1
index 686b1d0..245542c 100644
@@ -138,7 +138,7 @@ int rds_tcp_accept_one(struct socket *sock)
 			rds_tcp_reset_callbacks(new_sock, conn);
 			conn->c_outgoing = 0;
 			/* rds_connect_path_complete() marks RDS_CONN_UP */
-			rds_connect_path_complete(conn, RDS_CONN_DISCONNECTING);
+			rds_connect_path_complete(conn, RDS_CONN_RESETTING);
 		}
 	} else {
 		rds_tcp_set_callbacks(new_sock, conn);
Signature · 1 line
1.7.1
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Sowmini Varadhan

The state of the rds_connection after rds_tcp_reset_callbacks() would be RDS_CONN_RESETTING and this is the value that should be passed by rds_tcp_accept_one() to rds_connect_path_complete() to transition the socket to RDS_CONN_UP.

Fixes b5c21c0947c1 ("RDS: TCP: fix race windows in send-path quiescence

by rds_tcp_accept_one()")

Signed-off-by Sowmini Varadhan <[email protected]>

---

Acked-by Santosh Shilimkar <[email protected]>
maintainer Applied
#2 lore raw
In reply to Sowmini Varadhan

From: Sowmini Varadhan <[email protected]>
Date: Fri, 17 Jun 2016 16:12:12 -0400

Quoted 8 lines

The state of the rds_connection after rds_tcp_reset_callbacks() would be RDS_CONN_RESETTING and this is the value that should be passed by rds_tcp_accept_one() to rds_connect_path_complete() to transition the socket to RDS_CONN_UP.

Fixes b5c21c0947c1 ("RDS: TCP: fix race windows in send-path quiescence

by rds_tcp_accept_one()")

Signed-off-by Sowmini Varadhan <[email protected]>

Applied.