Commit 99f1a587 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux 

Pull nfsd updates from Chuck Lever:

 - Update NFSv2 and NFSv3 XDR decoding functions

 - Further improve support for re-exporting NFS mounts

 - Convert NFSD stats to per-CPU counters

 - Add batch Receive posting to the server's RPC/RDMA transport

* tag 'nfsd-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (65 commits)
  nfsd: skip some unnecessary stats in the v4 case
  nfs: use change attribute for NFS re-exports
  NFSv4_2: SSC helper should use its own config.
  nfsd: cstate->session->se_client -> cstate->clp
  nfsd: simplify nfsd4_check_open_reclaim
  nfsd: remove unused set_client argument
  nfsd: find_cpntf_state cleanup
  nfsd: refactor set_client
  nfsd: rename lookup_clientid->set_client
  nfsd: simplify nfsd_renew
  nfsd: simplify process_lock
  nfsd4: simplify process_lookup1
  SUNRPC: Correct a comment
  svcrdma: DMA-sync the receive buffer in svc_rdma_recvfrom()
  svcrdma: Reduce Receive doorbell rate
  svcrdma: Deprecate stat variables that are no longer used
  svcrdma: Restore read and write stats
  svcrdma: Convert rdma_stat_sq_starve to a per-CPU counter
  svcrdma: Convert rdma_stat_recv to a per-CPU counter
  svcrdma: Refactor svc_rdma_init() and svc_rdma_clean_up()
  ...
parents 681e2abe 428a23d2

fs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -333,6 +333,10 @@ config NFS_COMMON 
	depends on NFSD || NFS_FS || LOCKD

	default y



config NFS_V4_2_SSC_HELPER

	tristate

	default y if NFS_V4=y || NFS_FS=y



source "net/sunrpc/Kconfig"

source "fs/ceph/Kconfig"

source "fs/cifs/Kconfig"

fs/lockd/svc4proc.c

+24 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "NULL",

	},

	[NLMPROC_TEST] = {

		.pc_func = nlm4svc_proc_test,
@@ -520,6 +521,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St+2+No+Rg,

		.pc_name = "TEST",

	},

	[NLMPROC_LOCK] = {

		.pc_func = nlm4svc_proc_lock,
@@ -528,6 +530,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "LOCK",

	},

	[NLMPROC_CANCEL] = {

		.pc_func = nlm4svc_proc_cancel,
@@ -536,6 +539,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "CANCEL",

	},

	[NLMPROC_UNLOCK] = {

		.pc_func = nlm4svc_proc_unlock,
@@ -544,6 +548,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "UNLOCK",

	},

	[NLMPROC_GRANTED] = {

		.pc_func = nlm4svc_proc_granted,
@@ -552,6 +557,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "GRANTED",

	},

	[NLMPROC_TEST_MSG] = {

		.pc_func = nlm4svc_proc_test_msg,
@@ -560,6 +566,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "TEST_MSG",

	},

	[NLMPROC_LOCK_MSG] = {

		.pc_func = nlm4svc_proc_lock_msg,
@@ -568,6 +575,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "LOCK_MSG",

	},

	[NLMPROC_CANCEL_MSG] = {

		.pc_func = nlm4svc_proc_cancel_msg,
@@ -576,6 +584,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "CANCEL_MSG",

	},

	[NLMPROC_UNLOCK_MSG] = {

		.pc_func = nlm4svc_proc_unlock_msg,
@@ -584,6 +593,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNLOCK_MSG",

	},

	[NLMPROC_GRANTED_MSG] = {

		.pc_func = nlm4svc_proc_granted_msg,
@@ -592,6 +602,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "GRANTED_MSG",

	},

	[NLMPROC_TEST_RES] = {

		.pc_func = nlm4svc_proc_null,
@@ -600,6 +611,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "TEST_RES",

	},

	[NLMPROC_LOCK_RES] = {

		.pc_func = nlm4svc_proc_null,
@@ -608,6 +620,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "LOCK_RES",

	},

	[NLMPROC_CANCEL_RES] = {

		.pc_func = nlm4svc_proc_null,
@@ -616,6 +629,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "CANCEL_RES",

	},

	[NLMPROC_UNLOCK_RES] = {

		.pc_func = nlm4svc_proc_null,
@@ -624,6 +638,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNLOCK_RES",

	},

	[NLMPROC_GRANTED_RES] = {

		.pc_func = nlm4svc_proc_granted_res,
@@ -632,6 +647,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "GRANTED_RES",

	},

	[NLMPROC_NSM_NOTIFY] = {

		.pc_func = nlm4svc_proc_sm_notify,
@@ -640,6 +656,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_reboot),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "SM_NOTIFY",

	},

	[17] = {

		.pc_func = nlm4svc_proc_unused,
@@ -648,6 +665,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = 0,

		.pc_name = "UNUSED",

	},

	[18] = {

		.pc_func = nlm4svc_proc_unused,
@@ -656,6 +674,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = 0,

		.pc_name = "UNUSED",

	},

	[19] = {

		.pc_func = nlm4svc_proc_unused,
@@ -664,6 +683,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = 0,

		.pc_name = "UNUSED",

	},

	[NLMPROC_SHARE] = {

		.pc_func = nlm4svc_proc_share,
@@ -672,6 +692,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St+1,

		.pc_name = "SHARE",

	},

	[NLMPROC_UNSHARE] = {

		.pc_func = nlm4svc_proc_unshare,
@@ -680,6 +701,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St+1,

		.pc_name = "UNSHARE",

	},

	[NLMPROC_NM_LOCK] = {

		.pc_func = nlm4svc_proc_nm_lock,
@@ -688,6 +710,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "NM_LOCK",

	},

	[NLMPROC_FREE_ALL] = {

		.pc_func = nlm4svc_proc_free_all,
@@ -696,5 +719,6 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "FREE_ALL",

	},

};

