From: Stanislav Kinsbursky <skinsbursky@parallels.com>
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
devel@openvz.org
Subject: [PATCH 2/6] nfsd: swap fs root in NFSd kthreads
Date: Thu, 06 Dec 2012 18:34:47 +0300 [thread overview]
Message-ID: <20121206153447.30693.54128.stgit@localhost.localdomain> (raw)
In-Reply-To: <20121206153204.30693.11408.stgit@localhost.localdomain>
NFSd does lookup. Lookup is done starting from current->fs->root.
NFSd is a kthread, cloned by kthreadd, and thus have global (but luckely
unshared) root.
So we have to swap root to those, which process, started NFSd, has. Because
that process can be in a container with it's own root.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
fs/nfsd/netns.h | 1 +
fs/nfsd/nfssvc.c | 33 ++++++++++++++++++++++++++++++++-
2 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index abfc97c..5c423c6 100644
--- a/fs/nfsd/netns.h
+++ b/fs/nfsd/netns.h
@@ -101,6 +101,7 @@ struct nfsd_net {
struct timeval nfssvc_boot;
struct svc_serv *nfsd_serv;
+ struct path root;
};
extern int nfsd_net_id;
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index cee62ab..177bb60 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -392,6 +392,7 @@ int nfsd_create_serv(struct net *net)
set_max_drc();
do_gettimeofday(&nn->nfssvc_boot); /* record boot time */
+ get_fs_root(current->fs, &nn->root);
return 0;
}
@@ -426,8 +427,10 @@ void nfsd_destroy(struct net *net)
if (destroy)
svc_shutdown_net(nn->nfsd_serv, net);
svc_destroy(nn->nfsd_serv);
- if (destroy)
+ if (destroy) {
+ path_put(&nn->root);
nn->nfsd_serv = NULL;
+ }
}
int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)
@@ -533,6 +536,25 @@ out:
return error;
}
+/*
+ * This function is actually slightly modified set_fs_root()<F9>
+ */
+static void nfsd_swap_root(struct net *net)
+{
+ struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+ struct fs_struct *fs = current->fs;
+ struct path old_root;
+
+ path_get(&nn->root);
+ spin_lock(&fs->lock);
+ write_seqcount_begin(&fs->seq);
+ old_root = fs->root;
+ fs->root = nn->root;
+ write_seqcount_end(&fs->seq);
+ spin_unlock(&fs->lock);
+ if (old_root.dentry)
+ path_put(&old_root);
+}
/*
* This is the NFS server kernel thread
@@ -559,6 +581,15 @@ nfsd(void *vrqstp)
current->fs->umask = 0;
/*
+ * We have to swap NFSd kthread's fs->root.
+ * Why so? Because NFSd can be started in container, which has it's own
+ * root.
+ * And so what? NFSd lookup files, and lookup start from
+ * current->fs->root.
+ */
+ nfsd_swap_root(net);
+
+ /*
* thread is spawned with all signals set to SIG_IGN, re-enable
* the ones that will bring down the thread
*/
next prev parent reply other threads:[~2012-12-06 15:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-06 15:34 [PATCH 0/6] nfsd: make is works in a container Stanislav Kinsbursky
2012-12-06 15:34 ` [PATCH 1/6] nfsd: pass proper net to nfsd_destroy() from NFSd kthreads Stanislav Kinsbursky
2012-12-06 15:34 ` Stanislav Kinsbursky [this message]
2012-12-10 20:28 ` [PATCH 2/6] nfsd: swap fs root in " J. Bruce Fields
2012-12-11 14:00 ` Stanislav Kinsbursky
2012-12-11 14:12 ` [Devel] " Stanislav Kinsbursky
2012-12-11 14:51 ` Stanislav Kinsbursky
2012-12-11 14:56 ` J. Bruce Fields
2012-12-11 14:58 ` Al Viro
2012-12-11 15:07 ` Stanislav Kinsbursky
2012-12-11 15:20 ` J. Bruce Fields
2012-12-11 15:35 ` J. Bruce Fields
2012-12-12 7:45 ` Stanislav Kinsbursky
2013-01-11 14:56 ` Stanislav Kinsbursky
2013-01-11 17:03 ` J. Bruce Fields
2013-01-11 17:20 ` J. Bruce Fields
2013-01-14 6:17 ` Stanislav Kinsbursky
2013-01-14 6:08 ` Stanislav Kinsbursky
2012-12-11 14:54 ` Al Viro
2012-12-11 14:57 ` Stanislav Kinsbursky
2012-12-06 15:34 ` [PATCH 3/6] nfsd: make containerise NFSd filesystem Stanislav Kinsbursky
2012-12-06 15:34 ` [PATCH 4/6] nfsd: use proper net while reading "exports" file Stanislav Kinsbursky
2012-12-06 15:35 ` [PATCH 5/6] nfsd: disable usermode helper client tracker in container Stanislav Kinsbursky
2012-12-06 15:35 ` [PATCH 6/6] nfsd: enable NFSv4 state in containers Stanislav Kinsbursky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121206153447.30693.54128.stgit@localhost.localdomain \
--to=skinsbursky@parallels.com \
--cc=bfields@fieldses.org \
--cc=devel@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).