Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37e14f4f authored by Sowmini Varadhan's avatar Sowmini Varadhan Committed by David S. Miller
Browse files

RDS: TCP: rds_tcp_accept_worker() must exit gracefully when terminating rds-tcp 



There are two instances where we want to terminate RDS-TCP: when
exiting the netns or during module unload. In either case, the
termination sequence is to stop the listen socket, mark the
rtn->rds_tcp_listen_sock as null, and flush any accept workqs.
Thus any workqs that get flushed at this point will encounter a
null rds_tcp_listen_sock, and must exit gracefully to allow
the RDS-TCP termination to complete successfully.

Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc64869c

net/rds/tcp_listen.c

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ int rds_tcp_accept_one(struct socket *sock) 
	int conn_state;

	struct sock *nsk;



	if (!sock) /* module unload or netns delete in progress */

		return -ENETUNREACH;



	ret = sock_create_kern(sock_net(sock->sk), sock->sk->sk_family,

			       sock->sk->sk_type, sock->sk->sk_protocol,

			       &new_sock);