Merge tag 'nfs-rdma-for-5.1-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

NFSoRDMA client updates for 5.1

New features:
- Convert rpc auth layer to use xdr_streams
- Config option to disable insecure enctypes
- Reduce size of RPC receive buffers

Bugfixes and cleanups:
- Fix sparse warnings
- Check inline size before providing a write chunk
- Reduce the receive doorbell rate
- Various tracepoint improvements

[Trond: Fix up merge conflicts]
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

1 files changed, 26 insertions, 18 deletions

diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index eed3cb16ccf1..5f9076fdb090 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -74,14 +74,12 @@ struct rpc_cred_cache;
 struct rpc_authops;
 struct rpc_auth {
         unsigned int            au_cslack;      /* call cred size estimate */
-                                /* guess at number of u32's auth adds before
-                                 * reply data; normally the verifier size: */
-        unsigned int            au_rslack;
-                                /* for gss, used to calculate au_rslack: */
-        unsigned int            au_verfsize;
-
-        unsigned int            au_flags;       /* various flags */
-        const struct rpc_authops *au_ops;               /* operations */
+        unsigned int            au_rslack;      /* reply cred size estimate */
+        unsigned int            au_verfsize;    /* size of reply verifier */
+        unsigned int            au_ralign;      /* words before UL header */
+
+        unsigned int            au_flags;
+        const struct rpc_authops *au_ops;
         rpc_authflavor_t        au_flavor;      /* pseudoflavor (note may
                                                  * differ from the flavor in
                                                  * au_ops->au_flavor in gss
@@ -131,13 +129,15 @@ struct rpc_credops {
         void                    (*crdestroy)(struct rpc_cred *);
 
         int                     (*crmatch)(struct auth_cred *, struct rpc_cred *, int);
-        __be32 *                (*crmarshal)(struct rpc_task *, __be32 *);
+        int                     (*crmarshal)(struct rpc_task *task,
+                                             struct xdr_stream *xdr);
         int                     (*crrefresh)(struct rpc_task *);
-        __be32 *                (*crvalidate)(struct rpc_task *, __be32 *);
-        int                     (*crwrap_req)(struct rpc_task *, kxdreproc_t,
-                                                void *, __be32 *, void *);
-        int                     (*crunwrap_resp)(struct rpc_task *, kxdrdproc_t,
-                                                void *, __be32 *, void *);
+        int                     (*crvalidate)(struct rpc_task *task,
+                                              struct xdr_stream *xdr);
+        int                     (*crwrap_req)(struct rpc_task *task,
+                                              struct xdr_stream *xdr);
+        int                     (*crunwrap_resp)(struct rpc_task *task,
+                                                 struct xdr_stream *xdr);
         int                     (*crkey_timeout)(struct rpc_cred *);
         char *                  (*crstringify_acceptor)(struct rpc_cred *);
         bool                    (*crneed_reencode)(struct rpc_task *);
@@ -165,10 +165,18 @@ struct rpc_cred *	rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *
 void                    rpcauth_init_cred(struct rpc_cred *, const struct auth_cred *, struct rpc_auth *, const struct rpc_credops *);
 struct rpc_cred *       rpcauth_lookupcred(struct rpc_auth *, int);
 void                    put_rpccred(struct rpc_cred *);
-__be32 *                rpcauth_marshcred(struct rpc_task *, __be32 *);
-__be32 *                rpcauth_checkverf(struct rpc_task *, __be32 *);
-int                     rpcauth_wrap_req(struct rpc_task *task, kxdreproc_t encode, void *rqstp, __be32 *data, void *obj);
-int                     rpcauth_unwrap_resp(struct rpc_task *task, kxdrdproc_t decode, void *rqstp, __be32 *data, void *obj);
+int                     rpcauth_marshcred(struct rpc_task *task,
+                                          struct xdr_stream *xdr);
+int                     rpcauth_checkverf(struct rpc_task *task,
+                                          struct xdr_stream *xdr);
+int                     rpcauth_wrap_req_encode(struct rpc_task *task,
+                                                struct xdr_stream *xdr);
+int                     rpcauth_wrap_req(struct rpc_task *task,
+                                         struct xdr_stream *xdr);
+int                     rpcauth_unwrap_resp_decode(struct rpc_task *task,
+                                                   struct xdr_stream *xdr);
+int                     rpcauth_unwrap_resp(struct rpc_task *task,
+                                            struct xdr_stream *xdr);
 bool                    rpcauth_xmit_need_reencode(struct rpc_task *task);
 int                     rpcauth_refreshcred(struct rpc_task *);
 void                    rpcauth_invalcred(struct rpc_task *);