mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

svcrpc: fix xpt_list traversal locking on shutdown

Browse source 
Server threads are not running at this point, but svc_age_temp_xprts
still may be, so we need this locking.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2012-08-13 17:03:00 -04:00
parent 21179d81f1
commit 719f8bcc88
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
net/sunrpc/svc_xprt.c
View file

@ -917,16 +917,18 @@ void svc_close_xprt(struct svc_xprt *xprt)
} }
EXPORT_SYMBOL_GPL(svc_close_xprt); EXPORT_SYMBOL_GPL(svc_close_xprt);
static void svc_close_list(struct list_head *xprt_list, struct net *net) static void svc_close_list(struct svc_serv *serv, struct list_head *xprt_list, struct net *net)
{ {
struct svc_xprt *xprt; struct svc_xprt *xprt;
spin_lock(&serv->sv_lock);
list_for_each_entry(xprt, xprt_list, xpt_list) { list_for_each_entry(xprt, xprt_list, xpt_list) {
if (xprt->xpt_net != net) if (xprt->xpt_net != net)
continue; continue;
set_bit(XPT_CLOSE, &xprt->xpt_flags); set_bit(XPT_CLOSE, &xprt->xpt_flags);
set_bit(XPT_BUSY, &xprt->xpt_flags); set_bit(XPT_BUSY, &xprt->xpt_flags);
} }
spin_unlock(&serv->sv_lock);
} }
static void svc_clear_pools(struct svc_serv *serv, struct net *net) static void svc_clear_pools(struct svc_serv *serv, struct net *net)
@ -949,24 +951,28 @@ static void svc_clear_pools(struct svc_serv *serv, struct net *net)
} }
} }
static void svc_clear_list(struct list_head *xprt_list, struct net *net) static void svc_clear_list(struct svc_serv *serv, struct list_head *xprt_list, struct net *net)
{ {
struct svc_xprt *xprt; struct svc_xprt *xprt;
struct svc_xprt *tmp; struct svc_xprt *tmp;
LIST_HEAD(victims);
spin_lock(&serv->sv_lock);
list_for_each_entry_safe(xprt, tmp, xprt_list, xpt_list) { list_for_each_entry_safe(xprt, tmp, xprt_list, xpt_list) {
if (xprt->xpt_net != net) if (xprt->xpt_net != net)
continue; continue;
svc_delete_xprt(xprt); list_move(&xprt->xpt_list, &victims);
} }
list_for_each_entry(xprt, xprt_list, xpt_list) spin_unlock(&serv->sv_lock);
BUG_ON(xprt->xpt_net == net);
list_for_each_entry_safe(xprt, tmp, &victims, xpt_list)
svc_delete_xprt(xprt);
} }
void svc_close_net(struct svc_serv *serv, struct net *net) void svc_close_net(struct svc_serv *serv, struct net *net)
{ {
svc_close_list(&serv->sv_tempsocks, net); svc_close_list(serv, &serv->sv_tempsocks, net);
svc_close_list(&serv->sv_permsocks, net); svc_close_list(serv, &serv->sv_permsocks, net);
svc_clear_pools(serv, net); svc_clear_pools(serv, net);
/* /*
@ -974,8 +980,8 @@ void svc_close_net(struct svc_serv *serv, struct net *net)
* svc_xprt_enqueue will not add new entries without taking the * svc_xprt_enqueue will not add new entries without taking the
* sp_lock and checking XPT_BUSY. * sp_lock and checking XPT_BUSY.
*/ */
svc_clear_list(&serv->sv_tempsocks, net); svc_clear_list(serv, &serv->sv_tempsocks, net);
svc_clear_list(&serv->sv_permsocks, net); svc_clear_list(serv, &serv->sv_permsocks, net);
} }
/* /*