Skip to contentSkip to conversation

NFS v4.2 support to both the server and client (take 3)

PATCH In review Steve Dickson 2 participants 5 messages Feb 22, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover NFS v4.2 support to both the server and client (take 3)

Changes:
* fixed typo in Kconfig

These patches add v4.2 support to both the server and client. The v4.1 code is reused to support this new version. Main reason for this new version is to enable features like Label NFS.

Note, these patches apply on top of the lNFS: 3.8-rc3 release patches. Although the only conflict, if applied without those patches, would be in the Kconfig files

Steve Dickson (2):
NFSv4.2: Added NFS v4.2 support to the NFS client NFSDv4.2: Added NFS v4.2 support to the NFS server

 fs/nfs/Kconfig       | 12 +++++++++++-
 fs/nfs/callback.c    |  3 +++
 fs/nfs/nfs4client.c  |  5 +++++
 fs/nfs/nfs4proc.c    |  3 +++
 fs/nfs/super.c       |  7 ++++++-
 fs/nfsd/nfs4xdr.c    |  1 +
 fs/nfsd/nfsd.h       |  2 +-
 include/linux/nfs4.h |  4 ++++
 8 files changed, 34 insertions(+), 3 deletions(-)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/2 NFSv4.2: Added NFS v4.2 support to the NFS client

This enable NFSv4.2 support. To enable this code the CONFIG_NFS_V4_2 Kconfig define needs to be set and the -o v4.2 mount option need to be used.

---
 fs/nfs/Kconfig       | 12 +++++++++++-
 fs/nfs/callback.c    |  3 +++
 fs/nfs/nfs4client.c  |  5 +++++
 fs/nfs/nfs4proc.c    |  3 +++
 fs/nfs/super.c       |  7 ++++++-
 include/linux/nfs4.h |  4 ++++
 6 files changed, 32 insertions(+), 2 deletions(-)
fs/nfs/Kconfig +11 -1
index 3861a1f..4190710 100644
@@ -104,6 +104,16 @@ config NFS_V4_1
 
 	  If unsure, say N.
 
+config NFS_V4_2
+	bool "NFS client support for NFSv4.2"
+	depends on NFS_V4_1
+	select NFS_V4_SECURITY_LABEL
+	help
+	  This option enables support for minor version 2 of the NFSv4 protocol
+	  in the kernel's NFS client.
+
+	  If unsure, say N.
+
 config PNFS_FILE_LAYOUT
 	tristate
 	depends on NFS_V4_1
@@ -133,7 +143,7 @@ config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
 
 config NFS_V4_SECURITY_LABEL
 	bool "Provide Security Label support for NFSv4 client"
-	depends on NFS_V4 && SECURITY
+	depends on NFS_V4_2 && SECURITY
 	help
 
 	Say Y here if you want enable fine-grained security label attribute
fs/nfs/callback.c +3 -0
index 5088b57..4058ec8 100644
@@ -281,6 +281,9 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n
 		case 1:
 			ret = nfs41_callback_up_net(serv, net);
 			break;
+		case 2:
+			ret = nfs41_callback_up_net(serv, net);
+			break;
 		default:
 			printk(KERN_ERR "NFS: unknown callback version: %d\n",
 					minorversion);
fs/nfs/nfs4client.c +5 -0
index 2e9779b..2987fd6 100644
@@ -66,6 +66,11 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)
 	if (err)
 		goto error;
 
+	if (cl_init->minorversion > NFS4_MAX_MINOR_VERSION) {
+		err = -EINVAL;
+		goto error;
+	}
+		
 	spin_lock_init(&clp->cl_lock);
 	INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state);
 	rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");
