Commit 5e113224 authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields
Browse files

nfsd: nfsd_file cache entries should be per net namespace 



Ensure that we can safely clear out the file cache entries when the
nfs server is shut down on a container. Otherwise, the file cache
may end up pinning the mounts.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 2b86e3aa

fs/nfsd/export.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -240,7 +240,7 @@ static void expkey_flush(void) 
	 * destroyed while we're in the middle of flushing.

	 * destroyed while we're in the middle of flushing.

	 */

	 */

	mutex_lock(&nfsd_mutex);

	mutex_lock(&nfsd_mutex);

	nfsd_file_cache_purge();

	nfsd_file_cache_purge(current->nsproxy->net_ns);

	mutex_unlock(&nfsd_mutex);

	mutex_unlock(&nfsd_mutex);

}

}

fs/nfsd/filecache.c

+21 −12
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "vfs.h"

#include "vfs.h"

#include "nfsd.h"

#include "nfsd.h"

#include "nfsfh.h"

#include "nfsfh.h"

#include "netns.h"

#include "filecache.h"

#include "filecache.h"

#include "trace.h"

#include "trace.h"
@@ -167,7 +168,8 @@ nfsd_file_mark_find_or_create(struct nfsd_file *nf) 
}

}





static struct nfsd_file *

static struct nfsd_file *

nfsd_file_alloc(struct inode *inode, unsigned int may, unsigned int hashval)

nfsd_file_alloc(struct inode *inode, unsigned int may, unsigned int hashval,

		struct net *net)