fs/lockd/svcproc.c

+24 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "NULL",

	},

	[NLMPROC_TEST] = {

		.pc_func = nlmsvc_proc_test,
@@ -562,6 +563,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St+2+No+Rg,

		.pc_name = "TEST",

	},

	[NLMPROC_LOCK] = {

		.pc_func = nlmsvc_proc_lock,
@@ -570,6 +572,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "LOCK",

	},

	[NLMPROC_CANCEL] = {

		.pc_func = nlmsvc_proc_cancel,
@@ -578,6 +581,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "CANCEL",

	},

	[NLMPROC_UNLOCK] = {

		.pc_func = nlmsvc_proc_unlock,
@@ -586,6 +590,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "UNLOCK",

	},

	[NLMPROC_GRANTED] = {

		.pc_func = nlmsvc_proc_granted,
@@ -594,6 +599,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "GRANTED",

	},

	[NLMPROC_TEST_MSG] = {

		.pc_func = nlmsvc_proc_test_msg,
@@ -602,6 +608,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "TEST_MSG",

	},

	[NLMPROC_LOCK_MSG] = {

		.pc_func = nlmsvc_proc_lock_msg,
@@ -610,6 +617,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "LOCK_MSG",

	},

	[NLMPROC_CANCEL_MSG] = {

		.pc_func = nlmsvc_proc_cancel_msg,
@@ -618,6 +626,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "CANCEL_MSG",

	},

	[NLMPROC_UNLOCK_MSG] = {

		.pc_func = nlmsvc_proc_unlock_msg,
@@ -626,6 +635,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNLOCK_MSG",

	},

	[NLMPROC_GRANTED_MSG] = {

		.pc_func = nlmsvc_proc_granted_msg,
@@ -634,6 +644,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "GRANTED_MSG",

	},

	[NLMPROC_TEST_RES] = {

		.pc_func = nlmsvc_proc_null,
@@ -642,6 +653,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "TEST_RES",

	},

	[NLMPROC_LOCK_RES] = {

		.pc_func = nlmsvc_proc_null,
@@ -650,6 +662,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "LOCK_RES",

	},

	[NLMPROC_CANCEL_RES] = {

		.pc_func = nlmsvc_proc_null,
@@ -658,6 +671,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "CANCEL_RES",

	},

	[NLMPROC_UNLOCK_RES] = {

		.pc_func = nlmsvc_proc_null,
@@ -666,6 +680,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNLOCK_RES",

	},

	[NLMPROC_GRANTED_RES] = {

		.pc_func = nlmsvc_proc_granted_res,
@@ -674,6 +689,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "GRANTED_RES",

	},

	[NLMPROC_NSM_NOTIFY] = {

		.pc_func = nlmsvc_proc_sm_notify,
@@ -682,6 +698,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_reboot),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "SM_NOTIFY",

	},

	[17] = {

		.pc_func = nlmsvc_proc_unused,
@@ -690,6 +707,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNUSED",

	},

	[18] = {

		.pc_func = nlmsvc_proc_unused,
@@ -698,6 +716,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNUSED",

	},

	[19] = {

		.pc_func = nlmsvc_proc_unused,
@@ -706,6 +725,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNUSED",

	},

	[NLMPROC_SHARE] = {

		.pc_func = nlmsvc_proc_share,
@@ -714,6 +734,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St+1,

		.pc_name = "SHARE",

	},

	[NLMPROC_UNSHARE] = {

		.pc_func = nlmsvc_proc_unshare,
@@ -722,6 +743,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St+1,

		.pc_name = "UNSHARE",

	},

	[NLMPROC_NM_LOCK] = {

		.pc_func = nlmsvc_proc_nm_lock,
@@ -730,6 +752,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "NM_LOCK",

	},

	[NLMPROC_FREE_ALL] = {

		.pc_func = nlmsvc_proc_free_all,
@@ -738,5 +761,6 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_argsize = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = 0,

		.pc_name = "FREE_ALL",

	},

};

