| Message ID | 20240607142646.20924-7-snitzer@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | nfs/nfsd: add support for localio bypass | expand |
On Fri, 2024-06-07 at 10:26 -0400, Mike Snitzer wrote: > From: Weston Andros Adamson <dros@primarydata.com> > > Add new funtion rpcauth_map_to_svc_cred which maps a generic rpc_cred > to an > svc_cred suitable for use in nfsd. > > This is needed by the localio code to map nfs client creds to nfs > server > credentials. > > Signed-off-by: Weston Andros Adamson <dros@primarydata.com> > Signed-off-by: Lance Shelton <lance.shelton@hammerspace.com> > Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> > Signed-off-by: Mike Snitzer <snitzer@kernel.org> > --- > include/linux/sunrpc/auth.h | 4 ++++ > net/sunrpc/auth.c | 16 ++++++++++++++++ > 2 files changed, 20 insertions(+) > > diff --git a/include/linux/sunrpc/auth.h > b/include/linux/sunrpc/auth.h > index 61e58327b1aa..5ebf031361a1 100644 > --- a/include/linux/sunrpc/auth.h > +++ b/include/linux/sunrpc/auth.h > @@ -11,6 +11,7 @@ > #define _LINUX_SUNRPC_AUTH_H > > #include <linux/sunrpc/sched.h> > +#include <linux/sunrpc/svcauth.h> > #include <linux/sunrpc/msg_prot.h> > #include <linux/sunrpc/xdr.h> > > @@ -184,6 +185,9 @@ int rpcauth_uptodatecred(struct > rpc_task *); > int rpcauth_init_credcache(struct rpc_auth *); > void rpcauth_destroy_credcache(struct rpc_auth > *); > void rpcauth_clear_credcache(struct > rpc_cred_cache *); > +bool rpcauth_map_to_svc_cred(struct rpc_auth *, > + const struct cred *, > + struct svc_cred *); > char * rpcauth_stringify_acceptor(struct rpc_cred > *); > > static inline > diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c > index 04534ea537c8..55a03a3bcac2 100644 > --- a/net/sunrpc/auth.c > +++ b/net/sunrpc/auth.c > @@ -308,6 +308,22 @@ rpcauth_init_credcache(struct rpc_auth *auth) > } > EXPORT_SYMBOL_GPL(rpcauth_init_credcache); > > +bool > +rpcauth_map_to_svc_cred(struct rpc_auth *auth, const struct cred > *cred, > + struct svc_cred *svc) > +{ > + svc->cr_uid = cred->uid; > + svc->cr_gid = cred->gid; > + svc->cr_flavor = auth->au_flavor; > + svc->cr_principal = NULL; > + svc->cr_gss_mech = NULL; Setting the above to NULLs makes me a little nervous, but these values are usually handled at the RPC layer during svc_authenticate. The localio code hooks in below that, so this should hopefully not be a problem. > + if (cred->group_info) > + svc->cr_group_info = get_group_info(cred- > >group_info); > + > + return true; > +} > +EXPORT_SYMBOL_GPL(rpcauth_map_to_svc_cred); > + > char * > rpcauth_stringify_acceptor(struct rpc_cred *cred) > {
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h index 61e58327b1aa..5ebf031361a1 100644 --- a/include/linux/sunrpc/auth.h +++ b/include/linux/sunrpc/auth.h @@ -11,6 +11,7 @@ #define _LINUX_SUNRPC_AUTH_H #include <linux/sunrpc/sched.h> +#include <linux/sunrpc/svcauth.h> #include <linux/sunrpc/msg_prot.h> #include <linux/sunrpc/xdr.h> @@ -184,6 +185,9 @@ int rpcauth_uptodatecred(struct rpc_task *); int rpcauth_init_credcache(struct rpc_auth *); void rpcauth_destroy_credcache(struct rpc_auth *); void rpcauth_clear_credcache(struct rpc_cred_cache *); +bool rpcauth_map_to_svc_cred(struct rpc_auth *, + const struct cred *, + struct svc_cred *); char * rpcauth_stringify_acceptor(struct rpc_cred *); static inline diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 04534ea537c8..55a03a3bcac2 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -308,6 +308,22 @@ rpcauth_init_credcache(struct rpc_auth *auth) } EXPORT_SYMBOL_GPL(rpcauth_init_credcache); +bool +rpcauth_map_to_svc_cred(struct rpc_auth *auth, const struct cred *cred, + struct svc_cred *svc) +{ + svc->cr_uid = cred->uid; + svc->cr_gid = cred->gid; + svc->cr_flavor = auth->au_flavor; + svc->cr_principal = NULL; + svc->cr_gss_mech = NULL; + if (cred->group_info) + svc->cr_group_info = get_group_info(cred->group_info); + + return true; +} +EXPORT_SYMBOL_GPL(rpcauth_map_to_svc_cred); + char * rpcauth_stringify_acceptor(struct rpc_cred *cred) {