{

{

	struct nfsd_file *nf;

	struct nfsd_file *nf;
@@ -177,6 +179,7 @@ nfsd_file_alloc(struct inode *inode, unsigned int may, unsigned int hashval) 
		INIT_LIST_HEAD(&nf->nf_lru);

		INIT_LIST_HEAD(&nf->nf_lru);

		nf->nf_file = NULL;

		nf->nf_file = NULL;

		nf->nf_cred = get_current_cred();

		nf->nf_cred = get_current_cred();

		nf->nf_net = net;

		nf->nf_flags = 0;

		nf->nf_flags = 0;

		nf->nf_inode = inode;

		nf->nf_inode = inode;

		nf->nf_hashval = hashval;

		nf->nf_hashval = hashval;
@@ -607,10 +610,11 @@ nfsd_file_cache_init(void) 
 * Note this can deadlock with nfsd_file_lru_cb.

 * Note this can deadlock with nfsd_file_lru_cb.

 */

 */

void

void

nfsd_file_cache_purge(void)

nfsd_file_cache_purge(struct net *net)

{

{

	unsigned int		i;

	unsigned int		i;

	struct nfsd_file	*nf;

	struct nfsd_file	*nf;

	struct hlist_node	*next;

	LIST_HEAD(dispose);

	LIST_HEAD(dispose);

	bool del;

	bool del;
@@ -618,10 +622,12 @@ nfsd_file_cache_purge(void) 
		return;

		return;





	for (i = 0; i < NFSD_FILE_HASH_SIZE; i++) {

	for (i = 0; i < NFSD_FILE_HASH_SIZE; i++) {

		spin_lock(&nfsd_file_hashtbl[i].nfb_lock);

		struct nfsd_fcache_bucket *nfb = &nfsd_file_hashtbl[i];

		while(!hlist_empty(&nfsd_file_hashtbl[i].nfb_head)) {



			nf = hlist_entry(nfsd_file_hashtbl[i].nfb_head.first,

		spin_lock(&nfb->nfb_lock);

					 struct nfsd_file, nf_node);

		hlist_for_each_entry_safe(nf, next, &nfb->nfb_head, nf_node) {

			if (net && nf->nf_net != net)

				continue;

			del = nfsd_file_unhash_and_release_locked(nf, &dispose);

			del = nfsd_file_unhash_and_release_locked(nf, &dispose);





			/*

			/*
@@ -630,7 +636,7 @@ nfsd_file_cache_purge(void) 
			 */

			 */

			WARN_ON_ONCE(!del);

			WARN_ON_ONCE(!del);

		}

		}

		spin_unlock(&nfsd_file_hashtbl[i].nfb_lock);

		spin_unlock(&nfb->nfb_lock);

		nfsd_file_dispose_list(&dispose);

		nfsd_file_dispose_list(&dispose);

	}

	}

}

}
@@ -649,7 +655,7 @@ nfsd_file_cache_shutdown(void) 
	 * calling nfsd_file_cache_purge

	 * calling nfsd_file_cache_purge

	 */

	 */

	cancel_delayed_work_sync(&nfsd_filecache_laundrette);

	cancel_delayed_work_sync(&nfsd_filecache_laundrette);

	nfsd_file_cache_purge();

	nfsd_file_cache_purge(NULL);

	list_lru_destroy(&nfsd_file_lru);

	list_lru_destroy(&nfsd_file_lru);

	rcu_barrier();

	rcu_barrier();

	fsnotify_put_group(nfsd_file_fsnotify_group);

	fsnotify_put_group(nfsd_file_fsnotify_group);
@@ -685,7 +691,7 @@ nfsd_match_cred(const struct cred *c1, const struct cred *c2) 




static struct nfsd_file *

static struct nfsd_file *

nfsd_file_find_locked(struct inode *inode, unsigned int may_flags,

nfsd_file_find_locked(struct inode *inode, unsigned int may_flags,

			unsigned int hashval)

			unsigned int hashval, struct net *net)

{

{

	struct nfsd_file *nf;

	struct nfsd_file *nf;

	unsigned char need = may_flags & NFSD_FILE_MAY_MASK;

	unsigned char need = may_flags & NFSD_FILE_MAY_MASK;
@@ -696,6 +702,8 @@ nfsd_file_find_locked(struct inode *inode, unsigned int may_flags, 
			continue;

			continue;

		if (nf->nf_inode != inode)

		if (nf->nf_inode != inode)

			continue;

			continue;

		if (nf->nf_net != net)

			continue;

		if (!nfsd_match_cred(nf->nf_cred, current_cred()))

		if (!nfsd_match_cred(nf->nf_cred, current_cred()))

			continue;

			continue;

		if (nfsd_file_get(nf) != NULL)

		if (nfsd_file_get(nf) != NULL)
@@ -738,6 +746,7 @@ nfsd_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, 
		  unsigned int may_flags, struct nfsd_file **pnf)

		  unsigned int may_flags, struct nfsd_file **pnf)

{

{

	__be32	status;

	__be32	status;

	struct net *net = SVC_NET(rqstp);

	struct nfsd_file *nf, *new;

	struct nfsd_file *nf, *new;

	struct inode *inode;

	struct inode *inode;

	unsigned int hashval;

	unsigned int hashval;
@@ -752,12 +761,12 @@ nfsd_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, 
	hashval = (unsigned int)hash_long(inode->i_ino, NFSD_FILE_HASH_BITS);

	hashval = (unsigned int)hash_long(inode->i_ino, NFSD_FILE_HASH_BITS);

retry:

retry:

	rcu_read_lock();

	rcu_read_lock();

	nf = nfsd_file_find_locked(inode, may_flags, hashval);

	nf = nfsd_file_find_locked(inode, may_flags, hashval, net);

	rcu_read_unlock();

	rcu_read_unlock();

	if (nf)

	if (nf)

		goto wait_for_construction;

		goto wait_for_construction;





	new = nfsd_file_alloc(inode, may_flags, hashval);

	new = nfsd_file_alloc(inode, may_flags, hashval, net);

	if (!new) {

	if (!new) {

		trace_nfsd_file_acquire(rqstp, hashval, inode, may_flags,

		trace_nfsd_file_acquire(rqstp, hashval, inode, may_flags,

					NULL, nfserr_jukebox);

					NULL, nfserr_jukebox);
@@ -765,7 +774,7 @@ nfsd_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, 
	}

	}





	spin_lock(&nfsd_file_hashtbl[hashval].nfb_lock);

	spin_lock(&nfsd_file_hashtbl[hashval].nfb_lock);

	nf = nfsd_file_find_locked(inode, may_flags, hashval);

	nf = nfsd_file_find_locked(inode, may_flags, hashval, net);

	if (nf == NULL)

	if (nf == NULL)

		goto open_file;

		goto open_file;

	spin_unlock(&nfsd_file_hashtbl[hashval].nfb_lock);

	spin_unlock(&nfsd_file_hashtbl[hashval].nfb_lock);

fs/nfsd/filecache.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ struct nfsd_file { 
	struct rcu_head		nf_rcu;

	struct rcu_head		nf_rcu;

	struct file		*nf_file;

	struct file		*nf_file;

	const struct cred	*nf_cred;

	const struct cred	*nf_cred;

	struct net		*nf_net;

#define NFSD_FILE_HASHED	(0)

#define NFSD_FILE_HASHED	(0)

#define NFSD_FILE_PENDING	(1)

#define NFSD_FILE_PENDING	(1)

#define NFSD_FILE_BREAK_READ	(2)

#define NFSD_FILE_BREAK_READ	(2)
@@ -48,7 +49,7 @@ struct nfsd_file { 
};

};





int nfsd_file_cache_init(void);

int nfsd_file_cache_init(void);

void nfsd_file_cache_purge(void);

void nfsd_file_cache_purge(struct net *);

void nfsd_file_cache_shutdown(void);

void nfsd_file_cache_shutdown(void);

void nfsd_file_put(struct nfsd_file *nf);

void nfsd_file_put(struct nfsd_file *nf);

struct nfsd_file *nfsd_file_get(struct nfsd_file *nf);

struct nfsd_file *nfsd_file_get(struct nfsd_file *nf);

fs/nfsd/nfssvc.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -387,6 +387,7 @@ static void nfsd_shutdown_net(struct net *net) 
{

{

	struct nfsd_net *nn = net_generic(net, nfsd_net_id);

	struct nfsd_net *nn = net_generic(net, nfsd_net_id);





	nfsd_file_cache_purge(net);

	nfs4_state_shutdown_net(net);

	nfs4_state_shutdown_net(net);

	if (nn->lockd_up) {

	if (nn->lockd_up) {

		lockd_down(net);

		lockd_down(net);