Commit 2289e87b authored by Chuck Lever's avatar Chuck Lever
Browse files

SUNRPC: Make trace_svc_process() display the RPC procedure symbolically 



The next few patches will employ these strings to help make server-
side trace logs more human-readable. A similar technique is already
in use in kernel RPC client code.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 6ee1d745

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/nfsd/nfs2acl.c

+5 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ static const struct svc_procedure nfsd_acl_procedures2[5] = { 
		.pc_ressize = sizeof(struct nfsd_voidres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST,

		.pc_name = "NULL",

	},

	[ACLPROC2_GETACL] = {

		.pc_func = nfsacld_proc_getacl,
@@ -381,6 +382,7 @@ static const struct svc_procedure nfsd_acl_procedures2[5] = { 
		.pc_ressize = sizeof(struct nfsd3_getaclres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST+1+2*(1+ACL),

		.pc_name = "GETACL",

	},

	[ACLPROC2_SETACL] = {

		.pc_func = nfsacld_proc_setacl,
@@ -391,6 +393,7 @@ static const struct svc_procedure nfsd_acl_procedures2[5] = { 
		.pc_ressize = sizeof(struct nfsd_attrstat),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST+AT,

		.pc_name = "SETACL",

	},

	[ACLPROC2_GETATTR] = {

		.pc_func = nfsacld_proc_getattr,
@@ -401,6 +404,7 @@ static const struct svc_procedure nfsd_acl_procedures2[5] = { 
		.pc_ressize = sizeof(struct nfsd_attrstat),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST+AT,

		.pc_name = "GETATTR",

	},

	[ACLPROC2_ACCESS] = {

		.pc_func = nfsacld_proc_access,
@@ -411,6 +415,7 @@ static const struct svc_procedure nfsd_acl_procedures2[5] = { 
		.pc_ressize = sizeof(struct nfsd3_accessres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST+AT+1,

		.pc_name = "SETATTR",

	},

};

fs/nfsd/nfs3acl.c

+3 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ static const struct svc_procedure nfsd_acl_procedures3[3] = { 
		.pc_ressize = sizeof(struct nfsd_voidres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST,

		.pc_name = "NULL",

	},

	[ACLPROC3_GETACL] = {

		.pc_func = nfsd3_proc_getacl,
@@ -261,6 +262,7 @@ static const struct svc_procedure nfsd_acl_procedures3[3] = { 
		.pc_ressize = sizeof(struct nfsd3_getaclres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST+1+2*(1+ACL),

		.pc_name = "GETACL",

	},

	[ACLPROC3_SETACL] = {

		.pc_func = nfsd3_proc_setacl,
@@ -271,6 +273,7 @@ static const struct svc_procedure nfsd_acl_procedures3[3] = { 
		.pc_ressize = sizeof(struct nfsd3_attrstat),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST+pAT,

		.pc_name = "SETACL",

	},

};