nfs/nfsd: add support for localio
Subsystems (4)
v4 cover nfs/nfsd: add support for localio
Hi,
This v4 fixes a few bugs in v3, reorders patches and improves patch headers and code documentation. Please pay particular attention to patches 17 and 18.
If all looks good to others, for v5 I can rebase to the -next trees for nfs and nfsd.
My git tree is here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/
This v4 is both branch nfs-localio-for-6.11 (always tracks latest) and nfs-localio-for-6.11.v4
nfs-localio-for-6.11.v3, nfs-localio-for-6.11.v2 and nfs-localio-for-6.11.v1 are also there.
To see the changes from v3 to v4 please do:
git remote add snitzer git://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git
git remote update snitzer
git diff snitzer/nfs-localio-for-6.11.v3 snitzer/nfs-localio-for-6.11.v4
These changes have proven stable against various test scenarios:
1) client and server both on localhost (for both v3 and v4.2)
2) various permutations of client and server support enablement for both local and remote client and server.
3) client on host, server within a container (for both v3 and v4.2) My container testing was in terms of podman managed containers.
4) container stop/restart scenario documented in the last patch
All review and comments are welcome!
Thanks,
Mike
Mike Snitzer (10):
nfs_common: add NFS LOCALIO protocol extension enablement
nfs: implement v3 and v4 client support for NFS_LOCALIO_PROGRAM
nfsd: implement v3 and v4 server support for NFS_LOCALIO_PROGRAM nfs/nfsd: consolidate {encode,decode}_opaque_fixed in nfs_xdr.h nfs/localio: move managing nfsd_open_local_fh symbol to nfs_common nfs/nfsd: ensure localio server always uses its network namespace nfsd/localio: manage netns reference in nfsd_open_local_fh
nfsd: prepare to use SRCU to dereference nn->nfsd_serv
nfsd: use SRCU to dereference nn->nfsd_serv
nfsd/localio: use SRCU to dereference nn->nfsd_serv in nfsd_open_local_fh
Trond Myklebust (3):
NFS: Enable localio for non-pNFS I/O
pnfs/flexfiles: Enable localio for flexfiles I/O nfs/localio: use dedicated workqueues for filesystem read and write
Weston Andros Adamson (5):
nfs: pass nfs_client to nfs_initiate_pgio
nfs: pass descriptor thru nfs_initiate_pgio path
nfs: pass struct file to nfs_init_pgio and nfs_init_commit
sunrpc: add rpcauth_map_to_svc_cred_local nfs/nfsd: add "localio" support
fs/Kconfig | 3 + fs/nfs/Kconfig | 30 + fs/nfs/Makefile | 1 + fs/nfs/blocklayout/blocklayout.c | 6 +- fs/nfs/client.c | 15 +- fs/nfs/filelayout/filelayout.c | 16 +- fs/nfs/flexfilelayout/flexfilelayout.c | 131 +++- fs/nfs/flexfilelayout/flexfilelayout.h | 2 + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 6 + fs/nfs/inode.c | 61 +- fs/nfs/internal.h | 88 ++- fs/nfs/localio.c | 850 ++++++++++++++++++++++ fs/nfs/nfs3_fs.h | 1 + fs/nfs/nfs3client.c | 25 + fs/nfs/nfs3proc.c | 3 + fs/nfs/nfs3xdr.c | 58 ++ fs/nfs/nfs4_fs.h | 2 + fs/nfs/nfs4client.c | 23 + fs/nfs/nfs4proc.c | 3 + fs/nfs/nfs4xdr.c | 65 +- fs/nfs/nfstrace.h | 61 ++ fs/nfs/pagelist.c | 32 +- fs/nfs/pnfs.c | 24 +- fs/nfs/pnfs.h | 6 +- fs/nfs/pnfs_nfs.c | 2 +- fs/nfs/write.c | 13 +- fs/nfs_common/Makefile | 3 + fs/nfs_common/nfslocalio.c | 71 ++ fs/nfsd/Kconfig | 30 + fs/nfsd/Makefile | 1 + fs/nfsd/filecache.c | 15 +- fs/nfsd/localio.c | 398 ++++++++++ fs/nfsd/netns.h | 16 +- fs/nfsd/nfs4state.c | 25 +- fs/nfsd/nfsctl.c | 28 +- fs/nfsd/nfsd.h | 11 + fs/nfsd/nfssvc.c | 176 ++++- fs/nfsd/trace.h | 3 +- fs/nfsd/vfs.h | 9 + fs/nfsd/xdr.h | 6 + include/linux/nfs.h | 2 + include/linux/nfs_fs.h | 2 + include/linux/nfs_fs_sb.h | 9 + include/linux/nfs_xdr.h | 31 +- include/linux/nfslocalio.h | 61 ++ include/linux/sunrpc/auth.h | 4 + include/uapi/linux/nfs.h | 4 + net/sunrpc/auth.c | 15 + 48 files changed, 2305 insertions(+), 142 deletions(-) create mode 100644 fs/nfs/localio.c create mode 100644 fs/nfs_common/nfslocalio.c create mode 100644 fs/nfsd/localio.c create mode 100644 include/linux/nfslocalio.h
Signature · 1 line
2.44.0
PATCH v4 1/18 nfs: pass nfs_client to nfs_initiate_pgio
From: Weston Andros Adamson <[email protected]>
The nfs_client is needed for localio support. Otherwise it won't be possible to disable localio if it is attempted but fails.
--- fs/nfs/filelayout/filelayout.c | 4 ++-- fs/nfs/flexfilelayout/flexfilelayout.c | 6 ++++-- fs/nfs/internal.h | 5 +++-- fs/nfs/pagelist.c | 10 ++++++---- 4 files changed, 15 insertions(+), 10 deletions(-)
fs/nfs/filelayout/filelayout.c +2 -2
@@ -486,7 +486,7 @@ filelayout_read_pagelist(struct nfs_pgio_header *hdr) hdr->mds_offset = offset;/* Perform an asynchronous read to ds */ -nfs_initiate_pgio (ds_clnt, hdr, hdr->cred, +nfs_initiate_pgio (ds->ds_clp, ds_clnt, hdr, hdr->cred,NFS_PROTO (hdr->inode), &filelayout_read_call_ops,0 ,RPC_TASK_SOFTCONN );return PNFS_ATTEMPTED ;
@@ -528,7 +528,7 @@ filelayout_write_pagelist(struct nfs_pgio_header *hdr, int sync) hdr->args.offset =filelayout_get_dserver_offset (lseg, offset);/* Perform an asynchronous write */ -nfs_initiate_pgio (ds_clnt, hdr, hdr->cred, +nfs_initiate_pgio (ds->ds_clp, ds_clnt, hdr, hdr->cred,NFS_PROTO (hdr->inode), &filelayout_write_call_ops, sync,RPC_TASK_SOFTCONN );return PNFS_ATTEMPTED ;
fs/nfs/flexfilelayout/flexfilelayout.c +4 -2
@@ -1803,7 +1803,8 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr) hdr->mds_offset = offset;/* Perform an asynchronous read to ds */ -nfs_initiate_pgio (ds_clnt, hdr, ds_cred, ds->ds_clp->rpc_ops, +nfs_initiate_pgio (ds->ds_clp, ds_clnt, hdr, ds_cred, + ds->ds_clp->rpc_ops, vers ==3 ? &ff_layout_read_call_ops_v3 : &ff_layout_read_call_ops_v4,0 ,RPC_TASK_SOFTCONN );
@@ -1871,7 +1872,8 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync) hdr->args.offset = offset;/* Perform an asynchronous write */ -nfs_initiate_pgio (ds_clnt, hdr, ds_cred, ds->ds_clp->rpc_ops, +nfs_initiate_pgio (ds->ds_clp, ds_clnt, hdr, ds_cred, + ds->ds_clp->rpc_ops, vers ==3 ? &ff_layout_write_call_ops_v3 : &ff_layout_write_call_ops_v4, sync,RPC_TASK_SOFTCONN );
fs/nfs/internal.h +3 -2
@@ -306,8 +306,9 @@ extern const struct nfs_pageio_ops nfs_pgio_rw_ops;struct nfs_pgio_header *nfs_pgio_header_alloc (const struct nfs_rw_ops *);void nfs_pgio_header_free (struct nfs_pgio_header *);int nfs_generic_pgio (struct nfs_pageio_descriptor *,struct nfs_pgio_header *); -int nfs_initiate_pgio (struct rpc_clnt *clnt,struct nfs_pgio_header *hdr, -const struct cred *cred,const struct nfs_rpc_ops *rpc_ops, +int nfs_initiate_pgio (struct nfs_client *clp,struct rpc_clnt *rpc_clnt, +struct nfs_pgio_header *hdr,const struct cred *cred, +const struct nfs_rpc_ops *rpc_ops,const struct rpc_call_ops *call_ops,int how,int flags);void nfs_free_request (struct nfs_page *req); struct nfs_pgio_mirror *
fs/nfs/pagelist.c +6 -4
@@ -844,8 +844,9 @@ static void nfs_pgio_prepare(struct rpc_task *task, void *calldata)rpc_exit (task, err); } -int nfs_initiate_pgio (struct rpc_clnt *clnt,struct nfs_pgio_header *hdr, -const struct cred *cred,const struct nfs_rpc_ops *rpc_ops, +int nfs_initiate_pgio (struct nfs_client *clp,struct rpc_clnt *rpc_clnt, +struct nfs_pgio_header *hdr,const struct cred *cred, +const struct nfs_rpc_ops *rpc_ops,const struct rpc_call_ops *call_ops,int how,int flags) {struct rpc_task *task;
@@ -855,7 +856,7 @@ int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr, .rpc_cred = cred, };struct rpc_task_setup task_setup_data = { - .rpc_client = clnt, + .rpc_client = rpc_clnt, .task = &hdr->task, .rpc_message = &msg, .callback_ops = call_ops,
@@ -1070,7 +1071,8 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc)if (ret ==0 ) {if (NFS_SERVER (hdr->inode)->nfs_client->cl_minorversion) task_flags =RPC_TASK_MOVEABLE ; - ret = nfs_initiate_pgio(NFS_CLIENT(hdr->inode), + ret = nfs_initiate_pgio(NFS_SERVER(hdr->inode)->nfs_client, + NFS_CLIENT(hdr->inode), hdr, hdr->cred, NFS_PROTO(hdr->inode),
Signature · 1 line
2.44.0
PATCH v4 2/18 nfs: pass descriptor thru nfs_initiate_pgio path
In reply to Mike SnitzerFrom: Weston Andros Adamson <[email protected]>
This is needed for localio support.
--- fs/nfs/blocklayout/blocklayout.c | 6 ++++-- fs/nfs/filelayout/filelayout.c | 10 ++++++---- fs/nfs/flexfilelayout/flexfilelayout.c | 10 ++++++---- fs/nfs/internal.h | 6 +++--- fs/nfs/pagelist.c | 6 ++++-- fs/nfs/pnfs.c | 24 +++++++++++++----------- fs/nfs/pnfs.h | 6 ++++-- 7 files changed, 40 insertions(+), 28 deletions(-)
fs/nfs/blocklayout/blocklayout.c +4 -2
@@ -227,7 +227,8 @@ bl_end_par_io_read(void *data) }static enum pnfs_try_status -bl_read_pagelist (struct nfs_pgio_header *header) +bl_read_pagelist (struct nfs_pageio_descriptor *desc, +struct nfs_pgio_header *header) {struct pnfs_block_layout *bl =BLK_LSEG2EXT (header->lseg);struct pnfs_block_dev_map map = { .start =NFS4_MAX_UINT64 };
@@ -372,7 +373,8 @@ static void bl_end_par_io_write(void *data) }static enum pnfs_try_status -bl_write_pagelist (struct nfs_pgio_header *header,int sync) +bl_write_pagelist (struct nfs_pageio_descriptor *desc, +struct nfs_pgio_header *header,int sync) {struct pnfs_block_layout *bl =BLK_LSEG2EXT (header->lseg);struct pnfs_block_dev_map map = { .start =NFS4_MAX_UINT64 };
fs/nfs/filelayout/filelayout.c +6 -4
@@ -447,7 +447,8 @@ static const struct rpc_call_ops filelayout_commit_call_ops = { };static enum pnfs_try_status -filelayout_read_pagelist (struct nfs_pgio_header *hdr) +filelayout_read_pagelist (struct nfs_pageio_descriptor *desc, +struct nfs_pgio_header *hdr) {struct pnfs_layout_segment *lseg = hdr->lseg;struct nfs4_pnfs_ds *ds;
@@ -486,7 +487,7 @@ filelayout_read_pagelist(struct nfs_pgio_header *hdr) hdr->mds_offset = offset;/* Perform an asynchronous read to ds */ -nfs_initiate_pgio (ds->ds_clp, ds_clnt, hdr, hdr->cred, +nfs_initiate_pgio (desc, ds->ds_clp, ds_clnt, hdr, hdr->cred,NFS_PROTO (hdr->inode), &filelayout_read_call_ops,0 ,RPC_TASK_SOFTCONN );return PNFS_ATTEMPTED ;
@@ -494,7 +495,8 @@ filelayout_read_pagelist(struct nfs_pgio_header *hdr)/* Perform async writes. */ static enum pnfs_try_status -filelayout_write_pagelist (struct nfs_pgio_header *hdr,int sync) +filelayout_write_pagelist (struct nfs_pageio_descriptor *desc, +struct nfs_pgio_header *hdr,int sync) {struct pnfs_layout_segment *lseg = hdr->lseg;struct nfs4_pnfs_ds *ds;
@@ -528,7 +530,7 @@ filelayout_write_pagelist(struct nfs_pgio_header *hdr, int sync) hdr->args.offset =filelayout_get_dserver_offset (lseg, offset);/* Perform an asynchronous write */ -nfs_initiate_pgio (ds->ds_clp, ds_clnt, hdr, hdr->cred, +nfs_initiate_pgio (desc, ds->ds_clp, ds_clnt, hdr, hdr->cred,NFS_PROTO (hdr->inode), &filelayout_write_call_ops, sync,RPC_TASK_SOFTCONN );return PNFS_ATTEMPTED ;
fs/nfs/flexfilelayout/flexfilelayout.c +6 -4
@@ -1751,7 +1751,8 @@ static const struct rpc_call_ops ff_layout_commit_call_ops_v4 = { };static enum pnfs_try_status -ff_layout_read_pagelist (struct nfs_pgio_header *hdr) +ff_layout_read_pagelist (struct nfs_pageio_descriptor *desc, +struct nfs_pgio_header *hdr) {struct pnfs_layout_segment *lseg = hdr->lseg;struct nfs4_pnfs_ds *ds;
@@ -1803,7 +1804,7 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr) hdr->mds_offset = offset;/* Perform an asynchronous read to ds */ - nfs_initiate_pgio(ds->ds_clp, ds_clnt, hdr, ds_cred, + nfs_initiate_pgio(desc, ds->ds_clp, ds_clnt, hdr, ds_cred, ds->ds_clp->rpc_ops, vers == 3 ? &ff_layout_read_call_ops_v3 : &ff_layout_read_call_ops_v4,
@@ -1822,7 +1823,8 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr)/* Perform async writes. */ static enum pnfs_try_status -ff_layout_write_pagelist (struct nfs_pgio_header *hdr,int sync) +ff_layout_write_pagelist (struct nfs_pageio_descriptor *desc, +struct nfs_pgio_header *hdr,int sync) {struct pnfs_layout_segment *lseg = hdr->lseg;struct nfs4_pnfs_ds *ds;
@@ -1872,7 +1874,7 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync) hdr->args.offset = offset;/* Perform an asynchronous write */ - nfs_initiate_pgio(ds->ds_clp, ds_clnt, hdr, ds_cred, + nfs_initiate_pgio(desc, ds->ds_clp, ds_clnt, hdr, ds_cred, ds->ds_clp->rpc_ops, vers == 3 ? &ff_layout_write_call_ops_v3 : &ff_layout_write_call_ops_v4,
fs/nfs/internal.h +3 -3
@@ -306,9 +306,9 @@ extern const struct nfs_pageio_ops nfs_pgio_rw_ops;struct nfs_pgio_header *nfs_pgio_header_alloc (const struct nfs_rw_ops *);void nfs_pgio_header_free (struct nfs_pgio_header *);int nfs_generic_pgio (struct nfs_pageio_descriptor *,struct nfs_pgio_header *); -int nfs_initiate_pgio (struct nfs_client *clp,struct rpc_clnt *rpc_clnt, -struct nfs_pgio_header *hdr,const struct cred *cred, -const struct nfs_rpc_ops *rpc_ops, +int nfs_initiate_pgio (struct nfs_pageio_descriptor *,struct nfs_client *clp, +struct rpc_clnt *rpc_clnt,struct nfs_pgio_header *hdr, +const struct cred *cred,const struct nfs_rpc_ops *rpc_ops,const struct rpc_call_ops *call_ops,int how,int flags);void nfs_free_request (struct nfs_page *req); struct nfs_pgio_mirror *
fs/nfs/pagelist.c +4 -2
@@ -844,7 +844,8 @@ static void nfs_pgio_prepare(struct rpc_task *task, void *calldata)rpc_exit (task, err); } -int nfs_initiate_pgio (struct nfs_client *clp,struct rpc_clnt *rpc_clnt, +int nfs_initiate_pgio (struct nfs_pageio_descriptor *desc, +struct nfs_client *clp,struct rpc_clnt *rpc_clnt,struct nfs_pgio_header *hdr,const struct cred *cred,const struct nfs_rpc_ops *rpc_ops,const struct rpc_call_ops *call_ops,int how,int flags)
@@ -1071,7 +1072,8 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc)if (ret ==0 ) {if (NFS_SERVER (hdr->inode)->nfs_client->cl_minorversion) task_flags =RPC_TASK_MOVEABLE ; - ret = nfs_initiate_pgio(NFS_SERVER(hdr->inode)->nfs_client, + ret = nfs_initiate_pgio(desc, + NFS_SERVER(hdr->inode)->nfs_client, NFS_CLIENT(hdr->inode), hdr, hdr->cred,
fs/nfs/pnfs.c +13 -11
@@ -2885,10 +2885,11 @@ pnfs_write_through_mds(struct nfs_pageio_descriptor *desc, }static enum pnfs_try_status -pnfs_try_to_write_data (struct nfs_pgio_header *hdr, -const struct rpc_call_ops *call_ops, -struct pnfs_layout_segment *lseg, -int how) +pnfs_try_to_write_data (struct nfs_pageio_descriptor *desc, +struct nfs_pgio_header *hdr, +const struct rpc_call_ops *call_ops, +struct pnfs_layout_segment *lseg, +int how) {struct inode *inode = hdr->inode;enum pnfs_try_status trypnfs;
@@ -2898,7 +2899,7 @@ pnfs_try_to_write_data(struct nfs_pgio_header *hdr,dprintk ("%s: Writing ino:%lu %u@%llu (how %d)\n" , __func__, inode->i_ino, hdr->args.count, hdr->args.offset, how); - trypnfs = nfss->pnfs_curr_ld->write_pagelist (hdr, how); + trypnfs = nfss->pnfs_curr_ld->write_pagelist (desc, hdr, how);if (trypnfs !=PNFS_NOT_ATTEMPTED )nfs_inc_stats (inode,NFSIOS_PNFS_WRITE );dprintk ("%s End (trypnfs:%d)\n" , __func__, trypnfs);
@@ -2913,7 +2914,7 @@ pnfs_do_write(struct nfs_pageio_descriptor *desc,struct pnfs_layout_segment *lseg = desc->pg_lseg;enum pnfs_try_status trypnfs; - trypnfs =pnfs_try_to_write_data (hdr, call_ops, lseg, how); + trypnfs =pnfs_try_to_write_data (desc, hdr, call_ops, lseg, how);switch (trypnfs) {case PNFS_NOT_ATTEMPTED :pnfs_write_through_mds (desc, hdr);
@@ -3012,9 +3013,10 @@ pnfs_read_through_mds(struct nfs_pageio_descriptor *desc,* Call the appropriate parallel I/O subsystem read function. */ static enum pnfs_try_status -pnfs_try_to_read_data (struct nfs_pgio_header *hdr, -const struct rpc_call_ops *call_ops, -struct pnfs_layout_segment *lseg) +pnfs_try_to_read_data (struct nfs_pageio_descriptor *desc, +struct nfs_pgio_header *hdr, +const struct rpc_call_ops *call_ops, +struct pnfs_layout_segment *lseg) {struct inode *inode = hdr->inode;struct nfs_server *nfss =NFS_SERVER (inode);
@@ -3025,7 +3027,7 @@ pnfs_try_to_read_data(struct nfs_pgio_header *hdr,dprintk ("%s: Reading ino:%lu %u@%llu\n" , __func__, inode->i_ino, hdr->args.count, hdr->args.offset); - trypnfs = nfss->pnfs_curr_ld->read_pagelist (hdr); + trypnfs = nfss->pnfs_curr_ld->read_pagelist (desc, hdr);if (trypnfs !=PNFS_NOT_ATTEMPTED )nfs_inc_stats (inode,NFSIOS_PNFS_READ );dprintk ("%s End (trypnfs:%d)\n" , __func__, trypnfs);
@@ -3058,7 +3060,7 @@ pnfs_do_read(struct nfs_pageio_descriptor *desc, struct nfs_pgio_header *hdr)struct pnfs_layout_segment *lseg = desc->pg_lseg;enum pnfs_try_status trypnfs; - trypnfs =pnfs_try_to_read_data (hdr, call_ops, lseg); + trypnfs =pnfs_try_to_read_data (desc, hdr, call_ops, lseg);switch (trypnfs) {case PNFS_NOT_ATTEMPTED :pnfs_read_through_mds (desc, hdr);
fs/nfs/pnfs.h +4 -2
@@ -157,8 +157,10 @@ struct pnfs_layoutdriver_type {* Return PNFS_ATTEMPTED to indicate the layout code has attempted * I/O, else return PNFS_NOT_ATTEMPTED to fall back to normal NFS */ -enum pnfs_try_status (*read_pagelist)(struct nfs_pgio_header *); -enum pnfs_try_status (*write_pagelist)(struct nfs_pgio_header *,int ); +enum pnfs_try_status (*read_pagelist)(struct nfs_pageio_descriptor *, +struct nfs_pgio_header *); +enum pnfs_try_status (*write_pagelist)(struct nfs_pageio_descriptor *, +struct nfs_pgio_header *,int );void (*free_deviceid_node) (struct nfs4_deviceid_node *);struct nfs4_deviceid_node * (*alloc_deviceid_node)
Signature · 1 line
2.44.0
PATCH v4 3/18 nfs: pass struct file to nfs_init_pgio and nfs_init_commit
In reply to Mike SnitzerFrom: Weston Andros Adamson <[email protected]>
This is needed for localio support.
--- fs/nfs/filelayout/filelayout.c | 6 +++--- fs/nfs/flexfilelayout/flexfilelayout.c | 6 +++--- fs/nfs/internal.h | 6 ++++-- fs/nfs/pagelist.c | 6 ++++-- fs/nfs/pnfs_nfs.c | 2 +- fs/nfs/write.c | 5 +++-- 6 files changed, 18 insertions(+), 13 deletions(-)
fs/nfs/filelayout/filelayout.c +3 -3
@@ -489,7 +489,7 @@ filelayout_read_pagelist(struct nfs_pageio_descriptor *desc,/* Perform an asynchronous read to ds */ nfs_initiate_pgio (desc, ds->ds_clp, ds_clnt, hdr, hdr->cred,NFS_PROTO (hdr->inode), &filelayout_read_call_ops, -0 ,RPC_TASK_SOFTCONN ); +0 ,RPC_TASK_SOFTCONN ,NULL );return PNFS_ATTEMPTED ; }
@@ -532,7 +532,7 @@ filelayout_write_pagelist(struct nfs_pageio_descriptor *desc,/* Perform an asynchronous write */ nfs_initiate_pgio (desc, ds->ds_clp, ds_clnt, hdr, hdr->cred,NFS_PROTO (hdr->inode), &filelayout_write_call_ops, - sync,RPC_TASK_SOFTCONN ); + sync,RPC_TASK_SOFTCONN ,NULL );return PNFS_ATTEMPTED ; }
@@ -1013,7 +1013,7 @@ static int filelayout_initiate_commit(struct nfs_commit_data *data, int how) data->args.fh = fh;return nfs_initiate_commit (ds_clnt, data,NFS_PROTO (data->inode), &filelayout_commit_call_ops, how, -RPC_TASK_SOFTCONN ); +RPC_TASK_SOFTCONN ,NULL ); out_err:pnfs_generic_prepare_to_resend_writes (data);pnfs_generic_commit_release (data);
fs/nfs/flexfilelayout/flexfilelayout.c +3 -3
@@ -1808,7 +1808,7 @@ ff_layout_read_pagelist(struct nfs_pageio_descriptor *desc, ds->ds_clp->rpc_ops, vers ==3 ? &ff_layout_read_call_ops_v3 : &ff_layout_read_call_ops_v4, - 0, RPC_TASK_SOFTCONN); + 0, RPC_TASK_SOFTCONN, NULL);put_cred (ds_cred);return PNFS_ATTEMPTED ;
@@ -1878,7 +1878,7 @@ ff_layout_write_pagelist(struct nfs_pageio_descriptor *desc, ds->ds_clp->rpc_ops, vers ==3 ? &ff_layout_write_call_ops_v3 : &ff_layout_write_call_ops_v4, - sync, RPC_TASK_SOFTCONN); + sync, RPC_TASK_SOFTCONN, NULL);put_cred (ds_cred);return PNFS_ATTEMPTED ;
@@ -1953,7 +1953,7 @@ static int ff_layout_initiate_commit(struct nfs_commit_data *data, int how) ret =nfs_initiate_commit (ds_clnt, data, ds->ds_clp->rpc_ops, vers ==3 ? &ff_layout_commit_call_ops_v3 : &ff_layout_commit_call_ops_v4, - how,RPC_TASK_SOFTCONN ); + how,RPC_TASK_SOFTCONN ,NULL );put_cred (ds_cred);return ret; out_err:
fs/nfs/internal.h +4 -2
@@ -309,7 +309,8 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *, struct nfs_pgio_header *);int nfs_initiate_pgio (struct nfs_pageio_descriptor *,struct nfs_client *clp,struct rpc_clnt *rpc_clnt,struct nfs_pgio_header *hdr,const struct cred *cred,const struct nfs_rpc_ops *rpc_ops, -const struct rpc_call_ops *call_ops,int how,int flags); +const struct rpc_call_ops *call_ops,int how,int flags, +struct file *localio);void nfs_free_request (struct nfs_page *req);struct nfs_pgio_mirror *nfs_pgio_current_mirror (struct nfs_pageio_descriptor *desc);
@@ -529,7 +530,8 @@ extern int nfs_initiate_commit(struct rpc_clnt *clnt,struct nfs_commit_data *data, const struct nfs_rpc_ops *nfs_ops, const struct rpc_call_ops *call_ops, - int how, int flags); + int how, int flags, + struct file *localio); extern void nfs_init_commit(struct nfs_commit_data *data, struct list_head *head, struct pnfs_layout_segment *lseg,
fs/nfs/pagelist.c +4 -2
@@ -848,7 +848,8 @@ int nfs_initiate_pgio(struct nfs_pageio_descriptor *desc, struct nfs_client *clp, struct rpc_clnt *rpc_clnt, struct nfs_pgio_header *hdr, const struct cred *cred, const struct nfs_rpc_ops *rpc_ops, - const struct rpc_call_ops *call_ops, int how, int flags) + const struct rpc_call_ops *call_ops, int how, int flags, + struct file *localio) { struct rpc_task *task; struct rpc_message msg = {
@@ -1080,7 +1081,8 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc)NFS_PROTO (hdr->inode), desc->pg_rpc_callops, desc->pg_ioflags, - RPC_TASK_CRED_NOREF | task_flags); +RPC_TASK_CRED_NOREF | task_flags, + NULL); }return ret; }
fs/nfs/pnfs_nfs.c +1 -1
@@ -537,7 +537,7 @@ pnfs_generic_commit_pagelist(struct inode *inode, struct list_head *mds_pages,nfs_initiate_commit (NFS_CLIENT (inode), data,NFS_PROTO (data->inode), data->mds_ops, how, -RPC_TASK_CRED_NOREF ); +RPC_TASK_CRED_NOREF ,NULL ); }else {nfs_init_commit (data,NULL , data->lseg, cinfo);initiate_commit (data, how);
fs/nfs/write.c +3 -2
@@ -1670,7 +1670,8 @@ EXPORT_SYMBOL_GPL(nfs_commitdata_release);int nfs_initiate_commit (struct rpc_clnt *clnt,struct nfs_commit_data *data,const struct nfs_rpc_ops *nfs_ops,const struct rpc_call_ops *call_ops, -int how,int flags) +int how,int flags, +struct file *localio) {struct rpc_task *task;int priority =flush_task_priority (how);
@@ -1816,7 +1817,7 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how, task_flags =RPC_TASK_MOVEABLE ;return nfs_initiate_commit (NFS_CLIENT (inode), data,NFS_PROTO (inode), data->mds_ops, how, -RPC_TASK_CRED_NOREF | task_flags); +RPC_TASK_CRED_NOREF | task_flags,NULL ); }/*
Signature · 1 line
2.44.0
PATCH v4 4/18 sunrpc: add rpcauth_map_to_svc_cred_local
In reply to Mike SnitzerFrom: Weston Andros Adamson <[email protected]>
Add new funtion rpcauth_map_to_svc_cred_local which maps a generic cred to a svc_cred suitable for use in nfsd.
This is needed by the localio code to map nfs client creds to nfs server credentials.
--- include/linux/sunrpc/auth.h | 4 ++++ net/sunrpc/auth.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+)
include/linux/sunrpc/auth.h +4 -0
@@ -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 *); +void rpcauth_map_to_svc_cred_local (struct rpc_auth *, +const struct cred *, +struct svc_cred *);char *rpcauth_stringify_acceptor (struct rpc_cred *); static inline
net/sunrpc/auth.c +15 -0
@@ -308,6 +308,21 @@ rpcauth_init_credcache(struct rpc_auth *auth) }EXPORT_SYMBOL_GPL (rpcauth_init_credcache); +void +rpcauth_map_to_svc_cred_local (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; +if (cred->group_info) + svc->cr_group_info =get_group_info (cred->group_info); +/* These aren't relevant for local (network is bypassed) */ + svc->cr_principal =NULL ; + svc->cr_gss_mech =NULL ; +} +EXPORT_SYMBOL_GPL (rpcauth_map_to_svc_cred_local); +char *rpcauth_stringify_acceptor (struct rpc_cred *cred) {
Signature · 1 line
2.44.0
PATCH v4 5/18 nfs_common: add NFS LOCALIO protocol extension enablement
In reply to Mike SnitzerFirst use is in nfsd, to add access to a global nfsd_uuids list that will be used to identify local nfsd instances.
nfsd_uuids is protected by nfsd_mutex or RCU read lock. List is composed of nfsd_uuid_t instances that are managed as nfsd creates them (per network namespace).
nfsd_uuid_is_local() will be used to search all local nfsd for the client specified nfsd uuid.
--- fs/Kconfig | 3 +++ fs/nfs/Kconfig | 30 +++++++++++++++++++++++++++ fs/nfs_common/Makefile | 3 +++ fs/nfs_common/nfslocalio.c | 42 ++++++++++++++++++++++++++++++++++++++ fs/nfsd/Kconfig | 30 +++++++++++++++++++++++++++ fs/nfsd/netns.h | 4 ++++ fs/nfsd/nfssvc.c | 12 ++++++++++- include/linux/nfslocalio.h | 29 ++++++++++++++++++++++++++ 8 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 fs/nfs_common/nfslocalio.c create mode 100644 include/linux/nfslocalio.h
fs/Kconfig +3 -0
@@ -377,6 +377,9 @@ config NFS_ACL_SUPPORT tristate select FS_POSIX_ACL +config NFS_COMMON_LOCALIO_SUPPORT + tristate + config NFS_COMMON bool depends on NFSD || NFS_FS || LOCKD
fs/nfs/Kconfig +30 -0
@@ -1,10 +1,16 @@ # SPDX-License-Identifier: GPL-2.0-only + +config NFS_LOCALIO + tristate + config NFS_FS tristate "NFS client support" depends on INET && FILE_LOCKING && MULTIUSER select LOCKD select SUNRPC select NFS_ACL_SUPPORT if NFS_V3_ACL + select NFS_LOCALIO if NFS_V3_LOCALIO || NFS_V4_LOCALIO + select NFS_COMMON_LOCALIO_SUPPORT if NFS_LOCALIO help Choose Y here if you want to access files residing on other computers using Sun's Network File System protocol. To compile
@@ -72,6 +78,18 @@ config NFS_V3_ACL If unsure, say N. +config NFS_V3_LOCALIO + bool "NFS client support for the NFSv3 LOCALIO protocol extension" + depends on NFS_V3 + help + Some NFS servers support an auxiliary NFSv3 LOCALIO protocol + that is not an official part of the NFS version 3 protocol. + + This option enables support for version 3 of the LOCALIO + protocol in the kernel's NFS client. + + If unsure, say N. + config NFS_V4 tristate "NFS client support for NFS version 4" depends on NFS_FS
@@ -86,6 +104,18 @@ config NFS_V4 If unsure, say Y. +config NFS_V4_LOCALIO + bool "NFS client support for the NFSv4 LOCALIO protocol extension" + depends on NFS_V4 + help + Some NFS servers support an auxiliary NFSv4 LOCALIO protocol + that is not an official part of the NFS version 4 protocol. + + This option enables support for version 4 of the LOCALIO + protocol in the kernel's NFS client. + + If unsure, say N. + config NFS_SWAP bool "Provide swap over NFS support" default n
fs/nfs_common/Makefile +3 -0
@@ -6,5 +6,8 @@ obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl.o nfs_acl-objs := nfsacl.o +obj-$(CONFIG_NFS_COMMON_LOCALIO_SUPPORT) += nfs_localio.o +nfs_localio-objs := nfslocalio.o + obj-$(CONFIG_GRACE_PERIOD) += grace.o obj-$(CONFIG_NFS_V4_2_SSC_HELPER) += nfs_ssc.o
fs/nfs_common/nfslocalio.c new file +42 -0
42 lines not on this page · raw message
fs/nfsd/Kconfig +30 -0
@@ -1,4 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only + +config NFSD_LOCALIO + tristate + config NFSD tristate "NFS server support" depends on INET
@@ -9,6 +13,8 @@ config NFSD select EXPORTFS select NFS_ACL_SUPPORT if NFSD_V2_ACL select NFS_ACL_SUPPORT if NFSD_V3_ACL + select NFSD_LOCALIO if NFSD_V3_LOCALIO || NFSD_V4_LOCALIO + select NFS_COMMON_LOCALIO_SUPPORT if NFSD_LOCALIO depends on MULTIUSER help Choose Y here if you want to allow other computers to access
@@ -69,6 +75,18 @@ config NFSD_V3_ACL If unsure, say N. +config NFSD_V3_LOCALIO + bool "NFS server support for the NFSv3 LOCALIO protocol extension" + depends on NFSD + help + Some NFS servers support an auxiliary NFSv3 LOCALIO protocol + that is not an official part of the NFS version 3 protocol. + + This option enables support for version 3 of the LOCALIO + protocol in the kernel's NFS server. + + If unsure, say N. + config NFSD_V4 bool "NFS server support for NFS version 4" depends on NFSD && PROC_FS
@@ -89,6 +107,18 @@ config NFSD_V4 If unsure, say N. +config NFSD_V4_LOCALIO + bool "NFS server support for the NFSv4 LOCALIO protocol extension" + depends on NFSD_V4 + help + Some NFS servers support an auxiliary NFSv4 LOCALIO protocol + that is not an official part of the NFS version 4 protocol. + + This option enables support for version 4 of the LOCALIO + protocol in the kernel's NFS server. + + If unsure, say N. + config NFSD_PNFS bool
fs/nfsd/netns.h +4 -0
@@ -15,6 +15,7 @@#include <linux/percpu_counter.h> #include <linux/siphash.h> #include <linux/sunrpc/stats.h> +#include <linux/nfslocalio.h> /* Hash tables for nfs4_clientid state */ #define CLIENT_HASH_BITS 4
@@ -213,6 +214,9 @@ struct nfsd_net {/* last time an admin-revoke happened for NFSv4.0 */ time64_t nfs40_last_revoke; +#if IS_ENABLED (CONFIG_NFSD_LOCALIO ) +nfsd_uuid_t nfsd_uuid; +#endif };/* Simple check to find out if a given net was properly initialized */
fs/nfsd/nfssvc.c +11 -1
@@ -19,6 +19,7 @@#include <linux/sunrpc/svc_xprt.h> #include <linux/lockd/bind.h> #include <linux/nfsacl.h> +#include <linux/nfslocalio.h> #include <linux/seq_file.h> #include <linux/inetdevice.h> #include <net/addrconf.h>
@@ -427,6 +428,10 @@ static int nfsd_startup_net(struct net *net, const struct cred *cred)#ifdef CONFIG_NFSD_V4_2_INTER_SSC nfsd4_ssc_init_umount_work (nn); +#endif +#if IS_ENABLED (CONFIG_NFSD_LOCALIO ) +INIT_LIST_HEAD (&nn->nfsd_uuid.list); +list_add_tail_rcu (&nn->nfsd_uuid.list, &nfsd_uuids);#endif nn->nfsd_net_up = true;return 0 ;
@@ -456,6 +461,9 @@ static void nfsd_shutdown_net(struct net *net)lockd_down (net); nn->lockd_up = false; } +#if IS_ENABLED (CONFIG_NFSD_LOCALIO ) +list_del_rcu (&nn->nfsd_uuid.list); +#endif nn->nfsd_net_up = false;nfsd_shutdown_generic (); }
@@ -787,7 +795,9 @@ nfsd_svc(int nrservs, struct net *net, const struct cred *cred, const char *scopstrscpy (nn->nfsd_name, scope ? scope :utsname ()->nodename,sizeof (nn->nfsd_name)); - +#if IS_ENABLED (CONFIG_NFSD_LOCALIO ) +uuid_gen (&nn->nfsd_uuid.uuid); +#endif error =nfsd_create_serv (net);if (error) goto out;
include/linux/nfslocalio.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2024 Mike Snitzer <[email protected]> +*/ +#ifndef __LINUX_NFSLOCALIO_H +#define __LINUX_NFSLOCALIO_H + +#include <linux/list.h> +#include <linux/uuid.h> + +/* +* Global list of nfsd_uuid_t instances, add/remove +* is protected by fs/nfsd/nfssvc.c:nfsd_mutex. +*/ +extern struct list_head nfsd_uuids; + +/* +* Each nfsd instance has an nfsd_uuid_t that is accessible through the +* global nfsd_uuids list. Useful to allow a client to negotiate if localio +* possible with its server. +*/ +typedef struct { +uuid_t uuid; +struct list_head list; +}nfsd_uuid_t ; + +bool nfsd_uuid_is_local (const uuid_t *uuid); + +#endif /* __LINUX_NFSLOCALIO_H */
Signature · 1 line
2.44.0
PATCH v4 6/18 nfs/nfsd: add "localio" support
In reply to Mike SnitzerFrom: Weston Andros Adamson <[email protected]>
Add client support for bypassing NFS for localhost reads, writes, and commits. This is only useful when the client and the server are running on the same host.
nfs_local_probe() is stubbed out, later commits will enable client and server handshake via a LOCALIO protocol extension.
This has dynamic binding with the nfsd module. Localio will only work if nfsd is already loaded.
The "localio_enabled" nfs kernel module parameter can be used to disable and enable the ability to use localio support.
Also, tracepoints were added for nfs_local_open_fh, nfs_local_enable and nfs_local_disable.
--- fs/nfs/Makefile | 1 + fs/nfs/client.c | 7 + fs/nfs/inode.c | 5 + fs/nfs/internal.h | 53 +++ fs/nfs/localio.c | 797 ++++++++++++++++++++++++++++++++++++++ fs/nfs/nfstrace.h | 61 +++ fs/nfs/pagelist.c | 3 + fs/nfs/write.c | 3 + fs/nfsd/Makefile | 1 + fs/nfsd/filecache.c | 2 +- fs/nfsd/localio.c | 243 ++++++++++++ fs/nfsd/trace.h | 3 +- fs/nfsd/vfs.h | 8 + include/linux/nfs.h | 6 + include/linux/nfs_fs.h | 2 + include/linux/nfs_fs_sb.h | 5 + include/linux/nfs_xdr.h | 1 + 17 files changed, 1199 insertions(+), 2 deletions(-) create mode 100644 fs/nfs/localio.c create mode 100644 fs/nfsd/localio.c
fs/nfs/Makefile +1 -0
@@ -13,6 +13,7 @@ nfs-y := client.o dir.o file.o getroot.o inode.o super.o \ nfs-$(CONFIG_ROOT_NFS) += nfsroot.o nfs-$(CONFIG_SYSCTL) += sysctl.o nfs-$(CONFIG_NFS_FSCACHE) += fscache.o +nfs-$(CONFIG_NFS_LOCALIO) += localio.o obj-$(CONFIG_NFS_V2) += nfsv2.o nfsv2-y := nfs2super.o proc.o nfs2xdr.o
fs/nfs/client.c +7 -0
@@ -178,6 +178,10 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init) clp->cl_max_connect = cl_init->max_connect ? cl_init->max_connect :1 ; clp->cl_net =get_net (cl_init->net); +#if IS_ENABLED (CONFIG_NFS_LOCALIO ) +seqlock_init (&clp->cl_boot_lock); +ktime_get_real_ts64 (&clp->cl_nfssvc_boot); +#endif clp->cl_principal ="*" ; clp->cl_xprtsec = cl_init->xprtsec;return clp;
@@ -233,6 +237,8 @@ static void pnfs_init_server(struct nfs_server *server)*/ void nfs_free_client (struct nfs_client *clp) { +nfs_local_disable (clp); +/* -EIO all pending I/O */ if (!IS_ERR (clp->cl_rpcclient))rpc_shutdown_client (clp->cl_rpcclient);
@@ -424,6 +430,7 @@ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init)list_add_tail (&new->cl_share_link, &nn->nfs_client_list);spin_unlock (&nn->nfs_client_lock); +nfs_local_probe (new);return rpc_ops->init_client (new, cl_init); }
fs/nfs/inode.c +5 -0
@@ -39,6 +39,7 @@#include <linux/slab.h> #include <linux/compat.h> #include <linux/freezer.h> +#include <linux/file.h> #include <linux/uaccess.h> #include <linux/iversion.h>
@@ -1053,6 +1054,7 @@ struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry, ctx->lock_context.open_context = ctx;INIT_LIST_HEAD (&ctx->list); ctx->mdsthreshold =NULL ; + ctx->local_filp =NULL ;return ctx; }EXPORT_SYMBOL_GPL (alloc_nfs_open_context);
@@ -1084,6 +1086,8 @@ static void __put_nfs_open_context(struct nfs_open_context *ctx, int is_sync)nfs_sb_deactive (sb);put_rpccred (rcu_dereference_protected (ctx->ll_cred,1 ));kfree (ctx->mdsthreshold); +if (!IS_ERR_OR_NULL (ctx->local_filp)) +fput (ctx->local_filp);kfree_rcu (ctx, rcu_head); }
@@ -2495,6 +2499,7 @@ static int __init init_nfs_fs(void)if (err) goto out1; +nfs_local_init (); err =register_nfs_fs ();if (err) goto out0;
fs/nfs/internal.h +53 -0
59 lines not on this page · raw message
fs/nfs/localio.c new file +797 -0
797 lines not on this page · raw message
fs/nfs/nfstrace.h +61 -0
67 lines not on this page · raw message
fs/nfs/pagelist.c +3 -0
@@ -879,6 +879,9 @@ int nfs_initiate_pgio(struct nfs_pageio_descriptor *desc, hdr->args.count, (unsigned long long)hdr->args.offset); +if (localio) +return nfs_local_doio (clp, localio, hdr, call_ops); + task =rpc_run_task (&task_setup_data);if (IS_ERR (task))return PTR_ERR (task);
fs/nfs/write.c +3 -0
@@ -1700,6 +1700,9 @@ int nfs_initiate_commit(struct rpc_clnt *clnt, struct nfs_commit_data *data,dprintk ("NFS: initiated commit call\n" ); +if (localio) +return nfs_local_commit (localio, data, call_ops, how); + task =rpc_run_task (&task_setup_data);if (IS_ERR (task))return PTR_ERR (task);
fs/nfsd/Makefile +1 -0
@@ -23,3 +23,4 @@ nfsd-$(CONFIG_NFSD_PNFS) += nfs4layouts.o nfsd-$(CONFIG_NFSD_BLOCKLAYOUT) += blocklayout.o blocklayoutxdr.o nfsd-$(CONFIG_NFSD_SCSILAYOUT) += blocklayout.o blocklayoutxdr.o nfsd-$(CONFIG_NFSD_FLEXFILELAYOUT) += flexfilelayout.o flexfilelayoutxdr.o +nfsd-$(CONFIG_NFSD_LOCALIO) += localio.o
fs/nfsd/filecache.c +1 -1
@@ -52,7 +52,7 @@#define NFSD_FILE_CACHE_UP (0)/* We only care about NFSD_MAY_READ/WRITE for this cache */ -#define NFSD_FILE_MAY_MASK (NFSD_MAY_READ|NFSD_MAY_WRITE) +#define NFSD_FILE_MAY_MASK (NFSD_MAY_READ|NFSD_MAY_WRITE|NFSD_MAY_LOCALIO) static DEFINE_PER_CPU(unsigned long, nfsd_file_cache_hits); static DEFINE_PER_CPU(unsigned long, nfsd_file_acquisitions);
fs/nfsd/localio.c new file +243 -0
243 lines not on this page · raw message
fs/nfsd/trace.h +2 -1
@@ -86,7 +86,8 @@ DEFINE_NFSD_XDR_ERR_EVENT(cant_encode); { NFSD_MAY_NOT_BREAK_LEASE, "NOT_BREAK_LEASE" }, \ { NFSD_MAY_BYPASS_GSS, "BYPASS_GSS" }, \ { NFSD_MAY_READ_IF_EXEC, "READ_IF_EXEC" }, \ - { NFSD_MAY_64BIT_COOKIE, "64BIT_COOKIE" }) + { NFSD_MAY_64BIT_COOKIE, "64BIT_COOKIE" }, \ + { NFSD_MAY_LOCALIO, "LOCALIO" }) TRACE_EVENT(nfsd_compound, TP_PROTO(
fs/nfsd/vfs.h +8 -0
@@ -36,6 +36,8 @@#define NFSD_MAY_CREATE (NFSD_MAY_EXEC|NFSD_MAY_WRITE)#define NFSD_MAY_REMOVE (NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC) +#define NFSD_MAY_LOCALIO 0x800000 +struct nfsd_file ;/*
@@ -158,6 +160,12 @@ __be32 nfsd_permission(struct svc_rqst *, struct svc_export *,void nfsd_filp_close (struct file *fp); +int nfsd_open_local_fh (struct rpc_clnt *rpc_clnt, +const struct cred *cred, +const struct nfs_fh *nfs_fh, +const fmode_t fmode, +struct file **pfilp); +static inline int fh_want_write (struct svc_fh *fh) {int ret;
include/linux/nfs.h +6 -0
@@ -8,6 +8,8 @@#ifndef _LINUX_NFS_H#define _LINUX_NFS_H +#include <linux/cred.h> +#include <linux/sunrpc/auth.h> #include <linux/sunrpc/msg_prot.h> #include <linux/string.h> #include <linux/crc32.h>
@@ -46,6 +48,10 @@ enum nfs3_stable_how { NFS_INVALID_STABLE_HOW = -1 }; +typedef int (*nfs_to_nfsd_open_t )(struct rpc_clnt *,const struct cred *, +const struct nfs_fh *,const fmode_t , +struct file **); +#ifdef CONFIG_CRC32 /** * nfs_fhandle_hash - calculate the crc32 hash for the filehandle
include/linux/nfs_fs.h +2 -0
@@ -96,6 +96,8 @@ struct nfs_open_context {struct list_head list;struct nfs4_threshold *mdsthreshold;struct rcu_head rcu_head; + +struct file *local_filp; };struct nfs_open_dir_context {
include/linux/nfs_fs_sb.h +5 -0
@@ -49,6 +49,7 @@ struct nfs_client {#define NFS_CS_DS 7/* - Server is a DS */ #define NFS_CS_REUSEPORT 8/* - reuse src port on reconnect */ #define NFS_CS_PNFS 9/* - Server used for pnfs */ +#define NFS_CS_LOCAL_IO 10/* - client is local */ struct sockaddr_storage cl_addr;/* server identifier */ size_t cl_addrlen;char * cl_hostname;/* hostname of server */
@@ -125,6 +126,10 @@ struct nfs_client {struct net *cl_net;struct list_head pending_cb_stateids;struct rcu_head rcu; + +/* localio */ +struct timespec64 cl_nfssvc_boot; +seqlock_t cl_boot_lock; };/*
include/linux/nfs_xdr.h +1 -0
@@ -1605,6 +1605,7 @@ enum {NFS_IOHDR_RESEND_PNFS ,NFS_IOHDR_RESEND_MDS ,NFS_IOHDR_UNSTABLE_WRITES , + NFS_IOHDR_ODIRECT, };struct nfs_io_completion ;
Signature · 1 line
2.44.0
PATCH v4 7/18 NFS: Enable localio for non-pNFS I/O
In reply to Mike SnitzerFrom: Trond Myklebust <[email protected]>
Try a local open of the file we're writing to, and if it succeeds, then do local I/O.
--- fs/nfs/pagelist.c | 19 ++++++++++--------- fs/nfs/write.c | 7 ++++++- 2 files changed, 16 insertions(+), 10 deletions(-)
fs/nfs/pagelist.c +10 -9
@@ -1063,6 +1063,7 @@ EXPORT_SYMBOL_GPL(nfs_generic_pgio);static int nfs_generic_pg_pgios (struct nfs_pageio_descriptor *desc) {struct nfs_pgio_header *hdr; +struct file *filp;int ret;unsigned short task_flags =0 ;
@@ -1074,18 +1075,18 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc)nfs_pgheader_init (desc, hdr, nfs_pgio_header_free); ret =nfs_generic_pgio (desc, hdr);if (ret ==0 ) { +struct nfs_client *clp =NFS_SERVER (hdr->inode)->nfs_client; + + filp =nfs_local_file_open (clp, hdr->cred, hdr->args.fh, + hdr->args.context); +if (NFS_SERVER (hdr->inode)->nfs_client->cl_minorversion) task_flags =RPC_TASK_MOVEABLE ; - ret =nfs_initiate_pgio (desc, -NFS_SERVER (hdr->inode)->nfs_client, -NFS_CLIENT (hdr->inode), - hdr, - hdr->cred, -NFS_PROTO (hdr->inode), - desc->pg_rpc_callops, - desc->pg_ioflags, + ret =nfs_initiate_pgio (desc, clp,NFS_CLIENT (hdr->inode), + hdr, hdr->cred,NFS_PROTO (hdr->inode), + desc->pg_rpc_callops, desc->pg_ioflags,RPC_TASK_CRED_NOREF | task_flags, -NULL ); + filp); }return ret; }
fs/nfs/write.c +6 -1
@@ -1802,6 +1802,8 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how, struct nfs_commit_info *cinfo) {struct nfs_commit_data *data; +struct nfs_client *clp =NFS_SERVER (inode)->nfs_client; +struct file *filp;unsigned short task_flags =0 ;/* another commit raced with us */
@@ -1818,9 +1820,12 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how,nfs_init_commit (data, head,NULL , cinfo);if (NFS_SERVER (inode)->nfs_client->cl_minorversion) task_flags =RPC_TASK_MOVEABLE ; + + filp =nfs_local_file_open (clp, data->cred, data->args.fh, + data->context);return nfs_initiate_commit (NFS_CLIENT (inode), data,NFS_PROTO (inode), data->mds_ops, how, -RPC_TASK_CRED_NOREF | task_flags,NULL ); +RPC_TASK_CRED_NOREF | task_flags, filp); }/*
Signature · 1 line
2.44.0
PATCH v4 8/18 pnfs/flexfiles: Enable localio for flexfiles I/O
In reply to Mike SnitzerFrom: Trond Myklebust <[email protected]>
If the DS is local to this client, then we should be able to use local I/O to write the data.
--- fs/nfs/flexfilelayout/flexfilelayout.c | 113 ++++++++++++++++++++-- fs/nfs/flexfilelayout/flexfilelayout.h | 2 + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 6 ++ 3 files changed, 112 insertions(+), 9 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +104 -9
@@ -11,6 +11,7 @@#include <linux/nfs_mount.h> #include <linux/nfs_page.h> #include <linux/module.h> +#include <linux/file.h> #include <linux/sched/mm.h> #include <linux/sunrpc/metrics.h>
@@ -162,6 +163,52 @@ decode_name(struct xdr_stream *xdr, u32 *id)return 0 ; } +static struct file * +ff_local_open_fh (struct pnfs_layout_segment *lseg, +u32 ds_idx, +struct nfs_client *clp, +const struct cred *cred, +struct nfs_fh *fh, +fmode_t mode) +{ +struct nfs4_ff_layout_mirror *mirror =FF_LAYOUT_COMP (lseg, ds_idx); +struct file *filp, *new,__rcu **pfile; + +if (!nfs_server_is_local (clp)) +return NULL ; +if (mode &FMODE_WRITE ) { +/* +* Always request read and write access since this corresponds +* to a rw layout. +*/ + mode |=FMODE_READ ; + pfile = &mirror->rw_file; + }else + pfile = &mirror->ro_file; + + new =NULL ; +rcu_read_lock (); + filp =rcu_dereference (*pfile); +if (!filp) { +rcu_read_unlock (); + new =nfs_local_open_fh (clp, cred, fh, mode); +if (IS_ERR (new)) +return NULL ; +rcu_read_lock (); +/* try to swap in the pointer */ + filp =cmpxchg (pfile,NULL , new); +if (!filp) { + filp = new; + new =NULL ; + } + } + filp =get_file_rcu (&filp); +rcu_read_unlock (); +if (new) +fput (new); +return filp; +} +static bool ff_mirror_match_fh (const struct nfs4_ff_layout_mirror *m1,const struct nfs4_ff_layout_mirror *m2) {
@@ -237,8 +284,15 @@ static struct nfs4_ff_layout_mirror *ff_layout_alloc_mirror(gfp_t gfp_flags)static void ff_layout_free_mirror (struct nfs4_ff_layout_mirror *mirror) { +struct file *filp;const struct cred *cred; + filp =rcu_access_pointer (mirror->ro_file); +if (filp) +fput (filp); + filp =rcu_access_pointer (mirror->rw_file); +if (filp) +fput (filp);ff_layout_remove_mirror (mirror);kfree (mirror->fh_versions); cred =rcu_access_pointer (mirror->ro_cred);
@@ -414,6 +468,7 @@ ff_layout_alloc_lseg(struct pnfs_layout_hdr *lh,struct nfs4_ff_layout_mirror *mirror;struct cred *kcred;const struct cred __rcu *cred; +const struct cred __rcu *old;kuid_t uid;kgid_t gid;u32 ds_count, fh_count, id;
@@ -513,13 +568,26 @@ ff_layout_alloc_lseg(struct pnfs_layout_hdr *lh, mirror =ff_layout_add_mirror (lh, fls->mirror_array[i]);if (mirror != fls->mirror_array[i]) { +struct file *filp; +/* swap cred ptrs so free_mirror will clean up old */ if (lgr->range.iomode ==IOMODE_READ ) { - cred =xchg (&mirror->ro_cred, cred); -rcu_assign_pointer (fls->mirror_array[i]->ro_cred, cred); + old =xchg (&mirror->ro_cred, cred); +rcu_assign_pointer (fls->mirror_array[i]->ro_cred, old); +/* drop file if creds changed */ +if (old != cred) { + filp =rcu_dereference_protected (xchg (&mirror->ro_file,NULL ),1 ); +if (filp) +fput (filp); + } }else { - cred =xchg (&mirror->rw_cred, cred); -rcu_assign_pointer (fls->mirror_array[i]->rw_cred, cred); + old =xchg (&mirror->rw_cred, cred); +rcu_assign_pointer (fls->mirror_array[i]->rw_cred, old); +if (old != cred) { + filp =rcu_dereference_protected (xchg (&mirror->rw_file,NULL ),1 ); +if (filp) +fput (filp); + } }ff_layout_free_mirror (fls->mirror_array[i]); fls->mirror_array[i] = mirror;
@@ -1757,6 +1825,7 @@ ff_layout_read_pagelist(struct nfs_pageio_descriptor *desc,struct pnfs_layout_segment *lseg = hdr->lseg;struct nfs4_pnfs_ds *ds;struct rpc_clnt *ds_clnt; +struct file *filp;struct nfs4_ff_layout_mirror *mirror;const struct cred *ds_cred;loff_t offset = hdr->args.offset;
@@ -1803,12 +1872,20 @@ ff_layout_read_pagelist(struct nfs_pageio_descriptor *desc, hdr->args.offset = offset; hdr->mds_offset = offset; +/* Start IO accounting for local read */ + filp =ff_local_open_fh (lseg, idx, ds->ds_clp, ds_cred, fh, +FMODE_READ ); +if (filp) { + hdr->task.tk_start =ktime_get (); +ff_layout_read_record_layoutstats_start (&hdr->task, hdr); + } +/* Perform an asynchronous read to ds */ nfs_initiate_pgio (desc, ds->ds_clp, ds_clnt, hdr, ds_cred, ds->ds_clp->rpc_ops, vers ==3 ? &ff_layout_read_call_ops_v3 : &ff_layout_read_call_ops_v4, -0 ,RPC_TASK_SOFTCONN ,NULL ); +0 ,RPC_TASK_SOFTCONN , filp);put_cred (ds_cred);return PNFS_ATTEMPTED ;
@@ -1829,6 +1906,7 @@ ff_layout_write_pagelist(struct nfs_pageio_descriptor *desc,struct pnfs_layout_segment *lseg = hdr->lseg;struct nfs4_pnfs_ds *ds;struct rpc_clnt *ds_clnt; +struct file *filp;struct nfs4_ff_layout_mirror *mirror;const struct cred *ds_cred;loff_t offset = hdr->args.offset;
@@ -1873,12 +1951,20 @@ ff_layout_write_pagelist(struct nfs_pageio_descriptor *desc,*/ hdr->args.offset = offset; +/* Start IO accounting for local write */ + filp =ff_local_open_fh (lseg, idx, ds->ds_clp, ds_cred, fh, +FMODE_READ |FMODE_WRITE ); +if (filp) { + hdr->task.tk_start =ktime_get (); +ff_layout_write_record_layoutstats_start (&hdr->task, hdr); + } +/* Perform an asynchronous write */ nfs_initiate_pgio (desc, ds->ds_clp, ds_clnt, hdr, ds_cred, ds->ds_clp->rpc_ops, vers ==3 ? &ff_layout_write_call_ops_v3 : &ff_layout_write_call_ops_v4, - sync,RPC_TASK_SOFTCONN ,NULL ); + sync,RPC_TASK_SOFTCONN , filp);put_cred (ds_cred);return PNFS_ATTEMPTED ;
@@ -1912,6 +1998,7 @@ static int ff_layout_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; +struct file *filp;struct nfs4_ff_layout_mirror *mirror;const struct cred *ds_cred;u32 idx;
@@ -1950,10 +2037,18 @@ static int ff_layout_initiate_commit(struct nfs_commit_data *data, int how)if (fh) data->args.fh = fh; +/* Start IO accounting for local commit */ + filp =ff_local_open_fh (lseg, idx, ds->ds_clp, ds_cred, fh, +FMODE_READ |FMODE_WRITE ); +if (filp) { + data->task.tk_start =ktime_get (); +ff_layout_commit_record_layoutstats_start (&data->task, data); + } + ret =nfs_initiate_commit (ds_clnt, data, ds->ds_clp->rpc_ops, - vers ==3 ? &ff_layout_commit_call_ops_v3 : - &ff_layout_commit_call_ops_v4, - how,RPC_TASK_SOFTCONN ,NULL ); + vers ==3 ? &ff_layout_commit_call_ops_v3 : + &ff_layout_commit_call_ops_v4, + how,RPC_TASK_SOFTCONN , filp);put_cred (ds_cred);return ret; out_err:
fs/nfs/flexfilelayout/flexfilelayout.h +2 -0
@@ -82,7 +82,9 @@ struct nfs4_ff_layout_mirror {struct nfs_fh *fh_versions;nfs4_stateid stateid;const struct cred __rcu *ro_cred; +struct file __rcu *ro_file;const struct cred __rcu *rw_cred; +struct file __rcu *rw_file;refcount_t ref;spinlock_t lock;unsigned long flags;
fs/nfs/flexfilelayout/flexfilelayoutdev.c +6 -0
@@ -395,6 +395,12 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg,/* connect success, check rsize/wsize limit */ if (!status) { +/* +* ds_clp is put in destroy_ds(). +* keep ds_clp even if DS is local, so that if local IO cannot +* proceed somehow, we can fall back to NFS whenever we want. +*/ +nfs_local_probe (ds->ds_clp); max_payload =nfs_block_size (rpc_max_payload (ds->ds_clp->cl_rpcclient),NULL );
Signature · 1 line
2.44.0
PATCH v4 9/18 nfs: implement v3 and v4 client support for NFS_LOCALIO_PROGRAM
In reply to Mike SnitzerLOCALIOPROC_GETUUID allows client to discover server's uuid.
nfs_local_probe() will retrieve server's uuid via LOCALIO protocol and verify the server with that uuid it is known to be local. This ensures client and server 1: support localio 2: are local to each other.
While doing so, factor out nfs_init_localioclient() so it is used by both nfs3client.c and nfs4client.c
--- fs/nfs/client.c | 8 ++-- fs/nfs/internal.h | 19 +++++++++ fs/nfs/localio.c | 87 +++++++++++++++++++++++++++++++++++---- fs/nfs/nfs3_fs.h | 1 + fs/nfs/nfs3client.c | 25 +++++++++++ fs/nfs/nfs3proc.c | 3 ++ fs/nfs/nfs3xdr.c | 67 ++++++++++++++++++++++++++++++ fs/nfs/nfs4_fs.h | 2 + fs/nfs/nfs4client.c | 23 +++++++++++ fs/nfs/nfs4proc.c | 3 ++ fs/nfs/nfs4xdr.c | 52 +++++++++++++++++++++++ include/linux/nfs_fs_sb.h | 1 + include/linux/nfs_xdr.h | 10 +++++ include/uapi/linux/nfs.h | 4 ++ 14 files changed, 293 insertions(+), 12 deletions(-)
fs/nfs/client.c +5 -3
@@ -170,7 +170,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init) }INIT_LIST_HEAD (&clp->cl_superblocks); - clp->cl_rpcclient =ERR_PTR (-EINVAL ); + clp->cl_rpcclient = clp->cl_rpcclient_localio =ERR_PTR (-EINVAL ); clp->cl_flags = cl_init->init_flags; clp->cl_proto = cl_init->proto;
@@ -430,8 +430,10 @@ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init)list_add_tail (&new->cl_share_link, &nn->nfs_client_list);spin_unlock (&nn->nfs_client_lock); -nfs_local_probe (new); -return rpc_ops->init_client (new, cl_init); + new = rpc_ops->init_client (new, cl_init); +if (!IS_ERR (new)) +nfs_local_probe (new); +return new; }spin_unlock (&nn->nfs_client_lock);
fs/nfs/internal.h +19 -0
@@ -452,6 +452,25 @@ extern bool nfs_check_cache_invalid(struct inode *, unsigned long);extern int nfs_wait_bit_killable (struct wait_bit_key *key,int mode);#if IS_ENABLED (CONFIG_NFS_LOCALIO ) +/* +* Initialise an NFS localio client connection. +* Inlined here to allow nfs[34]client.c to share this code. +*/ +static __always_inline void +nfs_init_localioclient (struct nfs_client *clp, +const struct rpc_program *program,u32 vers) +{ +if (unlikely (!IS_ERR (clp->cl_rpcclient_localio))) + goto out; + clp->cl_rpcclient_localio =rpc_bind_new_program (clp->cl_rpcclient, + program, vers); +out: +dfprintk_rcu (CLIENT ,"%s: server (%s) %s NFSv%u LOCALIO\n" , __func__, +rpc_peeraddr2str (clp->cl_rpcclient,RPC_DISPLAY_ADDR ), + (IS_ERR (clp->cl_rpcclient_localio) ? +"does not support" :"supports" ), vers); +} +/* localio.c */ extern void nfs_local_init (void );extern void nfs_local_disable (struct nfs_client *);
fs/nfs/localio.c +78 -9
120 lines not on this page · raw message
fs/nfs/nfs3_fs.h +1 -0
@@ -30,6 +30,7 @@ static inline int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,struct nfs_server *nfs3_create_server (struct fs_context *);struct nfs_server *nfs3_clone_server (struct nfs_server *,struct nfs_fh *,struct nfs_fattr *,rpc_authflavor_t ); +void nfs3_init_localioclient (struct nfs_client *);/* nfs3super.c */ extern struct nfs_subversion nfs_v3;
fs/nfs/nfs3client.c +25 -0
@@ -7,6 +7,8 @@#include "netns.h" #include "sysfs.h" +#define NFSDBG_FACILITY NFSDBG_CLIENT +#ifdef CONFIG_NFS_V3_ACL static struct rpc_stat nfsacl_rpcstat = { &nfsacl_program }; static const struct rpc_version *nfsacl_version[] = {
@@ -130,3 +132,26 @@ struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv,return clp; }EXPORT_SYMBOL_GPL (nfs3_set_ds_client); + +#if defined(CONFIG_NFS_V3_LOCALIO ) +static struct rpc_stat nfslocalio_rpcstat = { &nfslocalio_program3 }; +static const struct rpc_version *nfslocalio_version[] = { + [3 ] = &nfslocalio_version3, +}; + +const struct rpc_program nfslocalio_program3 = { + .name ="nfslocalio" , + .number =NFS_LOCALIO_PROGRAM , + .nrvers =ARRAY_SIZE (nfslocalio_version), + .version = nfslocalio_version, + .stats = &nfslocalio_rpcstat, +}; + +/* +* Initialise an NFSv3 localio client connection +*/ +void nfs3_init_localioclient (struct nfs_client *clp) +{ +nfs_init_localioclient (clp, &nfslocalio_program3,3 ); +} +#endif /* CONFIG_NFS_V3_LOCALIO */
fs/nfs/nfs3proc.c +3 -0
@@ -1067,4 +1067,7 @@ const struct nfs_rpc_ops nfs_v3_clientops = { .free_client = nfs_free_client, .create_server = nfs3_create_server, .clone_server = nfs3_clone_server, +#if defined(CONFIG_NFS_V3_LOCALIO ) + .init_localioclient = nfs3_init_localioclient, +#endif };
fs/nfs/nfs3xdr.c +67 -0
70 lines not on this page · raw message
fs/nfs/nfs4_fs.h +2 -0
@@ -538,6 +538,8 @@ extern int nfs4_proc_commit(struct file *dst, __u64 offset, __u32 count, structextern const nfs4_stateid zero_stateid;extern const nfs4_stateid invalid_stateid; +extern void nfs4_init_localioclient (struct nfs_client *); +/* nfs4super.c */ struct nfs_mount_info ;extern struct nfs_subversion nfs_v4;
fs/nfs/nfs4client.c +23 -0
@@ -1384,3 +1384,26 @@ int nfs4_update_server(struct nfs_server *server, const char *hostname,return nfs_probe_server (server,NFS_FH (d_inode (server->super->s_root))); } + +#if defined(CONFIG_NFS_V4_LOCALIO ) +static struct rpc_stat nfslocalio_rpcstat = { &nfslocalio_program4 }; +static const struct rpc_version *nfslocalio_version[] = { + [4 ] = &nfslocalio_version4, +}; + +const struct rpc_program nfslocalio_program4 = { + .name ="nfslocalio" , + .number =NFS_LOCALIO_PROGRAM , + .nrvers =ARRAY_SIZE (nfslocalio_version), + .version = nfslocalio_version, + .stats = &nfslocalio_rpcstat, +}; + +/* +* Initialise an NFSv4 localio client connection +*/ +void nfs4_init_localioclient (struct nfs_client *clp) +{ +nfs_init_localioclient (clp, &nfslocalio_program4,4 ); +} +#endif /* CONFIG_NFS_V4_LOCALIO */
fs/nfs/nfs4proc.c +3 -0
@@ -10745,6 +10745,9 @@ const struct nfs_rpc_ops nfs_v4_clientops = { .discover_trunking = nfs4_discover_trunking, .enable_swap = nfs4_enable_swap, .disable_swap = nfs4_disable_swap, +#if defined(CONFIG_NFS_V4_LOCALIO ) + .init_localioclient = nfs4_init_localioclient, +#endif };static const struct xattr_handler nfs4_xattr_nfs4_acl_handler = {
fs/nfs/nfs4xdr.c +52 -0
55 lines not on this page · raw message
include/linux/nfs_fs_sb.h +1 -0
@@ -130,6 +130,7 @@ struct nfs_client {/* localio */ struct timespec64 cl_nfssvc_boot;seqlock_t cl_boot_lock; +struct rpc_clnt * cl_rpcclient_localio;/* localio RPC client handle */ };/*
include/linux/nfs_xdr.h +10 -0
@@ -1002,6 +1002,10 @@ struct nfs3_getaclres {struct posix_acl * acl_default; }; +struct nfs_getuuidres { +__u8 * uuid; +}; +#if IS_ENABLED (CONFIG_NFS_V4 )typedef u64 clientid4 ;
@@ -1819,6 +1823,7 @@ struct nfs_rpc_ops {int (*discover_trunking)(struct nfs_server *,struct nfs_fh *);void (*enable_swap)(struct inode *inode);void (*disable_swap)(struct inode *inode); +void (*init_localioclient)(struct nfs_client *); };/*
@@ -1834,4 +1839,9 @@ extern const struct rpc_version nfs_version4;extern const struct rpc_version nfsacl_version3;extern const struct rpc_program nfsacl_program; +extern const struct rpc_version nfslocalio_version3; +extern const struct rpc_program nfslocalio_program3; +extern const struct rpc_version nfslocalio_version4; +extern const struct rpc_program nfslocalio_program4; +#endif
include/uapi/linux/nfs.h +4 -0
@@ -33,6 +33,10 @@#define NFS_MNT_VERSION 1#define NFS_MNT3_VERSION 3 +#define NFS_LOCALIO_PROGRAM 100229 +#define LOCALIOPROC_NULL 0 +#define LOCALIOPROC_GETUUID 1 +#define NFS_PIPE_DIRNAME "nfs"/*
Signature · 1 line
2.44.0
PATCH v4 10/18 nfsd: implement v3 and v4 server support for NFS_LOCALIO_PROGRAM
In reply to Mike SnitzerLOCALIOPROC_GETUUID encodes the server's uuid_t in terms of the fixed UUID_SIZE (16). The fixed size opaque encode and decode XDR methods are used instead of the less efficient variable sized methods.
--- fs/nfsd/localio.c | 148 ++++++++++++++++++++++++++++++++++++++++++++++ fs/nfsd/nfsd.h | 11 ++++ fs/nfsd/nfssvc.c | 80 ++++++++++++++++++++++++- fs/nfsd/xdr.h | 6 ++ 4 files changed, 244 insertions(+), 1 deletion(-)
fs/nfsd/localio.c +148 -0
@@ -17,6 +17,9 @@#include "vfs.h" #include "netns.h" #include "filecache.h" +#include "cache.h" +#include "xdr3.h" +#include "xdr4.h" #define NFSDDBG_FACILITY NFSDDBG_FH
@@ -241,3 +244,148 @@ EXPORT_SYMBOL_GPL(nfsd_open_local_fh);/* Compile time type checking, not used by anything */ static nfs_to_nfsd_open_t __maybe_unused nfsd_open_local_fh_typecheck = nfsd_open_local_fh; + +/* +* GETUUID XDR encode functions +*/ + +static __be32 nfsd_proc_null (struct svc_rqst *rqstp) +{ +return rpc_success; +} + +static __be32 nfsd_proc_getuuid (struct svc_rqst *rqstp) +{ +struct nfsd_net *nn =net_generic (SVC_NET (rqstp), nfsd_net_id); +struct nfsd_getuuidres *resp = rqstp->rq_resp; + +uuid_copy (&resp->uuid, &nn->nfsd_uuid.uuid); + resp->status = nfs_ok; + +return rpc_success; +} + +#define NFS_getuuid_sz XDR_QUADLEN(UUID_SIZE) + +static inline void encode_opaque_fixed (struct xdr_stream *xdr,const void *buf,size_t len) +{ +WARN_ON_ONCE (xdr_stream_encode_opaque_fixed (xdr, buf, len) <0 ); +} + +static void encode_uuid (struct xdr_stream *xdr,uuid_t *src_uuid) +{ +u8 uuid[UUID_SIZE ]; + +export_uuid (uuid, src_uuid); +encode_opaque_fixed (xdr, uuid,UUID_SIZE ); +dprintk ("%s: uuid=%pU\n" , __func__, uuid); +} + +#if defined(CONFIG_NFSD_V3_LOCALIO ) +static bool nfs3svc_encode_getuuidres (struct svc_rqst *rqstp, +struct xdr_stream *xdr) +{ +struct nfsd_getuuidres *resp = rqstp->rq_resp; + +if (!svcxdr_encode_nfsstat3 (xdr, resp->status)) +return false; +if (resp->status == nfs_ok) +encode_uuid (xdr, &resp->uuid); + +return true; +} + +#define ST 1/* status */ +#define NFS3_filename_sz (1+(NFS3_MAXNAMLEN>>2)) + +static const struct svc_procedure nfsd_localio_procedures3[2 ] = { + [LOCALIOPROC_NULL ] = { + .pc_func = nfsd_proc_null, + .pc_decode = nfssvc_decode_voidarg, + .pc_encode = nfssvc_encode_voidres, + .pc_argsize =sizeof (struct nfsd_voidargs ), + .pc_ressize =sizeof (struct nfsd_voidres ), + .pc_cachetype =RC_NOCACHE , + .pc_xdrressize =1 , + .pc_name ="NULL" , + }, + [LOCALIOPROC_GETUUID ] = { + .pc_func = nfsd_proc_getuuid, + .pc_decode = nfssvc_decode_voidarg, + .pc_encode = nfs3svc_encode_getuuidres, + .pc_argsize =sizeof (struct nfsd_voidargs ), + .pc_ressize =sizeof (struct nfsd_getuuidres ), + .pc_cachetype =RC_NOCACHE , + .pc_xdrressize =1 +NFS_getuuid_sz, + .pc_name ="GETUUID" , + }, +}; + +static DEFINE_PER_CPU_ALIGNED(unsigned long, + nfsd_localio_count3[ARRAY_SIZE(nfsd_localio_procedures3)]); +const struct svc_version nfsd_localio_version3 = { + .vs_vers =3 , + .vs_nproc =2 , + .vs_proc = nfsd_localio_procedures3, + .vs_dispatch = nfsd_dispatch, + .vs_count = nfsd_localio_count3, + .vs_xdrsize =NFS3_SVC_XDRSIZE , +}; +#endif /* CONFIG_NFSD_V3_LOCALIO */ + +#if defined(CONFIG_NFSD_V4_LOCALIO ) +static bool nfs4svc_encode_getuuidres (struct svc_rqst *rqstp, +struct xdr_stream *xdr) +{ +struct nfsd_getuuidres *resp = rqstp->rq_resp; +__be32 *p; + + p =xdr_reserve_space (xdr,8 ); +if (!p) +return 0 ; + *p++ =cpu_to_be32 (LOCALIOPROC_GETUUID ); + *p++ = resp->status; + +if (resp->status == nfs_ok) +encode_uuid (xdr, &resp->uuid); + +return 1 ; +} + +static const struct svc_procedure nfsd_localio_procedures4[2 ] = { + [LOCALIOPROC_NULL ] = { + .pc_func = nfsd_proc_null, + .pc_decode = nfssvc_decode_voidarg, + .pc_encode = nfssvc_encode_voidres, + .pc_argsize =sizeof (struct nfsd_voidargs ), + .pc_ressize =sizeof (struct nfsd_voidres ), + .pc_cachetype =RC_NOCACHE , + .pc_xdrressize =1 , + .pc_name ="NULL" , + }, + [LOCALIOPROC_GETUUID ] = { + .pc_func = nfsd_proc_getuuid, + .pc_decode = nfssvc_decode_voidarg, + .pc_encode = nfs4svc_encode_getuuidres, + .pc_argsize =sizeof (struct nfsd_voidargs ), + .pc_ressize =sizeof (struct nfsd_getuuidres ), + .pc_cachetype =RC_NOCACHE , + .pc_xdrressize =2 +NFS_getuuid_sz, + .pc_name ="GETUUID" , + }, +}; + +static DEFINE_PER_CPU_ALIGNED(unsigned long, + nfsd_localio_count4[ARRAY_SIZE(nfsd_localio_procedures4)]); +const struct svc_version nfsd_localio_version4 = { + .vs_vers =4 , + .vs_nproc =2 , + .vs_proc = nfsd_localio_procedures4, + .vs_dispatch = nfsd_dispatch, + .vs_count = nfsd_localio_count4, + .vs_xdrsize =NFS4_SVC_XDRSIZE , + .vs_rpcb_optnl = true, + .vs_need_cong_ctrl = true, + +}; +#endif /* CONFIG_NFSD_V4_LOCALIO */
fs/nfsd/nfsd.h +11 -0
@@ -142,6 +142,17 @@ extern const struct svc_version nfsd_acl_version3;#endif #endif +#if defined(CONFIG_NFSD_V3_LOCALIO ) +extern const struct svc_version nfsd_localio_version3; +#else +#define nfsd_localio_version3 NULL +#endif +#if defined(CONFIG_NFSD_V4_LOCALIO ) +extern const struct svc_version nfsd_localio_version4; +#else +#define nfsd_localio_version4 NULL +#endif +struct nfsd_net ;enum vers_op {NFSD_SET ,NFSD_CLEAR ,NFSD_TEST ,NFSD_AVAIL };
fs/nfsd/nfssvc.c +79 -1
116 lines not on this page · raw message
fs/nfsd/xdr.h +6 -0
@@ -5,6 +5,7 @@#define LINUX_NFSD_H #include <linux/vfs.h> +#include <linux/uuid.h> #include "nfsd.h" #include "nfsfh.h"
@@ -123,6 +124,11 @@ struct nfsd_statfsres {struct kstatfs stats; }; +struct nfsd_getuuidres { +__be32 status; +uuid_t uuid; +}; +/* * Storage requirements for XDR arguments and results. */
Signature · 1 line
2.44.0
PATCH v4 11/18 nfs/nfsd: consolidate {encode,decode}_opaque_fixed in nfs_xdr.h
In reply to Mike SnitzerEliminates duplicate functions in various files.
--- fs/nfs/flexfilelayout/flexfilelayout.c | 6 ------ fs/nfs/nfs3xdr.c | 9 --------- fs/nfs/nfs4xdr.c | 13 ------------- fs/nfsd/localio.c | 7 ++----- include/linux/nfs_xdr.h | 20 +++++++++++++++++++- 5 files changed, 21 insertions(+), 34 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +0 -6
@@ -2185,12 +2185,6 @@ static int ff_layout_encode_ioerr(struct xdr_stream *xdr,return ff_layout_encode_ds_ioerr (xdr, &ff_args->errors); } -static void -encode_opaque_fixed (struct xdr_stream *xdr,const void *buf,size_t len) -{ -WARN_ON_ONCE (xdr_stream_encode_opaque_fixed (xdr, buf, len) <0 ); -} - static void ff_layout_encode_ff_iostat_head(struct xdr_stream *xdr, const nfs4_stateid *stateid,
fs/nfs/nfs3xdr.c +0 -9
@@ -2591,15 +2591,6 @@ static void nfs3_xdr_enc_getuuidargs(struct rpc_rqst *req,/* void function */ } -// FIXME: factor out from fs/nfs/nfs4xdr.c -static int decode_opaque_fixed (struct xdr_stream *xdr,void *buf,size_t len) -{ -ssize_t ret =xdr_stream_decode_opaque_fixed (xdr, buf, len); -if (unlikely (ret <0 )) -return -EIO ; -return 0 ; -} -static inline int nfs3_decode_getuuidresok (struct xdr_stream *xdr,struct nfs_getuuidres *result) {
fs/nfs/nfs4xdr.c +0 -13
@@ -968,11 +968,6 @@ static __be32 *reserve_space(struct xdr_stream *xdr, size_t nbytes)return p; } -static void encode_opaque_fixed (struct xdr_stream *xdr,const void *buf,size_t len) -{ -WARN_ON_ONCE (xdr_stream_encode_opaque_fixed (xdr, buf, len) <0 ); -} -static void encode_string (struct xdr_stream *xdr,unsigned int len,const char *str) {WARN_ON_ONCE (xdr_stream_encode_opaque (xdr, str, len) <0 );
@@ -4352,14 +4347,6 @@ static int decode_access(struct xdr_stream *xdr, u32 *supported, u32 *access)return 0 ; } -static int decode_opaque_fixed (struct xdr_stream *xdr,void *buf,size_t len) -{ -ssize_t ret =xdr_stream_decode_opaque_fixed (xdr, buf, len); -if (unlikely (ret <0 )) -return -EIO ; -return 0 ; -} -static int decode_stateid (struct xdr_stream *xdr,nfs4_stateid *stateid) {return decode_opaque_fixed (xdr, stateid,NFS4_STATEID_SIZE );
fs/nfsd/localio.c +2 -5
@@ -11,6 +11,8 @@#include <linux/sunrpc/svcauth_gss.h> #include <linux/sunrpc/clnt.h> #include <linux/nfs.h> +#include <linux/nfs_fs.h> +#include <linux/nfs_xdr.h> #include <linux/string.h> #include "nfsd.h"
@@ -267,11 +269,6 @@ static __be32 nfsd_proc_getuuid(struct svc_rqst *rqstp)#define NFS_getuuid_sz XDR_QUADLEN(UUID_SIZE) -static inline void encode_opaque_fixed (struct xdr_stream *xdr,const void *buf,size_t len) -{ -WARN_ON_ONCE (xdr_stream_encode_opaque_fixed (xdr, buf, len) <0 ); -} -static void encode_uuid (struct xdr_stream *xdr,uuid_t *src_uuid) {u8 uuid[UUID_SIZE ];
include/linux/nfs_xdr.h +19 -1
@@ -1826,6 +1826,24 @@ struct nfs_rpc_ops {void (*init_localioclient)(struct nfs_client *); }; +/* +* Helper functions used by NFS client and/or server +*/ +static inline void encode_opaque_fixed (struct xdr_stream *xdr, +const void *buf,size_t len) +{ +WARN_ON_ONCE (xdr_stream_encode_opaque_fixed (xdr, buf, len) <0 ); +} + +static inline int decode_opaque_fixed (struct xdr_stream *xdr, +void *buf,size_t len) +{ +ssize_t ret =xdr_stream_decode_opaque_fixed (xdr, buf, len); +if (unlikely (ret <0 )) +return -EIO ; +return 0 ; +} +/* * Function vectors etc. for the NFS client */
@@ -1844,4 +1862,4 @@ extern const struct rpc_program nfslocalio_program3;extern const struct rpc_version nfslocalio_version4;extern const struct rpc_program nfslocalio_program4; -#endif +#endif /* _LINUX_NFS_XDR_H */
Signature · 1 line
2.44.0
PATCH v4 12/18 nfs/localio: move managing nfsd_open_local_fh symbol to nfs_common
In reply to Mike SnitzerGet nfsd_open_local_fh and store it in rpc_client during client creation, put the symbol during nfs_local_disable -- which is also called during client destruction.
Eliminates the need for nfs_local_open_ctx and extra locking and refcounting work in fs/nfs/localio.c
Also makes it so the reference to the nfsd_open_local_fh symbol is managed by the nfs_common module instead of the nfs client modules.
--- fs/nfs/client.c | 1 + fs/nfs/inode.c | 1 - fs/nfs/internal.h | 18 +++++--- fs/nfs/localio.c | 86 +++----------------------------------- fs/nfs_common/nfslocalio.c | 26 ++++++++++++ include/linux/nfs.h | 4 -- include/linux/nfs_fs_sb.h | 2 + include/linux/nfslocalio.h | 8 ++++ 8 files changed, 54 insertions(+), 92 deletions(-)
fs/nfs/client.c +1 -0
@@ -171,6 +171,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)INIT_LIST_HEAD (&clp->cl_superblocks); clp->cl_rpcclient = clp->cl_rpcclient_localio =ERR_PTR (-EINVAL ); + clp->nfsd_open_local_fh =NULL ; clp->cl_flags = cl_init->init_flags; clp->cl_proto = cl_init->proto;
fs/nfs/inode.c +0 -1
@@ -2499,7 +2499,6 @@ static int __init init_nfs_fs(void)if (err) goto out1; -nfs_local_init (); err =register_nfs_fs ();if (err) goto out0;
fs/nfs/internal.h +12 -6
@@ -464,15 +464,22 @@ nfs_init_localioclient(struct nfs_client *clp, goto out; clp->cl_rpcclient_localio =rpc_bind_new_program (clp->cl_rpcclient, program, vers); +if (IS_ERR (clp->cl_rpcclient_localio)) + goto out; +/* No errors! Assume that localio is supported */ + clp->nfsd_open_local_fh =get_nfsd_open_local_fh (); +if (!clp->nfsd_open_local_fh) { +rpc_shutdown_client (clp->cl_rpcclient_localio); + clp->cl_rpcclient_localio =ERR_PTR (-EINVAL ); + } out: -dfprintk_rcu (CLIENT ,"%s: server (%s) %s NFSv%u LOCALIO\n" , __func__, -rpc_peeraddr2str (clp->cl_rpcclient,RPC_DISPLAY_ADDR ), - (IS_ERR (clp->cl_rpcclient_localio) ? -"does not support" :"supports" ), vers); +dfprintk_rcu (CLIENT ,"%s: server (%s) %s NFSv%u LOCALIO, nfsd_open_local_fh is %s.\n" , + __func__,rpc_peeraddr2str (clp->cl_rpcclient,RPC_DISPLAY_ADDR ), + (IS_ERR (clp->cl_rpcclient_localio) ?"does not support" :"supports" ), vers, + (clp->nfsd_open_local_fh ?"set" :"not set" )); }/* localio.c */ -extern void nfs_local_init (void );extern void nfs_local_disable (struct nfs_client *);extern void nfs_local_probe (struct nfs_client *); extern struct file *nfs_local_open_fh(struct nfs_client *, const struct cred *,
@@ -489,7 +496,6 @@ extern int nfs_local_commit(struct file *, struct nfs_commit_data *,extern bool nfs_server_is_local (const struct nfs_client *clp);#else -static inline void nfs_local_init (void ) {}static inline void nfs_local_disable (struct nfs_client *clp) {}static inline void nfs_local_probe (struct nfs_client *clp) {} static inline struct file *nfs_local_open_fh(struct nfs_client *clp,
fs/nfs/localio.c +5 -81
130 lines not on this page · raw message
fs/nfs_common/nfslocalio.c +26 -0
@@ -40,3 +40,29 @@ bool nfsd_uuid_is_local(const uuid_t *uuid)return !uuid_is_null (nfsd_uuid); }EXPORT_SYMBOL_GPL (nfsd_uuid_is_local); + +/* +* The nfs localio code needs to call into nfsd to do the filehandle -> struct path +* mapping, but cannot be statically linked, because that will make the nfs module +* depend on the nfsd module. +* +* Instead, do dynamic linking to the nfsd module (via nfs_common module). The +* nfs_common module will only hold a reference on nfsd when localio is in use. +* This allows some sanity checking, like giving up on localio if nfsd isn't loaded. +*/ + +extern int nfsd_open_local_fh (struct rpc_clnt *rpc_clnt, +const struct cred *cred,const struct nfs_fh *nfs_fh, +const fmode_t fmode,struct file **pfilp); + +nfs_to_nfsd_open_t get_nfsd_open_local_fh (void ) +{ +return symbol_request (nfsd_open_local_fh); +} +EXPORT_SYMBOL_GPL (get_nfsd_open_local_fh); + +void put_nfsd_open_local_fh (void ) +{ +symbol_put (nfsd_open_local_fh); +} +EXPORT_SYMBOL_GPL (put_nfsd_open_local_fh);
include/linux/nfs.h +0 -4
@@ -48,10 +48,6 @@ enum nfs3_stable_how { NFS_INVALID_STABLE_HOW = -1 }; -typedef int (*nfs_to_nfsd_open_t )(struct rpc_clnt *,const struct cred *, -const struct nfs_fh *,const fmode_t , -struct file **); -#ifdef CONFIG_CRC32 /** * nfs_fhandle_hash - calculate the crc32 hash for the filehandle
include/linux/nfs_fs_sb.h +2 -0
@@ -8,6 +8,7 @@#include <linux/wait.h> #include <linux/nfs_xdr.h> #include <linux/sunrpc/xprt.h> +#include <linux/nfslocalio.h> #include <linux/atomic.h> #include <linux/refcount.h>
@@ -131,6 +132,7 @@ struct nfs_client {struct timespec64 cl_nfssvc_boot;seqlock_t cl_boot_lock;struct rpc_clnt * cl_rpcclient_localio;/* localio RPC client handle */ +nfs_to_nfsd_open_t nfsd_open_local_fh; };/*
include/linux/nfslocalio.h +8 -0
@@ -7,6 +7,7 @@#include <linux/list.h> #include <linux/uuid.h> +#include <linux/nfs.h> /* * Global list of nfsd_uuid_t instances, add/remove
@@ -26,4 +27,11 @@ typedef struct {bool nfsd_uuid_is_local (const uuid_t *uuid); +typedef int (*nfs_to_nfsd_open_t )(struct rpc_clnt *,const struct cred *, +const struct nfs_fh *,const fmode_t , +struct file **); + +nfs_to_nfsd_open_t get_nfsd_open_local_fh (void ); +void put_nfsd_open_local_fh (void ); +#endif /* __LINUX_NFSLOCALIO_H */
Signature · 1 line
2.44.0
PATCH v4 13/18 nfs/nfsd: ensure localio server always uses its network namespace
In reply to Mike SnitzerPass the stored cl_nfssvc_net from the client to the server as first argument to nfsd_open_local_fh() to ensure the proper network namespace is used for localio.
Otherwise, before this commit, the nfs_client's network namespace was used (as extracted from the client's cl_rpcclient). This is clearly not going to allow proper functionality if the client and server happen to have disjoint network namespaces.
Elected to not rename the nfsd_uuid_t structure despite it growing a non-uuid member. Can revisit later.
--- fs/nfs/client.c | 1 + fs/nfs/localio.c | 12 ++++++++---- fs/nfs_common/nfslocalio.c | 15 +++++++++------ fs/nfsd/localio.c | 9 +++++---- fs/nfsd/nfssvc.c | 1 + fs/nfsd/vfs.h | 3 ++- include/linux/nfs_fs_sb.h | 1 + include/linux/nfslocalio.h | 10 ++++++---- 8 files changed, 33 insertions(+), 19 deletions(-)
fs/nfs/client.c +1 -0
@@ -171,6 +171,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)INIT_LIST_HEAD (&clp->cl_superblocks); clp->cl_rpcclient = clp->cl_rpcclient_localio =ERR_PTR (-EINVAL ); + clp->cl_nfssvc_net =NULL ; clp->nfsd_open_local_fh =NULL ; clp->cl_flags = cl_init->init_flags;
fs/nfs/localio.c +8 -4
@@ -132,10 +132,11 @@ EXPORT_SYMBOL_GPL(nfs_server_is_local);/* * nfs_local_enable - attempt to enable local i/o for an nfs_client */ -static void nfs_local_enable (struct nfs_client *clp) +static void nfs_local_enable (struct nfs_client *clp,struct net *net) {if (READ_ONCE (clp->nfsd_open_local_fh)) {set_bit (NFS_CS_LOCAL_IO , &clp->cl_flags); + clp->cl_nfssvc_net = net;trace_nfs_local_enable (clp); } }
@@ -153,6 +154,7 @@ void nfs_local_disable(struct nfs_client *clp)rpc_shutdown_client (clp->cl_rpcclient_localio); clp->cl_rpcclient_localio =ERR_PTR (-EINVAL ); } + clp->cl_nfssvc_net =NULL ; } }
@@ -192,6 +194,7 @@ static bool nfs_local_server_getuuid(struct nfs_client *clp, uuid_t *nfsd_uuid)void nfs_local_probe (struct nfs_client *clp) {uuid_t uuid; +struct net *net =NULL ;if (!localio_enabled) goto unsupported;
@@ -211,7 +214,7 @@ void nfs_local_probe(struct nfs_client *clp)* by verifying client's nfsd, with specified uuid, is local. */ if (!nfs_local_server_getuuid (clp, &uuid) || - !nfsd_uuid_is_local (&uuid)) + !nfsd_uuid_is_local (&uuid, &net)) goto unsupported;break ;default :
@@ -219,7 +222,7 @@ void nfs_local_probe(struct nfs_client *clp) }dprintk ("%s: detected local server.\n" , __func__); -nfs_local_enable (clp); +nfs_local_enable (clp, net);return ; unsupported:
@@ -243,7 +246,8 @@ nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred,if (mode & ~(FMODE_READ |FMODE_WRITE ))return ERR_PTR (-EINVAL ); - status = clp->nfsd_open_local_fh (clp->cl_rpcclient, cred, fh, mode, &filp); + status = clp->nfsd_open_local_fh (clp->cl_nfssvc_net, clp->cl_rpcclient, + cred, fh, mode, &filp);if (status <0 ) {dprintk ("%s: open local file failed error=%d\n" , __func__, status);
fs/nfs_common/nfslocalio.c +9 -6
@@ -12,29 +12,32 @@ MODULE_LICENSE("GPL");/* * Global list of nfsd_uuid_t instances, add/remove * is protected by fs/nfsd/nfssvc.c:nfsd_mutex. -* Reads are protected RCU read lock (see below). +* Reads are protected by RCU read lock (see below). */ LIST_HEAD (nfsd_uuids);EXPORT_SYMBOL (nfsd_uuids);/* Must be called with RCU read lock held. */ -static const uuid_t *nfsd_uuid_lookup (const uuid_t *uuid) +static const uuid_t *nfsd_uuid_lookup (const uuid_t *uuid, +struct net **netp) {nfsd_uuid_t *nfsd_uuid;list_for_each_entry_rcu (nfsd_uuid, &nfsd_uuids, list) -if (uuid_equal (&nfsd_uuid->uuid, uuid)) +if (uuid_equal (&nfsd_uuid->uuid, uuid)) { + *netp = nfsd_uuid->net;return &nfsd_uuid->uuid; + }return &uuid_null; } -bool nfsd_uuid_is_local (const uuid_t *uuid) +bool nfsd_uuid_is_local (const uuid_t *uuid,struct net **netp) {const uuid_t *nfsd_uuid;rcu_read_lock (); - nfsd_uuid =nfsd_uuid_lookup (uuid); + nfsd_uuid =nfsd_uuid_lookup (uuid, netp);rcu_read_unlock ();return !uuid_is_null (nfsd_uuid);
@@ -51,7 +54,7 @@ EXPORT_SYMBOL_GPL(nfsd_uuid_is_local);* This allows some sanity checking, like giving up on localio if nfsd isn't loaded. */ -extern int nfsd_open_local_fh (struct rpc_clnt *rpc_clnt, +extern int nfsd_open_local_fh (struct net *,struct rpc_clnt *rpc_clnt,const struct cred *cred,const struct nfs_fh *nfs_fh,const fmode_t fmode,struct file **pfilp);
fs/nfsd/localio.c +5 -4
@@ -103,10 +103,10 @@ nfsd_local_fakerqst_destroy(struct svc_rqst *rqstp) }static struct svc_rqst * -nfsd_local_fakerqst_create (struct rpc_clnt *rpc_clnt,const struct cred *cred) +nfsd_local_fakerqst_create (struct net *net,struct rpc_clnt *rpc_clnt, +const struct cred *cred) {struct svc_rqst *rqstp; -struct net *net =rpc_net_ns (rpc_clnt);struct nfsd_net *nn =net_generic (net, nfsd_net_id);int status;
@@ -186,7 +186,8 @@ nfsd_local_fakerqst_create(struct rpc_clnt *rpc_clnt, const struct cred *cred)* dependency on knfsd. So, there is no forward declaration in a header file * for it. */ -int nfsd_open_local_fh(struct rpc_clnt *rpc_clnt, +int nfsd_open_local_fh(struct net *net, + struct rpc_clnt *rpc_clnt, const struct cred *cred, const struct nfs_fh *nfs_fh, const fmode_t fmode,
@@ -203,7 +204,7 @@ int nfsd_open_local_fh(struct rpc_clnt *rpc_clnt,/* Save creds before calling into nfsd */ save_cred =get_current_cred (); - rqstp =nfsd_local_fakerqst_create (rpc_clnt, cred); + rqstp =nfsd_local_fakerqst_create (net, rpc_clnt, cred);if (IS_ERR (rqstp)) { status =PTR_ERR (rqstp); goto out_revertcred;
fs/nfsd/nfssvc.c +1 -0
@@ -473,6 +473,7 @@ static int nfsd_startup_net(struct net *net, const struct cred *cred)#endif #if IS_ENABLED (CONFIG_NFSD_LOCALIO )INIT_LIST_HEAD (&nn->nfsd_uuid.list); + nn->nfsd_uuid.net = net;list_add_tail_rcu (&nn->nfsd_uuid.list, &nfsd_uuids);#endif nn->nfsd_net_up = true;
fs/nfsd/vfs.h +2 -1
@@ -160,7 +160,8 @@ __be32 nfsd_permission(struct svc_rqst *, struct svc_export *,void nfsd_filp_close (struct file *fp); -int nfsd_open_local_fh(struct rpc_clnt *rpc_clnt, +int nfsd_open_local_fh(struct net *net, + struct rpc_clnt *rpc_clnt, const struct cred *cred, const struct nfs_fh *nfs_fh, const fmode_t fmode,
include/linux/nfs_fs_sb.h +1 -0
@@ -132,6 +132,7 @@ struct nfs_client {struct timespec64 cl_nfssvc_boot;seqlock_t cl_boot_lock;struct rpc_clnt * cl_rpcclient_localio;/* localio RPC client handle */ +struct net * cl_nfssvc_net;nfs_to_nfsd_open_t nfsd_open_local_fh; };
include/linux/nfslocalio.h +6 -4
@@ -8,6 +8,7 @@#include <linux/list.h> #include <linux/uuid.h> #include <linux/nfs.h> +#include <net/net_namespace.h> /* * Global list of nfsd_uuid_t instances, add/remove
@@ -23,13 +24,14 @@ extern struct list_head nfsd_uuids;typedef struct {uuid_t uuid;struct list_head list; +struct net *net;/* nfsd's network namespace */ }nfsd_uuid_t ; -bool nfsd_uuid_is_local (const uuid_t *uuid); +bool nfsd_uuid_is_local (const uuid_t *uuid,struct net **netp); -typedef int (*nfs_to_nfsd_open_t )(struct rpc_clnt *,const struct cred *, -const struct nfs_fh *,const fmode_t , -struct file **); +typedef int (*nfs_to_nfsd_open_t )(struct net *,struct rpc_clnt *, +const struct cred *,const struct nfs_fh *, +const fmode_t ,struct file **);nfs_to_nfsd_open_t get_nfsd_open_local_fh (void );void put_nfsd_open_local_fh (void );
Signature · 1 line
2.44.0
PATCH v4 14/18 nfsd/localio: manage netns reference in nfsd_open_local_fh
In reply to Mike SnitzerUse maybe_get_net() and put_net() in nfsd_open_local_fh(). Also refactor nfsd_open_local_fh() slightly.
--- fs/nfsd/localio.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-)
fs/nfsd/localio.c +26 -19
@@ -104,18 +104,11 @@ nfsd_local_fakerqst_destroy(struct svc_rqst *rqstp)static struct svc_rqst *nfsd_local_fakerqst_create (struct net *net,struct rpc_clnt *rpc_clnt, -const struct cred *cred) +const struct cred *cred,struct svc_serv *serv) {struct svc_rqst *rqstp; -struct nfsd_net *nn =net_generic (net, nfsd_net_id);int status; -/* FIXME: not running in nfsd context, must get reference on nfsd_serv */ -if (unlikely (!READ_ONCE (nn->nfsd_serv))) { -dprintk ("%s: localio denied. Server not running\n" , __func__); -return ERR_PTR (-ENXIO ); - } - rqstp =kzalloc (sizeof (*rqstp),GFP_KERNEL );if (!rqstp)return ERR_PTR (-ENOMEM );
@@ -125,13 +118,13 @@ nfsd_local_fakerqst_create(struct net *net, struct rpc_clnt *rpc_clnt, status = -ENOMEM ; goto out_err; } - rqstp->rq_xprt->xpt_net = net; +__set_bit (RQ_SECURE , &rqstp->rq_flags); rqstp->rq_proc =1 ; rqstp->rq_vers =3 ; rqstp->rq_prot =IPPROTO_TCP ; - rqstp->rq_server = nn->nfsd_serv; + rqstp->rq_server = serv;/* Note: we're connecting to ourself, so source addr == peer addr */ rqstp->rq_addrlen = rpc_peeraddr(rpc_clnt,
@@ -193,28 +186,44 @@ int nfsd_open_local_fh(struct net *net,const fmode_t fmode, struct file **pfilp) { + struct nfsd_net *nn;const struct cred *save_cred;struct svc_rqst *rqstp;struct svc_fh fh;struct nfsd_file *nf;int status =0 ;int mayflags =NFSD_MAY_LOCALIO ; +struct svc_serv *serv;__be32 beres; +if (nfs_fh->size >NFS4_FHSIZE ) +return -EINVAL ; + +/* Not running in nfsd context, must safely get reference on nfsd_serv */ + net =maybe_get_net (net); +if (!net) { +dprintk ("%s: localio denied. Server netns not available\n" , __func__); +return -ENXIO ; + } + nn =net_generic (net, nfsd_net_id); + + serv =READ_ONCE (nn->nfsd_serv); +if (unlikely (!serv)) { +dprintk ("%s: localio denied. Server not running\n" , __func__); + status = -ENXIO ; + goto out_net; + } +/* Save creds before calling into nfsd */ save_cred =get_current_cred (); - rqstp =nfsd_local_fakerqst_create (net, rpc_clnt, cred); + rqstp =nfsd_local_fakerqst_create (net, rpc_clnt, cred, serv);if (IS_ERR (rqstp)) { status =PTR_ERR (rqstp); goto out_revertcred; }/* nfs_fh -> svc_fh */ -if (nfs_fh->size >NFS4_FHSIZE ) { - status = -EINVAL ; - goto out; - }fh_init (&fh,NFS4_FHSIZE ); fh.fh_handle.fh_size = nfs_fh->size;memcpy (fh.fh_handle.fh_raw, nfs_fh->data, nfs_fh->size);
@@ -230,17 +239,15 @@ int nfsd_open_local_fh(struct net *net,dprintk ("%s: fh_verify failed %d\n" , __func__, status); goto out_fh_put; } - *pfilp =get_file (nf->nf_file); -nfsd_file_put (nf); out_fh_put:fh_put (&fh); - -out:nfsd_local_fakerqst_destroy (rqstp); out_revertcred:revert_creds (save_cred); +out_net: +put_net (net);return status; }EXPORT_SYMBOL_GPL (nfsd_open_local_fh);
Signature · 1 line
2.44.0
PATCH v4 15/18 nfsd: prepare to use SRCU to dereference nn->nfsd_serv
In reply to Mike SnitzerThe next commit switches the nfsd_serv member for struct nfsd_net over to a void pointer (void __rcu *). Prepare for this by assigning nn->nfsd_serv to an struct svc_serv pointer that is then happily dereferenced. This eliminates what would otherwise be numerous void pointer dereferences after the next commit.
All nfsd code what audited so that methods that hold nfsd_mutex will continue to directly dereference nn->nfsd_serv.
--- fs/nfsd/nfsctl.c | 21 +++++++++++++-------- fs/nfsd/nfssvc.c | 28 ++++++++++++++++------------ 2 files changed, 29 insertions(+), 20 deletions(-)
fs/nfsd/nfsctl.c +13 -8
@@ -679,10 +679,11 @@ static ssize_t write_versions(struct file *file, char *buf, size_t size)static ssize_t __write_ports_names (char *buf,struct net *net) {struct nfsd_net *nn =net_generic (net, nfsd_net_id); +struct svc_serv *serv = nn->nfsd_serv; -if (nn->nfsd_serv ==NULL ) +if (serv ==NULL )return 0 ; -return svc_xprt_names (nn->nfsd_serv, buf,SIMPLE_TRANSACTION_LIMIT ); +return svc_xprt_names (serv, buf,SIMPLE_TRANSACTION_LIMIT ); }/*
@@ -709,7 +710,7 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred serv = nn->nfsd_serv; err =svc_addsock (serv, net, fd, buf,SIMPLE_TRANSACTION_LIMIT , cred); -if (!serv->sv_nrthreads &&list_empty (&nn->nfsd_serv->sv_permsocks)) +if (!serv->sv_nrthreads &&list_empty (&serv->sv_permsocks))nfsd_destroy_serv (net);return err;
@@ -757,7 +758,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct crsvc_xprt_put (xprt); } out_err: -if (!serv->sv_nrthreads &&list_empty (&nn->nfsd_serv->sv_permsocks)) +if (!serv->sv_nrthreads &&list_empty (&serv->sv_permsocks))nfsd_destroy_serv (net);return err;
@@ -1666,6 +1667,7 @@ int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info)int nthreads =0 , count =0 , nrpools, ret = -EOPNOTSUPP , rem;struct net *net =genl_info_net (info);struct nfsd_net *nn =net_generic (net, nfsd_net_id); +struct svc_serv *serv;const struct nlattr *attr;const char *scope =NULL ;
@@ -1693,7 +1695,8 @@ int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info) info->attrs[NFSD_A_SERVER_LEASETIME] || info->attrs[NFSD_A_SERVER_SCOPE]) { ret = -EBUSY ; -if (nn->nfsd_serv && nn->nfsd_serv->sv_nrthreads) + serv = nn->nfsd_serv; +if (serv && serv->sv_nrthreads) goto out_unlock; ret = -EINVAL ;
@@ -1741,6 +1744,7 @@ int nfsd_nl_threads_get_doit(struct sk_buff *skb, struct genl_info *info) {struct net *net =genl_info_net (info);struct nfsd_net *nn =net_generic (net, nfsd_net_id); +struct svc_serv *serv;void *hdr;int err;
@@ -1765,11 +1769,12 @@ int nfsd_nl_threads_get_doit(struct sk_buff *skb, struct genl_info *info)if (err) goto err_unlock; -if (nn->nfsd_serv) { + serv = nn->nfsd_serv; +if (serv) {int i;for (i =0 ; i <nfsd_nrpools (net); ++i) { -struct svc_pool *sp = &nn->nfsd_serv->sv_pools[i]; +struct svc_pool *sp = &serv->sv_pools[i]; err =nla_put_u32 (skb,NFSD_A_SERVER_THREADS ,atomic_read (&sp->sp_nrthreads));
@@ -2087,7 +2092,7 @@ int nfsd_nl_listener_set_doit(struct sk_buff *skb, struct genl_info *info) err = ret; } -if (!serv->sv_nrthreads &&list_empty (&nn->nfsd_serv->sv_permsocks)) +if (!serv->sv_nrthreads &&list_empty (&serv->sv_permsocks))nfsd_destroy_serv (net); out_unlock_mtx:
fs/nfsd/nfssvc.c +16 -12
@@ -309,10 +309,12 @@ int nfsd_nrthreads(struct net *net) {int rv =0 ;struct nfsd_net *nn =net_generic (net, nfsd_net_id); +struct svc_serv *serv;mutex_lock (&nfsd_mutex); -if (nn->nfsd_serv) - rv = nn->nfsd_serv->sv_nrthreads; + serv = nn->nfsd_serv; +if (serv) + rv = serv->sv_nrthreads;mutex_unlock (&nfsd_mutex);return rv; }
@@ -321,16 +323,17 @@ static int nfsd_init_socks(struct net *net, const struct cred *cred) {int error;struct nfsd_net *nn =net_generic (net, nfsd_net_id); +struct svc_serv *serv = nn->nfsd_serv; -if (!list_empty (&nn->nfsd_serv->sv_permsocks)) +if (!list_empty (&serv->sv_permsocks))return 0 ; - error =svc_xprt_create (nn->nfsd_serv,"udp" , net,PF_INET ,NFS_PORT , + error =svc_xprt_create (serv,"udp" , net,PF_INET ,NFS_PORT ,SVC_SOCK_DEFAULTS , cred);if (error <0 )return error; - error =svc_xprt_create (nn->nfsd_serv,"tcp" , net,PF_INET ,NFS_PORT , + error =svc_xprt_create (serv,"tcp" , net,PF_INET ,NFS_PORT ,SVC_SOCK_DEFAULTS , cred);if (error <0 )return error;
@@ -742,11 +745,12 @@ int nfsd_create_serv(struct net *net)int nfsd_nrpools (struct net *net) {struct nfsd_net *nn =net_generic (net, nfsd_net_id); +struct svc_serv *serv = nn->nfsd_serv; -if (nn->nfsd_serv ==NULL ) +if (serv ==NULL )return 0 ;else -return nn->nfsd_serv->sv_nrpools; +return serv->sv_nrpools; }int nfsd_get_nrthreads (int n,int *nthreads,struct net *net)
@@ -767,14 +771,15 @@ int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)int tot =0 ;int err =0 ;struct nfsd_net *nn =net_generic (net, nfsd_net_id); +struct svc_serv *serv = nn->nfsd_serv;WARN_ON (!mutex_is_locked (&nfsd_mutex)); -if (nn->nfsd_serv ==NULL || n <=0 ) +if (serv ==NULL || n <=0 )return 0 ; -if (n > nn->nfsd_serv->sv_nrpools) - n = nn->nfsd_serv->sv_nrpools; +if (n > serv->sv_nrpools) + n = serv->sv_nrpools;/* enforce a global maximum number of threads */ tot =0 ;
@@ -804,8 +809,7 @@ int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)/* apply the new numbers */ for (i =0 ; i < n; i++) { - err =svc_set_num_threads (nn->nfsd_serv, - &nn->nfsd_serv->sv_pools[i], + err =svc_set_num_threads (serv, &serv->sv_pools[i], nthreads[i]);if (err)break ;
Signature · 1 line
2.44.0
PATCH v4 16/18 nfsd: use SRCU to dereference nn->nfsd_serv
In reply to Mike SnitzerIntroduce nfsd_serv_get, nfsd_serv_put and nfsd_serv_sync and update the nfsd code to prevent nfsd_destroy_serv from destroying nn->nfsd_serv until all nfsd code is done with it (particularly the localio code that doesn't run in the context of nfsd's svc threads, nor does it take the nfsd_mutex).
Commit 83d5e5b0af90 ("dm: optimize use SRCU and RCU") provided a familiar well-worn pattern for how implement.
--- fs/nfsd/filecache.c | 13 ++++++++--- fs/nfsd/netns.h | 12 ++++++++-- fs/nfsd/nfs4state.c | 25 ++++++++++++++------- fs/nfsd/nfsctl.c | 7 ++++-- fs/nfsd/nfssvc.c | 55 ++++++++++++++++++++++++++++++++++++--------- 5 files changed, 87 insertions(+), 25 deletions(-)
fs/nfsd/filecache.c +10 -3
@@ -413,12 +413,15 @@ nfsd_file_dispose_list_delayed(struct list_head *dispose)struct nfsd_file *nf =list_first_entry (dispose, struct nfsd_file, nf_lru);struct nfsd_net *nn =net_generic (nf->nf_net, nfsd_net_id); +int srcu_idx; +struct svc_serv *serv =nfsd_serv_get (nn, &srcu_idx);struct nfsd_fcache_disposal *l = nn->fcache_disposal;spin_lock (&l->lock);list_move_tail (&nf->nf_lru, &l->freeme);spin_unlock (&l->lock); -svc_wake_up (nn->nfsd_serv); +svc_wake_up (serv); +nfsd_serv_put (nn, srcu_idx); } }
@@ -443,11 +446,15 @@ void nfsd_file_net_dispose(struct nfsd_net *nn)for (i =0 ; i <8 && !list_empty (&l->freeme); i++)list_move (l->freeme.next, &dispose);spin_unlock (&l->lock); -if (!list_empty (&l->freeme)) +if (!list_empty (&l->freeme)) { +int srcu_idx; +struct svc_serv *serv =nfsd_serv_get (nn, &srcu_idx);/* Wake up another thread to share the work * *before* doing any actual disposing. */ -svc_wake_up (nn->nfsd_serv); +svc_wake_up (serv); +nfsd_serv_put (nn, srcu_idx); + }nfsd_file_dispose_list (&dispose); } }
fs/nfsd/netns.h +10 -2
@@ -139,8 +139,12 @@ struct nfsd_net {u32 clverifier_counter;struct svc_info nfsd_info; -#define nfsd_serv nfsd_info.serv - +/* +* The current 'nfsd_serv' at nfsd_info.serv +* Use nfsd_serv_get() or take nfsd_mutex to dereference. +*/ +void __rcu *nfsd_serv; +struct srcu_struct nfsd_serv_srcu;/* * clientid and stateid data for construction of net unique COPY
@@ -225,6 +229,10 @@ struct nfsd_net {extern bool nfsd_support_version (int vers);extern void nfsd_netns_free_versions (struct nfsd_net *nn); +extern struct svc_serv *nfsd_serv_get (struct nfsd_net *nn,int *srcu_idx); +extern void nfsd_serv_put (struct nfsd_net *nn,int srcu_idx); +extern void nfsd_serv_sync (struct nfsd_net *nn); +extern unsigned int nfsd_net_id;void nfsd_copy_write_verifier (__be32 verf[2 ],struct nfsd_net *nn);
fs/nfsd/nfs4state.c +17 -8
@@ -1919,6 +1919,8 @@ static u32 nfsd4_get_drc_mem(struct nfsd4_channel_attrs *ca, struct nfsd_net *nnu32 num = ca->maxreqs;unsigned long avail, total_avail;unsigned int scale_factor; +int srcu_idx; +struct svc_serv *serv =nfsd_serv_get (nn, &srcu_idx);spin_lock (&nfsd_drc_lock);if (nfsd_drc_max_mem > nfsd_drc_mem_used)
@@ -1940,7 +1942,7 @@ static u32 nfsd4_get_drc_mem(struct nfsd4_channel_attrs *ca, struct nfsd_net *nn* Give the client one slot even if that would require * over-allocation--it is better than failure. */ - scale_factor = max_t(unsigned int, 8, nn->nfsd_serv->sv_nrthreads); + scale_factor = max_t(unsigned int, 8, serv->sv_nrthreads); avail = clamp_t(unsigned long, avail, slotsize, total_avail/scale_factor);
@@ -1949,6 +1951,8 @@ static u32 nfsd4_get_drc_mem(struct nfsd4_channel_attrs *ca, struct nfsd_net *nn nfsd_drc_mem_used += num * slotsize;spin_unlock (&nfsd_drc_lock); +nfsd_serv_put (nn, srcu_idx); +return num; }
@@ -3702,12 +3706,16 @@ nfsd4_replay_create_session(struct nfsd4_create_session *cr_ses,static __be32 check_forechannel_attrs (struct nfsd4_channel_attrs *ca,struct nfsd_net *nn) { -u32 maxrpc = nn->nfsd_serv->sv_max_mesg; +int srcu_idx; +struct svc_serv *serv =nfsd_serv_get (nn, &srcu_idx); +u32 maxrpc = serv->sv_max_mesg; +__be32 status = nfs_ok; -if (ca->maxreq_sz <NFSD_MIN_REQ_HDR_SEQ_SZ ) -return nfserr_toosmall; -if (ca->maxresp_sz <NFSD_MIN_RESP_HDR_SEQ_SZ ) -return nfserr_toosmall; +if (ca->maxreq_sz <NFSD_MIN_REQ_HDR_SEQ_SZ || + ca->maxresp_sz <NFSD_MIN_RESP_HDR_SEQ_SZ ) { + status = nfserr_toosmall; + goto out; + } ca->headerpadsz =0 ; ca->maxreq_sz =min_t (u32, ca->maxreq_sz, maxrpc); ca->maxresp_sz =min_t (u32, ca->maxresp_sz, maxrpc);
@@ -3726,8 +3734,9 @@ static __be32 check_forechannel_attrs(struct nfsd4_channel_attrs *ca, struct nfs* accounting is soft and provides no guarantees either way. */ ca->maxreqs =nfsd4_get_drc_mem (ca, nn); - -return nfs_ok; +out: +nfsd_serv_put (nn, srcu_idx); +return status; }/*
fs/nfsd/nfsctl.c +5 -2
@@ -1561,10 +1561,12 @@ int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb, {struct nfsd_net *nn =net_generic (sock_net (skb->sk), nfsd_net_id);int i, ret, rqstp_index =0 ; +int srcu_idx; +struct svc_serv *serv =nfsd_serv_get (nn, &srcu_idx);rcu_read_lock (); -for (i =0 ; i < nn->nfsd_serv->sv_nrpools; i++) { +for (i =0 ; i < serv->sv_nrpools; i++) {struct svc_rqst *rqstp;if (i < cb->args[0 ])/* already consumed */
@@ -1572,7 +1574,7 @@ int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb, rqstp_index =0 ;list_for_each_entry_rcu (rqstp, - &nn->nfsd_serv->sv_pools[i].sp_all_threads, + &serv->sv_pools[i].sp_all_threads, rq_all) {struct nfsd_genl_rqstp genl_rqstp;unsigned int status_counter;
@@ -1637,6 +1639,7 @@ int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb, ret = skb->len; out:rcu_read_unlock (); +nfsd_serv_put (nn, srcu_idx);return ret; }
fs/nfsd/nfssvc.c +45 -10
128 lines not on this page · raw message
Signature · 1 line
2.44.0
PATCH v4 17/18 nfsd/localio: use SRCU to dereference nn->nfsd_serv in nfsd_open_local_fh
In reply to Mike SnitzerUse nfsd_serv_get to SRCU deference nn->nfsd_serv and pass the resulting svc_serv to nfsd_local_fakerqst_create, open the file handle and then drop the reference using nfsd_serv_put at the end of nfsd_open_local_fh.
Verified to fix an easy to hit crash that would occur if an nfsd instance running in a container, with a localio client mounted, is shutdown. Upon restart of the container and associated nfsd the client would go on to crash due to NULL pointer dereference that occuured due to the nfs client's localio attempting to nfsd_open_local_fh(), using nn->nfsd_serv, without having a proper reference on nn->nfsd_serv.
--- fs/nfsd/localio.c | 4 +++- include/linux/nfslocalio.h | 24 +++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-)
fs/nfsd/localio.c +3 -1
@@ -193,6 +193,7 @@ int nfsd_open_local_fh(struct net *net,struct nfsd_file *nf;int status =0 ;int mayflags =NFSD_MAY_LOCALIO ; +int srcu_idx;struct svc_serv *serv;__be32 beres;
@@ -207,7 +208,7 @@ int nfsd_open_local_fh(struct net *net, } nn =net_generic (net, nfsd_net_id); - serv =READ_ONCE (nn->nfsd_serv); + serv =nfsd_serv_get (nn, &srcu_idx);if (unlikely (!serv)) {dprintk ("%s: localio denied. Server not running\n" , __func__); status = -ENXIO ;
@@ -247,6 +248,7 @@ int nfsd_open_local_fh(struct net *net, out_revertcred:revert_creds (save_cred); out_net: +nfsd_serv_put (nn, srcu_idx);put_net (net);return status; }
include/linux/nfslocalio.h +23 -1
@@ -19,7 +19,29 @@ extern struct list_head nfsd_uuids;/* * Each nfsd instance has an nfsd_uuid_t that is accessible through the * global nfsd_uuids list. Useful to allow a client to negotiate if localio -* possible with its server. +* possible with its server. See fs/nfs/localio.c:nfs_local_probe() for the +* code that handshakes with nfsd to determine if localio is possible. +* +* The nfsd_uuids list is the basis for localio enablement, as such it has +* members that point to nfsd memory for direct use by the client (e.g. 'net' +* is the server's network namespace, through it the client can access +* nn->nfsd_serv with proper rcu read access). It is this client and server +* synchronization that enables advanced usage and lifetime of objects to +* span from the host kernel's nfsd to per-container knfsd instances that +* are connected to nfs client's running on the same local host. +* +* See fs/nfs/localio.c:nfs_local_open_fh() and +* fs/nfsd/localio.c:nfsd_open_local_fh() for the interface that makes +* focused use of nfsd_uuid_t struct to allow a client local to a server +* to open a file pointer without needing to go over the network. +* +* The performance advantage realized from localio's ability to bypass +* using XDR and RPC for reads, writes and commits can be extreme, e.g.: +* fio for 20 secs with 24 libaio threads, 64k directio reads, qd of 8, +* with localio: +* read: IOPS=795k, BW=48.5GiB/s (52.1GB/s)(971GiB/20002msec) +* without localio: +* read: IOPS=15.6k, BW=974MiB/s (1021MB/s)(19.0GiB/20013msec) */ typedef struct { uuid_t uuid;
Signature · 1 line
2.44.0
PATCH v4 18/18 nfs/localio: use dedicated workqueues for filesystem read and write
In reply to Mike SnitzerFrom: Trond Myklebust <[email protected]>
For localio access, don't call filesystem read() and write() routines directly.
Some filesystem writeback routines can end up taking up a lot of stack space (particularly xfs). Instead of risking running over due to the extra overhead from the NFS stack, we should just call these routines from a workqueue job.
Use of dedicated workqueues improves performance over using the system_unbound_wq. Localio is motivated by the promise of improved performance, it makes little sense to yield it back.
But further analysis of the latest stack depth requirements would be useful. It'd be nice to root cause and fix the latest stack pigs, because using workqueues at all causes a loss in performance:
Testing using fio with 24 read threads, libaio engine and directio. First to baseline /dev/pmem0 device and then to NFS running client in host and server in a container that exports the XFS filesystem on /dev/pmem0:
Without this commit:
read: IOPS=1037k, BW=63.3GiB/s (68.0GB/s)(1266GiB/20002msec)
read: IOPS=795k, BW=48.5GiB/s (52.1GB/s)(971GiB/20002msec)
With this commit:
read: IOPS=1073k, BW=65.5GiB/s (70.3GB/s)(1310GiB/20002msec)
read: IOPS=701k, BW=42.8GiB/s (46.0GB/s)(856GiB/20001msec)
--- fs/nfs/inode.c | 57 +++++++++++++++++--------- fs/nfs/internal.h | 1 + fs/nfs/localio.c | 102 +++++++++++++++++++++++++++++++++++----------- 3 files changed, 118 insertions(+), 42 deletions(-)
fs/nfs/inode.c +38 -19
@@ -2394,35 +2394,54 @@ static void nfs_destroy_inodecache(void)kmem_cache_destroy (nfs_inode_cachep); } +struct workqueue_struct *nfslocaliod_workqueue;struct workqueue_struct *nfsiod_workqueue;EXPORT_SYMBOL_GPL (nfsiod_workqueue);/* -* start up the nfsiod workqueue -*/ -static int nfsiod_start (void ) -{ -struct workqueue_struct *wq; -dprintk ("RPC: creating workqueue nfsiod\n" ); - wq =alloc_workqueue ("nfsiod" ,WQ_MEM_RECLAIM |WQ_UNBOUND ,0 ); -if (wq ==NULL ) -return -ENOMEM ; - nfsiod_workqueue = wq; -return 0 ; -} - -/* -* Destroy the nfsiod workqueue +* Destroy the nfsiod workqueues */ static void nfsiod_stop (void ) {struct workqueue_struct *wq; wq = nfsiod_workqueue; -if (wq ==NULL ) -return ; - nfsiod_workqueue =NULL ; -destroy_workqueue (wq); +if (wq !=NULL ) { + nfsiod_workqueue =NULL ; +destroy_workqueue (wq); + } +#if IS_ENABLED (CONFIG_NFS_LOCALIO ) + wq = nfslocaliod_workqueue; +if (wq !=NULL ) { + nfslocaliod_workqueue =NULL ; +destroy_workqueue (wq); + } +#endif /* CONFIG_NFS_LOCALIO */ +} + +/* +* Start the nfsiod workqueues +*/ +static int nfsiod_start (void ) +{ +dprintk ("RPC: creating workqueue nfsiod\n" ); + nfsiod_workqueue =alloc_workqueue ("nfsiod" ,WQ_MEM_RECLAIM |WQ_UNBOUND ,0 ); +if (nfsiod_workqueue ==NULL ) +return -ENOMEM ; +#if IS_ENABLED (CONFIG_NFS_LOCALIO ) +/* +* localio writes need to use a normal (non-memreclaim) workqueue. +* When we start getting low on space, XFS goes and calls flush_work() on +* a non-memreclaim work queue, which causes a priority inversion problem. +*/ +dprintk ("RPC: creating workqueue nfslocaliod\n" ); + nfslocaliod_workqueue =alloc_workqueue ("nfslocaliod" ,WQ_UNBOUND ,0 ); +if (unlikely (nfslocaliod_workqueue ==NULL )) { +nfsiod_stop (); +return -ENOMEM ; + } +#endif /* CONFIG_NFS_LOCALIO */ +return 0 ; }unsigned int nfs_net_id;
fs/nfs/internal.h +1 -0
@@ -440,6 +440,7 @@ int nfs_check_flags(int);/* inode.c */ extern struct workqueue_struct *nfsiod_workqueue; +extern struct workqueue_struct *nfslocaliod_workqueue;extern struct inode *nfs_alloc_inode (struct super_block *sb);extern void nfs_free_inode (struct inode *);extern int nfs_write_inode (struct inode *,struct writeback_control *);
fs/nfs/localio.c +79 -23
152 lines not on this page · raw message
Signature · 1 line
2.44.0
Quoted 31 lines · Mike Snitzer
Hi,
This v4 fixes a few bugs in v3, reorders patches and improves patch headers and code documentation. Please pay particular attention to patches 17 and 18.
If all looks good to others, for v5 I can rebase to the -next trees for nfs and nfsd.
My git tree is here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/This v4 is both branch nfs-localio-for-6.11 (always tracks latest) and nfs-localio-for-6.11.v4
nfs-localio-for-6.11.v3, nfs-localio-for-6.11.v2 and nfs-localio-for-6.11.v1 are also there.
To see the changes from v3 to v4 please do:
git remote add snitzergit://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git
git remote update snitzer
git diff snitzer/nfs-localio-for-6.11.v3 snitzer/nfs-localio-for-6.11.v4These changes have proven stable against various test scenarios:
1) client and server both on localhost (for both v3 and v4.2)
2) various permutations of client and server support enablement for both local and remote client and server.
3) client on host, server within a container (for both v3 and v4.2) My container testing was in terms of podman managed containers.
4) container stop/restart scenario documented in the last patch
Quoted 1 line
All review and comments are welcome!
With my NFSD maintainer hat on: I'm concerned about some of the long-term maintenance work being added by this series. This is more of a concern on the client side, for sure, but, IMO:
In a perfect world, we would have an RFC for this, and the set would come with tests we can add to our release CI framework. I'm not holding you to all that, but I would like to see something to help me out in the long-run.
Because this is not part of an Internet standard, this patch set needs to come with some architectural documentation like something under Documentation/filesystems/nfs.
It needs to explain the use cases and why this design was chosen. It should have a specification for the LOCALIO protocol. It needs to explain how to test the facility being added -- basically we need to know how /not/ to break this thing as we develop around it. I'm also interested to know who, besides Hammerspace, can benefit from this facility.
(This isn't a hard objection, just a request for some help with the long-term maintenance burden).
Signature · 1 line
Chuck Lever
Quoted 34 lines · Chuck Lever
Quoted 31 lines · Mike Snitzer
Hi,
This v4 fixes a few bugs in v3, reorders patches and improves patch headers and code documentation. Please pay particular attention to patches 17 and 18.
If all looks good to others, for v5 I can rebase to the -next trees for nfs and nfsd.
My git tree is here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/This v4 is both branch nfs-localio-for-6.11 (always tracks latest) and nfs-localio-for-6.11.v4
nfs-localio-for-6.11.v3, nfs-localio-for-6.11.v2 and nfs-localio-for-6.11.v1 are also there.
To see the changes from v3 to v4 please do:
git remote add snitzergit://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git
git remote update snitzer
git diff snitzer/nfs-localio-for-6.11.v3 snitzer/nfs-localio-for-6.11.v4These changes have proven stable against various test scenarios:
1) client and server both on localhost (for both v3 and v4.2)
2) various permutations of client and server support enablement for both local and remote client and server.
3) client on host, server within a container (for both v3 and v4.2) My container testing was in terms of podman managed containers.
4) container stop/restart scenario documented in the last patchQuoted 1 line
All review and comments are welcome!
Quoted 8 lines
With my NFSD maintainer hat on: I'm concerned about some of the long-term maintenance work being added by this series. This is more of a concern on the client side, for sure, but, IMO:
In a perfect world, we would have an RFC for this, and the set would come with tests we can add to our release CI framework. I'm not holding you to all that, but I would like to see something to help me out in the long-run.
I understand. Thankfully it is quite easy to test with client and server running on the same host.
The container-based testing (e.g. running client on host, nfsd in container) is a bit more fiddley/specialized to get setup due to the nature of all things containers.
Quoted 11 lines
Because this is not part of an Internet standard, this patch set needs to come with some architectural documentation like something under
Documentation/filesystems/nfs.It needs to explain the use cases and why this design was chosen. It should have a specification for the LOCALIO protocol. It needs to explain how to test the facility being added -- basically we need to know how /not/ to break this thing as we develop around it. I'm also interested to know who, besides Hammerspace, can benefit from this facility.
Quoted 2 lines
(This isn't a hard objection, just a request for some help with the long-term maintenance burden).
Sure, I'll work on Documentation for v5. These changes help everyone who might like to run client and server on the same system (and within containers). That may not be interesting to a lot of people but it isn't soooo niche.
As for maintenance burden: thankfully these changes are mostly isolated from the bulk of the rest of the nfs and nfsd code.
The SRCU changes to nfsd less so, but they are largely mechaical and straight-forward (when I ported to your latest nfsd-next last night, there was a simple matter of needing to fixup naked nn->nfsd_serv dereferences that were caught by the compiler due to dereferencing a void pointer warnings).
Thanks,
Mike