nfsd: ignore requests to disable unsupported versions
Subsystems (3)
Jeff Layton
maintainerPATCH v3 1/3 nfsd: ignore requests to disable unsupported versions
The kernel currently errors out if you attempt to enable or disable a version that it doesn't recognize. Change it to ignore attempts to disable an unrecognized version. If we don't support it, then there is no harm in doing so.
--- fs/nfsd/nfsctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/nfsd/nfsctl.c +3 -1
@@ -601,7 +601,9 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) }break ;default : -return -EINVAL ; +/* Ignore requests to disable non-existent versions */ +if (cmd ==NFSD_SET ) +return -EINVAL ; } vers += len +1 ; }while ((len =qword_get (&mesg, vers, size)) >0 );
Signature · 1 line
2.37.3
Jeff Layton
maintainerPATCH v3 2/3 nfsd: move nfserrno() to vfs.c
nfserrno() is common to all nfs versions, but nfsproc.c is specifically for NFSv2. Move it to vfs.c, and the prototype to vfs.h.
While we're in here, remove the #ifdef EDQUOT check in this function. It's apparently a holdover from the initial merge of the nfsd code in 1997. No other place in the kernel checks that that symbol is defined before using it, so I think we can dispense with it here.
--- fs/nfsd/blocklayout.c | 1 + fs/nfsd/blocklayoutxdr.c | 1 + fs/nfsd/export.h | 1 - fs/nfsd/flexfilelayout.c | 1 + fs/nfsd/nfs4idmap.c | 1 + fs/nfsd/nfsproc.c | 62 --------------------------------------- fs/nfsd/vfs.c | 63 ++++++++++++++++++++++++++++++++++++++++ fs/nfsd/vfs.h | 1 + 8 files changed, 68 insertions(+), 63 deletions(-)
fs/nfsd/blocklayout.c +1 -0
@@ -12,6 +12,7 @@#include "blocklayoutxdr.h" #include "pnfs.h" #include "filecache.h" +#include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_PNFS
fs/nfsd/blocklayoutxdr.c +1 -0
@@ -9,6 +9,7 @@#include "nfsd.h" #include "blocklayoutxdr.h" +#include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_PNFS
fs/nfsd/export.h +0 -1
@@ -115,7 +115,6 @@ struct svc_export * rqst_find_fsidzero_export(struct svc_rqst *);int exp_rootfh (struct net *,struct auth_domain *,char *path,struct knfsd_fh *,int maxsize);__be32 exp_pseudoroot (struct svc_rqst *,struct svc_fh *); -__be32 nfserrno (int errno);static inline void exp_put (struct svc_export *exp) {
fs/nfsd/flexfilelayout.c +1 -0
@@ -15,6 +15,7 @@#include "flexfilelayoutxdr.h" #include "pnfs.h" +#include "vfs.h" #define NFSDDBG_FACILITY NFSDDBG_PNFS
fs/nfsd/nfs4idmap.c +1 -0
@@ -41,6 +41,7 @@#include "idmap.h" #include "nfsd.h" #include "netns.h" +#include "vfs.h" /* * Turn off idmapping when using AUTH_SYS.
fs/nfsd/nfsproc.c +0 -62
65 lines not on this page · raw message
fs/nfsd/vfs.c +63 -0
69 lines not on this page · raw message
fs/nfsd/vfs.h +1 -0
@@ -60,6 +60,7 @@ static inline void nfsd_attrs_free(struct nfsd_attrs *attrs)posix_acl_release (attrs->na_dpacl); } +__be32 nfserrno (int errno);int nfsd_cross_mnt (struct svc_rqst *rqstp,struct dentry **dpp,struct svc_export **expp); __be32 nfsd_lookup(struct svc_rqst *, struct svc_fh *,
Signature · 1 line
2.37.3
Jeff Layton
maintainerPATCH v3 3/3 nfsd: allow disabling NFSv2 at compile time
In reply to Jeff Laytonrpc.nfsd stopped supporting NFSv2 a year ago. Take the next logical step toward deprecating it and allow NFSv2 support to be compiled out.
Add a new CONFIG_NFSD_V2 option that can be turned off and rework the CONFIG_NFSD_V?_ACL option dependencies. Add a description that discourages enabling it.
Also, change the description of CONFIG_NFSD to state that the always-on version is now 3 instead of 2.
Finally, add an #ifdef around "case 2:" in __write_versions. When NFSv2 is disabled at compile time, this should make the kernel ignore attempts to disable it at runtime, but still error out when trying to enable it.
--- fs/nfsd/Kconfig | 19 +++++++++++++++---- fs/nfsd/Makefile | 5 +++-- fs/nfsd/nfsctl.c | 2 ++ fs/nfsd/nfsd.h | 3 +-- fs/nfsd/nfssvc.c | 6 ++++++ 5 files changed, 27 insertions(+), 8 deletions(-)
fs/nfsd/Kconfig +15 -4
@@ -8,6 +8,7 @@ config NFSD select SUNRPC select EXPORTFS select NFS_ACL_SUPPORT if NFSD_V2_ACL + select NFS_ACL_SUPPORT if NFSD_V3_ACL depends on MULTIUSER help Choose Y here if you want to allow other computers to access
@@ -26,19 +27,29 @@ config NFSD Below you can choose which versions of the NFS protocol are available to clients mounting the NFS server on this system. - Support for NFS version 2 (RFC 1094) is always available when + Support for NFS version 3 (RFC 1813) is always available when CONFIG_NFSD is selected. If unsure, say N. -config NFSD_V2_ACL - bool +config NFSD_V2 + bool "NFS server support for NFS version 2 (DEPRECATED)" depends on NFSD + default n + help + NFSv2 (RFC 1094) was the first publicly-released version of NFS. + Unless you are hosting ancient (1990's era) NFS clients, you don't + need this. + + If unsure, say N. + +config NFSD_V2_ACL + bool "NFS server support for the NFSv2 ACL protocol extension" + depends on NFSD_V2 config NFSD_V3_ACL bool "NFS server support for the NFSv3 ACL protocol extension" depends on NFSD - select NFSD_V2_ACL help Solaris NFS servers support an auxiliary NFSv3 ACL protocol that never became an official part of the NFS version 3 protocol.
fs/nfsd/Makefile +3 -2
@@ -10,9 +10,10 @@ obj-$(CONFIG_NFSD) += nfsd.o # this one should be compiled first, as the tracing macros can easily blow up nfsd-y += trace.o -nfsd-y += nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \ - export.o auth.o lockd.o nfscache.o nfsxdr.o \ +nfsd-y += nfssvc.o nfsctl.o nfsfh.o vfs.o \ + export.o auth.o lockd.o nfscache.o \ stats.o filecache.o nfs3proc.o nfs3xdr.o +nfsd-$(CONFIG_NFSD_V2) += nfsproc.o nfsxdr.o nfsd-$(CONFIG_NFSD_V2_ACL) += nfs2acl.o nfsd-$(CONFIG_NFSD_V3_ACL) += nfs3acl.o nfsd-$(CONFIG_NFSD_V4) += nfs4proc.o nfs4xdr.o nfs4state.o nfs4idmap.o \
fs/nfsd/nfsctl.c +2 -0
@@ -581,7 +581,9 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) cmd = sign =='-' ?NFSD_CLEAR :NFSD_SET ;switch (num) { +#ifdef CONFIG_NFSD_V2 case 2 : +#endif case 3 :nfsd_vers (nn, num, cmd);break ;
fs/nfsd/nfsd.h +1 -2
@@ -64,8 +64,7 @@ struct readdir_cd {extern struct svc_program nfsd_program; -extern const struct svc_version nfsd_version2, nfsd_version3, - nfsd_version4; +extern const struct svc_version nfsd_version2, nfsd_version3, nfsd_version4;extern struct mutex nfsd_mutex;extern spinlock_t nfsd_drc_lock;extern unsigned long nfsd_drc_max_mem;
fs/nfsd/nfssvc.c +6 -0
@@ -91,8 +91,12 @@ unsigned long nfsd_drc_mem_used;#if defined(CONFIG_NFSD_V2_ACL ) || defined(CONFIG_NFSD_V3_ACL )static struct svc_stat nfsd_acl_svcstats;static const struct svc_version *nfsd_acl_version[] = { +# if defined(CONFIG_NFSD_V2_ACL) [2 ] = &nfsd_acl_version2, +# endif +# if defined(CONFIG_NFSD_V3_ACL) [3 ] = &nfsd_acl_version3, +# endif };#define NFSD_ACL_MINVERS 2
@@ -116,7 +120,9 @@ static struct svc_stat nfsd_acl_svcstats = {#endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */ static const struct svc_version *nfsd_version[] = { +#if defined(CONFIG_NFSD_V2) [2 ] = &nfsd_version2, +#endif [3 ] = &nfsd_version3, #if defined(CONFIG_NFSD_V4) [4] = &nfsd_version4,
Signature · 1 line
2.37.3
Re: [PATCH v3 3/3] nfsd: allow disabling NFSv2 at compile time
LGTM
Next, to make it a module!
Quoted 141 lines · Jeff Layton
rpc.nfsd stopped supporting NFSv2 a year ago. Take the next logical step toward deprecating it and allow NFSv2 support to be compiled out.
Add a new
CONFIG_NFSD_V2option that can be turned off and rework the CONFIG_NFSD_V?_ACL option dependencies. Add a description that discourages enabling it.Also, change the description of
CONFIG_NFSDto state that the always-on version is now 3 instead of 2.Finally, add an #ifdef around "case 2:" in
__write_versions. When NFSv2 is disabled at compile time, this should make the kernel ignore attempts to disable it at runtime, but still error out when trying to enable it.Signed-off-by Jeff Layton <[email protected]>--- fs/nfsd/Kconfig | 19 +++++++++++++++---- fs/nfsd/Makefile | 5 +++-- fs/nfsd/nfsctl.c | 2 ++ fs/nfsd/nfsd.h | 3 +-- fs/nfsd/nfssvc.c | 6 ++++++ 5 files changed, 27 insertions(+), 8 deletions(-)fs/nfsd/Kconfig +15
-4@@ -8,6 +8,7 @@ config NFSD select SUNRPC select EXPORTFS select NFS_ACL_SUPPORT if NFSD_V2_ACL + select NFS_ACL_SUPPORT if NFSD_V3_ACL depends on MULTIUSER help Choose Y here if you want to allow other computers to access@@ -26,19 +27,29 @@ config NFSD Below you can choose which versions of the NFS protocol are available to clients mounting the NFS server on this system. - Support for NFS version 2 (RFC 1094) is always available when + Support for NFS version 3 (RFC 1813) is always available when CONFIG_NFSD is selected. If unsure, say N. -config NFSD_V2_ACL - bool +config NFSD_V2 + bool "NFS server support for NFS version 2 (DEPRECATED)" depends on NFSD + default n + help + NFSv2 (RFC 1094) was the first publicly-released version of NFS. + Unless you are hosting ancient (1990's era) NFS clients, you don't + need this. + + If unsure, say N. + +config NFSD_V2_ACL + bool "NFS server support for the NFSv2 ACL protocol extension" + depends on NFSD_V2 config NFSD_V3_ACL bool "NFS server support for the NFSv3 ACL protocol extension" depends on NFSD - select NFSD_V2_ACL help Solaris NFS servers support an auxiliary NFSv3 ACL protocol that never became an official part of the NFS version 3 protocol.fs/nfsd/Makefile +3
-2@@ -10,9 +10,10 @@ obj-$(CONFIG_NFSD) += nfsd.o # this one should be compiled first, as the tracing macros can easily blow up nfsd-y += trace.o -nfsd-y += nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \ - export.o auth.o lockd.o nfscache.o nfsxdr.o \ +nfsd-y += nfssvc.o nfsctl.o nfsfh.o vfs.o \ + export.o auth.o lockd.o nfscache.o \ stats.o filecache.o nfs3proc.o nfs3xdr.o +nfsd-$(CONFIG_NFSD_V2) += nfsproc.o nfsxdr.o nfsd-$(CONFIG_NFSD_V2_ACL) += nfs2acl.o nfsd-$(CONFIG_NFSD_V3_ACL) += nfs3acl.o nfsd-$(CONFIG_NFSD_V4) += nfs4proc.o nfs4xdr.o nfs4state.o nfs4idmap.o \fs/nfsd/nfsctl.c +2
-0@@ -581,7 +581,9 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) cmd = sign =='-' ?NFSD_CLEAR :NFSD_SET ;switch (num) { +#ifdef CONFIG_NFSD_V2 case 2 : +#endif case 3 :nfsd_vers (nn, num, cmd);break ;fs/nfsd/nfsd.h +1
-2@@ -64,8 +64,7 @@ struct readdir_cd {extern struct svc_program nfsd_program; -extern const struct svc_version nfsd_version2, nfsd_version3, - nfsd_version4; +extern const struct svc_version nfsd_version2, nfsd_version3, nfsd_version4;extern struct mutex nfsd_mutex;extern spinlock_t nfsd_drc_lock;extern unsigned long nfsd_drc_max_mem;fs/nfsd/nfssvc.c +6
-0@@ -91,8 +91,12 @@ unsigned long nfsd_drc_mem_used;#if defined(CONFIG_NFSD_V2_ACL ) || defined(CONFIG_NFSD_V3_ACL )static struct svc_stat nfsd_acl_svcstats;static const struct svc_version *nfsd_acl_version[] = { +# if defined(CONFIG_NFSD_V2_ACL) [2 ] = &nfsd_acl_version2, +# endif +# if defined(CONFIG_NFSD_V3_ACL) [3 ] = &nfsd_acl_version3, +# endif };#define NFSD_ACL_MINVERS 2@@ -116,7 +120,9 @@ static struct svc_stat nfsd_acl_svcstats = {#endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */ static const struct svc_version *nfsd_version[] = { +#if defined(CONFIG_NFSD_V2) [2 ] = &nfsd_version2, +#endif [3 ] = &nfsd_version3, #if defined(CONFIG_NFSD_V4) [4] = &nfsd_version4,
Jeff Layton
maintainerRe: [PATCH v3 3/3] nfsd: allow disabling NFSv2 at compile time
Quoted 6 lines · Tom Talpey
LGTM
Reviewed-by Tom Talpey <[email protected]>Next, to make it a module!
We could, but I'm not sure it's worthwhile. We'd need to export about 15 symbols from nfsd.ko. Personally I'd rather see it just go away eventually.
Quoted 142 lines · Jeff Layton
Quoted 141 lines
rpc.nfsd stopped supporting NFSv2 a year ago. Take the next logical step toward deprecating it and allow NFSv2 support to be compiled out.
Add a new
CONFIG_NFSD_V2option that can be turned off and rework the CONFIG_NFSD_V?_ACL option dependencies. Add a description that discourages enabling it.Also, change the description of
CONFIG_NFSDto state that the always-on version is now 3 instead of 2.Finally, add an #ifdef around "case 2:" in
__write_versions. When NFSv2 is disabled at compile time, this should make the kernel ignore attempts to disable it at runtime, but still error out when trying to enable it.Signed-off-by Jeff Layton <[email protected]>--- fs/nfsd/Kconfig | 19 +++++++++++++++---- fs/nfsd/Makefile | 5 +++-- fs/nfsd/nfsctl.c | 2 ++ fs/nfsd/nfsd.h | 3 +-- fs/nfsd/nfssvc.c | 6 ++++++ 5 files changed, 27 insertions(+), 8 deletions(-)fs/nfsd/Kconfig +15
-4@@ -8,6 +8,7 @@ config NFSD select SUNRPC select EXPORTFS select NFS_ACL_SUPPORT if NFSD_V2_ACL + select NFS_ACL_SUPPORT if NFSD_V3_ACL depends on MULTIUSER help Choose Y here if you want to allow other computers to access@@ -26,19 +27,29 @@ config NFSD Below you can choose which versions of the NFS protocol are available to clients mounting the NFS server on this system. - Support for NFS version 2 (RFC 1094) is always available when + Support for NFS version 3 (RFC 1813) is always available when CONFIG_NFSD is selected. If unsure, say N. -config NFSD_V2_ACL - bool +config NFSD_V2 + bool "NFS server support for NFS version 2 (DEPRECATED)" depends on NFSD + default n + help + NFSv2 (RFC 1094) was the first publicly-released version of NFS. + Unless you are hosting ancient (1990's era) NFS clients, you don't + need this. + + If unsure, say N. + +config NFSD_V2_ACL + bool "NFS server support for the NFSv2 ACL protocol extension" + depends on NFSD_V2 config NFSD_V3_ACL bool "NFS server support for the NFSv3 ACL protocol extension" depends on NFSD - select NFSD_V2_ACL help Solaris NFS servers support an auxiliary NFSv3 ACL protocol that never became an official part of the NFS version 3 protocol.fs/nfsd/Makefile +3
-2@@ -10,9 +10,10 @@ obj-$(CONFIG_NFSD) += nfsd.o # this one should be compiled first, as the tracing macros can easily blow up nfsd-y += trace.o -nfsd-y += nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \ - export.o auth.o lockd.o nfscache.o nfsxdr.o \ +nfsd-y += nfssvc.o nfsctl.o nfsfh.o vfs.o \ + export.o auth.o lockd.o nfscache.o \ stats.o filecache.o nfs3proc.o nfs3xdr.o +nfsd-$(CONFIG_NFSD_V2) += nfsproc.o nfsxdr.o nfsd-$(CONFIG_NFSD_V2_ACL) += nfs2acl.o nfsd-$(CONFIG_NFSD_V3_ACL) += nfs3acl.o nfsd-$(CONFIG_NFSD_V4) += nfs4proc.o nfs4xdr.o nfs4state.o nfs4idmap.o \fs/nfsd/nfsctl.c +2
-0@@ -581,7 +581,9 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) cmd = sign =='-' ?NFSD_CLEAR :NFSD_SET ;switch (num) { +#ifdef CONFIG_NFSD_V2 case 2 : +#endif case 3 :nfsd_vers (nn, num, cmd);break ;fs/nfsd/nfsd.h +1
-2@@ -64,8 +64,7 @@ struct readdir_cd {extern struct svc_program nfsd_program; -extern const struct svc_version nfsd_version2, nfsd_version3, - nfsd_version4; +extern const struct svc_version nfsd_version2, nfsd_version3, nfsd_version4;extern struct mutex nfsd_mutex;extern spinlock_t nfsd_drc_lock;extern unsigned long nfsd_drc_max_mem;fs/nfsd/nfssvc.c +6
-0@@ -91,8 +91,12 @@ unsigned long nfsd_drc_mem_used;#if defined(CONFIG_NFSD_V2_ACL ) || defined(CONFIG_NFSD_V3_ACL )static struct svc_stat nfsd_acl_svcstats;static const struct svc_version *nfsd_acl_version[] = { +# if defined(CONFIG_NFSD_V2_ACL) [2 ] = &nfsd_acl_version2, +# endif +# if defined(CONFIG_NFSD_V3_ACL) [3 ] = &nfsd_acl_version3, +# endif };#define NFSD_ACL_MINVERS 2@@ -116,7 +120,9 @@ static struct svc_stat nfsd_acl_svcstats = {#endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */ static const struct svc_version *nfsd_version[] = { +#if defined(CONFIG_NFSD_V2) [2 ] = &nfsd_version2, +#endif [3 ] = &nfsd_version3, #if defined(CONFIG_NFSD_V4) [4] = &nfsd_version4,
Signature · 1 line
Jeff Layton <[email protected]>
Stylistically, I think this needs a "break;", but otherwise
Quoted 25 lines · Jeff Layton
The kernel currently errors out if you attempt to enable or disable a version that it doesn't recognize. Change it to ignore attempts to disable an unrecognized version. If we don't support it, then there is no harm in doing so.
Signed-off-by Jeff Layton <[email protected]>--- fs/nfsd/nfsctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/nfsd/nfsctl.c +3
-1@@ -601,7 +601,9 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) }break ;default : -return -EINVAL ; +/* Ignore requests to disable non-existent versions */ +if (cmd ==NFSD_SET ) +return -EINVAL ; } vers += len +1 ; }while ((len =qword_get (&mesg, vers, size)) >0 );