Commit b3d8e422 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-5.7' of git://git.linux-nfs.org/projects/cel/cel-2.6 

Pull nfsd updates from Chuck Lever:

 - Fix EXCHANGE_ID response when NFSD runs in a container

 - A battery of new static trace points

 - Socket transports now use bio_vec to send Replies

 - NFS/RDMA now supports filesystems with no .splice_read method

 - Favor memcpy() over DMA mapping for small RPC/RDMA Replies

 - Add pre-requisites for supporting multiple Write chunks

 - Numerous minor fixes and clean-ups

[ Chuck is filling in for Bruce this time while he and his family settle
  into a new house ]

* tag 'nfsd-5.7' of git://git.linux-nfs.org/projects/cel/cel-2.6: (39 commits)
  svcrdma: Fix leak of transport addresses
  SUNRPC: Fix a potential buffer overflow in 'svc_print_xprts()'
  SUNRPC/cache: don't allow invalid entries to be flushed
  nfsd: fsnotify on rmdir under nfsd/clients/
  nfsd4: kill warnings on testing stateids with mismatched clientids
  nfsd: remove read permission bit for ctl sysctl
  NFSD: Fix NFS server build errors
  sunrpc: Add tracing for cache events
  SUNRPC/cache: Allow garbage collection of invalid cache entries
  nfsd: export upcalls must not return ESTALE when mountd is down
  nfsd: Add tracepoints for update of the expkey and export cache entries
  nfsd: Add tracepoints for exp_find_key() and exp_get_by_name()
  nfsd: Add tracing to nfsd_set_fh_dentry()
  nfsd: Don't add locks to closed or closing open stateids
  SUNRPC: Teach server to use xprt_sock_sendmsg for socket sends
  SUNRPC: Refactor xs_sendpages()
  svcrdma: Avoid DMA mapping small RPC Replies
  svcrdma: Fix double sync of transport header buffer
  svcrdma: Refactor chunk list encoders
  SUNRPC: Add encoders for list item discriminators
  ...
parents bdabb689 1a33d8a2

fs/nfs/dns_resolve.c

+6 −5
Original line number Diff line number Diff line
@@ -152,12 +152,13 @@ static int nfs_dns_upcall(struct cache_detail *cd, 
		struct cache_head *ch)

{

	struct nfs_dns_ent *key = container_of(ch, struct nfs_dns_ent, h);

	int ret;



	ret = nfs_cache_upcall(cd, key->hostname);

	if (ret)

		ret = sunrpc_cache_pipe_upcall(cd, ch);

	return ret;

	if (test_and_set_bit(CACHE_PENDING, &ch->flags))

		return 0;

	if (!nfs_cache_upcall(cd, key->hostname))

		return 0;

	clear_bit(CACHE_PENDING, &ch->flags);

	return sunrpc_cache_pipe_upcall_timeout(cd, ch);

}



static int nfs_dns_match(struct cache_head *ca,

fs/nfsd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ config NFSD_FLEXFILELAYOUT 


config NFSD_V4_2_INTER_SSC

	bool "NFSv4.2 inter server to server COPY"

	depends on NFSD_V4 && NFS_V4_1 && NFS_V4_2

	depends on NFSD_V4 && NFS_V4_1 && NFS_V4_2 && NFS_FS=y

	help

	  This option enables support for NFSv4.2 inter server to

	  server copy where the destination server calls the NFSv4.2

fs/nfsd/export.c

+34 −11
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "netns.h"

#include "pnfs.h"

#include "filecache.h"

#include "trace.h"



#define NFSDDBG_FACILITY	NFSDDBG_EXPORT
@@ -50,6 +51,11 @@ static void expkey_put(struct kref *ref) 
	kfree_rcu(key, ek_rcu);

}



static int expkey_upcall(struct cache_detail *cd, struct cache_head *h)

{

	return sunrpc_cache_pipe_upcall(cd, h);

}



static void expkey_request(struct cache_detail *cd,

			   struct cache_head *h,

			   char **bpp, int *blen)
