| Message ID | 73ccad462f8f54dfa9c71576c3f5d48ea2b1dc12.1463579486.git.sowmini.varadhan@oracle.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 5/18/2016 10:06 AM, Sowmini Varadhan wrote: > 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: Sowmini Varadhan <sowmini.varadhan@oracle.com> > --- > net/rds/tcp_listen.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c > index be263cd..e10b422 100644 > --- a/net/rds/tcp_listen.c > +++ b/net/rds/tcp_listen.c > @@ -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; > + New error code type in RDS but seems appropriate :-) Patch looks good to me. Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c index be263cd..e10b422 100644 --- a/net/rds/tcp_listen.c +++ b/net/rds/tcp_listen.c @@ -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);
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: Sowmini Varadhan <sowmini.varadhan@oracle.com> --- net/rds/tcp_listen.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)