NFSv4.1 Use MDS auth flavor for data server connection
Subsystems (2)
PATCH 1/1 NFSv4.1 Use MDS auth flavor for data server connection
From: Andy Adamson <[email protected]>
Commit 4edaa308 "NFS: Use "krb5i" to establish NFSv4 state whenever possible" uses the nfs_client cl_rpcclient for all state management operations, and will use krb5i or auth_sys with no regard to the mount command authflavor choice.
The MDS, as any NFSv4.1 mount point, uses the nfs_server rpc client for all non-state management operations with a different nfs_server for each fsid encountered traversing the mount point, each with a potentially different auth flavor.
pNFS data servers are not mounted in the normal sense as there is no associated nfs_server structure. Data servers can also export multiple fsids, each with a potentially different auth flavor.
Data servers need to use the same authflavor as the MDS server rpc client for non-state management operations. Populate a list of rpc clients with the MDS server rpc client auth flavor for the DS to use.
--- fs/nfs/internal.h | 2 + fs/nfs/nfs4client.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ fs/nfs/nfs4filelayout.c | 35 ++++++++++---- include/linux/nfs_fs_sb.h | 1 + 4 files changed, 146 insertions(+), 8 deletions(-)
fs/nfs/internal.h +2 -0
@@ -186,6 +186,8 @@ extern struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp, int ds_addrlen, int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans); +extern struct rpc_clnt *nfs4_find_or_create_ds_client (struct nfs_client *, +struct inode *);#ifdef CONFIG_PROC_FS extern int __init nfs_fs_proc_init (void );extern void nfs_fs_proc_exit (void );
fs/nfs/nfs4client.c +116 -0
131 lines not on this page · raw message
fs/nfs/nfs4filelayout.c +27 -8
@@ -528,6 +528,7 @@ filelayout_read_pagelist(struct nfs_read_data *data)struct nfs_pgio_header *hdr = data->header;struct pnfs_layout_segment *lseg = hdr->lseg;struct nfs4_pnfs_ds *ds; +struct rpc_clnt *ds_clnt;loff_t offset = data->args.offset;u32 j, idx;struct nfs_fh *fh;
@@ -542,6 +543,11 @@ filelayout_read_pagelist(struct nfs_read_data *data) ds =nfs4_fl_prepare_ds (lseg, idx);if (!ds)return PNFS_NOT_ATTEMPTED ; + + ds_clnt =nfs4_find_or_create_ds_client (ds->ds_clp, hdr->inode); +if (IS_ERR (ds_clnt)) +return PNFS_NOT_ATTEMPTED ; +dprintk ("%s USE DS: %s cl_count %d\n" , __func__, ds->ds_remotestr,atomic_read (&ds->ds_clp->cl_count));
@@ -556,7 +562,7 @@ filelayout_read_pagelist(struct nfs_read_data *data) data->mds_offset = offset;/* Perform an asynchronous read to ds */ -nfs_initiate_read (ds->ds_clp->cl_rpcclient, data, +nfs_initiate_read (ds_clnt, data, &filelayout_read_call_ops,RPC_TASK_SOFTCONN );return PNFS_ATTEMPTED ; }
@@ -568,6 +574,7 @@ filelayout_write_pagelist(struct nfs_write_data *data, int sync)struct nfs_pgio_header *hdr = data->header;struct pnfs_layout_segment *lseg = hdr->lseg;struct nfs4_pnfs_ds *ds; +struct rpc_clnt *ds_clnt;loff_t offset = data->args.offset;u32 j, idx;struct nfs_fh *fh;
@@ -578,6 +585,11 @@ filelayout_write_pagelist(struct nfs_write_data *data, int sync) ds =nfs4_fl_prepare_ds (lseg, idx);if (!ds)return PNFS_NOT_ATTEMPTED ; + + ds_clnt =nfs4_find_or_create_ds_client (ds->ds_clp, hdr->inode); +if (IS_ERR (ds_clnt)) +return PNFS_NOT_ATTEMPTED ; +dprintk ("%s ino %lu sync %d req %Zu@%llu DS: %s cl_count %d\n" , __func__, hdr->inode->i_ino, sync, (size_t ) data->args.count, offset, ds->ds_remotestr,atomic_read (&ds->ds_clp->cl_count));
@@ -595,7 +607,7 @@ filelayout_write_pagelist(struct nfs_write_data *data, int sync) data->args.offset =filelayout_get_dserver_offset (lseg, offset);/* Perform an asynchronous write */ -nfs_initiate_write (ds->ds_clp->cl_rpcclient, data, +nfs_initiate_write (ds_clnt, data, &filelayout_write_call_ops, sync,RPC_TASK_SOFTCONN );return PNFS_ATTEMPTED ;
@@ -1105,16 +1117,19 @@ static int filelayout_initiate_commit(struct nfs_commit_data *data, int how) {struct pnfs_layout_segment *lseg = data->lseg;struct nfs4_pnfs_ds *ds; +struct rpc_clnt *ds_clnt;u32 idx;struct nfs_fh *fh; idx =calc_ds_index_from_commit (lseg, data->ds_commit_index); ds =nfs4_fl_prepare_ds (lseg, idx); -if (!ds) { -prepare_to_resend_writes (data); -filelayout_commit_release (data); -return -EAGAIN ; - } +if (!ds) + goto out_err; + + ds_clnt =nfs4_find_or_create_ds_client (ds->ds_clp, data->inode); +if (IS_ERR (ds_clnt)) + goto out_err; +dprintk ("%s ino %lu, how %d cl_count %d\n" , __func__, data->inode->i_ino, how,atomic_read (&ds->ds_clp->cl_count)); data->commit_done_cb = filelayout_commit_done_cb;
@@ -1123,9 +1138,13 @@ static int filelayout_initiate_commit(struct nfs_commit_data *data, int how) fh =select_ds_fh_from_commit (lseg, data->ds_commit_index);if (fh) data->args.fh = fh; -return nfs_initiate_commit (ds->ds_clp->cl_rpcclient, data, +return nfs_initiate_commit (ds_clnt, data, &filelayout_commit_call_ops, how,RPC_TASK_SOFTCONN ); +out_err: +prepare_to_resend_writes (data); +filelayout_commit_release (data); +return -EAGAIN ; } static int
include/linux/nfs_fs_sb.h +1 -0
@@ -56,6 +56,7 @@ struct nfs_client {struct rpc_cred *cl_machine_cred;#if IS_ENABLED (CONFIG_NFS_V4 ) +struct list_head cl_ds_clients;/* auth flavor data servers */ u64 cl_clientid;/* constant */ nfs4_verifier cl_confirm;/* Clientid verifier */ unsigned long cl_state;
Signature · 1 line
1.8.3.1
T24gRnJpLCAyMDEzLTA5LTA2IGF0IDE0OjE0IC0wNDAwLCBhbmRyb3NAbmV0YXBwLmNvbSB3cm90 ZToNCj4gRnJvbTogQW5keSBBZGFtc29uIDxhbmRyb3NAbmV0YXBwLmNvbT4NCj4gDQo+IENvbW1p dCA0ZWRhYTMwOCAiTkZTOiBVc2UgImtyYjVpIiB0byBlc3RhYmxpc2ggTkZTdjQgc3RhdGUgd2hl bmV2ZXIgcG9zc2libGUiDQo+IHVzZXMgdGhlIG5mc19jbGllbnQgY2xfcnBjY2xpZW50IGZvciBh bGwgc3RhdGUgbWFuYWdlbWVudCBvcGVyYXRpb25zLCBhbmQNCj4gd2lsbCB1c2Uga3JiNWkgb3Ig YXV0aF9zeXMgd2l0aCBubyByZWdhcmQgdG8gdGhlIG1vdW50IGNvbW1hbmQgYXV0aGZsYXZvcg0K PiBjaG9pY2UuDQo+IA0KPiBUaGUgTURTLCBhcyBhbnkgTkZTdjQuMSBtb3VudCBwb2ludCwgdXNl cyB0aGUgbmZzX3NlcnZlciBycGMgY2xpZW50IGZvciBhbGwNCj4gbm9uLXN0YXRlIG1hbmFnZW1l bnQgb3BlcmF0aW9ucyB3aXRoIGEgZGlmZmVyZW50IG5mc19zZXJ2ZXIgZm9yIGVhY2ggZnNpZA0K PiBlbmNvdW50ZXJlZCB0cmF2ZXJzaW5nIHRoZSBtb3VudCBwb2ludCwgZWFjaCB3aXRoIGEgcG90 ZW50aWFsbHkgZGlmZmVyZW50DQo+IGF1dGggZmxhdm9yLg0KPiANCj4gcE5GUyBkYXRhIHNlcnZl cnMgYXJlIG5vdCBtb3VudGVkIGluIHRoZSBub3JtYWwgc2Vuc2UgYXMgdGhlcmUgaXMgbm8gYXNz b2NpYXRlZA0KPiBuZnNfc2VydmVyIHN0cnVjdHVyZS4gRGF0YSBzZXJ2ZXJzIGNhbiBhbHNvIGV4 cG9ydCBtdWx0aXBsZSBmc2lkcywgZWFjaCB3aXRoDQo+IGEgcG90ZW50aWFsbHkgZGlmZmVyZW50 IGF1dGggZmxhdm9yLg0KPiANCj4gRGF0YSBzZXJ2ZXJzIG5lZWQgdG8gdXNlIHRoZSBzYW1lIGF1 dGhmbGF2b3IgYXMgdGhlIE1EUyBzZXJ2ZXIgcnBjIGNsaWVudCBmb3INCj4gbm9uLXN0YXRlIG1h bmFnZW1lbnQgb3BlcmF0aW9ucy4gUG9wdWxhdGUgYSBsaXN0IG9mIHJwYyBjbGllbnRzIHdpdGgg dGhlIE1EUw0KPiBzZXJ2ZXIgcnBjIGNsaWVudCBhdXRoIGZsYXZvciBmb3IgdGhlIERTIHRvIHVz ZS4NCj4gDQo+IFNpZ25lZC1vZmYtYnk6IEFuZHkgQWRhbXNvbiA8YW5kcm9zQG5ldGFwcC5jb20+ DQo+IC0tLQ0KPiAgDQoNClRoYW5rIHlvdSBBbmR5ISBVbmxlc3Mgc29tZXRoaW5nIGNvbWVzIHVw LCBJJ20gYXBwbHlpbmcgdGhpcyBvbmUuDQoNCi0tIA0KVHJvbmQgTXlrbGVidXN0DQpMaW51eCBO RlMgY2xpZW50IG1haW50YWluZXINCg0KTmV0QXBwDQpUcm9uZC5NeWtsZWJ1c3RAbmV0YXBwLmNv bQ0Kd3d3Lm5ldGFwcC5jb20NCg==
Quoted 21 lines · Trond
Quoted 20 lines · On Fri, 2013-09-06 at 14:14 -0400, [email protected] wrote:
From: Andy Adamson <[email protected]>
Commit
4edaa308"NFS: Use "krb5i" to establish NFSv4 state whenever possible" uses thenfs_clientcl_rpcclientfor all state management operations, and will use krb5i orauth_syswith no regard to the mount command authflavor choice.The MDS, as any NFSv4.1 mount point, uses the
nfs_serverrpc client for all non-state management operations with a differentnfs_serverfor each fsid encountered traversing the mount point, each with a potentially different auth flavor.pNFS data servers are not mounted in the normal sense as there is no associated
nfs_serverstructure. Data servers can also export multiple fsids, each with a potentially different auth flavor.Data servers need to use the same authflavor as the MDS server rpc client for non-state management operations. Populate a list of rpc clients with the MDS server rpc client auth flavor for the DS to use.
Quoted 5 lines
Quoted 3 lines
Signed-off-by Andy Adamson <[email protected]>---
Thank you Andy! Unless something comes up, I'm applying this one.
Good - thanks for all the valuable review :)
-->Andy
Quoted 8 lines
Signature · 7 lines
-- Trond Myklebust Linux NFS client maintainer NetApp [email protected] www.netapp.com