1 files changed, 73 insertions, 63 deletions

diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index f3023bbc0b7f..e7861026b9e5 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -17,9 +17,7 @@
 #include <linux/sunrpc/gss_api.h>
 #include <linux/spinlock.h>
 
-#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
-# define RPCDBG_FACILITY        RPCDBG_AUTH
-#endif
+#include <trace/events/sunrpc.h>
 
 #define RPC_CREDCACHE_DEFAULT_HASHBITS  (4)
 struct rpc_cred_cache {
@@ -267,8 +265,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 +632,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 +663,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 +679,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 +687,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);
 }
 
@@ -771,75 +758,102 @@ destroy:
 }
 EXPORT_SYMBOL_GPL(put_rpccred);
 
-__be32 *
-rpcauth_marshcred(struct rpc_task *task, __be32 *p)
+/**
+ * rpcauth_marshcred - Append RPC credential to end of @xdr
+ * @task: controlling RPC task
+ * @xdr: xdr_stream containing initial portion of RPC Call header
+ *
+ * On success, an appropriate verifier is added to @xdr, @xdr is
+ * updated to point past the verifier, and zero is returned.
+ * Otherwise, @xdr is in an undefined state and a negative errno
+ * is returned.
+ */
+int rpcauth_marshcred(struct rpc_task *task, struct xdr_stream *xdr)
 {
-        struct rpc_cred *cred = task->tk_rqstp->rq_cred;
+        const struct rpc_credops *ops = task->tk_rqstp->rq_cred->cr_ops;
 
-        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);
+        return ops->crmarshal(task, xdr);
 }
 
-__be32 *
-rpcauth_checkverf(struct rpc_task *task, __be32 *p)
+/**
+ * rpcauth_wrap_req_encode - XDR encode the RPC procedure
+ * @task: controlling RPC task
+ * @xdr: stream where on-the-wire bytes are to be marshalled
+ *
+ * On success, @xdr contains the encoded and wrapped message.
+ * Otherwise, @xdr is in an undefined state.
+ */
+int rpcauth_wrap_req_encode(struct rpc_task *task, struct xdr_stream *xdr)
 {
-        struct rpc_cred *cred = task->tk_rqstp->rq_cred;
+        kxdreproc_t encode = task->tk_msg.rpc_proc->p_encode;
 
-        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);
+        encode(task->tk_rqstp, xdr, task->tk_msg.rpc_argp);
+        return 0;
 }
+EXPORT_SYMBOL_GPL(rpcauth_wrap_req_encode);
 
-static void rpcauth_wrap_req_encode(kxdreproc_t encode, struct rpc_rqst *rqstp,
-                                   __be32 *data, void *obj)
+/**
+ * rpcauth_wrap_req - XDR encode and wrap the RPC procedure
+ * @task: controlling RPC task
+ * @xdr: stream where on-the-wire bytes are to be marshalled
+ *
+ * On success, @xdr contains the encoded and wrapped message,
+ * and zero is returned. Otherwise, @xdr is in an undefined
+ * state and a negative errno is returned.
+ */
+int rpcauth_wrap_req(struct rpc_task *task, struct xdr_stream *xdr)
 {
-        struct xdr_stream xdr;
+        const struct rpc_credops *ops = task->tk_rqstp->rq_cred->cr_ops;
 
-        xdr_init_encode(&xdr, &rqstp->rq_snd_buf, data);
-        encode(rqstp, &xdr, obj);
+        return ops->crwrap_req(task, xdr);
 }
 
+/**
+ * rpcauth_checkverf - Validate verifier in RPC Reply header
+ * @task: controlling RPC task
+ * @xdr: xdr_stream containing RPC Reply header
+ *
+ * On success, @xdr is updated to point past the verifier and
+ * zero is returned. Otherwise, @xdr is in an undefined state
+ * and a negative errno is returned.
+ */
 int
-rpcauth_wrap_req(struct rpc_task *task, kxdreproc_t encode, void *rqstp,
-                __be32 *data, void *obj)
+rpcauth_checkverf(struct rpc_task *task, struct xdr_stream *xdr)
 {
-        struct rpc_cred *cred = task->tk_rqstp->rq_cred;
+        const struct rpc_credops *ops = task->tk_rqstp->rq_cred->cr_ops;
 
-        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. */
-        rpcauth_wrap_req_encode(encode, rqstp, data, obj);
-        return 0;
+        return ops->crvalidate(task, xdr);
 }
 
-static int
-rpcauth_unwrap_req_decode(kxdrdproc_t decode, struct rpc_rqst *rqstp,
-                          __be32 *data, void *obj)
+/**
+ * rpcauth_unwrap_resp_decode - Invoke XDR decode function
+ * @task: controlling RPC task
+ * @xdr: stream where the Reply message resides
+ *
+ * Returns zero on success; otherwise a negative errno is returned.
+ */
+int
+rpcauth_unwrap_resp_decode(struct rpc_task *task, struct xdr_stream *xdr)
 {
-        struct xdr_stream xdr;
+        kxdrdproc_t decode = task->tk_msg.rpc_proc->p_decode;
 
-        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, data);
-        return decode(rqstp, &xdr, obj);
+        return decode(task->tk_rqstp, xdr, task->tk_msg.rpc_resp);
 }
+EXPORT_SYMBOL_GPL(rpcauth_unwrap_resp_decode);
 
+/**
+ * rpcauth_unwrap_resp - Invoke unwrap and decode function for the cred
+ * @task: controlling RPC task
+ * @xdr: stream where the Reply message resides
+ *
+ * Returns zero on success; otherwise a negative errno is returned.
+ */
 int
-rpcauth_unwrap_resp(struct rpc_task *task, kxdrdproc_t decode, void *rqstp,
-                __be32 *data, void *obj)
+rpcauth_unwrap_resp(struct rpc_task *task, struct xdr_stream *xdr)
 {
-        struct rpc_cred *cred = task->tk_rqstp->rq_cred;
+        const struct rpc_credops *ops = task->tk_rqstp->rq_cred->cr_ops;
 
-        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);
-        /* By default, we decode the arguments normally. */
-        return rpcauth_unwrap_req_decode(decode, rqstp, data, obj);
+        return ops->crunwrap_resp(task, xdr);
 }
 
 bool
@@ -865,8 +879,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 +892,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);
 }