fs/nfs/nfs4proc.c +3 -0
index 30b3e44..2384f91 100644
@@ -7136,6 +7136,9 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {
 #if defined(CONFIG_NFS_V4_1)
 	[1] = &nfs_v4_1_minor_ops,
 #endif
+#if defined(CONFIG_NFS_V4_2)
+	[2] = &nfs_v4_1_minor_ops,
+#endif
 };
 
 const struct inode_operations nfs4_dir_inode_operations = {
fs/nfs/super.c +6 -1
index 4e78f93..d35582c 100644
@@ -269,7 +269,7 @@ static match_table_t nfs_local_lock_tokens = {
 
 enum {
 	Opt_vers_2, Opt_vers_3, Opt_vers_4, Opt_vers_4_0,
-	Opt_vers_4_1,
+	Opt_vers_4_1, Opt_vers_4_2,
 
 	Opt_vers_err
 };
@@ -280,6 +280,7 @@ static match_table_t nfs_vers_tokens = {
 	{ Opt_vers_4, "4" },
 	{ Opt_vers_4_0, "4.0" },
 	{ Opt_vers_4_1, "4.1" },
+	{ Opt_vers_4_2, "4.2" },
 
 	{ Opt_vers_err, NULL }
 };
@@ -1143,6 +1144,10 @@ static int nfs_parse_version_string(char *string,
 		mnt->version = 4;
 		mnt->minorversion = 1;
 		break;
+	case Opt_vers_4_2:
+		mnt->version = 4;
+		mnt->minorversion = 2;
+		break;
 	default:
 		return 0;
 	}
include/linux/nfs4.h +4 -0
index aab8bd8..e9c040a 100644
@@ -394,11 +394,15 @@ enum lock_type4 {
 #define NFS4_VERSION 4
 #define NFS4_MINOR_VERSION 0
 
+#if defined(CONFIG_NFS_V4_2)
+#define NFS4_MAX_MINOR_VERSION 2
+#else
 #if defined(CONFIG_NFS_V4_1)
 #define NFS4_MAX_MINOR_VERSION 1
 #else
 #define NFS4_MAX_MINOR_VERSION 0
 #endif /* CONFIG_NFS_V4_1 */
+#endif /* CONFIG_NFS_V4_2 */
 
 #define NFS4_DEBUG 1
 
Signature · 1 line
1.8.1.2
#2 lore raw

Re: [PATCH 1/2] NFSv4.2: Added NFS v4.2 support to the NFS client

Quoted 19 lines · Steve Dickson

This enable NFSv4.2 support. To enable this code the CONFIG_NFS_V4_2 Kconfig define needs to be set and the -o v4.2 mount option need to be used.

---
 fs/nfs/Kconfig       | 12 +++++++++++-
 fs/nfs/callback.c    |  3 +++
 fs/nfs/nfs4client.c  |  5 +++++
 fs/nfs/nfs4proc.c    |  3 +++
 fs/nfs/super.c       |  7 ++++++-
 include/linux/nfs4.h |  4 ++++
 6 files changed, 32 insertions(+), 2 deletions(-)
fs/nfs/Kconfig +0 -0
index 3861a1f..4190710 100644

fs/nfs/Kconfig config NFS_V4_1 · line 113

Quoted 10 lines
fs/nfs/Kconfig +7 -0
@@ -104,6 +104,16 @@ config NFS_V4_1
 
 	  If unsure, say N.
 
+config NFS_V4_2
+	bool "NFS client support for NFSv4.2"
+	depends on NFS_V4_1
+	select NFS_V4_SECURITY_LABEL
+	help
+	  This option enables support for minor version 2 of the NFSv4 protocol
+	  in the kernel's NFS client.

+ Say Y here if you want enable fine-grained security label attributes

fs/nfs/Kconfig config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN · line 147

Quoted 13 lines
fs/nfs/Kconfig +4 -1
+
+	  If unsure, say N.
+
 config PNFS_FILE_LAYOUT
 	tristate
 	depends on NFS_V4_1
@@ -133,7 +143,7 @@ config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
 
 config NFS_V4_SECURITY_LABEL
 	bool "Provide Security Label support for NFSv4 client"
-	depends on NFS_V4 && SECURITY
+	depends on NFS_V4_2 && SECURITY
 	help

You don't need the above select at all above if you change this to

config NFS_V4_SECURITY_LABEL

	bool
	depends on NFS_V4_2 && SECURITY
	default y

fs/nfs/callback.c static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n · line 284

Quoted 10 lines
fs/nfs/callback.c +1 -0
index 5088b57..4058ec8 100644
@@ -281,6 +281,9 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n
 		case 1:
 			ret = nfs41_callback_up_net(serv, net);
 			break;
+		case 2:

Since this is identical to case 1:, they should be merged.

Quoted 87 lines
fs/nfs/callback.c +2 -0
+			ret = nfs41_callback_up_net(serv, net);
+			break;
 		default:
 			printk(KERN_ERR "NFS: unknown callback version: %d\n",
 					minorversion);
fs/nfs/nfs4client.c +5 -0
index 2e9779b..2987fd6 100644
@@ -66,6 +66,11 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)
 	if (err)
 		goto error;
 
+	if (cl_init->minorversion > NFS4_MAX_MINOR_VERSION) {
+		err = -EINVAL;
+		goto error;
+	}
+		
 	spin_lock_init(&clp->cl_lock);
 	INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state);
 	rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");
fs/nfs/nfs4proc.c +3 -0
index 30b3e44..2384f91 100644
@@ -7136,6 +7136,9 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {
 #if defined(CONFIG_NFS_V4_1)
 	[1] = &nfs_v4_1_minor_ops,
 #endif
+#if defined(CONFIG_NFS_V4_2)
+	[2] = &nfs_v4_1_minor_ops,
+#endif
 };
 
 const struct inode_operations nfs4_dir_inode_operations = {
fs/nfs/super.c +6 -1
index 4e78f93..d35582c 100644
@@ -269,7 +269,7 @@ static match_table_t nfs_local_lock_tokens = {
 
 enum {
 	Opt_vers_2, Opt_vers_3, Opt_vers_4, Opt_vers_4_0,
-	Opt_vers_4_1,
+	Opt_vers_4_1, Opt_vers_4_2,
 
 	Opt_vers_err
 };
@@ -280,6 +280,7 @@ static match_table_t nfs_vers_tokens = {
 	{ Opt_vers_4, "4" },
 	{ Opt_vers_4_0, "4.0" },
 	{ Opt_vers_4_1, "4.1" },
+	{ Opt_vers_4_2, "4.2" },
 
 	{ Opt_vers_err, NULL }
 };
@@ -1143,6 +1144,10 @@ static int nfs_parse_version_string(char *string,
 		mnt->version = 4;
 		mnt->minorversion = 1;
 		break;
+	case Opt_vers_4_2:
+		mnt->version = 4;
+		mnt->minorversion = 2;
+		break;
 	default:
 		return 0;
 	}
include/linux/nfs4.h +4 -0
index aab8bd8..e9c040a 100644
@@ -394,11 +394,15 @@ enum lock_type4 {
 #define NFS4_VERSION 4
 #define NFS4_MINOR_VERSION 0
 
+#if defined(CONFIG_NFS_V4_2)
+#define NFS4_MAX_MINOR_VERSION 2
+#else
 #if defined(CONFIG_NFS_V4_1)
 #define NFS4_MAX_MINOR_VERSION 1
 #else
 #define NFS4_MAX_MINOR_VERSION 0
 #endif /* CONFIG_NFS_V4_1 */
+#endif /* CONFIG_NFS_V4_2 */
 
 #define NFS4_DEBUG 1
 
Signature · 6 lines
Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com
#4 lore raw

PATCH 2/2 NFSDv4.2: Added NFS v4.2 support to the NFS server

In reply to Steve Dickson

This enable NFSv4.2 support for the server. To enable this code do the following:
echo "+4.2" >/proc/fs/nfsd/versions

after the nfsd kernel module is loaded.

---
 fs/nfsd/nfs4xdr.c | 1 +
 fs/nfsd/nfsd.h    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
fs/nfsd/nfs4xdr.c +1 -0
index d2ae8db..86be853 100644
@@ -1621,6 +1621,7 @@ struct nfsd4_minorversion_ops {
 static struct nfsd4_minorversion_ops nfsd4_minorversion[] = {
 	[0] = { nfsd4_dec_ops, ARRAY_SIZE(nfsd4_dec_ops) },
 	[1] = { nfsd41_dec_ops, ARRAY_SIZE(nfsd41_dec_ops) },
+	[2] = { nfsd41_dec_ops, ARRAY_SIZE(nfsd41_dec_ops) },
 };
 
 static __be32
fs/nfsd/nfsd.h +1 -1
index 26a457b..0e3ccd1 100644
@@ -24,7 +24,7 @@
 /*
  * nfsd version
  */
-#define NFSD_SUPPORTED_MINOR_VERSION	1
+#define NFSD_SUPPORTED_MINOR_VERSION	2
 /*
  * Maximum blocksizes supported by daemon under various circumstances.
  */
Signature · 1 line
1.8.1.2
#3 lore raw

Re: [PATCH 1/2] NFSv4.2: Added NFS v4.2 support to the NFS client

In reply to Myklebust, Trond
Quoted 31 lines · Trond
Quoted 29 lines · Steve Dickson

This enable NFSv4.2 support. To enable this code the CONFIG_NFS_V4_2 Kconfig define needs to be set and the -o v4.2 mount option need to be used.

---
 fs/nfs/Kconfig       | 12 +++++++++++-
 fs/nfs/callback.c    |  3 +++
 fs/nfs/nfs4client.c  |  5 +++++
 fs/nfs/nfs4proc.c    |  3 +++
 fs/nfs/super.c       |  7 ++++++-
 include/linux/nfs4.h |  4 ++++
 6 files changed, 32 insertions(+), 2 deletions(-)
fs/nfs/Kconfig +7 -0
index 3861a1f..4190710 100644
@@ -104,6 +104,16 @@ config NFS_V4_1
 
 	  If unsure, say N.
 
+config NFS_V4_2
+	bool "NFS client support for NFSv4.2"
+	depends on NFS_V4_1
+	select NFS_V4_SECURITY_LABEL
+	help
+	  This option enables support for minor version 2 of the NFSv4 protocol
+	  in the kernel's NFS client.

Review

Quoted 1 line
(quoted diff) +1 -0
+	Say Y here if you want enable fine-grained security label attributes

Ok...

Quoted 17 lines
Quoted 8 lines
fs/nfs/Kconfig +3 -0
+
+	  If unsure, say N.
+
 config PNFS_FILE_LAYOUT
 	tristate
 	depends on NFS_V4_1

fs/nfs/Kconfig config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN · line 147

Quoted 6 lines
fs/nfs/Kconfig +1 -1
@@ -133,7 +143,7 @@ config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
 
 config NFS_V4_SECURITY_LABEL
 	bool "Provide Security Label support for NFSv4 client"
-	depends on NFS_V4 && SECURITY
+	depends on NFS_V4_2 && SECURITY
 	help

You don't need the above select at all above if you change this to

Quoted 4 lines

config NFS_V4_SECURITY_LABEL

	bool
	depends on NFS_V4_2 && SECURITY
	default y

Fine...

Quoted 14 lines

fs/nfs/callback.c static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n · line 284

Quoted 11 lines
fs/nfs/callback.c +1 -0
index 5088b57..4058ec8 100644
@@ -281,6 +281,9 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n
 		case 1:
 			ret = nfs41_callback_up_net(serv, net);
 			break;
+		case 2:

Since this is identical to case 1:, they should be merged.

I guess wrong on how you wanted this handled... ;-)

steved.

Quoted 89 lines
Quoted 88 lines
fs/nfs/callback.c +2 -0
+			ret = nfs41_callback_up_net(serv, net);
+			break;
 		default:
 			printk(KERN_ERR "NFS: unknown callback version: %d\n",
 					minorversion);
fs/nfs/nfs4client.c +5 -0
index 2e9779b..2987fd6 100644
@@ -66,6 +66,11 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)
 	if (err)
 		goto error;
 
+	if (cl_init->minorversion > NFS4_MAX_MINOR_VERSION) {
+		err = -EINVAL;
+		goto error;
+	}
+		
 	spin_lock_init(&clp->cl_lock);
 	INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state);
 	rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");
fs/nfs/nfs4proc.c +3 -0
index 30b3e44..2384f91 100644
@@ -7136,6 +7136,9 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {
 #if defined(CONFIG_NFS_V4_1)
 	[1] = &nfs_v4_1_minor_ops,
 #endif
+#if defined(CONFIG_NFS_V4_2)
+	[2] = &nfs_v4_1_minor_ops,
+#endif
 };
 
 const struct inode_operations nfs4_dir_inode_operations = {
fs/nfs/super.c +6 -1
index 4e78f93..d35582c 100644
@@ -269,7 +269,7 @@ static match_table_t nfs_local_lock_tokens = {
 
 enum {
 	Opt_vers_2, Opt_vers_3, Opt_vers_4, Opt_vers_4_0,
-	Opt_vers_4_1,
+	Opt_vers_4_1, Opt_vers_4_2,
 
 	Opt_vers_err
 };
@@ -280,6 +280,7 @@ static match_table_t nfs_vers_tokens = {
 	{ Opt_vers_4, "4" },
 	{ Opt_vers_4_0, "4.0" },
 	{ Opt_vers_4_1, "4.1" },
+	{ Opt_vers_4_2, "4.2" },
 
 	{ Opt_vers_err, NULL }
 };
@@ -1143,6 +1144,10 @@ static int nfs_parse_version_string(char *string,
 		mnt->version = 4;
 		mnt->minorversion = 1;
 		break;
+	case Opt_vers_4_2:
+		mnt->version = 4;
+		mnt->minorversion = 2;
+		break;
 	default:
 		return 0;
 	}
include/linux/nfs4.h +4 -0
index aab8bd8..e9c040a 100644
@@ -394,11 +394,15 @@ enum lock_type4 {
 #define NFS4_VERSION 4
 #define NFS4_MINOR_VERSION 0
 
+#if defined(CONFIG_NFS_V4_2)
+#define NFS4_MAX_MINOR_VERSION 2
+#else
 #if defined(CONFIG_NFS_V4_1)
 #define NFS4_MAX_MINOR_VERSION 1
 #else
 #define NFS4_MAX_MINOR_VERSION 0
 #endif /* CONFIG_NFS_V4_1 */
+#endif /* CONFIG_NFS_V4_2 */
 
 #define NFS4_DEBUG 1