[kernel/f17] Add patches to fix NFS shutdown panic (rhbz 830862)
Josh Boyer
jwboyer at fedoraproject.org
Wed Jun 13 20:01:26 UTC 2012
commit 1b96ab66be2fedb661ca58c7e41f6fafab79f9ab
Author: Josh Boyer <jwboyer at redhat.com>
Date: Wed Jun 13 16:00:23 2012 -0400
Add patches to fix NFS shutdown panic (rhbz 830862)
...-move-per-net-operations-from-svc_destroy.patch | 327 ++++++++++++++++++++
SUNRPC-new-svc_bind-routine-introduced.patch | 249 +++++++++++++++
kernel.spec | 13 +-
3 files changed, 588 insertions(+), 1 deletions(-)
---
diff --git a/SUNRPC-move-per-net-operations-from-svc_destroy.patch b/SUNRPC-move-per-net-operations-from-svc_destroy.patch
new file mode 100644
index 0000000..1895b5b
--- /dev/null
+++ b/SUNRPC-move-per-net-operations-from-svc_destroy.patch
@@ -0,0 +1,327 @@
+Path: news.gmane.org!not-for-mail
+From: Stanislav Kinsbursky <skinsbursky at parallels.com>
+Newsgroups: gmane.linux.kernel,gmane.linux.nfs,gmane.linux.openvz.devel
+Subject: [PATCH 2/2] SUNRPC: move per-net operations from svc_destroy()
+Date: Fri, 01 Jun 2012 15:17:50 +0400
+Lines: 281
+Approved: news at gmane.org
+Message-ID: <20120601111750.7846.23782.stgit at localhost.localdomain>
+References: <20120601111619.7846.95457.stgit at localhost.localdomain>
+NNTP-Posting-Host: plane.gmane.org
+Mime-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 7bit
+X-Trace: dough.gmane.org 1338549639 9108 80.91.229.3 (1 Jun 2012 11:20:39 GMT)
+X-Complaints-To: usenet at dough.gmane.org
+NNTP-Posting-Date: Fri, 1 Jun 2012 11:20:39 +0000 (UTC)
+Cc: linux-nfs at vger.kernel.org, linux-kernel at vger.kernel.org,
+ devel at openvz.org
+To: bfields at fieldses.org, Trond.Myklebust at netapp.com
+Original-X-From: linux-kernel-owner at vger.kernel.org Fri Jun 01 13:20:37 2012
+Return-path: <linux-kernel-owner at vger.kernel.org>
+Envelope-to: glk-linux-kernel-3 at plane.gmane.org
+Original-Received: from vger.kernel.org ([209.132.180.67])
+ by plane.gmane.org with esmtp (Exim 4.69)
+ (envelope-from <linux-kernel-owner at vger.kernel.org>)
+ id 1SaPuE-0002JL-ED
+ for glk-linux-kernel-3 at plane.gmane.org; Fri, 01 Jun 2012 13:20:34 +0200
+Original-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
+ id S1759489Ab2FALUJ (ORCPT <rfc822;glk-linux-kernel-3 at m.gmane.org>);
+ Fri, 1 Jun 2012 07:20:09 -0400
+Original-Received: from mailhub.sw.ru ([195.214.232.25]:7947 "EHLO relay.sw.ru"
+ rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
+ id S1759474Ab2FALUE (ORCPT <rfc822;linux-kernel at vger.kernel.org>);
+ Fri, 1 Jun 2012 07:20:04 -0400
+Original-Received: from localhost.localdomain ([10.30.21.131])
+ by relay.sw.ru (8.13.4/8.13.4) with ESMTP id q51BJrkd020556;
+ Fri, 1 Jun 2012 15:19:54 +0400 (MSK)
+In-Reply-To: <20120601111619.7846.95457.stgit at localhost.localdomain>
+User-Agent: StGit/0.16
+Original-Sender: linux-kernel-owner at vger.kernel.org
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: linux-kernel at vger.kernel.org
+Xref: news.gmane.org gmane.linux.kernel:1306567 gmane.linux.nfs:50236 gmane.linux.openvz.devel:1597
+Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1306567>
+
+This patch was back-ported from 3.5 kernel.
+
+The idea is to separate service destruction and per-net operations, because
+these are two different things and it's mix looks ugly.
+
+Notes:
+1) For NFS server this patch looks ugly (sorry for that). But these place will
+be
+rewritten soon during NFSd containerization.
+2) LockD per-net counter increase int lockd_up() was moved prior to
+make_socks() to make lockd_down_net() call safe in case of error.
+
+Signed-off-by: Stanislav Kinsbursky <skinsbursky at parallels.com>
+---
+ fs/lockd/svc.c | 27 +++++++++++++++------------
+ fs/nfs/callback.c | 3 +++
+ fs/nfsd/nfsctl.c | 12 +++++++++---
+ fs/nfsd/nfssvc.c | 14 ++++++++++++++
+ net/sunrpc/svc.c | 4 ----
+ 5 files changed, 41 insertions(+), 19 deletions(-)
+
+diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
+index b1d0708..f1b3cce 100644
+--- a/fs/lockd/svc.c
++++ b/fs/lockd/svc.c
+@@ -257,7 +257,7 @@ static int lockd_up_net(struct net *net)
+ struct svc_serv *serv = nlmsvc_rqst->rq_server;
+ int error;
+
+- if (ln->nlmsvc_users)
++ if (ln->nlmsvc_users++)
+ return 0;
+
+ error = svc_rpcb_setup(serv, net);
+@@ -272,6 +272,7 @@ static int lockd_up_net(struct net *net)
+ err_socks:
+ svc_rpcb_cleanup(serv, net);
+ err_rpcb:
++ ln->nlmsvc_users--;
+ return error;
+ }
+
+@@ -300,6 +301,7 @@ int lockd_up(void)
+ struct svc_serv *serv;
+ int error = 0;
+ struct net *net = current->nsproxy->net_ns;
++ struct lockd_net *ln = net_generic(net, lockd_net_id);
+
+ mutex_lock(&nlmsvc_mutex);
+ /*
+@@ -331,9 +333,11 @@ int lockd_up(void)
+ goto destroy_and_out;
+ }
+
++ ln->nlmsvc_users++;
++
+ error = make_socks(serv, net);
+ if (error < 0)
+- goto destroy_and_out;
++ goto err_start;
+
+ /*
+ * Create the kernel thread and wait for it to start.
+@@ -345,7 +349,7 @@ int lockd_up(void)
+ printk(KERN_WARNING
+ "lockd_up: svc_rqst allocation failed, error=%d\n",
+ error);
+- goto destroy_and_out;
++ goto err_start;
+ }
+
+ svc_sock_update_bufs(serv);
+@@ -359,7 +363,7 @@ int lockd_up(void)
+ nlmsvc_rqst = NULL;
+ printk(KERN_WARNING
+ "lockd_up: kthread_run failed, error=%d\n", error);
+- goto destroy_and_out;
++ goto err_start;
+ }
+
+ /*
+@@ -369,14 +373,14 @@ int lockd_up(void)
+ destroy_and_out:
+ svc_destroy(serv);
+ out:
+- if (!error) {
+- struct lockd_net *ln = net_generic(net, lockd_net_id);
+-
+- ln->nlmsvc_users++;
++ if (!error)
+ nlmsvc_users++;
+- }
+ mutex_unlock(&nlmsvc_mutex);
+ return error;
++
++err_start:
++ lockd_down_net(net);
++ goto destroy_and_out;
+ }
+ EXPORT_SYMBOL_GPL(lockd_up);
+
+@@ -387,11 +391,10 @@ void
+ lockd_down(void)
+ {
+ mutex_lock(&nlmsvc_mutex);
++ lockd_down_net(current->nsproxy->net_ns);
+ if (nlmsvc_users) {
+- if (--nlmsvc_users) {
+- lockd_down_net(current->nsproxy->net_ns);
++ if (--nlmsvc_users)
+ goto out;
+- }
+ } else {
+ printk(KERN_ERR "lockd_down: no users! task=%p\n",
+ nlmsvc_task);
+diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
+index 0563237..38a44c6 100644
+--- a/fs/nfs/callback.c
++++ b/fs/nfs/callback.c
+@@ -313,6 +313,8 @@ out_err:
+ dprintk("NFS: Couldn't create callback socket or server thread; "
+ "err = %d\n", ret);
+ cb_info->users--;
++ if (serv)
++ svc_shutdown_net(serv, net);
+ goto out;
+ }
+
+@@ -327,6 +329,7 @@ void nfs_callback_down(int minorversion)
+ cb_info->users--;
+ if (cb_info->users == 0 && cb_info->task != NULL) {
+ kthread_stop(cb_info->task);
++ svc_shutdown_net(cb_info->serv, &init_net);
+ svc_exit_thread(cb_info->rqst);
+ cb_info->serv = NULL;
+ cb_info->rqst = NULL;
+diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
+index 2c53be6..3ab12eb 100644
+--- a/fs/nfsd/nfsctl.c
++++ b/fs/nfsd/nfsctl.c
+@@ -651,6 +651,7 @@ static ssize_t __write_ports_addfd(char *buf)
+ {
+ char *mesg = buf;
+ int fd, err;
++ struct net *net = &init_net;
+
+ err = get_int(&mesg, &fd);
+ if (err != 0 || fd < 0)
+@@ -662,6 +663,8 @@ static ssize_t __write_ports_addfd(char *buf)
+
+ err = svc_addsock(nfsd_serv, fd, buf, SIMPLE_TRANSACTION_LIMIT);
+ if (err < 0) {
++ if (nfsd_serv->sv_nrthreads == 1)
++ svc_shutdown_net(nfsd_serv, net);
+ svc_destroy(nfsd_serv);
+ return err;
+ }
+@@ -699,6 +702,7 @@ static ssize_t __write_ports_addxprt(char *buf)
+ char transport[16];
+ struct svc_xprt *xprt;
+ int port, err;
++ struct net *net = &init_net;
+
+ if (sscanf(buf, "%15s %4u", transport, &port) != 2)
+ return -EINVAL;
+@@ -710,12 +714,12 @@ static ssize_t __write_ports_addxprt(char *buf)
+ if (err != 0)
+ return err;
+
+- err = svc_create_xprt(nfsd_serv, transport, &init_net,
++ err = svc_create_xprt(nfsd_serv, transport, net,
+ PF_INET, port, SVC_SOCK_ANONYMOUS);
+ if (err < 0)
+ goto out_err;
+
+- err = svc_create_xprt(nfsd_serv, transport, &init_net,
++ err = svc_create_xprt(nfsd_serv, transport, net,
+ PF_INET6, port, SVC_SOCK_ANONYMOUS);
+ if (err < 0 && err != -EAFNOSUPPORT)
+ goto out_close;
+@@ -724,12 +728,14 @@ static ssize_t __write_ports_addxprt(char *buf)
+ nfsd_serv->sv_nrthreads--;
+ return 0;
+ out_close:
+- xprt = svc_find_xprt(nfsd_serv, transport, &init_net, PF_INET, port);
++ xprt = svc_find_xprt(nfsd_serv, transport, net, PF_INET, port);
+ if (xprt != NULL) {
+ svc_close_xprt(xprt);
+ svc_xprt_put(xprt);
+ }
+ out_err:
++ if (nfsd_serv->sv_nrthreads == 1)
++ svc_shutdown_net(nfsd_serv, net);
+ svc_destroy(nfsd_serv);
+ return err;
+ }
+diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
+index a6461f3..da50e1c 100644
+--- a/fs/nfsd/nfssvc.c
++++ b/fs/nfsd/nfssvc.c
+@@ -382,6 +382,7 @@ int nfsd_set_nrthreads(int n, int *nthreads)
+ int i = 0;
+ int tot = 0;
+ int err = 0;
++ struct net *net = &init_net;
+
+ WARN_ON(!mutex_is_locked(&nfsd_mutex));
+
+@@ -426,6 +427,9 @@ int nfsd_set_nrthreads(int n, int *nthreads)
+ if (err)
+ break;
+ }
++
++ if (nfsd_serv->sv_nrthreads == 1)
++ svc_shutdown_net(nfsd_serv, net);
+ svc_destroy(nfsd_serv);
+
+ return err;
+@@ -441,6 +445,7 @@ nfsd_svc(unsigned short port, int nrservs)
+ {
+ int error;
+ bool nfsd_up_before;
++ struct net *net = &init_net;
+
+ mutex_lock(&nfsd_mutex);
+ dprintk("nfsd: creating service\n");
+@@ -473,6 +478,8 @@ out_shutdown:
+ if (error < 0 && !nfsd_up_before)
+ nfsd_shutdown();
+ out_destroy:
++ if (nfsd_serv->sv_nrthreads == 1)
++ svc_shutdown_net(nfsd_serv, net);
+ svc_destroy(nfsd_serv); /* Release server */
+ out:
+ mutex_unlock(&nfsd_mutex);
+@@ -556,6 +563,9 @@ nfsd(void *vrqstp)
+ nfsdstats.th_cnt --;
+
+ out:
++ if (rqstp->rq_server->sv_nrthreads == 1)
++ svc_shutdown_net(rqstp->rq_server, &init_net);
++
+ /* Release the thread */
+ svc_exit_thread(rqstp);
+
+@@ -668,8 +678,12 @@ int nfsd_pool_stats_open(struct inode *inode, struct file *file)
+ int nfsd_pool_stats_release(struct inode *inode, struct file *file)
+ {
+ int ret = seq_release(inode, file);
++ struct net *net = &init_net;
++
+ mutex_lock(&nfsd_mutex);
+ /* this function really, really should have been called svc_put() */
++ if (nfsd_serv->sv_nrthreads == 1)
++ svc_shutdown_net(nfsd_serv, net);
+ svc_destroy(nfsd_serv);
+ mutex_unlock(&nfsd_mutex);
+ return ret;
+diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
+index e6d542c..b7210f5 100644
+--- a/net/sunrpc/svc.c
++++ b/net/sunrpc/svc.c
+@@ -537,8 +537,6 @@ EXPORT_SYMBOL_GPL(svc_shutdown_net);
+ void
+ svc_destroy(struct svc_serv *serv)
+ {
+- struct net *net = current->nsproxy->net_ns;
+-
+ dprintk("svc: svc_destroy(%s, %d)\n",
+ serv->sv_program->pg_name,
+ serv->sv_nrthreads);
+@@ -553,8 +551,6 @@ svc_destroy(struct svc_serv *serv)
+
+ del_timer_sync(&serv->sv_temptimer);
+
+- svc_shutdown_net(serv, net);
+-
+ /*
+ * The last user is gone and thus all sockets have to be destroyed to
+ * the point. Check this.
+
diff --git a/SUNRPC-new-svc_bind-routine-introduced.patch b/SUNRPC-new-svc_bind-routine-introduced.patch
new file mode 100644
index 0000000..58127cc
--- /dev/null
+++ b/SUNRPC-new-svc_bind-routine-introduced.patch
@@ -0,0 +1,249 @@
+Path: news.gmane.org!not-for-mail
+From: Stanislav Kinsbursky <skinsbursky-bzQdu9zFT3WakBO8gow8eQ at public.gmane.org>
+Newsgroups: gmane.linux.nfs,gmane.linux.kernel,gmane.linux.openvz.devel
+Subject: [PATCH 1/2] SUNRPC: new svc_bind() routine introduced
+Date: Fri, 01 Jun 2012 15:17:42 +0400
+Lines: 203
+Approved: news at gmane.org
+Message-ID: <20120601111742.7846.99872.stgit at localhost.localdomain>
+References: <20120601111619.7846.95457.stgit at localhost.localdomain>
+NNTP-Posting-Host: plane.gmane.org
+Mime-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 7bit
+X-Trace: dough.gmane.org 1338549604 8815 80.91.229.3 (1 Jun 2012 11:20:04 GMT)
+X-Complaints-To: usenet at dough.gmane.org
+NNTP-Posting-Date: Fri, 1 Jun 2012 11:20:04 +0000 (UTC)
+Cc: linux-nfs-u79uwXL29TY76Z2rM5mHXA at public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA at public.gmane.org,
+ devel-GEFAQzZX7r8dnm+yROfE0A at public.gmane.org
+To: bfields-uC3wQj2KruNg9hUCZPvPmw at public.gmane.org, Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA at public.gmane.org
+Original-X-From: linux-nfs-owner-u79uwXL29TY76Z2rM5mHXA at public.gmane.org Fri Jun 01 13:20:02 2012
+Return-path: <linux-nfs-owner-u79uwXL29TY76Z2rM5mHXA at public.gmane.org>
+Envelope-to: glN-linux-nfs-wOFGN7rlS/M9smdsby/KFg at public.gmane.org
+Original-Received: from vger.kernel.org ([209.132.180.67])
+ by plane.gmane.org with esmtp (Exim 4.69)
+ (envelope-from <linux-nfs-owner-u79uwXL29TY76Z2rM5mHXA at public.gmane.org>)
+ id 1SaPtg-0001Xs-F8
+ for glN-linux-nfs-wOFGN7rlS/M9smdsby/KFg at public.gmane.org; Fri, 01 Jun 2012 13:20:00 +0200
+Original-Received: (majordomo-u79uwXL29TY76Z2rM5mHXA at public.gmane.org) by vger.kernel.org via listexpand
+ id S1759450Ab2FALT7 (ORCPT <rfc822;glN-linux-nfs at m.gmane.org>);
+ Fri, 1 Jun 2012 07:19:59 -0400
+Original-Received: from mailhub.sw.ru ([195.214.232.25]:20534 "EHLO relay.sw.ru"
+ rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
+ id S1759448Ab2FALT6 (ORCPT <rfc822;linux-nfs-u79uwXL29TY76Z2rM5mHXA at public.gmane.org>);
+ Fri, 1 Jun 2012 07:19:58 -0400
+Original-Received: from localhost.localdomain ([10.30.21.131])
+ by relay.sw.ru (8.13.4/8.13.4) with ESMTP id q51BJjDD010948;
+ Fri, 1 Jun 2012 15:19:46 +0400 (MSK)
+In-Reply-To: <20120601111619.7846.95457.stgit-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob at public.gmane.org>
+User-Agent: StGit/0.16
+Original-Sender: linux-nfs-owner-u79uwXL29TY76Z2rM5mHXA at public.gmane.org
+Precedence: bulk
+List-ID: <linux-nfs.vger.kernel.org>
+X-Mailing-List: linux-nfs-u79uwXL29TY76Z2rM5mHXA at public.gmane.org
+Xref: news.gmane.org gmane.linux.nfs:50234 gmane.linux.kernel:1306565 gmane.linux.openvz.devel:1595
+Archived-At: <http://permalink.gmane.org/gmane.linux.nfs/50234>
+
+This patch was back-ported from 3.5 kernel.
+
+New routine is responsible for service registration in specified network
+context.
+The idea is to separate service creation from per-net operations.
+Since registering service with svc_bind() can fail, then service will be
+destroyed and during destruction it will try to unregister itself from
+rpcbind. In this case unregister have to be skipped.
+
+Signed-off-by: Stanislav Kinsbursky <skinsbursky-bzQdu9zFT3WakBO8gow8eQ at public.gmane.org>
+---
+ fs/lockd/svc.c | 6 ++++++
+ fs/nfs/callback.c | 13 ++++++++++---
+ fs/nfsd/nfssvc.c | 9 +++++++++
+ include/linux/sunrpc/svc.h | 1 +
+ net/sunrpc/rpcb_clnt.c | 12 +++++++-----
+ net/sunrpc/svc.c | 19 ++++++++++---------
+ 6 files changed, 43 insertions(+), 17 deletions(-)
+
+diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
+index f49b9af..b1d0708 100644
+--- a/fs/lockd/svc.c
++++ b/fs/lockd/svc.c
+@@ -325,6 +325,12 @@ int lockd_up(void)
+ goto out;
+ }
+
++ error = svc_bind(serv, net);
++ if (error < 0) {
++ printk(KERN_WARNING "lockd_up: bind service failed\n");
++ goto destroy_and_out;
++ }
++
+ error = make_socks(serv, net);
+ if (error < 0)
+ goto destroy_and_out;
+diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
+index eb95f50..0563237 100644
+--- a/fs/nfs/callback.c
++++ b/fs/nfs/callback.c
+@@ -106,7 +106,7 @@ nfs4_callback_up(struct svc_serv *serv, struct rpc_xprt *xprt)
+ {
+ int ret;
+
+- ret = svc_create_xprt(serv, "tcp", xprt->xprt_net, PF_INET,
++ ret = svc_create_xprt(serv, "tcp", &init_net, PF_INET,
+ nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);
+ if (ret <= 0)
+ goto out_err;
+@@ -114,7 +114,7 @@ nfs4_callback_up(struct svc_serv *serv, struct rpc_xprt *xprt)
+ dprintk("NFS: Callback listener port = %u (af %u)\n",
+ nfs_callback_tcpport, PF_INET);
+
+- ret = svc_create_xprt(serv, "tcp", xprt->xprt_net, PF_INET6,
++ ret = svc_create_xprt(serv, "tcp", &init_net, PF_INET6,
+ nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);
+ if (ret > 0) {
+ nfs_callback_tcpport6 = ret;
+@@ -183,7 +183,7 @@ nfs41_callback_up(struct svc_serv *serv, struct rpc_xprt *xprt)
+ * fore channel connection.
+ * Returns the input port (0) and sets the svc_serv bc_xprt on success
+ */
+- ret = svc_create_xprt(serv, "tcp-bc", xprt->xprt_net, PF_INET, 0,
++ ret = svc_create_xprt(serv, "tcp-bc", &init_net, PF_INET, 0,
+ SVC_SOCK_ANONYMOUS);
+ if (ret < 0) {
+ rqstp = ERR_PTR(ret);
+@@ -253,6 +253,7 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
+ char svc_name[12];
+ int ret = 0;
+ int minorversion_setup;
++ struct net *net = &init_net;
+
+ mutex_lock(&nfs_callback_mutex);
+ if (cb_info->users++ || cb_info->task != NULL) {
+@@ -265,6 +266,12 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
+ goto out_err;
+ }
+
++ ret = svc_bind(serv, net);
++ if (ret < 0) {
++ printk(KERN_WARNING "NFS: bind callback service failed\n");
++ goto out_err;
++ }
++
+ minorversion_setup = nfs_minorversion_callback_svc_setup(minorversion,
+ serv, xprt, &rqstp, &callback_svc);
+ if (!minorversion_setup) {
+diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
+index 28dfad3..a6461f3 100644
+--- a/fs/nfsd/nfssvc.c
++++ b/fs/nfsd/nfssvc.c
+@@ -11,6 +11,7 @@
+ #include <linux/module.h>
+ #include <linux/fs_struct.h>
+ #include <linux/swap.h>
++#include <linux/nsproxy.h>
+
+ #include <linux/sunrpc/stats.h>
+ #include <linux/sunrpc/svcsock.h>
+@@ -330,6 +331,8 @@ static int nfsd_get_default_max_blksize(void)
+
+ int nfsd_create_serv(void)
+ {
++ int error;
++
+ WARN_ON(!mutex_is_locked(&nfsd_mutex));
+ if (nfsd_serv) {
+ svc_get(nfsd_serv);
+@@ -343,6 +346,12 @@ int nfsd_create_serv(void)
+ if (nfsd_serv == NULL)
+ return -ENOMEM;
+
++ error = svc_bind(nfsd_serv, current->nsproxy->net_ns);
++ if (error < 0) {
++ svc_destroy(nfsd_serv);
++ return error;
++ }
++
+ set_max_drc();
+ do_gettimeofday(&nfssvc_boot); /* record boot time */
+ return 0;
+diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
+index 51b29ac..2b43e02 100644
+--- a/include/linux/sunrpc/svc.h
++++ b/include/linux/sunrpc/svc.h
+@@ -416,6 +416,7 @@ struct svc_procedure {
+ */
+ int svc_rpcb_setup(struct svc_serv *serv, struct net *net);
+ void svc_rpcb_cleanup(struct svc_serv *serv, struct net *net);
++int svc_bind(struct svc_serv *serv, struct net *net);
+ struct svc_serv *svc_create(struct svc_program *, unsigned int,
+ void (*shutdown)(struct svc_serv *, struct net *net));
+ struct svc_rqst *svc_prepare_thread(struct svc_serv *serv,
+diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
+index 78ac39f..4c38b33 100644
+--- a/net/sunrpc/rpcb_clnt.c
++++ b/net/sunrpc/rpcb_clnt.c
+@@ -180,14 +180,16 @@ void rpcb_put_local(struct net *net)
+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ struct rpc_clnt *clnt = sn->rpcb_local_clnt;
+ struct rpc_clnt *clnt4 = sn->rpcb_local_clnt4;
+- int shutdown;
++ int shutdown = 0;
+
+ spin_lock(&sn->rpcb_clnt_lock);
+- if (--sn->rpcb_users == 0) {
+- sn->rpcb_local_clnt = NULL;
+- sn->rpcb_local_clnt4 = NULL;
++ if (sn->rpcb_users) {
++ if (--sn->rpcb_users == 0) {
++ sn->rpcb_local_clnt = NULL;
++ sn->rpcb_local_clnt4 = NULL;
++ }
++ shutdown = !sn->rpcb_users;
+ }
+- shutdown = !sn->rpcb_users;
+ spin_unlock(&sn->rpcb_clnt_lock);
+
+ if (shutdown) {
+diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
+index 4153846..e6d542c 100644
+--- a/net/sunrpc/svc.c
++++ b/net/sunrpc/svc.c
+@@ -407,6 +407,14 @@ static int svc_uses_rpcbind(struct svc_serv *serv)
+ return 0;
+ }
+
++int svc_bind(struct svc_serv *serv, struct net *net)
++{
++ if (!svc_uses_rpcbind(serv))
++ return 0;
++ return svc_rpcb_setup(serv, net);
++}
++EXPORT_SYMBOL_GPL(svc_bind);
++
+ /*
+ * Create an RPC service
+ */
+@@ -471,15 +479,8 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
+ spin_lock_init(&pool->sp_lock);
+ }
+
+- if (svc_uses_rpcbind(serv)) {
+- if (svc_rpcb_setup(serv, current->nsproxy->net_ns) < 0) {
+- kfree(serv->sv_pools);
+- kfree(serv);
+- return NULL;
+- }
+- if (!serv->sv_shutdown)
+- serv->sv_shutdown = svc_rpcb_cleanup;
+- }
++ if (svc_uses_rpcbind(serv) && (!serv->sv_shutdown))
++ serv->sv_shutdown = svc_rpcb_cleanup;
+
+ return serv;
+ }
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA at public.gmane.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+
diff --git a/kernel.spec b/kernel.spec
index e36b3eb..70c7faa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 3
+%global baserelease 4
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -776,6 +776,10 @@ Patch22022: thp-avoid-atomic64_read-in-pmd_read_atomic-for-32bit-PAE.patch
Patch22023: iwlwifi-disable-the-buggy-chain-extension-feature-in-HW.patch
Patch22024: iwlwifi-dont-mess-up-the-SCD-when-removing-a-key.patch
+#rhbz 830862
+Patch22030: SUNRPC-new-svc_bind-routine-introduced.patch
+Patch22031: SUNRPC-move-per-net-operations-from-svc_destroy.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1491,6 +1495,10 @@ ApplyPatch thp-avoid-atomic64_read-in-pmd_read_atomic-for-32bit-PAE.patch
ApplyPatch iwlwifi-disable-the-buggy-chain-extension-feature-in-HW.patch
ApplyPatch iwlwifi-dont-mess-up-the-SCD-when-removing-a-key.patch
+#rhbz 830862
+ApplyPatch SUNRPC-new-svc_bind-routine-introduced.patch
+ApplyPatch SUNRPC-move-per-net-operations-from-svc_destroy.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2345,6 +2353,9 @@ fi
# '-' | |
# '-'
%changelog
+* Wed Jun 13 2012 Josh Boyer <jwboyer at redhat.com>
+- Add patches to fix NFS shutdown panic (rhbz 830862)
+
* Tue Jun 12 2012 Dennis Gilmore <dennis at ausil.us>
- build in RTC modules on arm boards as the module gets loaded after the rtc is read
More information about the scm-commits
mailing list