fs/nfs/callback_xdr.c

+2 −0
Original line number Diff line number Diff line
@@ -1060,6 +1060,7 @@ static const struct svc_procedure nfs4_callback_procedures1[] = { 
		.pc_decode = nfs4_decode_void,

		.pc_encode = nfs4_encode_void,

		.pc_xdrressize = 1,

		.pc_name = "NULL",

	},

	[CB_COMPOUND] = {

		.pc_func = nfs4_callback_compound,
@@ -1067,6 +1068,7 @@ static const struct svc_procedure nfs4_callback_procedures1[] = { 
		.pc_argsize = 256,

		.pc_ressize = 256,

		.pc_xdrressize = NFS4_CALLBACK_BUFSIZE,

		.pc_name = "COMPOUND",

	}

};

fs/nfs/export.c

+18 −0
Original line number Diff line number Diff line
@@ -167,10 +167,28 @@ nfs_get_parent(struct dentry *dentry) 
	return parent;

}



static u64 nfs_fetch_iversion(struct inode *inode)

{

	struct nfs_server *server = NFS_SERVER(inode);



	/* Is this the right call?: */

	nfs_revalidate_inode(server, inode);

	/*

	 * Also, note we're ignoring any returned error.  That seems to be

	 * the practice for cache consistency information elsewhere in

	 * the server, but I'm not sure why.

	 */

	if (server->nfs_client->rpc_ops->version >= 4)

		return inode_peek_iversion_raw(inode);

	else

		return time_to_chattr(&inode->i_ctime);

}



const struct export_operations nfs_export_ops = {

	.encode_fh = nfs_encode_fh,

	.fh_to_dentry = nfs_fh_to_dentry,

	.get_parent = nfs_get_parent,

	.fetch_iversion = nfs_fetch_iversion,

	.flags = EXPORT_OP_NOWCC|EXPORT_OP_NOSUBTREECHK|

		EXPORT_OP_CLOSE_BEFORE_UNLINK|EXPORT_OP_REMOTE_FS|

		EXPORT_OP_NOATOMIC_ATTR,