@@ -140,7 +146,9 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen) 
	if (len == 0) {

		set_bit(CACHE_NEGATIVE, &key.h.flags);

		ek = svc_expkey_update(cd, &key, ek);

		if (!ek)

		if (ek)

			trace_nfsd_expkey_update(ek, NULL);

		else

			err = -ENOMEM;

	} else {

		err = kern_path(buf, 0, &key.ek_path);
@@ -150,7 +158,9 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen) 
		dprintk("Found the path %s\n", buf);



		ek = svc_expkey_update(cd, &key, ek);

		if (!ek)

		if (ek)

			trace_nfsd_expkey_update(ek, buf);

		else

			err = -ENOMEM;

		path_put(&key.ek_path);

	}
@@ -249,6 +259,7 @@ static const struct cache_detail svc_expkey_cache_template = { 
	.hash_size	= EXPKEY_HASHMAX,

	.name		= "nfsd.fh",

	.cache_put	= expkey_put,

	.cache_upcall	= expkey_upcall,

	.cache_request	= expkey_request,

	.cache_parse	= expkey_parse,

	.cache_show	= expkey_show,
@@ -330,6 +341,11 @@ static void svc_export_put(struct kref *ref) 
	kfree_rcu(exp, ex_rcu);

}



static int svc_export_upcall(struct cache_detail *cd, struct cache_head *h)

{

	return sunrpc_cache_pipe_upcall(cd, h);

}



static void svc_export_request(struct cache_detail *cd,

			       struct cache_head *h,

			       char **bpp, int *blen)
@@ -643,15 +659,17 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen) 
	}



	expp = svc_export_lookup(&exp);

	if (expp)

		expp = svc_export_update(&exp, expp);

	else

	if (!expp) {

		err = -ENOMEM;

		goto out4;

	}

	expp = svc_export_update(&exp, expp);

	if (expp) {

		trace_nfsd_export_update(expp);

		cache_flush();

	if (expp == NULL)

		err = -ENOMEM;

	else

		exp_put(expp);

	} else

		err = -ENOMEM;

out4:

	nfsd4_fslocs_free(&exp.ex_fslocs);

	kfree(exp.ex_uuid);
@@ -767,6 +785,7 @@ static const struct cache_detail svc_export_cache_template = { 
	.hash_size	= EXPORT_HASHMAX,

	.name		= "nfsd.export",

	.cache_put	= svc_export_put,

	.cache_upcall	= svc_export_upcall,

	.cache_request	= svc_export_request,

	.cache_parse	= svc_export_parse,

	.cache_show	= svc_export_show,
@@ -832,8 +851,10 @@ exp_find_key(struct cache_detail *cd, struct auth_domain *clp, int fsid_type, 
	if (ek == NULL)

		return ERR_PTR(-ENOMEM);

	err = cache_check(cd, &ek->h, reqp);

	if (err)

	if (err) {

		trace_nfsd_exp_find_key(&key, err);

		return ERR_PTR(err);

	}

	return ek;

}
@@ -855,8 +876,10 @@ exp_get_by_name(struct cache_detail *cd, struct auth_domain *clp, 
	if (exp == NULL)

		return ERR_PTR(-ENOMEM);

	err = cache_check(cd, &exp->h, reqp);

	if (err)

	if (err) {

		trace_nfsd_exp_get_by_name(&key, err);

		return ERR_PTR(err);

	}

	return exp;

}

fs/nfsd/filecache.c

+1 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ nfsd_file_find_locked(struct inode *inode, unsigned int may_flags, 
	unsigned char need = may_flags & NFSD_FILE_MAY_MASK;



	hlist_for_each_entry_rcu(nf, &nfsd_file_hashtbl[hashval].nfb_head,

				 nf_node) {

				 nf_node, lockdep_is_held(&nfsd_file_hashtbl[hashval].nfb_lock)) {

		if ((need & nf->nf_may) != need)

			continue;

		if (nf->nf_inode != inode)

fs/nfsd/netns.h

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ struct nfsd_net { 
	unsigned int             longest_chain_cachesize;



	struct shrinker		nfsd_reply_cache_shrinker;

	/* utsname taken from the the process that starts the server */

	char			nfsd_name[UNX_MAXNODENAME+1];

};



/* Simple check to find out if a given net was properly initialized */

CRA Git | Maintained and supported by SUSTech CRA and CCSE