nfs/nfsd: improvements for LOCALIO
Subsystems (3)
v3 cover nfs/nfsd: improvements for LOCALIO
Hi,
All available here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/log/?h=nfs-localio-for-next
Changes since v2:
- switched from rcu_assign_pointer to RCU_INIT_POINTER when setting to NULL.
- removed some unnecessary #if IS_ENABLED(CONFIG_NFS_LOCALIO)
- revised the NFS v3 probe patch to use a new nfsv3.ko modparam 'nfs3_localio_probe_throttle' to control if NFSv3 will probe for LOCALIO. Avoids use of NFS_CS_LOCAL_IO and will probe every 'nfs3_localio_probe_throttle' IO requests (defaults to 0, disabled).
- added "Module Parameters" section to localio.rst
All review appreciated, thanks.
Mike
Mike Snitzer (14):
nfs/localio: add direct IO enablement with sync and async IO support
nfsd: add nfsd_file_{get,put} to 'nfs_to' nfsd_localio_operations
nfs_common: rename functions that invalidate LOCALIO nfs_clients
nfs_common: move localio_lock to new lock member of nfs_uuid_t
nfs: cache all open LOCALIO nfsd_file(s) in client
nfsd: update percpu_ref to manage references on nfsd_net
nfsd: rename nfsd_serv_ prefixed methods and variables with nfsd_net_
nfsd: nfsd_file_acquire_local no longer returns GC'd nfsd_file
nfs_common: rename nfslocalio nfs_uuid_lock to nfs_uuids_lock
nfs_common: track all open nfsd_files per LOCALIO nfs_client
nfs_common: add nfs_localio trace events
nfs/localio: remove redundant code and simplify LOCALIO enablement
nfs: probe for LOCALIO when v4 client reconnects to server
nfs: probe for LOCALIO when v3 client reconnects to server
Documentation/filesystems/nfs/localio.rst | 98 +++++---- fs/nfs/client.c | 6 +- fs/nfs/direct.c | 1 + fs/nfs/flexfilelayout/flexfilelayout.c | 25 +-- fs/nfs/flexfilelayout/flexfilelayout.h | 1 + fs/nfs/inode.c | 3 + fs/nfs/internal.h | 9 +- fs/nfs/localio.c | 232 +++++++++++++++----- fs/nfs/nfs3proc.c | 46 +++- fs/nfs/nfs4state.c | 1 + fs/nfs/nfstrace.h | 32 --- fs/nfs/pagelist.c | 5 +- fs/nfs/write.c | 3 +- fs/nfs_common/Makefile | 3 +- fs/nfs_common/localio_trace.c | 10 + fs/nfs_common/localio_trace.h | 56 +++++ fs/nfs_common/nfslocalio.c | 250 +++++++++++++++++----- fs/nfsd/filecache.c | 20 +- fs/nfsd/localio.c | 9 +- fs/nfsd/netns.h | 12 +- fs/nfsd/nfsctl.c | 6 +- fs/nfsd/nfssvc.c | 40 ++-- include/linux/nfs_fs.h | 22 +- include/linux/nfs_fs_sb.h | 3 +- include/linux/nfs_xdr.h | 1 + include/linux/nfslocalio.h | 48 +++-- 26 files changed, 674 insertions(+), 268 deletions(-) create mode 100644 fs/nfs_common/localio_trace.c create mode 100644 fs/nfs_common/localio_trace.h
Signature · 1 line
2.44.0
PATCH v3 1/14 nfs/localio: add direct IO enablement with sync and async IO support
This commit simply adds the required O_DIRECT plumbing. It doesn't address the fact that NFS doesn't ensure all writes are page aligned (nor device logical block size aligned as required by O_DIRECT).
Because NFS will read-modify-write for IO that isn't aligned, LOCALIO will not use O_DIRECT semantics by default if/when an application requests the use of O_DIRECT. Allow the use of O_DIRECT semantics by:
1: Adding a flag to the nfs_pgio_header struct to allow the NFS
O_DIRECT layer to signal that O_DIRECT was used by the application
2: Adding a 'localio_O_DIRECT_semantics' NFS module parameter that
when enabled will cause LOCALIO to use O_DIRECT semantics (this may cause IO to fail if applications do not properly align their IO).
This commit is derived from code developed by Weston Andros Adamson.
--- Documentation/filesystems/nfs/localio.rst | 11 +++ fs/nfs/direct.c | 1 + fs/nfs/localio.c | 93 ++++++++++++++++++++--- include/linux/nfs_xdr.h | 1 + 4 files changed, 96 insertions(+), 10 deletions(-)
Documentation/filesystems/nfs/localio.rst +11 -0
@@ -306,6 +306,17 @@ is issuing IO to the underlying local filesystem that it is sharing with the NFS server. See: fs/nfs/localio.c:nfs_local_doio() and fs/nfs/localio.c:nfs_local_commit(). +With normal NFS that makes use of RPC to issue IO to the server, if an +application uses O_DIRECT the NFS client will bypass the pagecache but +the NFS server will not. Because the NFS server's use of buffered IO +affords applications to be less precise with their alignment when +issuing IO to the NFS client. LOCALIO can be configured to use O_DIRECT +semantics by setting the 'localio_O_DIRECT_semantics' nfs module +parameter to Y, e.g.: + echo Y > /sys/module/nfs/parameters/localio_O_DIRECT_semantics +Once enabled, it will cause LOCALIO to use O_DIRECT semantics (this may +cause IO to fail if applications do not properly align their IO). + Security ========
fs/nfs/direct.c +1 -0
@@ -303,6 +303,7 @@ static void nfs_read_sync_pgio_error(struct list_head *head, int error)static void nfs_direct_pgio_init (struct nfs_pgio_header *hdr) {get_dreq (hdr->dreq); +set_bit (NFS_IOHDR_ODIRECT , &hdr->flags); }static const struct nfs_pgio_completion_ops nfs_direct_read_completion_ops = {
fs/nfs/localio.c +83 -10
160 lines not on this page · raw message
include/linux/nfs_xdr.h +1 -0
@@ -1632,6 +1632,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 v3 2/14 nfsd: add nfsd_file_{get,put} to 'nfs_to' nfsd_localio_operations
In reply to Mike SnitzerIn later a commit LOCALIO must call both nfsd_file_get and nfsd_file_put to manage extra nfsd_file references.
--- fs/nfsd/localio.c | 2 ++ include/linux/nfslocalio.h | 2 ++ 2 files changed, 4 insertions(+)
fs/nfsd/localio.c +2 -0
@@ -29,6 +29,8 @@ static const struct nfsd_localio_operations nfsd_localio_ops = { .nfsd_serv_put = nfsd_serv_put, .nfsd_open_local_fh = nfsd_open_local_fh, .nfsd_file_put_local = nfsd_file_put_local, + .nfsd_file_get = nfsd_file_get, + .nfsd_file_put = nfsd_file_put, .nfsd_file_file = nfsd_file_file, };
include/linux/nfslocalio.h +2 -0
@@ -56,6 +56,8 @@ struct nfsd_localio_operations { const struct nfs_fh *, const fmode_t);struct net *(*nfsd_file_put_local)(struct nfsd_file *); +struct nfsd_file *(*nfsd_file_get)(struct nfsd_file *); +void (*nfsd_file_put)(struct nfsd_file *);struct file *(*nfsd_file_file)(struct nfsd_file *); }____cacheline_aligned ;
Signature · 1 line
2.44.0
PATCH v3 3/14 nfs_common: rename functions that invalidate LOCALIO nfs_clients
In reply to Mike SnitzerRename nfs_uuid_invalidate_one_client to nfs_localio_disable_client. Rename nfs_uuid_invalidate_clients to nfs_localio_invalidate_clients.
--- fs/nfs/localio.c | 2 +- fs/nfs_common/nfslocalio.c | 8 ++++---- fs/nfsd/nfsctl.c | 4 ++-- include/linux/nfslocalio.h | 5 +++-- 4 files changed, 10 insertions(+), 9 deletions(-)
fs/nfs/localio.c +1 -1
@@ -140,7 +140,7 @@ void nfs_local_disable(struct nfs_client *clp)spin_lock (&clp->cl_localio_lock);if (test_and_clear_bit (NFS_CS_LOCAL_IO , &clp->cl_flags)) {trace_nfs_local_disable (clp); -nfs_uuid_invalidate_one_client (&clp->cl_uuid); +nfs_localio_disable_client (&clp->cl_uuid); }spin_unlock (&clp->cl_localio_lock); }
fs/nfs_common/nfslocalio.c +4 -4
@@ -107,7 +107,7 @@ static void nfs_uuid_put_locked(nfs_uuid_t *nfs_uuid)list_del_init (&nfs_uuid->list); } -void nfs_uuid_invalidate_clients (struct list_head *list) +void nfs_localio_invalidate_clients (struct list_head *list) {nfs_uuid_t *nfs_uuid, *tmp;
@@ -116,9 +116,9 @@ void nfs_uuid_invalidate_clients(struct list_head *list)nfs_uuid_put_locked (nfs_uuid);spin_unlock (&nfs_uuid_lock); } -EXPORT_SYMBOL_GPL (nfs_uuid_invalidate_clients); +EXPORT_SYMBOL_GPL (nfs_localio_invalidate_clients); -void nfs_uuid_invalidate_one_client (nfs_uuid_t *nfs_uuid) +void nfs_localio_disable_client (nfs_uuid_t *nfs_uuid) {if (nfs_uuid->net) {spin_lock (&nfs_uuid_lock);
@@ -126,7 +126,7 @@ void nfs_uuid_invalidate_one_client(nfs_uuid_t *nfs_uuid)spin_unlock (&nfs_uuid_lock); } } -EXPORT_SYMBOL_GPL (nfs_uuid_invalidate_one_client); +EXPORT_SYMBOL_GPL (nfs_localio_disable_client); struct nfsd_file *nfs_open_local_fh(nfs_uuid_t *uuid, struct rpc_clnt *rpc_clnt, const struct cred *cred,
fs/nfsd/nfsctl.c +2 -2
@@ -2276,14 +2276,14 @@ static __net_init int nfsd_net_init(struct net *net)* nfsd_net_pre_exit - Disconnect localio clients from net namespace * @net: a network namespace that is about to be destroyed * -* This invalidated ->net pointers held by localio clients +* This invalidates ->net pointers held by localio clients * while they can still safely access nn->counter. */ static __net_exit void nfsd_net_pre_exit(struct net *net) {struct nfsd_net *nn =net_generic (net, nfsd_net_id); -nfs_uuid_invalidate_clients (&nn->local_clients); +nfs_localio_invalidate_clients (&nn->local_clients); }#endif
include/linux/nfslocalio.h +3 -2
@@ -37,8 +37,9 @@ bool nfs_uuid_begin(nfs_uuid_t *);void nfs_uuid_end (nfs_uuid_t *);void nfs_uuid_is_local (const uuid_t *,struct list_head *,struct net *,struct auth_domain *,struct module *); -void nfs_uuid_invalidate_clients (struct list_head *list); -void nfs_uuid_invalidate_one_client (nfs_uuid_t *nfs_uuid); + +void nfs_localio_disable_client (nfs_uuid_t *nfs_uuid); +void nfs_localio_invalidate_clients (struct list_head *list);/* localio needs to map filehandle -> struct nfsd_file */ extern struct nfsd_file *
Signature · 1 line
2.44.0
PATCH v3 4/14 nfs_common: move localio_lock to new lock member of nfs_uuid_t
In reply to Mike SnitzerRemove cl_localio_lock from 'struct nfs_client' in favor of adding a lock to the nfs_uuid_t struct (which is embedded in each nfs_client).
Push nfs_local_{enable,disable} implementation down to nfs_common. Those methods now call nfs_localio_{enable,disable}_client.
This allows implementing nfs_localio_invalidate_clients in terms of nfs_localio_disable_client.
--- fs/nfs/client.c | 1 - fs/nfs/localio.c | 14 +++------- fs/nfs_common/nfslocalio.c | 57 ++++++++++++++++++++++++++------------ include/linux/nfs_fs_sb.h | 1 - include/linux/nfslocalio.h | 8 +++++- 5 files changed, 51 insertions(+), 30 deletions(-)
fs/nfs/client.c +0 -1
@@ -186,7 +186,6 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)seqlock_init (&clp->cl_boot_lock);ktime_get_real_ts64 (&clp->cl_nfssvc_boot);nfs_uuid_init (&clp->cl_uuid); -spin_lock_init (&clp->cl_localio_lock);#endif /* CONFIG_NFS_LOCALIO */ clp->cl_principal ="*" ;
fs/nfs/localio.c +4 -10
@@ -126,10 +126,8 @@ const struct rpc_program nfslocalio_program = {*/ static void nfs_local_enable (struct nfs_client *clp) { -spin_lock (&clp->cl_localio_lock); -set_bit (NFS_CS_LOCAL_IO , &clp->cl_flags);trace_nfs_local_enable (clp); -spin_unlock (&clp->cl_localio_lock); +nfs_localio_enable_client (clp); }/*
@@ -137,12 +135,8 @@ static void nfs_local_enable(struct nfs_client *clp)*/ void nfs_local_disable (struct nfs_client *clp) { -spin_lock (&clp->cl_localio_lock); -if (test_and_clear_bit (NFS_CS_LOCAL_IO , &clp->cl_flags)) { -trace_nfs_local_disable (clp); -nfs_localio_disable_client (&clp->cl_uuid); - } -spin_unlock (&clp->cl_localio_lock); +trace_nfs_local_disable (clp); +nfs_localio_disable_client (clp); }/*
@@ -184,7 +178,7 @@ static bool nfs_server_uuid_is_local(struct nfs_client *clp)rpc_shutdown_client (rpcclient_localio);/* Server is only local if it initialized required struct members */ -if (status || !clp->cl_uuid.net || !clp->cl_uuid.dom) +if (status || !rcu_access_pointer (clp->cl_uuid.net) || !clp->cl_uuid.dom)return false;return true;
fs/nfs_common/nfslocalio.c +40 -17
91 lines not on this page · raw message
include/linux/nfs_fs_sb.h +0 -1
@@ -132,7 +132,6 @@ struct nfs_client {struct timespec64 cl_nfssvc_boot;seqlock_t cl_boot_lock;nfs_uuid_t cl_uuid; -spinlock_t cl_localio_lock;#endif /* CONFIG_NFS_LOCALIO */ };
include/linux/nfslocalio.h +7 -1
@@ -6,6 +6,7 @@#ifndef __LINUX_NFSLOCALIO_H#define __LINUX_NFSLOCALIO_H +/* nfsd_file structure is purposely kept opaque to NFS client */ struct nfsd_file ;
@@ -19,6 +20,8 @@ struct nfsd_file;#include <linux/nfs.h> #include <net/net_namespace.h> +struct nfs_client ; +/* * Useful to allow a client to negotiate if localio * possible with its server.
@@ -27,6 +30,8 @@ struct nfsd_file;*/ typedef struct { uuid_t uuid; + /* sadly this struct is just over a cacheline, avoid bouncing */ + spinlock_t ____cacheline_aligned lock; struct list_head list; struct net __rcu *net; /* nfsd's network namespace */ struct auth_domain *dom; /* auth_domain for localio */
@@ -38,7 +43,8 @@ void nfs_uuid_end(nfs_uuid_t *);void nfs_uuid_is_local (const uuid_t *,struct list_head *,struct net *,struct auth_domain *,struct module *); -void nfs_localio_disable_client (nfs_uuid_t *nfs_uuid); +void nfs_localio_enable_client (struct nfs_client *clp); +void nfs_localio_disable_client (struct nfs_client *clp);void nfs_localio_invalidate_clients (struct list_head *list);/* localio needs to map filehandle -> struct nfsd_file */
Signature · 1 line
2.44.0
PATCH v3 5/14 nfs: cache all open LOCALIO nfsd_file(s) in client
In reply to Mike SnitzerThis commit switches from leaning heavily on NFSD's filecache (in terms of GC'd nfsd_files) back to caching nfsd_files in the client. A later commit will add the callback mechanism needed to allow NFSD to force the NFS client to cleanup all cached nfsd_files.
Add nfs_fh_localio_init() and 'struct nfs_fh_localio' to cache opened nfsd_file(s) (both a RO and RW nfsd_file is able to be opened and cached for a given nfs_fh).
Update nfs_local_open_fh() to cache the nfsd_file once it is opened using __nfs_local_open_fh().
Introduce nfs_close_local_fh() to clear the cached open nfsd_files and call nfs_to_nfsd_file_put_local().
Refcounting is such that:
- nfs_local_open_fh() is paired with nfs_close_local_fh().
- __nfs_local_open_fh() is paired with nfs_to_nfsd_file_put_local().
- nfs_local_file_get() is paired with nfs_local_file_put().
--- fs/nfs/flexfilelayout/flexfilelayout.c | 25 ++++---- fs/nfs/flexfilelayout/flexfilelayout.h | 1 + fs/nfs/inode.c | 3 + fs/nfs/internal.h | 4 +- fs/nfs/localio.c | 89 +++++++++++++++++++++----- fs/nfs/pagelist.c | 5 +- fs/nfs/write.c | 3 +- fs/nfs_common/nfslocalio.c | 52 ++++++++++++++- include/linux/nfs_fs.h | 22 ++++++- include/linux/nfslocalio.h | 18 +++--- 10 files changed, 177 insertions(+), 45 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +13 -12
@@ -164,18 +164,17 @@ decode_name(struct xdr_stream *xdr, u32 *id) }static struct nfsd_file * -ff_local_open_fh (struct nfs_client *clp,const struct cred *cred, +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) { -if (mode &FMODE_WRITE ) { -/* -* Always request read and write access since this corresponds -* to a rw layout. -*/ - mode |=FMODE_READ ; - } +#if IS_ENABLED (CONFIG_NFS_LOCALIO ) +struct nfs4_ff_layout_mirror *mirror =FF_LAYOUT_COMP (lseg, ds_idx); -return nfs_local_open_fh (clp, cred, fh, mode); +return nfs_local_open_fh (clp, cred, fh, &mirror->nfl, mode); +#else +return NULL ; +#endif } static bool ff_mirror_match_fh(const struct nfs4_ff_layout_mirror *m1,
@@ -247,6 +246,7 @@ static struct nfs4_ff_layout_mirror *ff_layout_alloc_mirror(gfp_t gfp_flags)spin_lock_init (&mirror->lock);refcount_set (&mirror->ref,1 );INIT_LIST_HEAD (&mirror->mirrors); +nfs_localio_file_init (&mirror->nfl); }return mirror; }
@@ -257,6 +257,7 @@ static void ff_layout_free_mirror(struct nfs4_ff_layout_mirror *mirror)ff_layout_remove_mirror (mirror);kfree (mirror->fh_versions); +nfs_close_local_fh (&mirror->nfl); cred =rcu_access_pointer (mirror->ro_cred);put_cred (cred); cred =rcu_access_pointer (mirror->rw_cred);
@@ -1820,7 +1821,7 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr) hdr->mds_offset = offset;/* Start IO accounting for local read */ - localio =ff_local_open_fh (ds->ds_clp, ds_cred, fh,FMODE_READ ); + localio =ff_local_open_fh (lseg, idx, ds->ds_clp, ds_cred, fh,FMODE_READ );if (localio) { hdr->task.tk_start =ktime_get ();ff_layout_read_record_layoutstats_start (&hdr->task, hdr);
@@ -1896,7 +1897,7 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync) hdr->args.offset = offset;/* Start IO accounting for local write */ - localio =ff_local_open_fh (ds->ds_clp, ds_cred, fh, + localio =ff_local_open_fh (lseg, idx, ds->ds_clp, ds_cred, fh,FMODE_READ |FMODE_WRITE );if (localio) { hdr->task.tk_start =ktime_get ();
@@ -1981,7 +1982,7 @@ static int ff_layout_initiate_commit(struct nfs_commit_data *data, int how) data->args.fh = fh;/* Start IO accounting for local commit */ - localio =ff_local_open_fh (ds->ds_clp, ds_cred, fh, + localio =ff_local_open_fh (lseg, idx, ds->ds_clp, ds_cred, fh,FMODE_READ |FMODE_WRITE );if (localio) { data->task.tk_start =ktime_get ();
fs/nfs/flexfilelayout/flexfilelayout.h +1 -0
@@ -83,6 +83,7 @@ struct nfs4_ff_layout_mirror {nfs4_stateid stateid;const struct cred __rcu *ro_cred;const struct cred __rcu *rw_cred; +struct nfs_file_localio nfl;refcount_t ref;spinlock_t lock;unsigned long flags;
fs/nfs/inode.c +3 -0
@@ -1137,6 +1137,8 @@ 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 ; +nfs_localio_file_init (&ctx->nfl); +return ctx; }EXPORT_SYMBOL_GPL (alloc_nfs_open_context);
@@ -1168,6 +1170,7 @@ 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); +nfs_close_local_fh (&ctx->nfl);kfree_rcu (ctx, rcu_head); }
fs/nfs/internal.h +3 -1
@@ -459,6 +459,7 @@ extern void nfs_local_probe(struct nfs_client *);extern struct nfsd_file *nfs_local_open_fh (struct nfs_client *,const struct cred *,struct nfs_fh *, +struct nfs_file_localio *,const fmode_t ); extern int nfs_local_doio(struct nfs_client *, struct nfsd_file *,
@@ -474,7 +475,8 @@ static inline void nfs_local_disable(struct nfs_client *clp) {}static inline void nfs_local_probe (struct nfs_client *clp) {}static inline struct nfsd_file *nfs_local_open_fh (struct nfs_client *clp,const struct cred *cred, -struct nfs_fh *fh,const fmode_t mode) +struct nfs_fh *fh,struct nfs_file_localio *nfl, +const fmode_t mode) {return NULL ; }
fs/nfs/localio.c +72 -17
130 lines not on this page · raw message
fs/nfs/pagelist.c +3 -2
@@ -961,8 +961,9 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc)struct nfs_client *clp =NFS_SERVER (hdr->inode)->nfs_client;struct nfsd_file *localio = -nfs_local_open_fh (clp, hdr->cred, - hdr->args.fh, hdr->args.context->mode); +nfs_local_open_fh (clp, hdr->cred, hdr->args.fh, + &hdr->args.context->nfl, + hdr->args.context->mode);if (NFS_SERVER (hdr->inode)->nfs_client->cl_minorversion) task_flags =RPC_TASK_MOVEABLE ;
fs/nfs/write.c +2 -1
@@ -1817,7 +1817,8 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how, task_flags =RPC_TASK_MOVEABLE ; localio =nfs_local_open_fh (NFS_SERVER (inode)->nfs_client, data->cred, - data->args.fh, data->context->mode); + data->args.fh, &data->context->nfl, + data->context->mode);return nfs_initiate_commit (NFS_CLIENT (inode), data,NFS_PROTO (inode), data->mds_ops, how,RPC_TASK_CRED_NOREF | task_flags, localio);
fs/nfs_common/nfslocalio.c +50 -2
77 lines not on this page · raw message
include/linux/nfs_fs.h +20 -2
@@ -77,6 +77,23 @@ struct nfs_lock_context {struct rcu_head rcu_head; }; +struct nfs_file_localio { +struct nfsd_file __rcu *ro_file; +struct nfsd_file __rcu *rw_file; +struct list_head list; +void __rcu *nfs_uuid;/* opaque pointer to 'nfs_uuid_t' */ +}; + +static inline void nfs_localio_file_init (struct nfs_file_localio *nfl) +{ +#if IS_ENABLED (CONFIG_NFS_LOCALIO ) + nfl->ro_file =NULL ; + nfl->rw_file =NULL ; +INIT_LIST_HEAD (&nfl->list); + nfl->nfs_uuid =NULL ; +#endif +} +struct nfs4_state ;struct nfs_open_context {struct nfs_lock_context lock_context;
@@ -87,15 +104,16 @@ struct nfs_open_context {struct nfs4_state *state;fmode_t mode; +int error;unsigned long flags;#define NFS_CONTEXT_BAD (2)#define NFS_CONTEXT_UNLOCK (3)#define NFS_CONTEXT_FILE_OPEN (4) -int error; -struct list_head list;struct nfs4_threshold *mdsthreshold; +struct list_head list;struct rcu_head rcu_head; +struct nfs_file_localio nfl; };struct nfs_open_dir_context {
include/linux/nfslocalio.h +10 -8
@@ -6,10 +6,6 @@#ifndef __LINUX_NFSLOCALIO_H#define __LINUX_NFSLOCALIO_H - -/* nfsd_file structure is purposely kept opaque to NFS client */ -struct nfsd_file ; -#if IS_ENABLED (CONFIG_NFS_LOCALIO )#include <linux/module.h>
@@ -21,6 +17,7 @@ struct nfsd_file;#include <net/net_namespace.h> struct nfs_client ; +struct nfs_file_localio ;/* * Useful to allow a client to negotiate if localio
@@ -52,6 +49,7 @@ extern struct nfsd_file * nfsd_open_local_fh(struct net *, struct auth_domain *, struct rpc_clnt *, const struct cred *, const struct nfs_fh *,const fmode_t)__must_hold (rcu); +void nfs_close_local_fh (struct nfs_file_localio *);struct nfsd_localio_operations {bool (*nfsd_serv_try_get)(struct net *);
@@ -73,7 +71,8 @@ extern const struct nfsd_localio_operations *nfs_to;struct nfsd_file *nfs_open_local_fh (nfs_uuid_t *,struct rpc_clnt *,const struct cred *, -const struct nfs_fh *,const fmode_t ); +const struct nfs_fh *,struct nfs_file_localio *, +const fmode_t );static inline void nfs_to_nfsd_net_put (struct net *net) {
@@ -100,12 +99,15 @@ static inline void nfs_to_nfsd_file_put_local(struct nfsd_file *localio) }#else /* CONFIG_NFS_LOCALIO */ + +struct nfs_file_localio ; +static inline void nfs_close_local_fh (struct nfs_file_localio *nfl) +{ +}static inline void nfsd_localio_ops_init (void ) { } -static inline void nfs_to_nfsd_file_put_local (struct nfsd_file *localio) -{ -} +#endif /* CONFIG_NFS_LOCALIO */ #endif /* __LINUX_NFSLOCALIO_H */
Signature · 1 line
2.44.0
PATCH v3 6/14 nfsd: update percpu_ref to manage references on nfsd_net
In reply to Mike SnitzerHolding a reference on nfsd_net is what is required, it was never actually about ensuring nn->nfsd_serv available.
Move waiting for outstanding percpu references from nfsd_destroy_serv() to nfsd_shutdown_net().
By moving it later it will be possible to invalidate localio clients during nfsd_file_cache_shutdown_net() via __nfsd_file_cache_purge().
--- fs/nfsd/nfssvc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
fs/nfsd/nfssvc.c +7 -5
@@ -436,6 +436,10 @@ static void nfsd_shutdown_net(struct net *net)if (!nn->nfsd_net_up)return ; + +percpu_ref_kill_and_confirm (&nn->nfsd_serv_ref, nfsd_serv_done); +wait_for_completion (&nn->nfsd_serv_confirm_done); +nfsd_export_flush (net);nfs4_state_shutdown_net (net);nfsd_reply_cache_shutdown (nn);
@@ -444,7 +448,10 @@ static void nfsd_shutdown_net(struct net *net)lockd_down (net); nn->lockd_up = false; } + +wait_for_completion (&nn->nfsd_serv_free_done);percpu_ref_exit (&nn->nfsd_serv_ref); + nn->nfsd_net_up = false;nfsd_shutdown_generic (); }
@@ -526,11 +533,6 @@ void nfsd_destroy_serv(struct net *net)lockdep_assert_held (&nfsd_mutex); -percpu_ref_kill_and_confirm (&nn->nfsd_serv_ref, nfsd_serv_done); -wait_for_completion (&nn->nfsd_serv_confirm_done); -wait_for_completion (&nn->nfsd_serv_free_done); -/* percpu_ref_exit is called in nfsd_shutdown_net */ -spin_lock (&nfsd_notifier_lock); nn->nfsd_serv =NULL ;spin_unlock (&nfsd_notifier_lock);
Signature · 1 line
2.44.0
PATCH v3 7/14 nfsd: rename nfsd_serv_ prefixed methods and variables with nfsd_net_
In reply to Mike SnitzerAlso update Documentation/filesystems/nfs/localio.rst accordingly and reduce the technical documentation debt that was previously captured in that document.
--- Documentation/filesystems/nfs/localio.rst | 81 +++++++---------------- fs/nfs_common/nfslocalio.c | 10 ++- fs/nfsd/filecache.c | 2 +- fs/nfsd/localio.c | 4 +- fs/nfsd/netns.h | 11 +-- fs/nfsd/nfssvc.c | 34 +++++----- include/linux/nfslocalio.h | 12 ++-- 7 files changed, 64 insertions(+), 90 deletions(-)
Documentation/filesystems/nfs/localio.rst +25 -56
@@ -218,64 +218,30 @@ NFS Client and Server Interlock =============================== LOCALIO provides the nfs_uuid_t object and associated interfaces to -allow proper network namespace (net-ns) and NFSD object refcounting: +allow proper network namespace (net-ns) and NFSD object refcounting. - We don't want to keep a long-term counted reference on each NFSD's - net-ns in the client because that prevents a server container from - completely shutting down. - - So we avoid taking a reference at all and rely on the per-cpu - reference to the server (detailed below) being sufficient to keep - the net-ns active. This involves allowing the NFSD's net-ns exit - code to iterate all active clients and clear their ->net pointers - (which are needed to find the per-cpu-refcount for the nfsd_serv). - - Details: - - - Embed nfs_uuid_t in nfs_client. nfs_uuid_t provides a list_head - that can be used to find the client. It does add the 16-byte - uuid_t to nfs_client so it is bigger than needed (given that - uuid_t is only used during the initial NFS client and server - LOCALIO handshake to determine if they are local to each other). - If that is really a problem we can find a fix. - - - When the nfs server confirms that the uuid_t is local, it moves - the nfs_uuid_t onto a per-net-ns list in NFSD's nfsd_net. - - - When each server's net-ns is shutting down - in a "pre_exit" - handler, all these nfs_uuid_t have their ->net cleared. There is - an rcu_synchronize() call between pre_exit() handlers and exit() - handlers so any caller that sees nfs_uuid_t ->net as not NULL can - safely manage the per-cpu-refcount for nfsd_serv. - - - The client's nfs_uuid_t is passed to nfsd_open_local_fh() so it - can safely dereference ->net in a private rcu_read_lock() section - to allow safe access to the associated nfsd_net and nfsd_serv. - -So LOCALIO required the introduction and use of NFSD's percpu_ref to -interlock nfsd_destroy_serv() and nfsd_open_local_fh(), to ensure each -nn->nfsd_serv is not destroyed while in use by nfsd_open_local_fh(), and +LOCALIO required the introduction and use of NFSD's percpu nfsd_net_ref +to interlock nfsd_shutdown_net() and nfsd_open_local_fh(), to ensure +each net-ns is not destroyed while in use by nfsd_open_local_fh(), and warrants a more detailed explanation: - nfsd_open_local_fh() uses nfsd_serv_try_get() before opening its + nfsd_open_local_fh() uses nfsd_net_try_get() before opening its nfsd_file handle and then the caller (NFS client) must drop the - reference for the nfsd_file and associated nn->nfsd_serv using - nfs_file_put_local() once it has completed its IO. + reference for the nfsd_file and associated net-ns using + nfsd_file_put_local() once it has completed its IO. This interlock working relies heavily on nfsd_open_local_fh() being afforded the ability to safely deal with the possibility that the NFSD's net-ns (and nfsd_net by association) may have been destroyed - by nfsd_destroy_serv() via nfsd_shutdown_net() -- which is only - possible given the nfs_uuid_t ->net pointer managemenet detailed - above. + by nfsd_destroy_serv() via nfsd_shutdown_net(). -All told, this elaborate interlock of the NFS client and server has been -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 occurred due -to the LOCALIO client's attempting to nfsd_open_local_fh(), using -nn->nfsd_serv, without having a proper reference on nn->nfsd_serv. +This interlock of the NFS client and server has been 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 occurred due to the LOCALIO client's +attempting to nfsd_open_local_fh() without having a proper reference on +NFSD's net-ns. NFS Client issues IO instead of Server ======================================
@@ -308,14 +274,17 @@ fs/nfs/localio.c:nfs_local_commit(). With normal NFS that makes use of RPC to issue IO to the server, if an application uses O_DIRECT the NFS client will bypass the pagecache but -the NFS server will not. Because the NFS server's use of buffered IO -affords applications to be less precise with their alignment when -issuing IO to the NFS client. LOCALIO can be configured to use O_DIRECT -semantics by setting the 'localio_O_DIRECT_semantics' nfs module +the NFS server will not. The NFS server's use of buffered IO affords +applications to be less precise with their alignment when issuing IO to +the NFS client. But if all applications properly align their IO, LOCALIO +can be configured to use end-to-end O_DIRECT semantics from the NFS +client to the underlying local filesystem, that it is sharing with +the NFS server, by setting the 'localio_O_DIRECT_semantics' nfs module parameter to Y, e.g.: - echo Y > /sys/module/nfs/parameters/localio_O_DIRECT_semantics -Once enabled, it will cause LOCALIO to use O_DIRECT semantics (this may -cause IO to fail if applications do not properly align their IO). + echo Y > /sys/module/nfs/parameters/localio_O_DIRECT_semantics +Once enabled, it will cause LOCALIO to use end-to-end O_DIRECT semantics +(but again, this may cause IO to fail if applications do not properly +align their IO). Security ========
fs/nfs_common/nfslocalio.c +7 -3
@@ -159,6 +159,10 @@ static void nfs_uuid_add_file(nfs_uuid_t *nfs_uuid, struct nfs_file_localio *nflspin_unlock (&nfs_uuid_lock); } +/* +* Caller is responsible for calling nfsd_net_put and +* nfsd_file_put (via nfs_to_nfsd_file_put_local). +*/ struct nfsd_file *nfs_open_local_fh(nfs_uuid_t *uuid, struct rpc_clnt *rpc_clnt, const struct cred *cred, const struct nfs_fh *nfs_fh, struct nfs_file_localio *nfl,
@@ -171,7 +175,7 @@ struct nfsd_file *nfs_open_local_fh(nfs_uuid_t *uuid,* Not running in nfsd context, so must safely get reference on nfsd_serv. * But the server may already be shutting down, if so disallow new localio. * uuid->net is NOT a counted reference, but rcu_read_lock() ensures that -* if uuid->net is not NULL, then calling nfsd_serv_try_get() is safe +* if uuid->net is not NULL, then calling nfsd_net_try_get() is safe * and if it succeeds we will have an implied reference to the net. * * Otherwise NFS may not have ref on NFSD and therefore cannot safely
@@ -179,12 +183,12 @@ struct nfsd_file *nfs_open_local_fh(nfs_uuid_t *uuid,*/ rcu_read_lock (); net =rcu_dereference (uuid->net); -if (!net || !nfs_to->nfsd_serv_try_get (net)) { +if (!net || !nfs_to->nfsd_net_try_get (net)) {rcu_read_unlock ();return ERR_PTR (-ENXIO ); }rcu_read_unlock (); -/* We have an implied reference to net thanks to nfsd_serv_try_get */ +/* We have an implied reference to net thanks to nfsd_net_try_get */ localio = nfs_to->nfsd_open_local_fh (net, uuid->dom, rpc_clnt, cred, nfs_fh, fmode);if (IS_ERR (localio))
fs/nfsd/filecache.c +1 -1
@@ -391,7 +391,7 @@ nfsd_file_put(struct nfsd_file *nf) }/** -* nfsd_file_put_local - put nfsd_file reference and arm nfsd_serv_put in caller +* nfsd_file_put_local - put nfsd_file reference and arm nfsd_net_put in caller * @nf: nfsd_file of which to put the reference * * First save the associated net to return to caller, then put
fs/nfsd/localio.c +2 -2
@@ -25,8 +25,8 @@#include "cache.h" static const struct nfsd_localio_operations nfsd_localio_ops = { - .nfsd_serv_try_get = nfsd_serv_try_get, - .nfsd_serv_put = nfsd_serv_put, + .nfsd_net_try_get = nfsd_net_try_get, + .nfsd_net_put = nfsd_net_put, .nfsd_open_local_fh = nfsd_open_local_fh, .nfsd_file_put_local = nfsd_file_put_local, .nfsd_file_get = nfsd_file_get,
fs/nfsd/netns.h +6 -5
@@ -140,9 +140,10 @@ struct nfsd_net {struct svc_info nfsd_info;#define nfsd_serv nfsd_info.serv -struct percpu_ref nfsd_serv_ref; -struct completion nfsd_serv_confirm_done; -struct completion nfsd_serv_free_done; + +struct percpu_ref nfsd_net_ref; +struct completion nfsd_net_confirm_done; +struct completion nfsd_net_free_done;/* * clientid and stateid data for construction of net unique COPY
@@ -229,8 +230,8 @@ struct nfsd_net {extern bool nfsd_support_version (int vers);extern unsigned int nfsd_net_id; -bool nfsd_serv_try_get (struct net *net); -void nfsd_serv_put (struct net *net); +bool nfsd_net_try_get (struct net *net); +void nfsd_net_put (struct net *net);void nfsd_copy_write_verifier (__be32 verf[2 ],struct nfsd_net *nn);void nfsd_reset_write_verifier (struct nfsd_net *nn);
fs/nfsd/nfssvc.c +17 -17
@@ -214,32 +214,32 @@ int nfsd_minorversion(struct nfsd_net *nn, u32 minorversion, enum vers_op changereturn 0 ; } -bool nfsd_serv_try_get (struct net *net)__must_hold (rcu) +bool nfsd_net_try_get (struct net *net)__must_hold (rcu) {struct nfsd_net *nn =net_generic (net, nfsd_net_id); -return (nn &&percpu_ref_tryget_live (&nn->nfsd_serv_ref)); +return (nn &&percpu_ref_tryget_live (&nn->nfsd_net_ref)); } -void nfsd_serv_put (struct net *net)__must_hold (rcu) +void nfsd_net_put (struct net *net)__must_hold (rcu) {struct nfsd_net *nn =net_generic (net, nfsd_net_id); -percpu_ref_put (&nn->nfsd_serv_ref); +percpu_ref_put (&nn->nfsd_net_ref); } -static void nfsd_serv_done (struct percpu_ref *ref) +static void nfsd_net_done (struct percpu_ref *ref) { - struct nfsd_net *nn = container_of(ref, struct nfsd_net, nfsd_serv_ref); + struct nfsd_net *nn = container_of(ref, struct nfsd_net, nfsd_net_ref); -complete (&nn->nfsd_serv_confirm_done); +complete (&nn->nfsd_net_confirm_done); } -static void nfsd_serv_free (struct percpu_ref *ref) +static void nfsd_net_free (struct percpu_ref *ref) { - struct nfsd_net *nn = container_of(ref, struct nfsd_net, nfsd_serv_ref); + struct nfsd_net *nn = container_of(ref, struct nfsd_net, nfsd_net_ref); -complete (&nn->nfsd_serv_free_done); +complete (&nn->nfsd_net_free_done); }/*
@@ -437,8 +437,8 @@ static void nfsd_shutdown_net(struct net *net)if (!nn->nfsd_net_up)return ; -percpu_ref_kill_and_confirm (&nn->nfsd_serv_ref, nfsd_serv_done); -wait_for_completion (&nn->nfsd_serv_confirm_done); +percpu_ref_kill_and_confirm (&nn->nfsd_net_ref, nfsd_net_done); +wait_for_completion (&nn->nfsd_net_confirm_done);nfsd_export_flush (net);nfs4_state_shutdown_net (net);
@@ -449,8 +449,8 @@ static void nfsd_shutdown_net(struct net *net) nn->lockd_up = false; } -wait_for_completion (&nn->nfsd_serv_free_done); -percpu_ref_exit (&nn->nfsd_serv_ref); +wait_for_completion (&nn->nfsd_net_free_done); +percpu_ref_exit (&nn->nfsd_net_ref); nn->nfsd_net_up = false;nfsd_shutdown_generic ();
@@ -654,12 +654,12 @@ int nfsd_create_serv(struct net *net)if (nn->nfsd_serv)return 0 ; - error =percpu_ref_init (&nn->nfsd_serv_ref, nfsd_serv_free, + error =percpu_ref_init (&nn->nfsd_net_ref, nfsd_net_free,0 ,GFP_KERNEL );if (error)return error; -init_completion (&nn->nfsd_serv_free_done); -init_completion (&nn->nfsd_serv_confirm_done); +init_completion (&nn->nfsd_net_free_done); +init_completion (&nn->nfsd_net_confirm_done);if (nfsd_max_blksize ==0 ) nfsd_max_blksize =nfsd_get_default_max_blksize ();
include/linux/nfslocalio.h +6 -6
@@ -52,8 +52,8 @@ nfsd_open_local_fh(struct net *, struct auth_domain *, struct rpc_clnt *,void nfs_close_local_fh (struct nfs_file_localio *);struct nfsd_localio_operations { -bool (*nfsd_serv_try_get)(struct net *); -void (*nfsd_serv_put)(struct net *); +bool (*nfsd_net_try_get)(struct net *); +void (*nfsd_net_put)(struct net *); struct nfsd_file *(*nfsd_open_local_fh)(struct net *, struct auth_domain *, struct rpc_clnt *,
@@ -77,12 +77,12 @@ struct nfsd_file *nfs_open_local_fh(nfs_uuid_t *,static inline void nfs_to_nfsd_net_put (struct net *net) {/* -* Once reference to nfsd_serv is dropped, NFSD could be -* unloaded, so ensure safe return from nfsd_file_put_local() -* by always taking RCU. +* Once reference to net (and associated nfsd_serv) is dropped, NFSD +* could be unloaded, so ensure safe return from nfsd_net_put() by +* always taking RCU. */ rcu_read_lock (); - nfs_to->nfsd_serv_put (net); + nfs_to->nfsd_net_put (net);rcu_read_unlock (); }
Signature · 1 line
2.44.0
PATCH v3 8/14 nfsd: nfsd_file_acquire_local no longer returns GC'd nfsd_file
In reply to Mike SnitzerNow that LOCALIO no longer leans on NFSD's filecache for caching open files (and instead uses NFS client-side open nfsd_file caching) there is no need to use NFSD filecache's GC feature. Avoiding GC will speed up nfsd_file initial opens.
--- fs/nfsd/filecache.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
fs/nfsd/filecache.c +4 -5
@@ -1225,10 +1225,9 @@ nfsd_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp,* a file. The security implications of this should be carefully * considered before use. * -* The nfsd_file object returned by this API is reference-counted -* and garbage-collected. The object is retained for a few -* seconds after the final nfsd_file_put() in case the caller -* wants to re-use it. +* The nfsd_file_object returned by this API is reference-counted +* but not garbage-collected. The object is unhashed after the +* final nfsd_file_put(). * * Return values: * %nfs_ok - @pnf points to an nfsd_file with its reference
@@ -1250,7 +1249,7 @@ nfsd_file_acquire_local(struct net *net, struct svc_cred *cred,__be32 beres; beres =nfsd_file_do_acquire (NULL , net, cred, client, - fhp, may_flags,NULL , pnf, true); + fhp, may_flags,NULL , pnf, false);revert_creds (save_cred);return beres; }
Signature · 1 line
2.44.0
PATCH v3 9/14 nfs_common: rename nfslocalio nfs_uuid_lock to nfs_uuids_lock
In reply to Mike SnitzerThis global spinlock protects all nfs_uuid_t relative to the global nfs_uuids list. A later commit will split this global spinlock so prepare by renaming this lock to reflect its intended narrow scope.
--- fs/nfs_common/nfslocalio.c | 34 +++++++++++++++++----------------- fs/nfsd/localio.c | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-)
fs/nfs_common/nfslocalio.c +17 -17
@@ -15,11 +15,11 @@MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("NFS localio protocol bypass support" ); -static DEFINE_SPINLOCK (nfs_uuid_lock); +static DEFINE_SPINLOCK (nfs_uuids_lock);/* * Global list of nfs_uuid_t instances -* that is protected by nfs_uuid_lock. +* that is protected by nfs_uuids_lock. */ static LIST_HEAD (nfs_uuids);
@@ -34,15 +34,15 @@ EXPORT_SYMBOL_GPL(nfs_uuid_init);bool nfs_uuid_begin (nfs_uuid_t *nfs_uuid) { -spin_lock (&nfs_uuid_lock); +spin_lock (&nfs_uuids_lock);/* Is this nfs_uuid already in use? */ if (!list_empty (&nfs_uuid->list)) { -spin_unlock (&nfs_uuid_lock); +spin_unlock (&nfs_uuids_lock);return false; }uuid_gen (&nfs_uuid->uuid);list_add_tail (&nfs_uuid->list, &nfs_uuids); -spin_unlock (&nfs_uuid_lock); +spin_unlock (&nfs_uuids_lock);return true; }
@@ -51,10 +51,10 @@ EXPORT_SYMBOL_GPL(nfs_uuid_begin);void nfs_uuid_end (nfs_uuid_t *nfs_uuid) {if (nfs_uuid->net ==NULL ) { -spin_lock (&nfs_uuid_lock); +spin_lock (&nfs_uuids_lock);if (nfs_uuid->net ==NULL )list_del_init (&nfs_uuid->list); -spin_unlock (&nfs_uuid_lock); +spin_unlock (&nfs_uuids_lock); } }EXPORT_SYMBOL_GPL (nfs_uuid_end);
@@ -78,7 +78,7 @@ void nfs_uuid_is_local(const uuid_t *uuid, struct list_head *list, {nfs_uuid_t *nfs_uuid; -spin_lock (&nfs_uuid_lock); +spin_lock (&nfs_uuids_lock); nfs_uuid =nfs_uuid_lookup_locked (uuid);if (nfs_uuid) {kref_get (&dom->ref);
@@ -94,7 +94,7 @@ void nfs_uuid_is_local(const uuid_t *uuid, struct list_head *list,__module_get (mod); nfsd_mod = mod; } -spin_unlock (&nfs_uuid_lock); +spin_unlock (&nfs_uuids_lock); }EXPORT_SYMBOL_GPL (nfs_uuid_is_local);
@@ -128,9 +128,9 @@ void nfs_localio_disable_client(struct nfs_client *clp)spin_lock (&nfs_uuid->lock);if (test_and_clear_bit (NFS_CS_LOCAL_IO , &clp->cl_flags)) { -spin_lock (&nfs_uuid_lock); +spin_lock (&nfs_uuids_lock);nfs_uuid_put_locked (nfs_uuid); -spin_unlock (&nfs_uuid_lock); +spin_unlock (&nfs_uuids_lock); }spin_unlock (&nfs_uuid->lock); }
@@ -140,23 +140,23 @@ void nfs_localio_invalidate_clients(struct list_head *cl_uuid_list) {nfs_uuid_t *nfs_uuid, *tmp; -spin_lock (&nfs_uuid_lock); +spin_lock (&nfs_uuids_lock);list_for_each_entry_safe (nfs_uuid, tmp, cl_uuid_list, list) {struct nfs_client *clp = container_of(nfs_uuid, struct nfs_client, cl_uuid);nfs_localio_disable_client (clp); } -spin_unlock (&nfs_uuid_lock); +spin_unlock (&nfs_uuids_lock); }EXPORT_SYMBOL_GPL (nfs_localio_invalidate_clients);static void nfs_uuid_add_file (nfs_uuid_t *nfs_uuid,struct nfs_file_localio *nfl) { -spin_lock (&nfs_uuid_lock); +spin_lock (&nfs_uuids_lock);if (!nfl->nfs_uuid)rcu_assign_pointer (nfl->nfs_uuid, nfs_uuid); -spin_unlock (&nfs_uuid_lock); +spin_unlock (&nfs_uuids_lock); }/*
@@ -217,14 +217,14 @@ void nfs_close_local_fh(struct nfs_file_localio *nfl) ro_nf =rcu_access_pointer (nfl->ro_file); rw_nf =rcu_access_pointer (nfl->rw_file);if (ro_nf || rw_nf) { -spin_lock (&nfs_uuid_lock); +spin_lock (&nfs_uuids_lock);if (ro_nf) ro_nf =rcu_dereference_protected (xchg (&nfl->ro_file,NULL ),1 );if (rw_nf) rw_nf =rcu_dereference_protected (xchg (&nfl->rw_file,NULL ),1 );rcu_assign_pointer (nfl->nfs_uuid,NULL ); -spin_unlock (&nfs_uuid_lock); +spin_unlock (&nfs_uuids_lock);rcu_read_unlock ();if (ro_nf)
fs/nfsd/localio.c +1 -1
@@ -54,7 +54,7 @@ void nfsd_localio_ops_init(void)* avoid all the NFS overhead with reads, writes and commits. * * On successful return, returned nfsd_file will have its nf_net member -* set. Caller (NFS client) is responsible for calling nfsd_serv_put and +* set. Caller (NFS client) is responsible for calling nfsd_net_put and * nfsd_file_put (via nfs_to_nfsd_file_put_local). */ struct nfsd_file *
Signature · 1 line
2.44.0
PATCH v3 10/14 nfs_common: track all open nfsd_files per LOCALIO nfs_client
In reply to Mike SnitzerThis tracking enables __nfsd_file_cache_purge() to call nfs_localio_invalidate_clients(), upon shutdown or export change, to nfs_close_local_fh() all open nfsd_files that are still cached by the LOCALIO nfs clients associated with nfsd_net that is being shutdown.
Now that the client must track all open nfsd_files there was more work than necessary being done with the global nfs_uuids_lock contended. This manifested in various RCU issues, e.g.:
hrtimer: interrupt took 47969440 ns
rcu: INFO: rcu_sched detected stalls on CPUs/tasks:
Use nfs_uuid->lock to protect all nfs_uuid_t members, instead of nfs_uuids_lock, once nfs_uuid_is_local() adds the client to nn->local_clients.
Also add 'local_clients_lock' to 'struct nfsd_net' to protect nn->local_clients. And store a pointer to spinlock in the 'list_lock' member of nfs_uuid_t so nfs_localio_disable_client() can use it to avoid taking the global nfs_uuids_lock.
In combination, these split out locks eliminate the use of the single nfslocalio.c global nfs_uuids_lock in the IO paths (open and close).
Also refactored associated fs/nfs_common/nfslocalio.c methods' locking to reduce work performed with spinlocks held in general.
--- fs/nfs_common/nfslocalio.c | 168 +++++++++++++++++++++++++++---------- fs/nfsd/filecache.c | 9 ++ fs/nfsd/localio.c | 1 + fs/nfsd/netns.h | 1 + fs/nfsd/nfsctl.c | 4 +- include/linux/nfslocalio.h | 8 +- 6 files changed, 144 insertions(+), 47 deletions(-)
fs/nfs_common/nfslocalio.c +124 -44
@@ -23,27 +23,49 @@ static DEFINE_SPINLOCK(nfs_uuids_lock);*/ static LIST_HEAD (nfs_uuids); +/* +* Lock ordering: +* 1: nfs_uuid->lock +* 2: nfs_uuids_lock +* 3: nfs_uuid->list_lock (aka nn->local_clients_lock) +* +* May skip locks in select cases, but never hold multiple +* locks out of order. +*/ +void nfs_uuid_init (nfs_uuid_t *nfs_uuid) { nfs_uuid->net =NULL ; nfs_uuid->dom =NULL ; + nfs_uuid->list_lock =NULL ;INIT_LIST_HEAD (&nfs_uuid->list); +INIT_LIST_HEAD (&nfs_uuid->files);spin_lock_init (&nfs_uuid->lock); }EXPORT_SYMBOL_GPL (nfs_uuid_init);bool nfs_uuid_begin (nfs_uuid_t *nfs_uuid) { +spin_lock (&nfs_uuid->lock); +if (nfs_uuid->net) { +/* This nfs_uuid is already in use */ +spin_unlock (&nfs_uuid->lock); +return false; + } +spin_lock (&nfs_uuids_lock); -/* Is this nfs_uuid already in use? */ if (!list_empty (&nfs_uuid->list)) { +/* This nfs_uuid is already in use */ spin_unlock (&nfs_uuids_lock); +spin_unlock (&nfs_uuid->lock);return false; } -uuid_gen (&nfs_uuid->uuid);list_add_tail (&nfs_uuid->list, &nfs_uuids);spin_unlock (&nfs_uuids_lock); +uuid_gen (&nfs_uuid->uuid); +spin_unlock (&nfs_uuid->lock); +return true; }EXPORT_SYMBOL_GPL (nfs_uuid_begin);
@@ -51,11 +73,15 @@ EXPORT_SYMBOL_GPL(nfs_uuid_begin);void nfs_uuid_end (nfs_uuid_t *nfs_uuid) {if (nfs_uuid->net ==NULL ) { -spin_lock (&nfs_uuids_lock); -if (nfs_uuid->net ==NULL ) +spin_lock (&nfs_uuid->lock); +if (nfs_uuid->net ==NULL ) { +/* Not local, remove from nfs_uuids */ +spin_lock (&nfs_uuids_lock);list_del_init (&nfs_uuid->list); -spin_unlock (&nfs_uuids_lock); - } +spin_unlock (&nfs_uuids_lock); + } +spin_unlock (&nfs_uuid->lock); + } }EXPORT_SYMBOL_GPL (nfs_uuid_end);
@@ -73,28 +99,39 @@ static nfs_uuid_t * nfs_uuid_lookup_locked(const uuid_t *uuid)static struct module *nfsd_mod;void nfs_uuid_is_local (const uuid_t *uuid,struct list_head *list, -struct net *net,struct auth_domain *dom, -struct module *mod) +spinlock_t *list_lock,struct net *net, +struct auth_domain *dom,struct module *mod) {nfs_uuid_t *nfs_uuid;spin_lock (&nfs_uuids_lock); nfs_uuid =nfs_uuid_lookup_locked (uuid); -if (nfs_uuid) { -kref_get (&dom->ref); - nfs_uuid->dom = dom; -/* -* We don't hold a ref on the net, but instead put -* ourselves on a list so the net pointer can be -* invalidated. -*/ -list_move (&nfs_uuid->list, list); -rcu_assign_pointer (nfs_uuid->net, net); - -__module_get (mod); - nfsd_mod = mod; +if (!nfs_uuid) { +spin_unlock (&nfs_uuids_lock); +return ; } + +/* +* We don't hold a ref on the net, but instead put +* ourselves on @list (nn->local_clients) so the net +* pointer can be invalidated. +*/ +spin_lock (list_lock);/* list_lock is nn->local_clients_lock */ +list_move (&nfs_uuid->list, list); +spin_unlock (list_lock); +spin_unlock (&nfs_uuids_lock); +/* Once nfs_uuid is parented to @list, avoid global nfs_uuids_lock */ +spin_lock (&nfs_uuid->lock); + +__module_get (mod); + nfsd_mod = mod; + + nfs_uuid->list_lock = list_lock; +kref_get (&dom->ref); + nfs_uuid->dom = dom; +rcu_assign_pointer (nfs_uuid->net, net); +spin_unlock (&nfs_uuid->lock); }EXPORT_SYMBOL_GPL (nfs_uuid_is_local);
@@ -108,55 +145,96 @@ void nfs_localio_enable_client(struct nfs_client *clp) }EXPORT_SYMBOL_GPL (nfs_localio_enable_client); -static void nfs_uuid_put_locked (nfs_uuid_t *nfs_uuid) +/* +* Cleanup the nfs_uuid_t embedded in an nfs_client. +* This is the long-form of nfs_uuid_init(). +*/ +static void nfs_uuid_put (nfs_uuid_t *nfs_uuid) { -if (!nfs_uuid->net) +LIST_HEAD (local_files); +struct nfs_file_localio *nfl, *tmp; + +spin_lock (&nfs_uuid->lock); +if (unlikely (!nfs_uuid->net)) { +spin_unlock (&nfs_uuid->lock);return ; -module_put (nfsd_mod); + }RCU_INIT_POINTER (nfs_uuid->net,NULL );if (nfs_uuid->dom) {auth_domain_put (nfs_uuid->dom); nfs_uuid->dom =NULL ; } -list_del_init (&nfs_uuid->list); + +list_splice_init (&nfs_uuid->files, &local_files); +spin_unlock (&nfs_uuid->lock); + +/* Walk list of files and ensure their last references dropped */ +list_for_each_entry_safe (nfl, tmp, &local_files, list) { +nfs_close_local_fh (nfl); +cond_resched (); + } + +spin_lock (&nfs_uuid->lock); +BUG_ON (!list_empty (&nfs_uuid->files)); + +/* Remove client from nn->local_clients */ +if (nfs_uuid->list_lock) { +spin_lock (nfs_uuid->list_lock); +BUG_ON (list_empty (&nfs_uuid->list)); +list_del_init (&nfs_uuid->list); +spin_unlock (nfs_uuid->list_lock); + nfs_uuid->list_lock =NULL ; + } + +module_put (nfsd_mod); +spin_unlock (&nfs_uuid->lock); }void nfs_localio_disable_client (struct nfs_client *clp) { -nfs_uuid_t *nfs_uuid = &clp->cl_uuid; +nfs_uuid_t *nfs_uuid =NULL ; -spin_lock (&nfs_uuid->lock); +spin_lock (&clp->cl_uuid.lock);/* aka &nfs_uuid->lock */ if (test_and_clear_bit (NFS_CS_LOCAL_IO , &clp->cl_flags)) { -spin_lock (&nfs_uuids_lock); -nfs_uuid_put_locked (nfs_uuid); -spin_unlock (&nfs_uuids_lock); +/* &clp->cl_uuid is always not NULL, using as bool here */ + nfs_uuid = &clp->cl_uuid; } -spin_unlock (&nfs_uuid->lock); +spin_unlock (&clp->cl_uuid.lock); + +if (nfs_uuid) +nfs_uuid_put (nfs_uuid); }EXPORT_SYMBOL_GPL (nfs_localio_disable_client); -void nfs_localio_invalidate_clients (struct list_head *cl_uuid_list) +void nfs_localio_invalidate_clients (struct list_head *nn_local_clients, +spinlock_t *nn_local_clients_lock) { +LIST_HEAD (local_clients);nfs_uuid_t *nfs_uuid, *tmp; +struct nfs_client *clp; -spin_lock (&nfs_uuids_lock); -list_for_each_entry_safe (nfs_uuid, tmp, cl_uuid_list, list) { -struct nfs_client *clp = - container_of(nfs_uuid, struct nfs_client, cl_uuid); - +spin_lock (nn_local_clients_lock); +list_splice_init (nn_local_clients, &local_clients); +spin_unlock (nn_local_clients_lock); +list_for_each_entry_safe (nfs_uuid, tmp, &local_clients, list) { +if (WARN_ON (nfs_uuid->list_lock != nn_local_clients_lock)) +break ; + clp = container_of(nfs_uuid, struct nfs_client, cl_uuid);nfs_localio_disable_client (clp); } -spin_unlock (&nfs_uuids_lock); }EXPORT_SYMBOL_GPL (nfs_localio_invalidate_clients);static void nfs_uuid_add_file (nfs_uuid_t *nfs_uuid,struct nfs_file_localio *nfl) { -spin_lock (&nfs_uuids_lock); -if (!nfl->nfs_uuid) +/* Add nfl to nfs_uuid->files if it isn't already */ +spin_lock (&nfs_uuid->lock); +if (list_empty (&nfl->list)) {rcu_assign_pointer (nfl->nfs_uuid, nfs_uuid); -spin_unlock (&nfs_uuids_lock); +list_add_tail (&nfl->list, &nfs_uuid->files); + } +spin_unlock (&nfs_uuid->lock); }/*
@@ -217,14 +295,16 @@ void nfs_close_local_fh(struct nfs_file_localio *nfl) ro_nf =rcu_access_pointer (nfl->ro_file); rw_nf =rcu_access_pointer (nfl->rw_file);if (ro_nf || rw_nf) { -spin_lock (&nfs_uuids_lock); +spin_lock (&nfs_uuid->lock);if (ro_nf) ro_nf =rcu_dereference_protected (xchg (&nfl->ro_file,NULL ),1 );if (rw_nf) rw_nf =rcu_dereference_protected (xchg (&nfl->rw_file,NULL ),1 ); -rcu_assign_pointer (nfl->nfs_uuid,NULL ); -spin_unlock (&nfs_uuids_lock); +/* Remove nfl from nfs_uuid->files list */ +RCU_INIT_POINTER (nfl->nfs_uuid,NULL ); +list_del_init (&nfl->list); +spin_unlock (&nfs_uuid->lock);rcu_read_unlock ();if (ro_nf)
fs/nfsd/filecache.c +9 -0
@@ -39,6 +39,7 @@#include <linux/fsnotify.h> #include <linux/seq_file.h> #include <linux/rhashtable.h> +#include <linux/nfslocalio.h> #include "vfs.h" #include "nfsd.h"
@@ -836,6 +837,14 @@ __nfsd_file_cache_purge(struct net *net)struct nfsd_file *nf;LIST_HEAD (dispose); +#if IS_ENABLED (CONFIG_NFS_LOCALIO ) +if (net) { +struct nfsd_net *nn =net_generic (net, nfsd_net_id); +nfs_localio_invalidate_clients (&nn->local_clients, + &nn->local_clients_lock); + } +#endif +rhltable_walk_enter (&nfsd_file_rhltable, &iter); do { rhashtable_walk_start(&iter);
fs/nfsd/localio.c +1 -0
@@ -116,6 +116,7 @@ static __be32 localio_proc_uuid_is_local(struct svc_rqst *rqstp)struct nfsd_net *nn =net_generic (net, nfsd_net_id);nfs_uuid_is_local (&argp->uuid, &nn->local_clients, + &nn->local_clients_lock, net, rqstp->rq_client,THIS_MODULE );return rpc_success;
fs/nfsd/netns.h +1 -0
@@ -220,6 +220,7 @@ struct nfsd_net {#if IS_ENABLED (CONFIG_NFS_LOCALIO )/* Local clients to be invalidated when net is shut down */ +spinlock_t local_clients_lock;struct list_head local_clients;#endif };
fs/nfsd/nfsctl.c +3 -1
@@ -2259,6 +2259,7 @@ static __net_init int nfsd_net_init(struct net *net)seqlock_init (&nn->writeverf_lock);nfsd_proc_stat_init (net);#if IS_ENABLED (CONFIG_NFS_LOCALIO ) +spin_lock_init (&nn->local_clients_lock);INIT_LIST_HEAD (&nn->local_clients);#endif return 0 ;
@@ -2283,7 +2284,8 @@ static __net_exit void nfsd_net_pre_exit(struct net *net) {struct nfsd_net *nn =net_generic (net, nfsd_net_id); -nfs_localio_invalidate_clients (&nn->local_clients); +nfs_localio_invalidate_clients (&nn->local_clients, + &nn->local_clients_lock); }#endif
include/linux/nfslocalio.h +6 -2
@@ -30,19 +30,23 @@ typedef struct {/* sadly this struct is just over a cacheline, avoid bouncing */ spinlock_t ____cacheline_aligned lock;struct list_head list; +spinlock_t *list_lock;/* nn->local_clients_lock */ struct net __rcu *net;/* nfsd's network namespace */ struct auth_domain *dom;/* auth_domain for localio */ +/* Local files to close when net is shut down or exports change */ +struct list_head files; } nfs_uuid_t;void nfs_uuid_init (nfs_uuid_t *);bool nfs_uuid_begin (nfs_uuid_t *);void nfs_uuid_end (nfs_uuid_t *); -void nfs_uuid_is_local (const uuid_t *,struct list_head *, +void nfs_uuid_is_local (const uuid_t *,struct list_head *,spinlock_t *,struct net *,struct auth_domain *,struct module *);void nfs_localio_enable_client (struct nfs_client *clp);void nfs_localio_disable_client (struct nfs_client *clp); -void nfs_localio_invalidate_clients (struct list_head *list); +void nfs_localio_invalidate_clients (struct list_head *nn_local_clients, +spinlock_t *nn_local_clients_lock);/* localio needs to map filehandle -> struct nfsd_file */ extern struct nfsd_file *
Signature · 1 line
2.44.0
PATCH v3 11/14 nfs_common: add nfs_localio trace events
In reply to Mike SnitzerThe nfs_localio.ko now exposes /sys/kernel/tracing/events/nfs_localio with nfs_localio_enable_client and nfs_localio_disable_client events.
--- fs/nfs_common/Makefile | 3 +- fs/nfs_common/localio_trace.c | 10 +++++++ fs/nfs_common/localio_trace.h | 56 +++++++++++++++++++++++++++++++++++ fs/nfs_common/nfslocalio.c | 4 +++ 4 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 fs/nfs_common/localio_trace.c create mode 100644 fs/nfs_common/localio_trace.h
fs/nfs_common/Makefile +2 -1
@@ -6,8 +6,9 @@ obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl.o nfs_acl-objs := nfsacl.o +CFLAGS_localio_trace.o += -I$(src) obj-$(CONFIG_NFS_COMMON_LOCALIO_SUPPORT) += nfs_localio.o -nfs_localio-objs := nfslocalio.o +nfs_localio-objs := nfslocalio.o localio_trace.o obj-$(CONFIG_GRACE_PERIOD) += grace.o obj-$(CONFIG_NFS_V4_2_SSC_HELPER) += nfs_ssc.o
fs/nfs_common/localio_trace.c new file +10 -0
@@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2024 Trond Myklebust <[email protected]> +* Copyright (C) 2024 Mike Snitzer <[email protected]> +*/ +#include <linux/nfs_fs.h> +#include <linux/namei.h> + +#define CREATE_TRACE_POINTS +#include "localio_trace.h"
fs/nfs_common/localio_trace.h new file +56 -0
56 lines not on this page · raw message
fs/nfs_common/nfslocalio.c +4 -0
@@ -12,6 +12,8 @@#include <linux/nfs_fs.h> #include <net/netns/generic.h> +#include "localio_trace.h" +MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("NFS localio protocol bypass support" );
@@ -141,6 +143,7 @@ void nfs_localio_enable_client(struct nfs_client *clp)spin_lock (&nfs_uuid->lock);set_bit (NFS_CS_LOCAL_IO , &clp->cl_flags); +trace_nfs_localio_enable_client (clp);spin_unlock (&nfs_uuid->lock); }EXPORT_SYMBOL_GPL (nfs_localio_enable_client);
@@ -199,6 +202,7 @@ void nfs_localio_disable_client(struct nfs_client *clp)if (test_and_clear_bit (NFS_CS_LOCAL_IO , &clp->cl_flags)) {/* &clp->cl_uuid is always not NULL, using as bool here */ nfs_uuid = &clp->cl_uuid; +trace_nfs_localio_disable_client (clp); }spin_unlock (&clp->cl_uuid.lock);
Signature · 1 line
2.44.0
PATCH v3 12/14 nfs/localio: remove redundant code and simplify LOCALIO enablement
In reply to Mike SnitzerRemove nfs_local_enable and nfs_local_disable, instead use nfs_localio_enable_client and nfs_localio_disable_client.
Discontinue use of the NFS_CS_LOCAL_IO bit in the nfs_client struct's cl_flags to reflect that LOCALIO is enabled; instead just test if the net member of the nfs_uuid_t struct is set.
Also remove NFS_CS_LOCAL_IO.
Lastly, remove trace_nfs_local_enable and trace_nfs_local_disable because comparable traces are available from nfs_localio.ko.
--- fs/nfs/client.c | 4 ++-- fs/nfs/internal.h | 2 -- fs/nfs/localio.c | 28 +++++----------------------- fs/nfs/nfstrace.h | 32 -------------------------------- fs/nfs_common/nfslocalio.c | 34 +++++++++++----------------------- include/linux/nfs_fs_sb.h | 1 - include/linux/nfslocalio.h | 4 ++++ 7 files changed, 22 insertions(+), 83 deletions(-)
fs/nfs/client.c +2 -2
@@ -38,7 +38,7 @@#include <linux/sunrpc/bc_xprt.h> #include <linux/nsproxy.h> #include <linux/pid_namespace.h> - +#include <linux/nfslocalio.h> #include "nfs4_fs.h" #include "callback.h"
@@ -243,7 +243,7 @@ static void pnfs_init_server(struct nfs_server *server)*/ void nfs_free_client (struct nfs_client *clp) { -nfs_local_disable (clp); +nfs_localio_disable_client (clp);/* -EIO all pending I/O */ if (!IS_ERR (clp->cl_rpcclient))
fs/nfs/internal.h +0 -2
@@ -454,7 +454,6 @@ extern int nfs_wait_bit_killable(struct wait_bit_key *key, int mode);#if IS_ENABLED (CONFIG_NFS_LOCALIO )/* localio.c */ -extern void nfs_local_disable (struct nfs_client *);extern void nfs_local_probe (struct nfs_client *); extern struct nfsd_file *nfs_local_open_fh(struct nfs_client *, const struct cred *,
@@ -471,7 +470,6 @@ extern int nfs_local_commit(struct nfsd_file *,extern bool nfs_server_is_local (const struct nfs_client *clp);#else /* CONFIG_NFS_LOCALIO */ -static inline void nfs_local_disable (struct nfs_client *clp) {}static inline void nfs_local_probe (struct nfs_client *clp) {}static inline struct nfsd_file * nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred,
fs/nfs/localio.c +5 -23
@@ -56,7 +56,7 @@ MODULE_PARM_DESC(localio_O_DIRECT_semantics,static inline bool nfs_client_is_local (const struct nfs_client *clp) { -return !!test_bit (NFS_CS_LOCAL_IO , &clp->cl_flags); +return !!rcu_access_pointer (clp->cl_uuid.net); }bool nfs_server_is_local (const struct nfs_client *clp)
@@ -121,24 +121,6 @@ const struct rpc_program nfslocalio_program = { .stats = &nfslocalio_rpcstat, }; -/* -* nfs_local_enable - enable local i/o for an nfs_client -*/ -static void nfs_local_enable (struct nfs_client *clp) -{ -trace_nfs_local_enable (clp); -nfs_localio_enable_client (clp); -} - -/* -* nfs_local_disable - disable local i/o for an nfs_client -*/ -void nfs_local_disable (struct nfs_client *clp) -{ -trace_nfs_local_disable (clp); -nfs_localio_disable_client (clp); -} -/* * nfs_init_localioclient - Initialise an NFS localio client connection */
@@ -194,19 +176,19 @@ void nfs_local_probe(struct nfs_client *clp)/* Disallow localio if disabled via sysfs or AUTH_SYS isn't used */ if (!localio_enabled || clp->cl_rpcclient->cl_auth->au_flavor !=RPC_AUTH_UNIX ) { -nfs_local_disable (clp); +nfs_localio_disable_client (clp);return ; }if (nfs_client_is_local (clp)) {/* If already enabled, disable and re-enable */ -nfs_local_disable (clp); +nfs_localio_disable_client (clp); }if (!nfs_uuid_begin (&clp->cl_uuid))return ;if (nfs_server_uuid_is_local (clp)) -nfs_local_enable (clp); +nfs_localio_enable_client (clp);nfs_uuid_end (&clp->cl_uuid); }EXPORT_SYMBOL_GPL (nfs_local_probe);
@@ -748,7 +730,7 @@ int nfs_local_doio(struct nfs_client *clp, struct nfsd_file *localio,if (status !=0 ) {if (status == -EAGAIN ) -nfs_local_disable (clp); +nfs_localio_disable_client (clp);nfs_local_file_put (localio); hdr->task.tk_status = status;nfs_local_hdr_release (hdr, call_ops);
fs/nfs/nfstrace.h +0 -32
@@ -1714,38 +1714,6 @@ TRACE_EVENT(nfs_local_open_fh, ) ); -DECLARE_EVENT_CLASS (nfs_local_client_event, -TP_PROTO ( - const struct nfs_client *clp - ), - -TP_ARGS (clp), - -TP_STRUCT__entry ( - __field(unsigned int, protocol) -__string (server, clp->cl_hostname) - ), - -TP_fast_assign ( - __entry->protocol = clp->rpc_ops->version; - __assign_str(server); - ), - -TP_printk ( -"server=%s NFSv%u" ,__get_str (server), __entry->protocol - ) -); - -#define DEFINE_NFS_LOCAL_CLIENT_EVENT (name) \ - DEFINE_EVENT(nfs_local_client_event, name, \ - TP_PROTO( \ - const struct nfs_client *clp \ - ), \ - TP_ARGS(clp)) - -DEFINE_NFS_LOCAL_CLIENT_EVENT (nfs_local_enable); -DEFINE_NFS_LOCAL_CLIENT_EVENT (nfs_local_disable); - DECLARE_EVENT_CLASS(nfs_xdr_event, TP_PROTO( const struct xdr_stream *xdr,
fs/nfs_common/nfslocalio.c +11 -23
@@ -37,7 +37,7 @@ static LIST_HEAD(nfs_uuids);void nfs_uuid_init (nfs_uuid_t *nfs_uuid) { - nfs_uuid->net =NULL ; +RCU_INIT_POINTER (nfs_uuid->net,NULL ); nfs_uuid->dom =NULL ; nfs_uuid->list_lock =NULL ;INIT_LIST_HEAD (&nfs_uuid->list);
@@ -49,7 +49,7 @@ EXPORT_SYMBOL_GPL(nfs_uuid_init);bool nfs_uuid_begin (nfs_uuid_t *nfs_uuid) {spin_lock (&nfs_uuid->lock); -if (nfs_uuid->net) { +if (rcu_access_pointer (nfs_uuid->net)) {/* This nfs_uuid is already in use */ spin_unlock (&nfs_uuid->lock);return false;
@@ -74,9 +74,9 @@ EXPORT_SYMBOL_GPL(nfs_uuid_begin);void nfs_uuid_end (nfs_uuid_t *nfs_uuid) { -if (nfs_uuid->net ==NULL ) { +if (!rcu_access_pointer (nfs_uuid->net)) {spin_lock (&nfs_uuid->lock); -if (nfs_uuid->net ==NULL ) { +if (!rcu_access_pointer (nfs_uuid->net)) {/* Not local, remove from nfs_uuids */ spin_lock (&nfs_uuids_lock);list_del_init (&nfs_uuid->list);
@@ -139,12 +139,8 @@ EXPORT_SYMBOL_GPL(nfs_uuid_is_local);void nfs_localio_enable_client (struct nfs_client *clp) { -nfs_uuid_t *nfs_uuid = &clp->cl_uuid; - -spin_lock (&nfs_uuid->lock); -set_bit (NFS_CS_LOCAL_IO , &clp->cl_flags); +/* nfs_uuid_is_local() does the actual enablement */ trace_nfs_localio_enable_client (clp); -spin_unlock (&nfs_uuid->lock); }EXPORT_SYMBOL_GPL (nfs_localio_enable_client);
@@ -152,15 +148,15 @@ EXPORT_SYMBOL_GPL(nfs_localio_enable_client);* Cleanup the nfs_uuid_t embedded in an nfs_client. * This is the long-form of nfs_uuid_init(). */ -static void nfs_uuid_put (nfs_uuid_t *nfs_uuid) +static bool nfs_uuid_put (nfs_uuid_t *nfs_uuid) {LIST_HEAD (local_files);struct nfs_file_localio *nfl, *tmp;spin_lock (&nfs_uuid->lock); -if (unlikely (!nfs_uuid->net)) { +if (unlikely (!rcu_access_pointer (nfs_uuid->net))) {spin_unlock (&nfs_uuid->lock); -return ; +return false; }RCU_INIT_POINTER (nfs_uuid->net,NULL );
@@ -192,22 +188,14 @@ static void nfs_uuid_put(nfs_uuid_t *nfs_uuid)module_put (nfsd_mod);spin_unlock (&nfs_uuid->lock); + +return true; }void nfs_localio_disable_client (struct nfs_client *clp) { -nfs_uuid_t *nfs_uuid =NULL ; - -spin_lock (&clp->cl_uuid.lock);/* aka &nfs_uuid->lock */ -if (test_and_clear_bit (NFS_CS_LOCAL_IO , &clp->cl_flags)) { -/* &clp->cl_uuid is always not NULL, using as bool here */ - nfs_uuid = &clp->cl_uuid; +if (nfs_uuid_put (&clp->cl_uuid))trace_nfs_localio_disable_client (clp); - } -spin_unlock (&clp->cl_uuid.lock); - -if (nfs_uuid) -nfs_uuid_put (nfs_uuid); }EXPORT_SYMBOL_GPL (nfs_localio_disable_client);
include/linux/nfs_fs_sb.h +0 -1
@@ -50,7 +50,6 @@ 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 */
include/linux/nfslocalio.h +4 -0
@@ -111,6 +111,10 @@ static inline void nfs_close_local_fh(struct nfs_file_localio *nfl)static inline void nfsd_localio_ops_init (void ) { } +struct nfs_client ; +static inline void nfs_localio_disable_client (struct nfs_client *clp) +{ +}#endif /* CONFIG_NFS_LOCALIO */
Signature · 1 line
2.44.0
PATCH v3 13/14 nfs: probe for LOCALIO when v4 client reconnects to server
In reply to Mike SnitzerIntroduce nfs_local_probe_async() for the NFS client to initiate if/when it reconnects with server. For NFSv4 it is a simple matter to call nfs_local_probe_async() from nfs4_do_reclaim (during NFSv4 grace).
--- fs/nfs/client.c | 1 + fs/nfs/internal.h | 3 +++ fs/nfs/localio.c | 14 ++++++++++++++ fs/nfs/nfs4state.c | 1 + include/linux/nfs_fs_sb.h | 1 + 5 files changed, 20 insertions(+)
fs/nfs/client.c +1 -0
@@ -186,6 +186,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)seqlock_init (&clp->cl_boot_lock);ktime_get_real_ts64 (&clp->cl_nfssvc_boot);nfs_uuid_init (&clp->cl_uuid); +INIT_WORK (&clp->cl_local_probe_work, nfs_local_probe_async_work);#endif /* CONFIG_NFS_LOCALIO */ clp->cl_principal ="*" ;
fs/nfs/internal.h +3 -0
@@ -455,6 +455,8 @@ extern int nfs_wait_bit_killable(struct wait_bit_key *key, int mode);#if IS_ENABLED (CONFIG_NFS_LOCALIO )/* localio.c */ extern void nfs_local_probe (struct nfs_client *); +extern void nfs_local_probe_async (struct nfs_client *); +extern void nfs_local_probe_async_work (struct work_struct *); extern struct nfsd_file *nfs_local_open_fh(struct nfs_client *, const struct cred *, struct nfs_fh *,
@@ -471,6 +473,7 @@ extern bool nfs_server_is_local(const struct nfs_client *clp);#else /* CONFIG_NFS_LOCALIO */ static inline void nfs_local_probe (struct nfs_client *clp) {} +static inline void nfs_local_probe_async (struct nfs_client *clp) {}static inline struct nfsd_file * nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred, struct nfs_fh *fh, struct nfs_file_localio *nfl,
fs/nfs/localio.c +14 -0
@@ -193,6 +193,20 @@ void nfs_local_probe(struct nfs_client *clp) }EXPORT_SYMBOL_GPL (nfs_local_probe); +void nfs_local_probe_async_work (struct work_struct *work) +{ +struct nfs_client *clp = + container_of(work, struct nfs_client, cl_local_probe_work); + +nfs_local_probe (clp); +} + +void nfs_local_probe_async (struct nfs_client *clp) +{ +queue_work (nfsiod_workqueue, &clp->cl_local_probe_work); +} +EXPORT_SYMBOL_GPL (nfs_local_probe_async); +static inline struct nfsd_file *nfs_local_file_get (struct nfsd_file *nf) {return nfs_to->nfsd_file_get (nf);
fs/nfs/nfs4state.c +1 -0
@@ -1955,6 +1955,7 @@ static int nfs4_do_reclaim(struct nfs_client *clp, const struct nfs4_state_recov }rcu_read_unlock ();nfs4_free_state_owners (&freeme); +nfs_local_probe_async (clp);if (lost_locks)pr_warn ("NFS: %s: lost %d locks\n" , clp->cl_hostname, lost_locks);
include/linux/nfs_fs_sb.h +1 -0
@@ -131,6 +131,7 @@ struct nfs_client {struct timespec64 cl_nfssvc_boot;seqlock_t cl_boot_lock;nfs_uuid_t cl_uuid; +struct work_struct cl_local_probe_work;#endif /* CONFIG_NFS_LOCALIO */ };
Signature · 1 line
2.44.0
PATCH v3 14/14 nfs: probe for LOCALIO when v3 client reconnects to server
In reply to Mike SnitzerRe-enabling NFSv3 LOCALIO is made more complex (than NFSv4) because v3 is stateless. As such, the hueristic used to identify a LOCALIO probe point is more adhoc by nature: if/when NFSv3 client IO begins to complete again in terms of normal RPC-based NFSv3 server IO, attempt nfs_local_probe_async().
Care is taken to throttle the frequency of nfs_local_probe_async(), otherwise there could be a flood of repeat calls to nfs_local_probe_async().
The throttle is admin controlled using a new module parameter for nfsv3, e.g.:
echo 512 > /sys/module/nfsv3/parameters/nfs3_localio_probe_throttle
Probe for NFSv3 LOCALIO every N IO requests (512 in this case). Must be power-of-2, defaults to 0 (probing disabled).
On systems that expect to use LOCALIO with NFSv3 the admin should configure the 'nfs3_localio_probe_throttle' module parameter.
This commit backfills module parameter documentation in localio.rst
--- Documentation/filesystems/nfs/localio.rst | 20 +++++++++- fs/nfs/nfs3proc.c | 46 +++++++++++++++++++++-- fs/nfs_common/nfslocalio.c | 1 + include/linux/nfslocalio.h | 3 +- 4 files changed, 65 insertions(+), 5 deletions(-)
Documentation/filesystems/nfs/localio.rst +19 -1
@@ -289,7 +289,7 @@ align their IO). Security ======== -Localio is only supported when UNIX-style authentication (AUTH_UNIX, aka +LOCALIO is only supported when UNIX-style authentication (AUTH_UNIX, aka AUTH_SYS) is used. Care is taken to ensure the same NFS security mechanisms are used
@@ -304,6 +304,24 @@ client is afforded this same level of access (albeit in terms of the NFS protocol via SUNRPC). No other namespaces (user, mount, etc) have been altered or purposely extended from the server to the client. +Module Parameters +================= + +/sys/module/nfs/parameters/localio_enabled (bool) +controls if LOCALIO is enabled, defaults to Y. If client and server are +local but 'localio_enabled' is set to N then LOCALIO will not be used. + +/sys/module/nfs/parameters/localio_O_DIRECT_semantics (bool) +controls if O_DIRECT extends down to the underlying filesystem, defaults +to N. Application IO must be logical blocksize aligned, otherwise +O_DIRECT will fail. + +/sys/module/nfsv3/parameters/nfs3_localio_probe_throttle (uint) +controls if NFSv3 read and write IOs will trigger (re)enabling of +LOCALIO every N (nfs3_localio_probe_throttle) IOs, defaults to 0 +(disabled). Must be power-of-2, admin keeps all the pieces if they +misconfigure (too low a value or non-power-of-2). + Testing =======
fs/nfs/nfs3proc.c +43 -3
65 lines not on this page · raw message
fs/nfs_common/nfslocalio.c +1 -0
@@ -43,6 +43,7 @@ void nfs_uuid_init(nfs_uuid_t *nfs_uuid)INIT_LIST_HEAD (&nfs_uuid->list);INIT_LIST_HEAD (&nfs_uuid->files);spin_lock_init (&nfs_uuid->lock); + nfs_uuid->nfs3_localio_probe_count =0 ; }EXPORT_SYMBOL_GPL (nfs_uuid_init);
include/linux/nfslocalio.h +2 -1
@@ -27,7 +27,8 @@ struct nfs_file_localio;*/ typedef struct { uuid_t uuid; - /* sadly this struct is just over a cacheline, avoid bouncing */ + unsigned nfs3_localio_probe_count; + /* this struct is over a cacheline, avoid bouncing */ spinlock_t ____cacheline_aligned lock; struct list_head list; spinlock_t *list_lock; /* nn->local_clients_lock */
Signature · 1 line
2.44.0
Quoted 55 lines · Mike Snitzer
Hi,
All available here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/log/?h=nfs-localio-for-nextChanges since v2:
- switched fromrcu_assign_pointertoRCU_INIT_POINTERwhen setting to NULL.
- removed some unnecessary #ifIS_ENABLED(CONFIG_NFS_LOCALIO)
- revised the NFS v3 probe patch to use a new nfsv3.ko modparam 'nfs3_localio_probe_throttle' to control if NFSv3 will probe for LOCALIO. Avoids use ofNFS_CS_LOCAL_IOand will probe every 'nfs3_localio_probe_throttle' IO requests (defaults to 0, disabled).
- added "Module Parameters" section tolocalio.rstAll review appreciated, thanks.
MikeMike Snitzer (14):
nfs/localio: add direct IO enablement with sync and async IO support
nfsd: add nfsd_file_{get,put} to 'nfs_to'nfsd_localio_operations
nfs_common: rename functions that invalidate LOCALIOnfs_clients
nfs_common: movelocalio_lockto new lock member ofnfs_uuid_t
nfs: cache all open LOCALIOnfsd_file(s)in client
nfsd: updatepercpu_refto manage references onnfsd_net
nfsd: renamenfsd_serv_prefixed methods and variables withnfsd_net_
nfsd:nfsd_file_acquire_localno longer returns GC'dnfsd_file
nfs_common: rename nfslocalionfs_uuid_locktonfs_uuids_lock
nfs_common: track all opennfsd_filesper LOCALIOnfs_client
nfs_common: addnfs_localiotrace events
nfs/localio: remove redundant code and simplify LOCALIO enablement
nfs: probe for LOCALIO when v4 client reconnects to server
nfs: probe for LOCALIO when v3 client reconnects to serverDocumentation/filesystems/nfs/localio.rst | 98 +++++---- fs/nfs/client.c | 6 +- fs/nfs/direct.c | 1 + fs/nfs/flexfilelayout/flexfilelayout.c | 25 +-- fs/nfs/flexfilelayout/flexfilelayout.h | 1 + fs/nfs/inode.c | 3 + fs/nfs/internal.h | 9 +- fs/nfs/localio.c | 232 +++++++++++++++----- fs/nfs/nfs3proc.c | 46 +++- fs/nfs/nfs4state.c | 1 + fs/nfs/nfstrace.h | 32 --- fs/nfs/pagelist.c | 5 +- fs/nfs/write.c | 3 +- fs/nfs_common/Makefile | 3 +- fs/nfs_common/localio_trace.c | 10 + fs/nfs_common/localio_trace.h | 56 +++++ fs/nfs_common/nfslocalio.c | 250 +++++++++++++++++----- fs/nfsd/filecache.c | 20 +- fs/nfsd/localio.c | 9 +- fs/nfsd/netns.h | 12 +- fs/nfsd/nfsctl.c | 6 +-
Quoted 9 lines
fs/nfsd/nfssvc.c | 40 ++-- include/linux/nfs_fs.h | 22 +- include/linux/nfs_fs_sb.h | 3 +- include/linux/nfs_xdr.h | 1 + include/linux/nfslocalio.h | 48 +++-- 26 files changed, 674 insertions(+), 268 deletions(-) create mode 100644 fs/nfs_common/localio_trace.c create mode 100644 fs/nfs_common/localio_trace.h
I went through the set and it looks mostly sane to me. The one concern I have is that you have the client set up to start caching nfsd files before there is a mechanism to call it and ask them to return them. You might see some weird behavior there on a bisect, but it looks like it all gets resolved in the end.
How do you intend for this to go in? Since most of this is client side, will this be going in via Trond/Anna's tree?
You can add:
Quoted 66 lines · Jeff Layton
Quoted 55 lines · Mike Snitzer
Hi,
All available here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/log/?h=nfs-localio-for-nextChanges since v2:
- switched fromrcu_assign_pointertoRCU_INIT_POINTERwhen setting to NULL.
- removed some unnecessary #ifIS_ENABLED(CONFIG_NFS_LOCALIO)
- revised the NFS v3 probe patch to use a new nfsv3.ko modparam 'nfs3_localio_probe_throttle' to control if NFSv3 will probe for LOCALIO. Avoids use ofNFS_CS_LOCAL_IOand will probe every 'nfs3_localio_probe_throttle' IO requests (defaults to 0, disabled).
- added "Module Parameters" section tolocalio.rstAll review appreciated, thanks.
MikeMike Snitzer (14):
nfs/localio: add direct IO enablement with sync and async IO support
nfsd: add nfsd_file_{get,put} to 'nfs_to'nfsd_localio_operations
nfs_common: rename functions that invalidate LOCALIOnfs_clients
nfs_common: movelocalio_lockto new lock member ofnfs_uuid_t
nfs: cache all open LOCALIOnfsd_file(s)in client
nfsd: updatepercpu_refto manage references onnfsd_net
nfsd: renamenfsd_serv_prefixed methods and variables withnfsd_net_
nfsd:nfsd_file_acquire_localno longer returns GC'dnfsd_file
nfs_common: rename nfslocalionfs_uuid_locktonfs_uuids_lock
nfs_common: track all opennfsd_filesper LOCALIOnfs_client
nfs_common: addnfs_localiotrace events
nfs/localio: remove redundant code and simplify LOCALIO enablement
nfs: probe for LOCALIO when v4 client reconnects to server
nfs: probe for LOCALIO when v3 client reconnects to serverDocumentation/filesystems/nfs/localio.rst | 98 +++++---- fs/nfs/client.c | 6 +- fs/nfs/direct.c | 1 + fs/nfs/flexfilelayout/flexfilelayout.c | 25 +-- fs/nfs/flexfilelayout/flexfilelayout.h | 1 + fs/nfs/inode.c | 3 + fs/nfs/internal.h | 9 +- fs/nfs/localio.c | 232 +++++++++++++++----- fs/nfs/nfs3proc.c | 46 +++- fs/nfs/nfs4state.c | 1 + fs/nfs/nfstrace.h | 32 --- fs/nfs/pagelist.c | 5 +- fs/nfs/write.c | 3 +- fs/nfs_common/Makefile | 3 +- fs/nfs_common/localio_trace.c | 10 + fs/nfs_common/localio_trace.h | 56 +++++ fs/nfs_common/nfslocalio.c | 250 +++++++++++++++++----- fs/nfsd/filecache.c | 20 +- fs/nfsd/localio.c | 9 +- fs/nfsd/netns.h | 12 +- fs/nfsd/nfsctl.c | 6 +-Quoted 9 lines
fs/nfsd/nfssvc.c | 40 ++-- include/linux/nfs_fs.h | 22 +- include/linux/nfs_fs_sb.h | 3 +- include/linux/nfs_xdr.h | 1 + include/linux/nfslocalio.h | 48 +++-- 26 files changed, 674 insertions(+), 268 deletions(-) create mode 100644 fs/nfs_common/localio_trace.c create mode 100644 fs/nfs_common/localio_trace.h
Quoted 5 lines
I went through the set and it looks mostly sane to me. The one concern I have is that you have the client set up to start caching nfsd files before there is a mechanism to call it and ask them to return them. You might see some weird behavior there on a bisect, but it looks like it all gets resolved in the end.
Yeah, couldn't see a better way to atomically pivot to the new disable functionality without it needing to be a large muddled patch.
Shouldn't be bad even if someone did bisect, its only the server being restarted during LOCALIO that could see issues (unlikely thing for someone to be testing for specifically with a bisect).
Quoted 2 lines
How do you intend for this to go in? Since most of this is client side, will this be going in via Trond/Anna's tree?
Yes, likely easiest to have it go through Trond/Anna's tree. Trond did have it in his testing tree, maybe your Reviewed-by helps it all land.
Quoted 3 lines
You can add:
Reviewed-by Jeff Layton <[email protected]>
Thanks,
Mike
Quoted 87 lines · Mike Snitzer
Quoted 66 lines · Jeff Layton
Quoted 55 lines · Mike Snitzer
Hi,
All available here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/log/?h=nfs-localio-for-nextChanges since v2:
- switched fromrcu_assign_pointertoRCU_INIT_POINTERwhen setting to NULL.
- removed some unnecessary #ifIS_ENABLED(CONFIG_NFS_LOCALIO)
- revised the NFS v3 probe patch to use a new nfsv3.ko modparam 'nfs3_localio_probe_throttle' to control if NFSv3 will probe for LOCALIO. Avoids use ofNFS_CS_LOCAL_IOand will probe every 'nfs3_localio_probe_throttle' IO requests (defaults to 0, disabled).
- added "Module Parameters" section tolocalio.rstAll review appreciated, thanks.
MikeMike Snitzer (14):
nfs/localio: add direct IO enablement with sync and async IO support
nfsd: add nfsd_file_{get,put} to 'nfs_to'nfsd_localio_operations
nfs_common: rename functions that invalidate LOCALIOnfs_clients
nfs_common: movelocalio_lockto new lock member ofnfs_uuid_t
nfs: cache all open LOCALIOnfsd_file(s)in client
nfsd: updatepercpu_refto manage references onnfsd_net
nfsd: renamenfsd_serv_prefixed methods and variables withnfsd_net_
nfsd:nfsd_file_acquire_localno longer returns GC'dnfsd_file
nfs_common: rename nfslocalionfs_uuid_locktonfs_uuids_lock
nfs_common: track all opennfsd_filesper LOCALIOnfs_client
nfs_common: addnfs_localiotrace events
nfs/localio: remove redundant code and simplify LOCALIO enablement
nfs: probe for LOCALIO when v4 client reconnects to server
nfs: probe for LOCALIO when v3 client reconnects to serverDocumentation/filesystems/nfs/localio.rst | 98 +++++---- fs/nfs/client.c | 6 +- fs/nfs/direct.c | 1 + fs/nfs/flexfilelayout/flexfilelayout.c | 25 +-- fs/nfs/flexfilelayout/flexfilelayout.h | 1 + fs/nfs/inode.c | 3 + fs/nfs/internal.h | 9 +- fs/nfs/localio.c | 232 +++++++++++++++----- fs/nfs/nfs3proc.c | 46 +++- fs/nfs/nfs4state.c | 1 + fs/nfs/nfstrace.h | 32 --- fs/nfs/pagelist.c | 5 +- fs/nfs/write.c | 3 +- fs/nfs_common/Makefile | 3 +- fs/nfs_common/localio_trace.c | 10 + fs/nfs_common/localio_trace.h | 56 +++++ fs/nfs_common/nfslocalio.c | 250 +++++++++++++++++----- fs/nfsd/filecache.c | 20 +- fs/nfsd/localio.c | 9 +- fs/nfsd/netns.h | 12 +- fs/nfsd/nfsctl.c | 6 +-Quoted 9 lines
fs/nfsd/nfssvc.c | 40 ++-- include/linux/nfs_fs.h | 22 +- include/linux/nfs_fs_sb.h | 3 +- include/linux/nfs_xdr.h | 1 + include/linux/nfslocalio.h | 48 +++-- 26 files changed, 674 insertions(+), 268 deletions(-) create mode 100644 fs/nfs_common/localio_trace.c create mode 100644 fs/nfs_common/localio_trace.hQuoted 5 lines
I went through the set and it looks mostly sane to me. The one concern I have is that you have the client set up to start caching nfsd files before there is a mechanism to call it and ask them to return them. You might see some weird behavior there on a bisect, but it looks like it all gets resolved in the end.
Yeah, couldn't see a better way to atomically pivot to the new disable functionality without it needing to be a large muddled patch.
Shouldn't be bad even if someone did bisect, its only the server being restarted during LOCALIO that could see issues (unlikely thing for someone to be testing for specifically with a bisect).
Quoted 2 lines
How do you intend for this to go in? Since most of this is client side, will this be going in via Trond/Anna's tree?
Yes, likely easiest to have it go through Trond/Anna's tree. Trond did have it in his testing tree, maybe your Reviewed-by helps it all land.
Quoted 7 lines
Quoted 3 lines
You can add:
Reviewed-by Jeff Layton <[email protected]>Thanks,
Mike
Hi all,
These LOCALIO changes didn't land for 6.13 merge, please advise on if we might get these changes staged for 6.14 now-ish.
Trond and/or Anna, do you feel comfortable picking this series up (nfsd cachnges too) or would you like to see any changes before that is possible?
Thanks,
Mike
Quoted 92 lines · Mike Snitzer
Quoted 91 lines · Mike Snitzer
Quoted 66 lines · Jeff Layton
Quoted 55 lines · Mike Snitzer
Hi,
All available here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/log/?h=nfs-localio-for-nextChanges since v2:
- switched fromrcu_assign_pointertoRCU_INIT_POINTERwhen setting to NULL.
- removed some unnecessary #ifIS_ENABLED(CONFIG_NFS_LOCALIO)
- revised the NFS v3 probe patch to use a new nfsv3.ko modparam 'nfs3_localio_probe_throttle' to control if NFSv3 will probe for LOCALIO. Avoids use ofNFS_CS_LOCAL_IOand will probe every 'nfs3_localio_probe_throttle' IO requests (defaults to 0, disabled).
- added "Module Parameters" section tolocalio.rstAll review appreciated, thanks.
MikeMike Snitzer (14):
nfs/localio: add direct IO enablement with sync and async IO support
nfsd: add nfsd_file_{get,put} to 'nfs_to'nfsd_localio_operations
nfs_common: rename functions that invalidate LOCALIOnfs_clients
nfs_common: movelocalio_lockto new lock member ofnfs_uuid_t
nfs: cache all open LOCALIOnfsd_file(s)in client
nfsd: updatepercpu_refto manage references onnfsd_net
nfsd: renamenfsd_serv_prefixed methods and variables withnfsd_net_
nfsd:nfsd_file_acquire_localno longer returns GC'dnfsd_file
nfs_common: rename nfslocalionfs_uuid_locktonfs_uuids_lock
nfs_common: track all opennfsd_filesper LOCALIOnfs_client
nfs_common: addnfs_localiotrace events
nfs/localio: remove redundant code and simplify LOCALIO enablement
nfs: probe for LOCALIO when v4 client reconnects to server
nfs: probe for LOCALIO when v3 client reconnects to serverDocumentation/filesystems/nfs/localio.rst | 98 +++++---- fs/nfs/client.c | 6 +- fs/nfs/direct.c | 1 + fs/nfs/flexfilelayout/flexfilelayout.c | 25 +-- fs/nfs/flexfilelayout/flexfilelayout.h | 1 + fs/nfs/inode.c | 3 + fs/nfs/internal.h | 9 +- fs/nfs/localio.c | 232 +++++++++++++++----- fs/nfs/nfs3proc.c | 46 +++- fs/nfs/nfs4state.c | 1 + fs/nfs/nfstrace.h | 32 --- fs/nfs/pagelist.c | 5 +- fs/nfs/write.c | 3 +- fs/nfs_common/Makefile | 3 +- fs/nfs_common/localio_trace.c | 10 + fs/nfs_common/localio_trace.h | 56 +++++ fs/nfs_common/nfslocalio.c | 250 +++++++++++++++++----- fs/nfsd/filecache.c | 20 +- fs/nfsd/localio.c | 9 +- fs/nfsd/netns.h | 12 +- fs/nfsd/nfsctl.c | 6 +-Quoted 9 lines
fs/nfsd/nfssvc.c | 40 ++-- include/linux/nfs_fs.h | 22 +- include/linux/nfs_fs_sb.h | 3 +- include/linux/nfs_xdr.h | 1 + include/linux/nfslocalio.h | 48 +++-- 26 files changed, 674 insertions(+), 268 deletions(-) create mode 100644 fs/nfs_common/localio_trace.c create mode 100644 fs/nfs_common/localio_trace.hQuoted 5 lines
I went through the set and it looks mostly sane to me. The one concern I have is that you have the client set up to start caching nfsd files before there is a mechanism to call it and ask them to return them. You might see some weird behavior there on a bisect, but it looks like it all gets resolved in the end.
Yeah, couldn't see a better way to atomically pivot to the new disable functionality without it needing to be a large muddled patch.
Shouldn't be bad even if someone did bisect, its only the server being restarted during LOCALIO that could see issues (unlikely thing for someone to be testing for specifically with a bisect).
Quoted 2 lines
How do you intend for this to go in? Since most of this is client side, will this be going in via Trond/Anna's tree?
Yes, likely easiest to have it go through Trond/Anna's tree. Trond did have it in his testing tree, maybe your Reviewed-by helps it all land.
Quoted 3 lines
You can add:
Reviewed-by Jeff Layton <[email protected]>
Quoted 8 lines
Quoted 3 lines
Thanks,
MikeHi all,
These LOCALIO changes didn't land for 6.13 merge, please advise on if we might get these changes staged for 6.14 now-ish.
Works for me.
Quoted 4 lines
Trond and/or Anna, do you feel comfortable picking this series up (nfsd cachnges too) or would you like to see any changes before that is possible?
I'll go through the patches once more, but they should be fine. I will need Acked-by's for the NFSD bits from Chuck or Jeff.
Anna
Quoted 3 lines
Thanks,
Mike
Chuck Lever
Acked-byQuoted 104 lines · Anna Schumaker
Quoted 92 lines · Mike Snitzer
Quoted 91 lines · Mike Snitzer
Quoted 66 lines · Jeff Layton
Quoted 61 lines · Mike Snitzer
Hi,
All available here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/log/?h=nfs-localio-for-nextChanges since v2:
- switched fromrcu_assign_pointertoRCU_INIT_POINTERwhen setting to NULL.
- removed some unnecessary #ifIS_ENABLED(CONFIG_NFS_LOCALIO)
- revised the NFS v3 probe patch to use a new nfsv3.ko modparam 'nfs3_localio_probe_throttle' to control if NFSv3 will probe for LOCALIO. Avoids use ofNFS_CS_LOCAL_IOand will probe every 'nfs3_localio_probe_throttle' IO requests (defaults to 0, disabled).
- added "Module Parameters" section tolocalio.rstAll review appreciated, thanks.
MikeMike Snitzer (14):
nfs/localio: add direct IO enablement with sync and async IO support
nfsd: add nfsd_file_{get,put} to 'nfs_to'nfsd_localio_operations
nfs_common: rename functions that invalidate LOCALIOnfs_clients
nfs_common: movelocalio_lockto new lock member ofnfs_uuid_t
nfs: cache all open LOCALIOnfsd_file(s)in client
nfsd: updatepercpu_refto manage references onnfsd_net
nfsd: renamenfsd_serv_prefixed methods and variables withnfsd_net_
nfsd:nfsd_file_acquire_localno longer returns GC'dnfsd_file
nfs_common: rename nfslocalionfs_uuid_locktonfs_uuids_lock
nfs_common: track all opennfsd_filesper LOCALIOnfs_client
nfs_common: addnfs_localiotrace events
nfs/localio: remove redundant code and simplify LOCALIO enablement
nfs: probe for LOCALIO when v4 client reconnects to server
nfs: probe for LOCALIO when v3 client reconnects to serverDocumentation/filesystems/nfs/localio.rst | 98 +++++---- fs/nfs/client.c | 6 +- fs/nfs/direct.c | 1 + fs/nfs/flexfilelayout/flexfilelayout.c | 25 +-- fs/nfs/flexfilelayout/flexfilelayout.h | 1 + fs/nfs/inode.c | 3 + fs/nfs/internal.h | 9 +- fs/nfs/localio.c | 232 +++++++++++++++----- fs/nfs/nfs3proc.c | 46 +++- fs/nfs/nfs4state.c | 1 + fs/nfs/nfstrace.h | 32 --- fs/nfs/pagelist.c | 5 +- fs/nfs/write.c | 3 +- fs/nfs_common/Makefile | 3 +- fs/nfs_common/localio_trace.c | 10 + fs/nfs_common/localio_trace.h | 56 +++++ fs/nfs_common/nfslocalio.c | 250 +++++++++++++++++----- fs/nfsd/filecache.c | 20 +- fs/nfsd/localio.c | 9 +- fs/nfsd/netns.h | 12 +- fs/nfsd/nfsctl.c | 6 +- fs/nfsd/nfssvc.c | 40 ++-- include/linux/nfs_fs.h | 22 +- include/linux/nfs_fs_sb.h | 3 +- include/linux/nfs_xdr.h | 1 + include/linux/nfslocalio.h | 48 +++-- 26 files changed, 674 insertions(+), 268 deletions(-)Quoted 3 lines
create mode 100644
fs/nfs_common/localio_trace.ccreate mode 100644fs/nfs_common/localio_trace.hQuoted 5 lines
I went through the set and it looks mostly sane to me. The one concern I have is that you have the client set up to start caching nfsd files before there is a mechanism to call it and ask them to return them. You might see some weird behavior there on a bisect, but it looks like it all gets resolved in the end.
Yeah, couldn't see a better way to atomically pivot to the new disable functionality without it needing to be a large muddled patch.
Shouldn't be bad even if someone did bisect, its only the server being restarted during LOCALIO that could see issues (unlikely thing for someone to be testing for specifically with a bisect).
Quoted 2 lines
How do you intend for this to go in? Since most of this is client side, will this be going in via Trond/Anna's tree?
Yes, likely easiest to have it go through Trond/Anna's tree. Trond did have it in his testing tree, maybe your Reviewed-by helps it all land.
Quoted 3 lines
You can add:
Reviewed-by Jeff Layton <[email protected]>Quoted 8 lines
Quoted 3 lines
Thanks,
MikeHi all,
These LOCALIO changes didn't land for 6.13 merge, please advise on if we might get these changes staged for 6.14 now-ish.
Quoted 8 lines
Works for me.
Quoted 4 lines
Trond and/or Anna, do you feel comfortable picking this series up (nfsd cachnges too) or would you like to see any changes before that is possible?
I'll go through the patches once more, but they should be fine. I will need Acked-by's for the NFSD bits from Chuck or Jeff.
Looks like Jeff gave his Reviewed-by for the series already.
I had asked for some minor changes, haven't seen them go by, but, for the NFSD-related hunks:
Signature · 1 line
Chuck Lever
Quoted 112 lines · Chuck Lever
Quoted 111 lines · Anna Schumaker
Quoted 92 lines · Mike Snitzer
Quoted 91 lines · Mike Snitzer
Quoted 66 lines · Jeff Layton
Quoted 61 lines · Mike Snitzer
Hi,
All available here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/log/?h=nfs-localio-for-nextChanges since v2:
- switched fromrcu_assign_pointertoRCU_INIT_POINTERwhen setting to NULL.
- removed some unnecessary #ifIS_ENABLED(CONFIG_NFS_LOCALIO)
- revised the NFS v3 probe patch to use a new nfsv3.ko modparam 'nfs3_localio_probe_throttle' to control if NFSv3 will probe for LOCALIO. Avoids use ofNFS_CS_LOCAL_IOand will probe every 'nfs3_localio_probe_throttle' IO requests (defaults to 0, disabled).
- added "Module Parameters" section tolocalio.rstAll review appreciated, thanks.
MikeMike Snitzer (14):
nfs/localio: add direct IO enablement with sync and async IO support
nfsd: add nfsd_file_{get,put} to 'nfs_to'nfsd_localio_operations
nfs_common: rename functions that invalidate LOCALIOnfs_clients
nfs_common: movelocalio_lockto new lock member ofnfs_uuid_t
nfs: cache all open LOCALIOnfsd_file(s)in client
nfsd: updatepercpu_refto manage references onnfsd_net
nfsd: renamenfsd_serv_prefixed methods and variables withnfsd_net_
nfsd:nfsd_file_acquire_localno longer returns GC'dnfsd_file
nfs_common: rename nfslocalionfs_uuid_locktonfs_uuids_lock
nfs_common: track all opennfsd_filesper LOCALIOnfs_client
nfs_common: addnfs_localiotrace events
nfs/localio: remove redundant code and simplify LOCALIO enablement
nfs: probe for LOCALIO when v4 client reconnects to server
nfs: probe for LOCALIO when v3 client reconnects to serverDocumentation/filesystems/nfs/localio.rst | 98 +++++---- fs/nfs/client.c | 6 +- fs/nfs/direct.c | 1 + fs/nfs/flexfilelayout/flexfilelayout.c | 25 +-- fs/nfs/flexfilelayout/flexfilelayout.h | 1 + fs/nfs/inode.c | 3 + fs/nfs/internal.h | 9 +- fs/nfs/localio.c | 232 +++++++++++++++----- fs/nfs/nfs3proc.c | 46 +++- fs/nfs/nfs4state.c | 1 + fs/nfs/nfstrace.h | 32 --- fs/nfs/pagelist.c | 5 +- fs/nfs/write.c | 3 +- fs/nfs_common/Makefile | 3 +- fs/nfs_common/localio_trace.c | 10 + fs/nfs_common/localio_trace.h | 56 +++++ fs/nfs_common/nfslocalio.c | 250 +++++++++++++++++----- fs/nfsd/filecache.c | 20 +- fs/nfsd/localio.c | 9 +- fs/nfsd/netns.h | 12 +- fs/nfsd/nfsctl.c | 6 +- fs/nfsd/nfssvc.c | 40 ++-- include/linux/nfs_fs.h | 22 +- include/linux/nfs_fs_sb.h | 3 +- include/linux/nfs_xdr.h | 1 + include/linux/nfslocalio.h | 48 +++-- 26 files changed, 674 insertions(+), 268 deletions(-)Quoted 3 lines
create mode 100644
fs/nfs_common/localio_trace.ccreate mode 100644fs/nfs_common/localio_trace.hQuoted 5 lines
I went through the set and it looks mostly sane to me. The one concern I have is that you have the client set up to start caching nfsd files before there is a mechanism to call it and ask them to return them. You might see some weird behavior there on a bisect, but it looks like it all gets resolved in the end.
Yeah, couldn't see a better way to atomically pivot to the new disable functionality without it needing to be a large muddled patch.
Shouldn't be bad even if someone did bisect, its only the server being restarted during LOCALIO that could see issues (unlikely thing for someone to be testing for specifically with a bisect).
Quoted 2 lines
How do you intend for this to go in? Since most of this is client side, will this be going in via Trond/Anna's tree?
Yes, likely easiest to have it go through Trond/Anna's tree. Trond did have it in his testing tree, maybe your Reviewed-by helps it all land.
Quoted 3 lines
You can add:
Reviewed-by Jeff Layton <[email protected]>Quoted 8 lines
Quoted 3 lines
Thanks,
MikeHi all,
These LOCALIO changes didn't land for 6.13 merge, please advise on if we might get these changes staged for 6.14 now-ish.
Works for me.
Quoted 4 lines
Trond and/or Anna, do you feel comfortable picking this series up (nfsd cachnges too) or would you like to see any changes before that is possible?
Quoted 5 lines
Quoted 1 line
I'll go through the patches once more, but they should be fine. I will need Acked-by's for the NFSD bits from Chuck or Jeff.
Looks like Jeff gave his Reviewed-by for the series already.
I had asked for some minor changes, haven't seen them go by,
Only thing I was aware of, and addressed in v2, was this:
https://lore.kernel.org/all/[email protected]/
I added a module parameters section to the localio.rst and mentioned that in v2's 0th header:
https://lore.kernel.org/r/all/[email protected]/
with:
"- updated Documentation/filesystems/nfs/localio.rst to reflect the
percpu_ref change from nfsd_serv to nfsd_net. Also discuss O_DIRECT relative to LOCALIO and document the nfs module param (Chuck, I do think we need it, otherwise O_DIRECT regressions are possible)."
Quoted 3 lines
but, for the NFSD-related hunks:
Acked-by Chuck Lever <[email protected]>
Thanks!
[top-posting because of my general inquiry]
Hi Anna,
I know Trond has been quite busy, I suspect you have been too (holidays and all too). I just wanted to check with you on this patchset.
Given the 6.14 merge window is fast approaching, is there anything you need from me?
Jeff did provide his Reviewed-by, and Chuck his Acked-by. But would it help for me to prepare a v4 that explicitly adds their tags accordingly?
There is also this LOCALIO error path fix that should go upstream and be marked for stable@:
https://lore.kernel.org/linux-nfs/[email protected]/
I could put that fix in the front of a v4 resubmission. I'm also perfectly fine to stand-down and let you review and apply if/when you have time.. the patches haven't changed at all, but happy to sweep through and do the v4 if it helps.
Thanks,
Mike
Quoted 139 lines · Mike Snitzer
Quoted 112 lines · Chuck Lever
Quoted 111 lines · Anna Schumaker
Quoted 92 lines · Mike Snitzer
Quoted 91 lines · Mike Snitzer
Quoted 66 lines · Jeff Layton
Quoted 61 lines · Mike Snitzer
Hi,
All available here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/log/?h=nfs-localio-for-nextChanges since v2:
- switched fromrcu_assign_pointertoRCU_INIT_POINTERwhen setting to NULL.
- removed some unnecessary #ifIS_ENABLED(CONFIG_NFS_LOCALIO)
- revised the NFS v3 probe patch to use a new nfsv3.ko modparam 'nfs3_localio_probe_throttle' to control if NFSv3 will probe for LOCALIO. Avoids use ofNFS_CS_LOCAL_IOand will probe every 'nfs3_localio_probe_throttle' IO requests (defaults to 0, disabled).
- added "Module Parameters" section tolocalio.rstAll review appreciated, thanks.
MikeMike Snitzer (14):
nfs/localio: add direct IO enablement with sync and async IO support
nfsd: add nfsd_file_{get,put} to 'nfs_to'nfsd_localio_operations
nfs_common: rename functions that invalidate LOCALIOnfs_clients
nfs_common: movelocalio_lockto new lock member ofnfs_uuid_t
nfs: cache all open LOCALIOnfsd_file(s)in client
nfsd: updatepercpu_refto manage references onnfsd_net
nfsd: renamenfsd_serv_prefixed methods and variables withnfsd_net_
nfsd:nfsd_file_acquire_localno longer returns GC'dnfsd_file
nfs_common: rename nfslocalionfs_uuid_locktonfs_uuids_lock
nfs_common: track all opennfsd_filesper LOCALIOnfs_client
nfs_common: addnfs_localiotrace events
nfs/localio: remove redundant code and simplify LOCALIO enablement
nfs: probe for LOCALIO when v4 client reconnects to server
nfs: probe for LOCALIO when v3 client reconnects to serverDocumentation/filesystems/nfs/localio.rst | 98 +++++---- fs/nfs/client.c | 6 +- fs/nfs/direct.c | 1 + fs/nfs/flexfilelayout/flexfilelayout.c | 25 +-- fs/nfs/flexfilelayout/flexfilelayout.h | 1 + fs/nfs/inode.c | 3 + fs/nfs/internal.h | 9 +- fs/nfs/localio.c | 232 +++++++++++++++----- fs/nfs/nfs3proc.c | 46 +++- fs/nfs/nfs4state.c | 1 + fs/nfs/nfstrace.h | 32 --- fs/nfs/pagelist.c | 5 +- fs/nfs/write.c | 3 +- fs/nfs_common/Makefile | 3 +- fs/nfs_common/localio_trace.c | 10 + fs/nfs_common/localio_trace.h | 56 +++++ fs/nfs_common/nfslocalio.c | 250 +++++++++++++++++----- fs/nfsd/filecache.c | 20 +- fs/nfsd/localio.c | 9 +- fs/nfsd/netns.h | 12 +- fs/nfsd/nfsctl.c | 6 +- fs/nfsd/nfssvc.c | 40 ++-- include/linux/nfs_fs.h | 22 +- include/linux/nfs_fs_sb.h | 3 +- include/linux/nfs_xdr.h | 1 + include/linux/nfslocalio.h | 48 +++-- 26 files changed, 674 insertions(+), 268 deletions(-)Quoted 3 lines
create mode 100644
fs/nfs_common/localio_trace.ccreate mode 100644fs/nfs_common/localio_trace.hQuoted 5 lines
I went through the set and it looks mostly sane to me. The one concern I have is that you have the client set up to start caching nfsd files before there is a mechanism to call it and ask them to return them. You might see some weird behavior there on a bisect, but it looks like it all gets resolved in the end.
Yeah, couldn't see a better way to atomically pivot to the new disable functionality without it needing to be a large muddled patch.
Shouldn't be bad even if someone did bisect, its only the server being restarted during LOCALIO that could see issues (unlikely thing for someone to be testing for specifically with a bisect).
Quoted 2 lines
How do you intend for this to go in? Since most of this is client side, will this be going in via Trond/Anna's tree?
Yes, likely easiest to have it go through Trond/Anna's tree. Trond did have it in his testing tree, maybe your Reviewed-by helps it all land.
Quoted 3 lines
You can add:
Reviewed-by Jeff Layton <[email protected]>Quoted 8 lines
Quoted 3 lines
Thanks,
MikeHi all,
These LOCALIO changes didn't land for 6.13 merge, please advise on if we might get these changes staged for 6.14 now-ish.
Works for me.
Quoted 4 lines
Trond and/or Anna, do you feel comfortable picking this series up (nfsd cachnges too) or would you like to see any changes before that is possible?
Quoted 5 lines
Quoted 1 line
I'll go through the patches once more, but they should be fine. I will need Acked-by's for the NFSD bits from Chuck or Jeff.
Looks like Jeff gave his Reviewed-by for the series already.
I had asked for some minor changes, haven't seen them go by,
Only thing I was aware of, and addressed in v2, was this:
https://lore.kernel.org/all/[email protected]/I added a module parameters section to the
localio.rstand mentioned that in v2's 0th header:
https://lore.kernel.org/r/all/[email protected]/with:
"- updated
Documentation/filesystems/nfs/localio.rstto reflect the
percpu_refchange fromnfsd_servtonfsd_net. Also discussO_DIRECTrelative to LOCALIO and document the nfs module param (Chuck, I do think we need it, otherwiseO_DIRECTregressions are possible)."Quoted 3 lines
but, for the NFSD-related hunks:
Acked-by Chuck Lever <[email protected]>Thanks!
Hi Mike,
Quoted 8 lines · Mike Snitzer
[top-posting because of my general inquiry]
Hi Anna,
I know Trond has been quite busy, I suspect you have been too (holidays and all too). I just wanted to check with you on this patchset.
Quoted 6 lines
Given the 6.14 merge window is fast approaching, is there anything you need from me?
Jeff did provide his Reviewed-by, and Chuck his Acked-by. But would it help for me to prepare a v4 that explicitly adds their tags accordingly?
Thanks for checking in! I don't think I need anything from you at this time. I just pushed out a linux-next branch including these patches and your additional bugfix from the other week, so everything should be covered. If you notice anything missing, do let me know!
Anna
Quoted 155 lines
There is also this LOCALIO error path fix that should go upstream and be marked for stable@:
https://lore.kernel.org/linux-nfs/[email protected]/I could put that fix in the front of a v4 resubmission. I'm also perfectly fine to stand-down and let you review and apply if/when you have time.. the patches haven't changed at all, but happy to sweep through and do the v4 if it helps.
Thanks,
MikeQuoted 139 lines · Mike Snitzer
Quoted 112 lines · Chuck Lever
Quoted 111 lines · Anna Schumaker
Quoted 92 lines · Mike Snitzer
Quoted 91 lines · Mike Snitzer
Quoted 66 lines · Jeff Layton
Quoted 61 lines · Mike Snitzer
Hi,
All available here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/log/?h=nfs-localio-for-nextChanges since v2:
- switched fromrcu_assign_pointertoRCU_INIT_POINTERwhen setting to NULL.
- removed some unnecessary #ifIS_ENABLED(CONFIG_NFS_LOCALIO)
- revised the NFS v3 probe patch to use a new nfsv3.ko modparam 'nfs3_localio_probe_throttle' to control if NFSv3 will probe for LOCALIO. Avoids use ofNFS_CS_LOCAL_IOand will probe every 'nfs3_localio_probe_throttle' IO requests (defaults to 0, disabled).
- added "Module Parameters" section tolocalio.rstAll review appreciated, thanks.
MikeMike Snitzer (14):
nfs/localio: add direct IO enablement with sync and async IO support
nfsd: add nfsd_file_{get,put} to 'nfs_to'nfsd_localio_operations
nfs_common: rename functions that invalidate LOCALIOnfs_clients
nfs_common: movelocalio_lockto new lock member ofnfs_uuid_t
nfs: cache all open LOCALIOnfsd_file(s)in client
nfsd: updatepercpu_refto manage references onnfsd_net
nfsd: renamenfsd_serv_prefixed methods and variables withnfsd_net_
nfsd:nfsd_file_acquire_localno longer returns GC'dnfsd_file
nfs_common: rename nfslocalionfs_uuid_locktonfs_uuids_lock
nfs_common: track all opennfsd_filesper LOCALIOnfs_client
nfs_common: addnfs_localiotrace events
nfs/localio: remove redundant code and simplify LOCALIO enablement
nfs: probe for LOCALIO when v4 client reconnects to server
nfs: probe for LOCALIO when v3 client reconnects to serverDocumentation/filesystems/nfs/localio.rst | 98 +++++---- fs/nfs/client.c | 6 +- fs/nfs/direct.c | 1 + fs/nfs/flexfilelayout/flexfilelayout.c | 25 +-- fs/nfs/flexfilelayout/flexfilelayout.h | 1 + fs/nfs/inode.c | 3 + fs/nfs/internal.h | 9 +- fs/nfs/localio.c | 232 +++++++++++++++----- fs/nfs/nfs3proc.c | 46 +++- fs/nfs/nfs4state.c | 1 + fs/nfs/nfstrace.h | 32 --- fs/nfs/pagelist.c | 5 +- fs/nfs/write.c | 3 +- fs/nfs_common/Makefile | 3 +- fs/nfs_common/localio_trace.c | 10 + fs/nfs_common/localio_trace.h | 56 +++++ fs/nfs_common/nfslocalio.c | 250 +++++++++++++++++----- fs/nfsd/filecache.c | 20 +- fs/nfsd/localio.c | 9 +- fs/nfsd/netns.h | 12 +- fs/nfsd/nfsctl.c | 6 +- fs/nfsd/nfssvc.c | 40 ++-- include/linux/nfs_fs.h | 22 +- include/linux/nfs_fs_sb.h | 3 +- include/linux/nfs_xdr.h | 1 + include/linux/nfslocalio.h | 48 +++-- 26 files changed, 674 insertions(+), 268 deletions(-)Quoted 3 lines
create mode 100644
fs/nfs_common/localio_trace.ccreate mode 100644fs/nfs_common/localio_trace.hQuoted 5 lines
I went through the set and it looks mostly sane to me. The one concern I have is that you have the client set up to start caching nfsd files before there is a mechanism to call it and ask them to return them. You might see some weird behavior there on a bisect, but it looks like it all gets resolved in the end.
Yeah, couldn't see a better way to atomically pivot to the new disable functionality without it needing to be a large muddled patch.
Shouldn't be bad even if someone did bisect, its only the server being restarted during LOCALIO that could see issues (unlikely thing for someone to be testing for specifically with a bisect).
Quoted 2 lines
How do you intend for this to go in? Since most of this is client side, will this be going in via Trond/Anna's tree?
Yes, likely easiest to have it go through Trond/Anna's tree. Trond did have it in his testing tree, maybe your Reviewed-by helps it all land.
Quoted 3 lines
You can add:
Reviewed-by Jeff Layton <[email protected]>Quoted 8 lines
Quoted 3 lines
Thanks,
MikeHi all,
These LOCALIO changes didn't land for 6.13 merge, please advise on if we might get these changes staged for 6.14 now-ish.
Works for me.
Quoted 4 lines
Trond and/or Anna, do you feel comfortable picking this series up (nfsd cachnges too) or would you like to see any changes before that is possible?
Quoted 5 lines
Quoted 1 line
I'll go through the patches once more, but they should be fine. I will need Acked-by's for the NFSD bits from Chuck or Jeff.
Looks like Jeff gave his Reviewed-by for the series already.
I had asked for some minor changes, haven't seen them go by,
Only thing I was aware of, and addressed in v2, was this:
https://lore.kernel.org/all/[email protected]/I added a module parameters section to the
localio.rstand mentioned that in v2's 0th header:
https://lore.kernel.org/r/all/[email protected]/with:
"- updated
Documentation/filesystems/nfs/localio.rstto reflect the
percpu_refchange fromnfsd_servtonfsd_net. Also discussO_DIRECTrelative to LOCALIO and document the nfs module param (Chuck, I do think we need it, otherwiseO_DIRECTregressions are possible)."Quoted 3 lines
but, for the NFSD-related hunks:
Acked-by Chuck Lever <[email protected]>Thanks!
PATCH v2 1/1 nfs: fix incorrect error handling in LOCALIO (was: Re: [for-6.13 PATCH v3 00/14] nfs/nfsd: improvements for LOCALIO)
Quoted 14 lines · Anna Schumaker
Hi Mike,
Quoted 11 lines · Mike Snitzer
[top-posting because of my general inquiry]
Hi Anna,
I know Trond has been quite busy, I suspect you have been too (holidays and all too). I just wanted to check with you on this patchset.
Given the 6.14 merge window is fast approaching, is there anything you need from me?
Quoted 8 lines
Quoted 3 lines
Jeff did provide his Reviewed-by, and Chuck his Acked-by. But would it help for me to prepare a v4 that explicitly adds their tags accordingly?
Thanks for checking in! I don't think I need anything from you at this time. I just pushed out a linux-next branch including these patches and your additional bugfix from the other week, so everything should be covered. If you notice anything missing, do let me know!
Thanks! And of course I sent my previous mail _just_ before you pushed your linux-next changes out. ;)
I do have the following v2 for the LOCALIO bugfix, commit 17da35c54142 ("nfs: fix incorrect error handling in LOCALIO") in your linux-next tree. Once you've had a chance to look, would it be possible for you to replace the original fix and forcibly rebase with this v2 instead?
Trond reviewed the first patch and noted that for LOCALIO's purposes it results in some bad conversions from errno to NFSv4 status (e.g. -EAGAIN to NFS4ERR_LOCKED and -ENODATA to NFS4ERR_NOXATTR). I cross-referenced the long-standing code that Hammerspace used for this and this v2 reflects the errno to NFS v4 status mappings LOCALIO needs:
From: Mike Snitzer <[email protected]>
Subject: [PATCH v2] nfs: fix incorrect error handling in LOCALIO
nfs4_stat_to_errno() expects a NFSv4 error code as an argument and returns a POSIX errno.
The problem is LOCALIO is passing nfs4_stat_to_errno() the POSIX errno return values from filp->f_op->read_iter(), filp->f_op->write_iter() and vfs_fsync_range().
So the POSIX errno that nfs_local_pgio_done() and nfs_local_commit_done() are passing to nfs4_stat_to_errno() are failing to match any NFSv4 error code, which results in nfs4_stat_to_errno() defaulting to returning -EREMOTEIO. This causes assertions in upper layers due to -EREMOTEIO not being a valid NFSv4 error code.
Fix this by updating nfs_local_pgio_done() and nfs_local_commit_done() to use the new nfs_localio_errno_to_nfs4_stat() to map a POSIX errno to an NFSv4 error code.
Care was taken to factor out nfs4_errtbl_common[] to avoid duplicating the same NFS error to errno table. nfs4_errtbl_common[] is checked first by both nfs4_stat_to_errno and nfs_localio_errno_to_nfs4_stat before they check their own more specialized tables (nfs4_errtbl[] and nfs4_errtbl_localio[] respectively).
While auditing the associated error mapping tables, the (ab)use of -1 for the last table entry was removed in favor of using ARRAY_SIZE to iterate the nfs_errtbl[] and nfs4_errtbl[]. And 'errno_NFSERR_IO' was removed because it caused needless obfuscation.
--- fs/nfs/localio.c | 4 +- fs/nfs_common/common.c | 89 +++++++++++++++++++++++++++++++++----- include/linux/nfs_common.h | 3 +- 3 files changed, 82 insertions(+), 14 deletions(-)
fs/nfs/localio.c +2 -2
@@ -388,7 +388,7 @@ nfs_local_pgio_done(struct nfs_pgio_header *hdr, long status) hdr->res.op_status =NFS4_OK ; hdr->task.tk_status =0 ; }else { - hdr->res.op_status =nfs4_stat_to_errno (status); + hdr->res.op_status =nfs_localio_errno_to_nfs4_stat (status); hdr->task.tk_status = status; } }
@@ -786,7 +786,7 @@ nfs_local_commit_done(struct nfs_commit_data *data, int status) data->task.tk_status =0 ; }else {nfs_reset_boot_verifier (data->inode); - data->res.op_status =nfs4_stat_to_errno (status); + data->res.op_status =nfs_localio_errno_to_nfs4_stat (status); data->task.tk_status = status; } }
fs/nfs_common/common.c +78 -11
143 lines not on this page · raw message
include/linux/nfs_common.h +2 -1
@@ -9,9 +9,10 @@#include <uapi/linux/nfs.h> /* Mapping from NFS error code to "errno" error code. */ -#define errno_NFSERR_IO EIOint nfs_stat_to_errno (enum nfs_stat status);int nfs4_stat_to_errno (int stat); +__u32 nfs_localio_errno_to_nfs4_stat (int errno); +#endif /* _LINUX_NFS_COMMON_H */
Signature · 1 line
2.44.0
Quoted 104 lines · Anna Schumaker
Quoted 92 lines · Mike Snitzer
Quoted 91 lines · Mike Snitzer
Quoted 66 lines · Jeff Layton
Quoted 55 lines · Mike Snitzer
Hi,
All available here:
https://git.kernel.org/pub/scm/linux/kernel/git/snitzer/linux.git/log/?h=nfs-localio-for-nextChanges since v2:
- switched fromrcu_assign_pointertoRCU_INIT_POINTERwhen setting to NULL.
- removed some unnecessary #ifIS_ENABLED(CONFIG_NFS_LOCALIO)
- revised the NFS v3 probe patch to use a new nfsv3.ko modparam 'nfs3_localio_probe_throttle' to control if NFSv3 will probe for LOCALIO. Avoids use ofNFS_CS_LOCAL_IOand will probe every 'nfs3_localio_probe_throttle' IO requests (defaults to 0, disabled).
- added "Module Parameters" section tolocalio.rstAll review appreciated, thanks.
MikeMike Snitzer (14):
nfs/localio: add direct IO enablement with sync and async IO support
nfsd: add nfsd_file_{get,put} to 'nfs_to'nfsd_localio_operations
nfs_common: rename functions that invalidate LOCALIOnfs_clients
nfs_common: movelocalio_lockto new lock member ofnfs_uuid_t
nfs: cache all open LOCALIOnfsd_file(s)in client
nfsd: updatepercpu_refto manage references onnfsd_net
nfsd: renamenfsd_serv_prefixed methods and variables withnfsd_net_
nfsd:nfsd_file_acquire_localno longer returns GC'dnfsd_file
nfs_common: rename nfslocalionfs_uuid_locktonfs_uuids_lock
nfs_common: track all opennfsd_filesper LOCALIOnfs_client
nfs_common: addnfs_localiotrace events
nfs/localio: remove redundant code and simplify LOCALIO enablement
nfs: probe for LOCALIO when v4 client reconnects to server
nfs: probe for LOCALIO when v3 client reconnects to serverDocumentation/filesystems/nfs/localio.rst | 98 +++++---- fs/nfs/client.c | 6 +- fs/nfs/direct.c | 1 + fs/nfs/flexfilelayout/flexfilelayout.c | 25 +-- fs/nfs/flexfilelayout/flexfilelayout.h | 1 + fs/nfs/inode.c | 3 + fs/nfs/internal.h | 9 +- fs/nfs/localio.c | 232 +++++++++++++++----- fs/nfs/nfs3proc.c | 46 +++- fs/nfs/nfs4state.c | 1 + fs/nfs/nfstrace.h | 32 --- fs/nfs/pagelist.c | 5 +- fs/nfs/write.c | 3 +- fs/nfs_common/Makefile | 3 +- fs/nfs_common/localio_trace.c | 10 + fs/nfs_common/localio_trace.h | 56 +++++ fs/nfs_common/nfslocalio.c | 250 +++++++++++++++++----- fs/nfsd/filecache.c | 20 +- fs/nfsd/localio.c | 9 +- fs/nfsd/netns.h | 12 +- fs/nfsd/nfsctl.c | 6 +-Quoted 9 lines
fs/nfsd/nfssvc.c | 40 ++-- include/linux/nfs_fs.h | 22 +- include/linux/nfs_fs_sb.h | 3 +- include/linux/nfs_xdr.h | 1 + include/linux/nfslocalio.h | 48 +++-- 26 files changed, 674 insertions(+), 268 deletions(-) create mode 100644 fs/nfs_common/localio_trace.c create mode 100644 fs/nfs_common/localio_trace.hQuoted 5 lines
I went through the set and it looks mostly sane to me. The one concern I have is that you have the client set up to start caching nfsd files before there is a mechanism to call it and ask them to return them. You might see some weird behavior there on a bisect, but it looks like it all gets resolved in the end.
Yeah, couldn't see a better way to atomically pivot to the new disable functionality without it needing to be a large muddled patch.
Shouldn't be bad even if someone did bisect, its only the server being restarted during LOCALIO that could see issues (unlikely thing for someone to be testing for specifically with a bisect).
Quoted 2 lines
How do you intend for this to go in? Since most of this is client side, will this be going in via Trond/Anna's tree?
Yes, likely easiest to have it go through Trond/Anna's tree. Trond did have it in his testing tree, maybe your Reviewed-by helps it all land.
Quoted 3 lines
You can add:
Reviewed-by Jeff Layton <[email protected]>Quoted 8 lines
Quoted 3 lines
Thanks,
MikeHi all,
These LOCALIO changes didn't land for 6.13 merge, please advise on if we might get these changes staged for 6.14 now-ish.
Quoted 8 lines
Works for me.
Quoted 4 lines
Trond and/or Anna, do you feel comfortable picking this series up (nfsd cachnges too) or would you like to see any changes before that is possible?
I'll go through the patches once more, but they should be fine. I will need Acked-by's for the NFSD bits from Chuck or Jeff.
OK, Jeff did already provide his Reviewed-by for the entire set (still visible in the exchange I quoted above).
Thanks,
Mike