NFSV4 IPV6 server support
Subsystems (4)
PATCH 1/2 NFSV4 IPV6 server support
That's the Chuck Lever's patch series that adds rpcbind v4 support to svc_register()
I have tested on 2.6.27-rc3.
---
Chuck Lever (7):
SUNRPC: Support IPv6 when registering kernel RPC services
SUNRPC: Split portmap unregister API into separate function
SUNRPC: Simplify rpcb_register() API
SUNRPC: Use proper INADDR_ANY when setting up RPC services on IPv6
SUNRPC: Set V6ONLY socket option for RPC listener sockets
SUNRPC: Add address family field to svc_serv data structure
NFS: nfs_parsed_mount_options can use unsigned int
---
fs/Kconfig | 22 +++++ fs/lockd/svc.c | 2 fs/nfs/callback.c | 3 fs/nfs/internal.h | 8 +- fs/nfsd/nfssvc.c | 3 include/linux/sunrpc/clnt.h | 4 - include/linux/sunrpc/svc.h | 15 ++- net/sunrpc/rpcb_clnt.c | 65 +++++++--------- net/sunrpc/svc.c | 175 ++++++++++++++++++++++++++++++++++++-------- net/sunrpc/svc_xprt.c | 37 +++++++-- net/sunrpc/svcsock.c | 13 +++ 11 files changed, 260 insertions(+), 87 deletions(-)
fs/Kconfig +22 -0
@@ -1765,6 +1765,28 @@ If unsure, say N. +config SUNRPC_REGISTER_V4 + bool "Register local RPC services via rpcbind v4 (EXPERIMENTAL)" + depends on SUNRPC && EXPERIMENTAL + default n + help + Sun added support for registering RPC services at an IPv6 + address by creating two new versions of the rpcbind protocol + (RFC 1833). + + This option enables support in the kernel RPC server for + registering kernel RPC services via version 4 of the rpcbind + protocol. If you enable this option, you must run a portmapper + daemon that supports rpcbind protocol version 4. + + Serving NFS over IPv6 from knfsd (the kernel's NFS server) + requires that you enable this option and use a portmapper that + supports rpcbind version 4. + + If unsure, say N to get traditional behavior (register kernel + RPC services using only rpcbind version 2). Distributions + using the legacy Linux portmapper daemon must say N here. + config RPCSEC_GSS_KRB5 tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)" depends on SUNRPC && EXPERIMENTAL
fs/lockd/svc.c +1 -1
@@ -266,7 +266,7 @@ "lockd_up: no pid, %d users??\n", nlmsvc_users); error = -ENOMEM ; - serv =svc_create (&nlmsvc_program,LOCKD_BUFSIZE ,NULL ); + serv =svc_create (&nlmsvc_program,LOCKD_BUFSIZE ,AF_INET ,NULL );if (!serv) {printk (KERN_WARNING "lockd_up: create service failed\n" ); goto out;
fs/nfs/callback.c +2 -1
@@ -105,7 +105,8 @@mutex_lock (&nfs_callback_mutex);if (nfs_callback_info.users++ || nfs_callback_info.task !=NULL ) goto out; - serv =svc_create (&nfs4_callback_program,NFS4_CALLBACK_BUFSIZE ,NULL ); + serv =svc_create (&nfs4_callback_program,NFS4_CALLBACK_BUFSIZE , +AF_INET ,NULL ); ret = -ENOMEM ;if (!serv) goto out_err;
fs/nfs/internal.h +4 -4
@@ -32,11 +32,11 @@*/ struct nfs_parsed_mount_data {int flags; -int rsize, wsize; -int timeo, retrans; -int acregmin, acregmax, +unsigned int rsize, wsize; +unsigned int timeo, retrans; +unsigned int acregmin, acregmax, acdirmin, acdirmax; -int namlen; +unsigned int namlen;unsigned int bsize;unsigned int auth_flavor_len;rpc_authflavor_t auth_flavors[1 ];
fs/nfsd/nfssvc.c +2 -1
@@ -229,7 +229,8 @@atomic_set (&nfsd_busy,0 ); nfsd_serv =svc_create_pooled (&nfsd_program, nfsd_max_blksize, - nfsd_last_thread, nfsd,THIS_MODULE ); +AF_INET , nfsd_last_thread, + nfsd,THIS_MODULE );if (nfsd_serv ==NULL ) err = -ENOMEM ;
include/linux/sunrpc/clnt.h +2 -2
@@ -124,10 +124,10 @@void rpc_shutdown_client (struct rpc_clnt *);void rpc_release_client (struct rpc_clnt *); -int rpcb_register (u32 ,u32 ,int ,unsigned short ,int *); +int rpcb_register (u32 ,u32 ,int ,unsigned short );int rpcb_v4_register (const u32 program,const u32 version,const struct sockaddr *address, -const char *netid,int *result); +const char *netid);int rpcb_getport_sync (struct sockaddr_in *,u32 ,u32 ,int );void rpcb_getport_async (struct rpc_task *);
include/linux/sunrpc/svc.h +10 -5
@@ -66,6 +66,7 @@struct list_head sv_tempsocks;/* all temporary sockets */ int sv_tmpcnt;/* count of temporary sockets */ struct timer_list sv_temptimer;/* timer for aging temporary sockets */ +sa_family_t sv_family;/* listener's address family */ char * sv_name;/* service name */
@@ -381,18 +382,22 @@/* * Function prototypes. */ -struct svc_serv *svc_create (struct svc_program *,unsigned int , -void (*shutdown)(struct svc_serv *)); +struct svc_serv *svc_create (struct svc_program *,unsigned int , +const sa_family_t , +void (*shutdown)(struct svc_serv *));struct svc_rqst *svc_prepare_thread (struct svc_serv *serv,struct svc_pool *pool);void svc_exit_thread (struct svc_rqst *);struct svc_serv *svc_create_pooled (struct svc_program *,unsigned int , -void (*shutdown)(struct svc_serv *),svc_thread_fn , -struct module *); +const sa_family_t , +void (*shutdown)(struct svc_serv *), +svc_thread_fn ,struct module *);int svc_set_num_threads (struct svc_serv *,struct svc_pool *,int );void svc_destroy (struct svc_serv *);int svc_process (struct svc_rqst *); -int svc_register (struct svc_serv *,int ,unsigned short ); +int svc_register (const struct svc_serv *,const unsigned short , +const unsigned short ); +void svc_wake_up (struct svc_serv *);void svc_reserve (struct svc_rqst *rqstp,int space);struct svc_pool *svc_pool_for_cpu (struct svc_serv *serv,int cpu);
net/sunrpc/rpcb_clnt.c +28 -37
151 lines not on this page · raw message
net/sunrpc/svc.c +146 -29
255 lines not on this page · raw message
net/sunrpc/svcsock.c +13 -0
@@ -1114,6 +1114,7 @@struct svc_sock *svsk;struct sock *inet;int pmap_register = !(flags &SVC_SOCK_ANONYMOUS ); +int val;dprintk ("svc: svc_setup_socket %p\n" , sock);if (!(svsk =kzalloc (sizeof (*svsk),GFP_KERNEL ))) {
@@ -1146,6 +1147,18 @@else svc_tcp_init (svsk, serv); +/* +* We start one listener per sv_serv. We want AF_INET +* requests to be automatically shunted to our AF_INET6 +* listener using a mapped IPv4 address. Make sure +* no-one starts an equivalent IPv4 listener, which +* would steal our incoming connections. +*/ + val =0 ; +if (serv->sv_family ==AF_INET6 ) +kernel_setsockopt (sock,SOL_IPV6 ,IPV6_V6ONLY , + (char *)&val,sizeof (val)); +dprintk ("svc: svc_setup_socket created %p (inet %p)\n" , svsk, svsk->sk_sk);
net/sunrpc/svc_xprt.c +30 -7
@@ -159,16 +159,41 @@ }EXPORT_SYMBOL_GPL (svc_xprt_init); -int svc_create_xprt (struct svc_serv *serv,char *xprt_name,unsigned short port, -int flags) +static struct svc_xprt *__svc_xpo_create (struct svc_xprt_class *xcl, +struct svc_serv *serv, +unsigned short port,int flags) { -struct svc_xprt_class *xcl;struct sockaddr_in sin = { .sin_family =AF_INET , .sin_addr.s_addr =htonl (INADDR_ANY ), .sin_port =htons (port), }; -dprintk ("svc: creating transport %s[%d]\n" , xprt_name, port); +struct sockaddr_in6 sin6 = { + .sin6_family =AF_INET6 , + .sin6_addr =IN6ADDR_ANY_INIT , + .sin6_port =htons (port), + }; + +switch (serv->sv_family) { +case AF_INET : +return xcl->xcl_ops->xpo_create (serv, + (struct sockaddr *)&sin, +sizeof (sin), flags); +case AF_INET6 : +return xcl->xcl_ops->xpo_create (serv, + (struct sockaddr *)&sin6, +sizeof (sin6), flags); + } + +return ERR_PTR (-EAFNOSUPPORT ); +} + +int svc_create_xprt (struct svc_serv *serv,char *xprt_name,unsigned short port, +int flags) +{ +struct svc_xprt_class *xcl; + +dprintk ("svc: creating transport %s[%u]\n" , xprt_name, port);spin_lock (&svc_xprt_class_lock);list_for_each_entry (xcl, &svc_xprt_class_list, xcl_list) {struct svc_xprt *newxprt;
@@ -180,9 +205,7 @@ goto err;spin_unlock (&svc_xprt_class_lock); - newxprt = xcl->xcl_ops-> -xpo_create (serv, (struct sockaddr *)&sin,sizeof (sin), - flags); + newxprt =__svc_xpo_create (xcl, serv, port, flags);if (IS_ERR (newxprt)) {module_put (xcl->xcl_owner);return PTR_ERR (newxprt);
Signature · 8 lines
----------------------------------------------------------------- Company : Bull, Architect of an Open World TM (www.bull.com) Name : Aime Le Rouzic Mail : Bull - BP 208 - 38432 Echirolles Cedex - France E-Mail : [email protected] Phone : 33 (4) 76.29.75.51 Fax : 33 (4) 76.29.75.18 -----------------------------------------------------------------