Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80125d4a authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

SUNRPC: Remove some dprintk() call sites from auth functions 



Clean up: Reduce dprintk noise by removing dprintk() call sites
from hot path that do not report exceptions. These are usually
replaceable with function graph tracing.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent f23f6584

net/sunrpc/auth.c

+0 −29
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
#include <linux/sunrpc/gss_api.h>

#include <linux/spinlock.h>



#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

# define RPCDBG_FACILITY	RPCDBG_AUTH

#endif



#define RPC_CREDCACHE_DEFAULT_HASHBITS	(4)

struct rpc_cred_cache {

	struct hlist_head	*hashtable;
@@ -267,8 +263,6 @@ rpcauth_list_flavors(rpc_authflavor_t *array, int size) 
		}

	}

	rcu_read_unlock();



	dprintk("RPC:       %s returns %d\n", __func__, result);

	return result;

}

EXPORT_SYMBOL_GPL(rpcauth_list_flavors);
@@ -636,9 +630,6 @@ rpcauth_lookupcred(struct rpc_auth *auth, int flags) 
	struct rpc_cred *ret;

	const struct cred *cred = current_cred();



	dprintk("RPC:       looking up %s cred\n",

		auth->au_ops->au_name);



	memset(&acred, 0, sizeof(acred));

	acred.cred = cred;

	ret = auth->au_ops->lookup_cred(auth, &acred, flags);
@@ -670,8 +661,6 @@ rpcauth_bind_root_cred(struct rpc_task *task, int lookupflags) 
	};

	struct rpc_cred *ret;



	dprintk("RPC: %5u looking up %s cred\n",

		task->tk_pid, task->tk_client->cl_auth->au_ops->au_name);

	ret = auth->au_ops->lookup_cred(auth, &acred, lookupflags);

	put_cred(acred.cred);

	return ret;
@@ -688,8 +677,6 @@ rpcauth_bind_machine_cred(struct rpc_task *task, int lookupflags) 


	if (!acred.principal)

		return NULL;

	dprintk("RPC: %5u looking up %s machine cred\n",

		task->tk_pid, task->tk_client->cl_auth->au_ops->au_name);

	return auth->au_ops->lookup_cred(auth, &acred, lookupflags);

}
@@ -698,8 +685,6 @@ rpcauth_bind_new_cred(struct rpc_task *task, int lookupflags) 
{

	struct rpc_auth *auth = task->tk_client->cl_auth;



	dprintk("RPC: %5u looking up %s cred\n",

		task->tk_pid, auth->au_ops->au_name);

	return rpcauth_lookupcred(auth, lookupflags);

}
@@ -776,9 +761,6 @@ rpcauth_marshcred(struct rpc_task *task, __be32 *p) 
{

	struct rpc_cred	*cred = task->tk_rqstp->rq_cred;



	dprintk("RPC: %5u marshaling %s cred %p\n",

		task->tk_pid, cred->cr_auth->au_ops->au_name, cred);



	return cred->cr_ops->crmarshal(task, p);

}
@@ -787,9 +769,6 @@ rpcauth_checkverf(struct rpc_task *task, __be32 *p) 
{

	struct rpc_cred	*cred = task->tk_rqstp->rq_cred;



	dprintk("RPC: %5u validating %s cred %p\n",

		task->tk_pid, cred->cr_auth->au_ops->au_name, cred);



	return cred->cr_ops->crvalidate(task, p);

}
@@ -808,8 +787,6 @@ rpcauth_wrap_req(struct rpc_task *task, kxdreproc_t encode, void *rqstp, 
{

	struct rpc_cred *cred = task->tk_rqstp->rq_cred;



	dprintk("RPC: %5u using %s cred %p to wrap rpc data\n",

			task->tk_pid, cred->cr_ops->cr_name, cred);

	if (cred->cr_ops->crwrap_req)

		return cred->cr_ops->crwrap_req(task, encode, rqstp, data, obj);

	/* By default, we encode the arguments normally. */
@@ -833,8 +810,6 @@ rpcauth_unwrap_resp(struct rpc_task *task, kxdrdproc_t decode, void *rqstp, 
{

	struct rpc_cred *cred = task->tk_rqstp->rq_cred;



	dprintk("RPC: %5u using %s cred %p to unwrap rpc data\n",

			task->tk_pid, cred->cr_ops->cr_name, cred);

	if (cred->cr_ops->crunwrap_resp)

		return cred->cr_ops->crunwrap_resp(task, decode, rqstp,

						   data, obj);
@@ -865,8 +840,6 @@ rpcauth_refreshcred(struct rpc_task *task) 
			goto out;

		cred = task->tk_rqstp->rq_cred;

	}

	dprintk("RPC: %5u refreshing %s cred %p\n",

		task->tk_pid, cred->cr_auth->au_ops->au_name, cred);



	err = cred->cr_ops->crrefresh(task);

out:
@@ -880,8 +853,6 @@ rpcauth_invalcred(struct rpc_task *task) 
{

	struct rpc_cred *cred = task->tk_rqstp->rq_cred;



	dprintk("RPC: %5u invalidating %s cred %p\n",

		task->tk_pid, cred->cr_auth->au_ops->au_name, cred);

	if (cred)

		clear_bit(RPCAUTH_CRED_UPTODATE, &cred->cr_flags);

}

net/sunrpc/auth_unix.c

+1 −8
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ static mempool_t *unix_pool; 
static struct rpc_auth *

unx_create(const struct rpc_auth_create_args *args, struct rpc_clnt *clnt)

{

	dprintk("RPC:       creating UNIX authenticator for client %p\n",

			clnt);

	refcount_inc(&unix_auth.au_count);

	return &unix_auth;

}
@@ -37,7 +35,6 @@ unx_create(const struct rpc_auth_create_args *args, struct rpc_clnt *clnt) 
static void

unx_destroy(struct rpc_auth *auth)

{

	dprintk("RPC:       destroying UNIX authenticator %p\n", auth);

}



/*
@@ -48,10 +45,6 @@ unx_lookup_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags) 
{

	struct rpc_cred *ret = mempool_alloc(unix_pool, GFP_NOFS);



	dprintk("RPC:       allocating UNIX cred for uid %d gid %d\n",

			from_kuid(&init_user_ns, acred->cred->fsuid),

			from_kgid(&init_user_ns, acred->cred->fsgid));



	rpcauth_init_cred(ret, acred, auth, &unix_credops);

	ret->cr_flags = 1UL << RPCAUTH_CRED_UPTODATE;

	return ret;
@@ -61,7 +54,7 @@ static void 
unx_free_cred_callback(struct rcu_head *head)

{

	struct rpc_cred *rpc_cred = container_of(head, struct rpc_cred, cr_rcu);

	dprintk("RPC:       unx_free_cred %p\n", rpc_cred);



	put_cred(rpc_cred->cr_cred);

	mempool_free(rpc_cred, unix_pool);

}