Attachment 179512 Details for Bug 204340 – add svcpool_close so that svcpool_destroy doesn't get called when nfsd threads are killed

[patch] add svcpool_close so that svcpool_destroy doesn't get called when nfsd threads are killed

svccrash.patch (text/plain), 2.95 KB, created by Rick Macklem on 2017-02-02 01:45:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rick Macklem

Created: 2017-02-02 01:45:10 UTC

Size: 2.95 KB

patch

obsolete

>--- rpc/svc.h.sav	2017-02-01 11:36:04.253254000 -0500
>+++ rpc/svc.h	2017-02-01 11:38:06.692413000 -0500
>@@ -729,6 +729,12 @@ extern SVCPOOL* svcpool_create(const cha
> extern void svcpool_destroy(SVCPOOL *pool);
> 
> /*
>+ * Close a service pool.  Similar to svcpool_destroy(), but it does not
>+ * free the data structures.  As such, the pool can be used again.
>+ */
>+extern void svcpool_close(SVCPOOL *pool);
>+
>+/*
>  * Transport independent svc_create routine.
>  */
> extern int svc_create(SVCPOOL *, void (*)(struct svc_req *, SVCXPRT *),
>--- rpc/svc.c.sav	2017-02-01 11:27:07.665884000 -0500
>+++ rpc/svc.c	2017-02-01 12:10:32.711438000 -0500
>@@ -226,6 +226,58 @@ svcpool_destroy(SVCPOOL *pool)
> }
> 
> /*
>+ * Similar to svcpool_destroy(), except that it does not destroy the actual
>+ * data structures.  As such, "pool" may be used again.
>+ */
>+void
>+svcpool_close(SVCPOOL *pool)
>+{
>+	SVCGROUP *grp;
>+	SVCXPRT *xprt, *nxprt;
>+	struct svc_callout *s;
>+	struct svc_loss_callout *sl;
>+	struct svcxprt_list cleanup;
>+	int g;
>+
>+	TAILQ_INIT(&cleanup);
>+
>+	for (g = 0; g < SVC_MAXGROUPS; g++) {
>+		grp = &pool->sp_groups[g];
>+		mtx_lock(&grp->sg_lock);
>+		while ((xprt = TAILQ_FIRST(&grp->sg_xlist)) != NULL) {
>+			xprt_unregister_locked(xprt);
>+			TAILQ_INSERT_TAIL(&cleanup, xprt, xp_link);
>+		}
>+		mtx_unlock(&grp->sg_lock);
>+	}
>+	TAILQ_FOREACH_SAFE(xprt, &cleanup, xp_link, nxprt) {
>+		SVC_RELEASE(xprt);
>+	}
>+
>+	mtx_lock(&pool->sp_lock);
>+	while ((s = TAILQ_FIRST(&pool->sp_callouts)) != NULL) {
>+		mtx_unlock(&pool->sp_lock);
>+		svc_unreg(pool, s->sc_prog, s->sc_vers);
>+		mtx_lock(&pool->sp_lock);
>+	}
>+	while ((sl = TAILQ_FIRST(&pool->sp_lcallouts)) != NULL) {
>+		mtx_unlock(&pool->sp_lock);
>+		svc_loss_unreg(pool, sl->slc_dispatch);
>+		mtx_lock(&pool->sp_lock);
>+	}
>+
>+	/* Now, initialize the pool's state for a fresh svc_run() call. */
>+	pool->sp_state = SVCPOOL_INIT;
>+	mtx_unlock(&pool->sp_lock);
>+	for (g = 0; g < SVC_MAXGROUPS; g++) {
>+		grp = &pool->sp_groups[g];
>+		mtx_lock(&grp->sg_lock);
>+		grp->sg_state = SVCPOOL_ACTIVE;
>+		mtx_unlock(&grp->sg_lock);
>+	}
>+}
>+
>+/*
>  * Sysctl handler to get the present thread count on a pool
>  */
> static int
>--- fs/nfsserver/nfs_nfsdkrpc.c.sav	2017-02-01 10:07:47.961431000 -0500
>+++ fs/nfsserver/nfs_nfsdkrpc.c	2017-02-01 11:40:01.541209000 -0500
>@@ -551,18 +551,16 @@ nfsrvd_init(int terminating)
> 		nfsd_master_proc = NULL;
> 		NFSD_UNLOCK();
> 		nfsrv_freeallbackchannel_xprts();
>-		svcpool_destroy(nfsrvd_pool);
>-		nfsrvd_pool = NULL;
>+		svcpool_close(nfsrvd_pool);
>+		NFSD_LOCK();
>+	} else {
>+		NFSD_UNLOCK();
>+		nfsrvd_pool = svcpool_create("nfsd",
>+		    SYSCTL_STATIC_CHILDREN(_vfs_nfsd));
>+		nfsrvd_pool->sp_rcache = NULL;
>+		nfsrvd_pool->sp_assign = fhanew_assign;
>+		nfsrvd_pool->sp_done = fha_nd_complete;
> 		NFSD_LOCK();
> 	}
>-
>-	NFSD_UNLOCK();
>-
>-	nfsrvd_pool = svcpool_create("nfsd", SYSCTL_STATIC_CHILDREN(_vfs_nfsd));
>-	nfsrvd_pool->sp_rcache = NULL;
>-	nfsrvd_pool->sp_assign = fhanew_assign;
>-	nfsrvd_pool->sp_done = fha_nd_complete;
>-
>-	NFSD_LOCK();
> }
>

Actions: View | Diff

Attachments on bug 204340: 163160 | 163217 | 163299 | 163300 | 179512 | 179661