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

Commit e3406081 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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



NFS: NFSoRDMA Client Side Changes

New Features:
- Add kerberos support

Bugfixes and cleanups:
- Remove ALLPHYSICAL memory registration mode
- Fix FMR disconnect recovery
- Reduce memory usage

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parents 92d21ac7 a4e187d8

fs/nfs/callback_xdr.c

+5 −1
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r 
	if (hdr_arg.minorversion == 0) {

		cps.clp = nfs4_find_client_ident(SVC_NET(rqstp), hdr_arg.cb_ident);

		if (!cps.clp || !check_gss_callback_principal(cps.clp, rqstp))

			return rpc_drop_reply;

			goto out_invalidcred;

	}



	cps.minorversion = hdr_arg.minorversion;
@@ -953,6 +953,10 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r 
	nfs_put_client(cps.clp);

	dprintk("%s: done, status = %u\n", __func__, ntohl(status));

	return rpc_success;



out_invalidcred:

	pr_warn_ratelimited("NFS: NFSv4 callback contains invalid cred\n");

	return rpc_autherr_badcred;

}



/*

include/linux/sunrpc/auth.h

+3 −0
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ struct rpc_auth { 
	/* per-flavor data */

};



/* rpc_auth au_flags */

#define RPCAUTH_AUTH_DATATOUCH	0x00000002



struct rpc_auth_create_args {

	rpc_authflavor_t pseudoflavor;

	const char *target_name;

include/linux/sunrpc/gss_api.h

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ u32 gss_delete_sec_context( 
rpc_authflavor_t gss_svc_to_pseudoflavor(struct gss_api_mech *, u32 qop,

					u32 service);

u32 gss_pseudoflavor_to_service(struct gss_api_mech *, u32 pseudoflavor);

bool gss_pseudoflavor_to_datatouch(struct gss_api_mech *, u32 pseudoflavor);

char *gss_service_to_auth_domain_name(struct gss_api_mech *, u32 service);



struct pf_desc {
@@ -81,6 +82,7 @@ struct pf_desc { 
	u32	service;

	char	*name;

	char	*auth_domain_name;

	bool	datatouch;

};



/* Different mechanisms (e.g., krb5 or spkm3) may implement gss-api, and

net/sunrpc/auth_gss/auth_gss.c

+2 −0
Original line number Diff line number Diff line
@@ -1017,6 +1017,8 @@ gss_create_new(struct rpc_auth_create_args *args, struct rpc_clnt *clnt) 
	auth->au_rslack = GSS_VERF_SLACK >> 2;

	auth->au_ops = &authgss_ops;

	auth->au_flavor = flavor;

	if (gss_pseudoflavor_to_datatouch(gss_auth->mech, flavor))

		auth->au_flags |= RPCAUTH_AUTH_DATATOUCH;

	atomic_set(&auth->au_count, 1);

	kref_init(&gss_auth->kref);

net/sunrpc/auth_gss/gss_krb5_mech.c

+2 −0
Original line number Diff line number Diff line
@@ -745,12 +745,14 @@ static struct pf_desc gss_kerberos_pfs[] = { 
		.qop = GSS_C_QOP_DEFAULT,

		.service = RPC_GSS_SVC_INTEGRITY,

		.name = "krb5i",

		.datatouch = true,

	},

	[2] = {

		.pseudoflavor = RPC_AUTH_GSS_KRB5P,

		.qop = GSS_C_QOP_DEFAULT,

		.service = RPC_GSS_SVC_PRIVACY,

		.name = "krb5p",

		.datatouch = true,

	},

};