nfs server patches for 2.6.25
Subsystems (5)
Below is a summary of the nfs server patches which I expect to submit (any day now) for 2.6.25; please let me know if you notice anything wrong or missing. I'll follow up to [email protected] with the full list of patches.
The biggest changes come from Tom Tucker's rdma and server transport switch patches, which Chuck Lever, Greg Banks, Neil Brown, and others helped review (thanks!). The rest is mostly bug fixes and cleanup.
As a reminder, you can see the patches I've got queued up any time from the nfs-server-stable branch at:
git://linux-nfs.org/~bfields/linux.git nfs-server-stable
--b.
Chuck Lever (9):
SUNRPC: Prevent length underflow in read_flush()
SUNRPC: Use unsigned string lengths in xdr_decode_string_inplace
NLM: Fix sign of length of NLM variable length strings
NFSD: Use unsigned length argument for decode_filename
NFSD: File name length signage in nfsd request argument structures
NFSD: Adjust filename length argument of nfsd_lookup
NFSD: Use unsigned length argument for decode_pathname
NFSD: Fix mixed sign comparison in nfs3svc_decode_symlinkargs
NFSD: Path name length signage in nfsd request argument structures
Frank Filz (1):
nfsd: Allow AIX client to read dir containing mountpoints
J. Bruce Fields (34):
nfsd4: probe callback channel only once
nfsd: move callback rpc_client creation into separate thread
knfsd: fix broken length check in nfs4idmap.c
knfsd: fix cache.c comment
nfsd: Fix handling of negative lengths in read_buf()
knfsd: cleanup nfsd4 properly on module init failure
nfsd: cleanup nfsd module initialization cleanup
nfsd: fail module init on reply cache init failure
knfsd: cache unregistration needn't return error
nfsd: select CONFIG_PROC_FS in nfsv4 and gss server cases
nfsd: fail init on /proc/fs/nfs/exports creation failure
nfsd: move cache proc (un)registration to separate function
knfsd: allow cache_register to return error on failure
nfsd: move nfsd/auth.h into fs/nfsd
nfsd: minor fs/nfsd/auth.h cleanup
nfsd4: kill some unneeded setclientid comments
nfsd: eliminate final bogus case from setclientid logic
nfsd: uniquify cl_confirm values
nfsd4: kill unnecessary same_name() in setclientid_confirm
nfsd4: remove unnecessary cl_verifier check from setclientid_confirm
nfsd4: kill unneeded cl_confirm check
nfsd: fix encode_entryplus_baggage() indentation
nfsd4: make current_clientid local
nfsd4: miscellaneous nfs4state.c style fixes
nfsd4: recognize callback channel failure earlier
nfsd4: fix bad seqid on lock request incompatible with open mode
nfsd: allow root to set uid and gid on create
nfsd: fix rsi_cache reference count leak
sunrpc: gss: simplify rsi_parse logic
nfsd4: clean up access_valid, deny_valid checks.
svcrpc: ensure gss DESTROY tokens free contexts from cache
knfsd: don't bother mapping putrootfh enoent to eperm
lockd: minor log message fix
nfsd: more careful input validation in nfsctl write methods
Jeff Layton (4):
SUNRPC: spin svc_rqst initialization to its own function
SUNRPC: export svc_sock_update_bufs
NLM: Convert lockd to use kthreads
NLM: have nlm_shutdown_hosts kill off all NLM RPC tasks
Neil Brown (1):
knfsd: change mailing list for nfsd in MAINTAINERS
Oleg Drokin (3):
lockd: fix reference count leaks in async locking case
lockd: fix a leak in nlmsvc_testlock asynchronous request handling Leak in nlmsvc_testlock for async GETFL case
Prasad P (1):
Fix incorrect assignment
Tom Tucker (47):
svc: Add an svc transport class
svc: Make svc_sock the tcp/udp transport
svc: Change the svc_sock in the rqstp structure to a transport
svc: Add a max payload value to the transport
svc: Move sk_sendto and sk_recvfrom to svc_xprt_class
svc: Add transport specific xpo_release function
svc: Add per-transport delete functions
svc: Add xpo_prep_reply_hdr
svc: Add a transport function that checks for write space
svc: Move close processing to a single place
svc: Add xpo_accept transport function
svc: Remove unnecessary call to svc_sock_enqueue
svc: Move connection limit checking to its own function
svc: Add a generic transport svc_create_xprt function
svc: Change services to use new svc_create_xprt service
svc: Change sk_inuse to a kref
svc: Move sk_flags to the svc_xprt structure
svc: Move sk_server and sk_pool to svc_xprt
svc: Make close transport independent
svc: Move sk_reserved to svc_xprt
svc: Make the enqueue service transport neutral and export it.
svc: Make svc_send transport neutral
svc: Change svc_sock_received to svc_xprt_received and export it
svc: Move accept call to svc_xprt_received to common code
svc: Remove sk_lastrecv
svc: Move the authinfo cache to svc_xprt.
svc: Make deferral processing xprt independent
svc: Move the sockaddr information to svc_xprt
svc: Make svc_sock_release svc_xprt_release
svc: Make svc_recv transport neutral
svc: Make svc_age_temp_sockets svc_age_temp_transports
svc: Move create logic to common code
svc: Removing remaining references to rq_sock in rqstp
svc: Make svc_check_conn_limits xprt independent
svc: Move the xprt independent code to the svc_xprt.c file
svc: Add transport hdr size for defer/revisit
svc: Add /proc/sys/sunrpc/transport files
svc: Add svc API that queries for a transport instance
knfsd: Support adding transports by writing portlist file
svc: Add svc_xprt_names service to replace svc_sock_names
rdma: SVCRMDA Header File
rdma: SVCRDMA Transport Module
rdma: SVCRDMA Core Transport Services
rdma: SVCRDMA recvfrom
rdma: SVCRDMA sendto
rdma: ONCRPC RDMA protocol marshalling
rdma: makefile
PATCH 1/100 nfsd4: probe callback channel only once
Our callback code doesn't actually handle concurrent attempts to probe the callback channel. Some rethinking of the locking may be required. However, we can also just move the callback probing to this case. Since this is the only time a client is "confirmed" (and since that can only happen once in the lifetime of a client), this ensures we only probe once.
--- fs/nfsd/nfs4callback.c | 3 +-- fs/nfsd/nfs4state.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
fs/nfsd/nfs4callback.c +1 -2
@@ -395,8 +395,7 @@ nfsd4_probe_callback(struct nfs4_client *clp) };struct task_struct *t; -if (atomic_read (&cb->cb_set)) -return ; +BUG_ON (atomic_read (&clp->cl_callback.cb_set));/* Initialize address */ memset (&addr,0 ,sizeof (addr));
fs/nfsd/nfs4state.c +1 -2
@@ -948,6 +948,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, }move_to_confirmed (unconf); conf = unconf; +nfsd4_probe_callback (conf); status = nfs_ok; } } else if ((!conf || (conf && !same_verf(&conf->cl_confirm, &confirm)))
@@ -965,8 +966,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, status = nfserr_clid_inuse; } out: -if (!status) -nfsd4_probe_callback (conf);nfs4_unlock_state ();return status; }
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 2/100 nfsd: move callback rpc_client creation into separate thread
The whole reason to move this callback-channel probe into a separate thread was because (for now) we don't have an easy way to create the rpc_client asynchronously. But I forgot to move the rpc_create() to the spawned thread. Doh! Fix that.
--- fs/nfsd/nfs4callback.c | 78 ++++++++++++++++++++++++------------------------ 1 files changed, 39 insertions(+), 39 deletions(-)
fs/nfsd/nfs4callback.c +39 -39
@@ -350,30 +350,6 @@ static struct rpc_version * nfs_cb_version[] = {static int do_probe_callback (void *data) {struct nfs4_client *clp = data; -struct nfs4_callback *cb = &clp->cl_callback; -struct rpc_message msg = { - .rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL ], - .rpc_argp = clp, - }; -int status; - - status =rpc_call_sync (cb->cb_client, &msg,RPC_TASK_SOFT ); - -if (status) { -rpc_shutdown_client (cb->cb_client); - cb->cb_client =NULL ; - }else -atomic_set (&cb->cb_set,1 ); -put_nfs4_client (clp); -return 0 ; -} - -/* -* Set up the callback client and put a NFSPROC4_CB_NULL on the wire... -*/ -void -nfsd4_probe_callback (struct nfs4_client *clp) -{struct sockaddr_in addr;struct nfs4_callback *cb = &clp->cl_callback;struct rpc_timeout timeparms = {
@@ -390,12 +366,15 @@ nfsd4_probe_callback(struct nfs4_client *clp) .timeout = &timeparms, .program = program, .version = nfs_cb_version[1]->number, - .authflavor = RPC_AUTH_UNIX, /* XXX: need AUTH_GSS... */ + .authflavor = RPC_AUTH_UNIX, /* XXX: need AUTH_GSS... */ .flags = (RPC_CLNT_CREATE_NOPING), }; -struct task_struct *t; - -BUG_ON (atomic_read (&clp->cl_callback.cb_set)); +struct rpc_message msg = { + .rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL ], + .rpc_argp = clp, + }; +struct rpc_clnt *client; +int status;/* Initialize address */ memset (&addr,0 ,sizeof (addr));
@@ -415,29 +394,50 @@ nfsd4_probe_callback(struct nfs4_client *clp) program->stats->program = program;/* Create RPC client */ - cb->cb_client =rpc_create (&args); -if (IS_ERR (cb->cb_client)) { + client =rpc_create (&args); +if (IS_ERR (client)) {dprintk ("NFSD: couldn't create callback client\n" ); + status =PTR_ERR (client); goto out_err; } + status =rpc_call_sync (client, &msg,RPC_TASK_SOFT ); + +if (status) + goto out_release_client; + + cb->cb_client = client; +atomic_set (&cb->cb_set,1 ); +put_nfs4_client (clp); +return 0 ; +out_release_client: +rpc_shutdown_client (client); +out_err: +put_nfs4_client (clp); +dprintk ("NFSD: warning: no callback path to client %.*s\n" , + (int )clp->cl_name.len, clp->cl_name.data); +return status; +} + +/* +* Set up the callback client and put a NFSPROC4_CB_NULL on the wire... +*/ +void +nfsd4_probe_callback (struct nfs4_client *clp) +{ +struct task_struct *t; + +BUG_ON (atomic_read (&clp->cl_callback.cb_set)); +/* the task holds a reference to the nfs4_client struct */ atomic_inc (&clp->cl_count); t =kthread_run (do_probe_callback, clp,"nfs4_cb_probe" );if (IS_ERR (t)) - goto out_release_clp; +atomic_dec (&clp->cl_count);return ; - -out_release_clp: -atomic_dec (&clp->cl_count); -rpc_shutdown_client (cb->cb_client); -out_err: - cb->cb_client =NULL ; -dprintk ("NFSD: warning: no callback path to client %.*s\n" , - (int )clp->cl_name.len, clp->cl_name.data); }/*
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 3/100 Fix incorrect assignment
From: Prasad P <[email protected]>
Dereferenced pointer "dentry" without checking and assigned to inode in the declaration.
(We could just delete the NULL checks that follow instead, as we never get to the encode function in this particular case. But it takes a little detective work to verify that fact, so it's probably safer to leave the checks in place.)
--- fs/nfsd/nfs2acl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/nfsd/nfs2acl.c +1 -1
@@ -221,7 +221,7 @@ static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p, struct nfsd3_getaclres *resp) {struct dentry *dentry = resp->fh.fh_dentry; -struct inode *inode = dentry->d_inode; +struct inode *inode;struct kvec *head = rqstp->rq_res.head;unsigned int base;int n;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 4/100 knfsd: fix broken length check in nfs4idmap.c
Obviously at some point we thought "error" represented the length when positive. This appears to be a long-standing typo.
Thanks to Prasad Potluri <[email protected]> for finding the problem and proposing an earlier version of this patch.
--- fs/nfsd/nfs4idmap.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
fs/nfsd/nfs4idmap.c +3 -6
@@ -255,13 +255,10 @@ idtoname_parse(struct cache_detail *cd, char *buf, int buflen) goto out;if (len ==0 )set_bit (CACHE_NEGATIVE , &ent.h.flags); -else { -if (error >=IDMAP_NAMESZ ) { - error = -EINVAL ; - goto out; - } +else if (len >=IDMAP_NAMESZ ) + goto out; +else memcpy (ent.name, buf1,sizeof (ent.name)); - } error = -ENOMEM ; res =idtoname_update (&ent, res);if (res ==NULL )
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 5/100 SUNRPC: Prevent length underflow in read_flush()
From: Chuck Lever <[email protected]>
Make sure we compare an unsigned length to an unsigned count in read_flush().
--- net/sunrpc/cache.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
net/sunrpc/cache.c +5 -5
@@ -1242,18 +1242,18 @@ static ssize_t read_flush(struct file *file, char __user *buf,struct cache_detail *cd =PDE (file->f_path.dentry->d_inode)->data;char tbuf[20 ];unsigned long p = *ppos; -int len; +size_t len;sprintf (tbuf,"%lu\n" , cd->flush_time); len =strlen (tbuf);if (p >= len)return 0 ; len -= p; -if (len > count) len = count; +if (len > count) + len = count;if (copy_to_user (buf, (void *)(tbuf+p), len)) - len = -EFAULT ; -else - *ppos += len; +return -EFAULT ; + *ppos += len;return len; }
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 6/100 SUNRPC: Use unsigned string lengths in xdr_decode_string_inplace
From: Chuck Lever <[email protected]>
XDR strings, opaques, and net objects should all use unsigned lengths. To wit, RFC 4506 says:
4.2. Unsigned Integer
An XDR unsigned integer is a 32-bit datum that encodes a non-negative integer in the range [0,4294967295].
...
4.11. String
The standard defines a string of n (numbered 0 through n-1) ASCII bytes to be the number n encoded as an unsigned integer (as described above), and followed by the n bytes of the string.
After this patch, xdr_decode_string_inplace now matches the other XDR string and array helpers that take a string length argument. See:
xdr_encode_opaque_fixed, xdr_encode_opaque, xdr_encode_array
--- include/linux/sunrpc/xdr.h | 3 ++- net/sunrpc/xdr.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-)
include/linux/sunrpc/xdr.h +2 -1
@@ -112,7 +112,8 @@ struct xdr_buf {__be32 *xdr_encode_opaque_fixed (__be32 *p,const void *ptr,unsigned int len);__be32 *xdr_encode_opaque (__be32 *p,const void *ptr,unsigned int len);__be32 *xdr_encode_string (__be32 *p,const char *s); -__be32 *xdr_decode_string_inplace (__be32 *p,char **sp,int *lenp,int maxlen); +__be32 *xdr_decode_string_inplace (__be32 *p,char **sp,unsigned int *lenp, +unsigned int maxlen);__be32 *xdr_encode_netobj (__be32 *p,const struct xdr_netobj *);__be32 *xdr_decode_netobj (__be32 *p,struct xdr_netobj *);
net/sunrpc/xdr.c +5 -3
@@ -93,11 +93,13 @@ xdr_encode_string(__be32 *p, const char *string) }__be32 * -xdr_decode_string_inplace (__be32 *p,char **sp,int *lenp,int maxlen) +xdr_decode_string_inplace (__be32 *p,char **sp, +unsigned int *lenp,unsigned int maxlen) { -unsigned int len; +u32 len; -if ((len =ntohl (*p++)) > maxlen) + len =ntohl (*p++); +if (len > maxlen)return NULL ; *lenp = len; *sp = (char *) p;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 7/100 NLM: Fix sign of length of NLM variable length strings
From: Chuck Lever <[email protected]>
According to The Open Group's NLM specification, NLM callers are variable length strings. XDR variable length strings use an unsigned 32 bit length. And internally, negative string lengths are not meaningful for the Linux NLM implementation.
Clean up: Make nlm_lock.len and nlm_reboot.len unsigned integers. This makes the sign of NLM string lengths consistent with the sign of xdr_netobj lengths.
--- fs/lockd/host.c | 19 +++++++++++-------- include/linux/lockd/lockd.h | 9 ++++++--- include/linux/lockd/xdr.h | 4 ++-- 3 files changed, 19 insertions(+), 13 deletions(-)
fs/lockd/host.c +11 -8
@@ -34,10 +34,10 @@ static DEFINE_MUTEX(nlm_host_mutex);static void nlm_gc_hosts (void );static struct nsm_handle *__nsm_find (const struct sockaddr_in *, -const char *,int ,int ); +const char *,unsigned int ,int );static struct nsm_handle *nsm_find (const struct sockaddr_in *sin,const char *hostname, -int hostname_len); +unsigned int hostname_len);/* * Common host lookup routine for server & client
@@ -45,7 +45,8 @@ static struct nsm_handle * nsm_find(const struct sockaddr_in *sin,static struct nlm_host *nlm_lookup_host (int server,const struct sockaddr_in *sin,int proto,int version,const char *hostname, -int hostname_len,const struct sockaddr_in *ssin) +unsigned int hostname_len, +const struct sockaddr_in *ssin) {struct hlist_head *chain;struct hlist_node *pos;
@@ -176,7 +177,7 @@ nlm_destroy_host(struct nlm_host *host)*/ struct nlm_host *nlmclnt_lookup_host (const struct sockaddr_in *sin,int proto,int version, -const char *hostname,int hostname_len) +const char *hostname,unsigned int hostname_len) {struct sockaddr_in ssin = {0 };
@@ -189,7 +190,7 @@ nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version,*/ struct nlm_host *nlmsvc_lookup_host (struct svc_rqst *rqstp, -const char *hostname,int hostname_len) +const char *hostname,unsigned int hostname_len) {struct sockaddr_in ssin = {0 };
@@ -307,7 +308,8 @@ void nlm_release_host(struct nlm_host *host)* Release all resources held by that peer. */ void nlm_host_rebooted (const struct sockaddr_in *sin, -const char *hostname,int hostname_len, +const char *hostname, +unsigned int hostname_len,u32 new_state) {struct hlist_head *chain;
@@ -449,7 +451,7 @@ static DEFINE_MUTEX(nsm_mutex);static struct nsm_handle *__nsm_find (const struct sockaddr_in *sin, -const char *hostname,int hostname_len, +const char *hostname,unsigned int hostname_len,int create) {struct nsm_handle *nsm =NULL ;
@@ -503,7 +505,8 @@ out: }static struct nsm_handle * -nsm_find (const struct sockaddr_in *sin,const char *hostname,int hostname_len) +nsm_find (const struct sockaddr_in *sin,const char *hostname, +unsigned int hostname_len) {return __nsm_find (sin, hostname, hostname_len,1 ); }
include/linux/lockd/lockd.h +6 -3
@@ -173,14 +173,17 @@ void nlmclnt_next_cookie(struct nlm_cookie *);/* * Host cache */ -struct nlm_host *nlmclnt_lookup_host (const struct sockaddr_in *,int ,int ,const char *,int ); -struct nlm_host *nlmsvc_lookup_host (struct svc_rqst *,const char *,int ); +struct nlm_host *nlmclnt_lookup_host (const struct sockaddr_in *,int ,int , +const char *,unsigned int ); +struct nlm_host *nlmsvc_lookup_host (struct svc_rqst *,const char *, +unsigned int );struct rpc_clnt *nlm_bind_host (struct nlm_host *);void nlm_rebind_host (struct nlm_host *);struct nlm_host *nlm_get_host (struct nlm_host *);void nlm_release_host (struct nlm_host *);void nlm_shutdown_hosts (void ); -extern void nlm_host_rebooted (const struct sockaddr_in *,const char *,int ,u32 ); +extern void nlm_host_rebooted (const struct sockaddr_in *,const char *, +unsigned int ,u32 );void nsm_release (struct nsm_handle *);
include/linux/lockd/xdr.h +2 -2
@@ -29,7 +29,7 @@ struct svc_rqst;/* Lock info passed via NLM */ struct nlm_lock {char * caller; -int len;/* length of "caller" */ +unsigned int len;/* length of "caller" */ struct nfs_fh fh;struct xdr_netobj oh;u32 svid;
@@ -78,7 +78,7 @@ struct nlm_res {*/ struct nlm_reboot {char * mon; -int len; +unsigned int len;u32 state;__be32 addr;__be32 vers;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 8/100 NFSD: Use unsigned length argument for decode_filename
From: Chuck Lever <[email protected]>
Clean up: file name lengths are unsigned on the wire, negative lengths are not meaningful natively either.
--- fs/nfsd/nfs3xdr.c | 4 ++-- fs/nfsd/nfsxdr.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
fs/nfsd/nfs3xdr.c +2 -2
@@ -88,10 +88,10 @@ encode_fh(__be32 *p, struct svc_fh *fhp)* no slashes or null bytes. */ static __be32 * -decode_filename (__be32 *p,char **namp,int *lenp) +decode_filename (__be32 *p,char **namp,unsigned int *lenp) {char *name; -int i; +unsigned int i;if ((p =xdr_decode_string_inplace (p, namp, lenp,NFS3_MAXNAMLEN )) !=NULL ) {for (i =0 , name = *namp; i < *lenp; i++, name++) {
fs/nfsd/nfsxdr.c +2 -2
@@ -62,10 +62,10 @@ encode_fh(__be32 *p, struct svc_fh *fhp)* no slashes or null bytes. */ static __be32 * -decode_filename (__be32 *p,char **namp,int *lenp) +decode_filename (__be32 *p,char **namp,unsigned int *lenp) {char *name; -int i; +unsigned int i;if ((p =xdr_decode_string_inplace (p, namp, lenp,NFS_MAXNAMLEN )) !=NULL ) {for (i =0 , name = *namp; i < *lenp; i++, name++) {
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 9/100 NFSD: File name length signage in nfsd request argument structures
From: Chuck Lever <[email protected]>
Clean up: For consistency, store the length of file name strings in nfsd argument structures as unsigned integers. This matches the XDR routines and client argument structures for the same operation types.
--- include/linux/nfsd/xdr.h | 12 ++++++------ include/linux/nfsd/xdr3.h | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-)
include/linux/nfsd/xdr.h +6 -6
@@ -23,7 +23,7 @@ struct nfsd_sattrargs {struct nfsd_diropargs {struct svc_fh fh;char * name; -int len; +unsigned int len; };struct nfsd_readargs {
@@ -43,17 +43,17 @@ struct nfsd_writeargs {struct nfsd_createargs {struct svc_fh fh;char * name; -int len; +unsigned int len;struct iattr attrs; };struct nfsd_renameargs {struct svc_fh ffh;char * fname; -int flen; +unsigned int flen;struct svc_fh tfh;char * tname; -int tlen; +unsigned int tlen; };struct nfsd_readlinkargs {
@@ -65,13 +65,13 @@ struct nfsd_linkargs {struct svc_fh ffh;struct svc_fh tfh;char * tname; -int tlen; +unsigned int tlen; };struct nfsd_symlinkargs {struct svc_fh ffh;char * fname; -int flen; +unsigned int flen;char * tname;int tlen;struct iattr attrs;
include/linux/nfsd/xdr3.h +7 -7
@@ -21,7 +21,7 @@ struct nfsd3_sattrargs {struct nfsd3_diropargs {struct svc_fh fh;char * name; -int len; +unsigned int len; };struct nfsd3_accessargs {
@@ -48,7 +48,7 @@ struct nfsd3_writeargs {struct nfsd3_createargs {struct svc_fh fh;char * name; -int len; +unsigned int len;int createmode;struct iattr attrs;__be32 * verf;
@@ -57,7 +57,7 @@ struct nfsd3_createargs {struct nfsd3_mknodargs {struct svc_fh fh;char * name; -int len; +unsigned int len;__u32 ftype;__u32 major, minor;struct iattr attrs;
@@ -66,10 +66,10 @@ struct nfsd3_mknodargs {struct nfsd3_renameargs {struct svc_fh ffh;char * fname; -int flen; +unsigned int flen;struct svc_fh tfh;char * tname; -int tlen; +unsigned int tlen; };struct nfsd3_readlinkargs {
@@ -81,13 +81,13 @@ struct nfsd3_linkargs {struct svc_fh ffh;struct svc_fh tfh;char * tname; -int tlen; +unsigned int tlen; };struct nfsd3_symlinkargs {struct svc_fh ffh;char * fname; -int flen; +unsigned int flen;char * tname;int tlen;struct iattr attrs;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 10/100 NFSD: Adjust filename length argument of nfsd_lookup
From: Chuck Lever <[email protected]>
Clean up: adjust the sign of the length argument of nfsd_lookup and nfsd_lookup_dentry, for consistency with recent changes. NFSD version 4 callers already pass an unsigned file name length.
--- fs/nfsd/vfs.c | 4 ++-- include/linux/nfsd/nfsd.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
fs/nfsd/vfs.c +2 -2
@@ -132,7 +132,7 @@ out:__be32 nfsd_lookup_dentry (struct svc_rqst *rqstp,struct svc_fh *fhp, -const char *name,int len, +const char *name,unsigned int len,struct svc_export **exp_ret,struct dentry **dentry_ret) {struct svc_export *exp;
@@ -226,7 +226,7 @@ out_nfserr:*/ __be32 nfsd_lookup (struct svc_rqst *rqstp,struct svc_fh *fhp,const char *name, -int len,struct svc_fh *resfh) +unsigned int len,struct svc_fh *resfh) {struct svc_export *exp;struct dentry *dentry;
include/linux/nfsd/nfsd.h +2 -2
@@ -70,9 +70,9 @@ void nfsd_racache_shutdown(void);int nfsd_cross_mnt (struct svc_rqst *rqstp,struct dentry **dpp,struct svc_export **expp);__be32 nfsd_lookup (struct svc_rqst *,struct svc_fh *, -const char *,int ,struct svc_fh *); +const char *,unsigned int ,struct svc_fh *);__be32 nfsd_lookup_dentry (struct svc_rqst *,struct svc_fh *, -const char *,int , +const char *,unsigned int ,struct svc_export **,struct dentry **);__be32 nfsd_setattr (struct svc_rqst *,struct svc_fh *,struct iattr *,int ,time_t );
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 11/100 NFSD: Use unsigned length argument for decode_pathname
From: Chuck Lever <[email protected]>
Clean up: path name lengths are unsigned on the wire, negative lengths are not meaningful natively either.
--- fs/nfsd/nfsxdr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
fs/nfsd/nfsxdr.c +2 -2
@@ -78,10 +78,10 @@ decode_filename(__be32 *p, char **namp, unsigned int *lenp) }static __be32 * -decode_pathname (__be32 *p,char **namp,int *lenp) +decode_pathname (__be32 *p,char **namp,unsigned int *lenp) {char *name; -int i; +unsigned int i;if ((p =xdr_decode_string_inplace (p, namp, lenp,NFS_MAXPATHLEN )) !=NULL ) {for (i =0 , name = *namp; i < *lenp; i++, name++) {
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 12/100 NFSD: Fix mixed sign comparison in nfs3svc_decode_symlinkargs
From: Chuck Lever <[email protected]>
--- fs/nfsd/nfs3xdr.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
fs/nfsd/nfs3xdr.c +3 -3
@@ -452,8 +452,7 @@ int nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p, struct nfsd3_symlinkargs *args) { - unsigned int len; -int avail; + unsigned int len, avail;char *old, *new;struct kvec *vec;
@@ -486,7 +485,8 @@ nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p,/* now copy next page if there is one */ if (len && !avail && rqstp->rq_arg.page_len) { avail = rqstp->rq_arg.page_len; -if (avail >PAGE_SIZE ) avail =PAGE_SIZE ; +if (avail >PAGE_SIZE ) + avail =PAGE_SIZE ; old =page_address (rqstp->rq_arg.pages[0 ]); }while (len && avail && *old) {
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 13/100 NFSD: Path name length signage in nfsd request argument structures
From: Chuck Lever <[email protected]>
Clean up: For consistency, store the length of path name strings in nfsd argument structures as unsigned integers.
--- include/linux/nfsd/xdr.h | 2 +- include/linux/nfsd/xdr3.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/nfsd/xdr.h +1 -1
@@ -73,7 +73,7 @@ struct nfsd_symlinkargs {char * fname;unsigned int flen;char * tname; -int tlen; +unsigned int tlen;struct iattr attrs; };
include/linux/nfsd/xdr3.h +1 -1
@@ -89,7 +89,7 @@ struct nfsd3_symlinkargs {char * fname;unsigned int flen;char * tname; -int tlen; +unsigned int tlen;struct iattr attrs; };
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 14/100 knfsd: fix cache.c comment
The path here must be left over from some earlier draft; fix it. And do some more minor cleanup while we're there.
--- net/sunrpc/cache.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
net/sunrpc/cache.c +5 -5
@@ -634,13 +634,13 @@ void cache_clean_deferred(void *owner)/* * communicate with user-space * -* We have a magic /proc file - /proc/sunrpc/cache -* On read, you get a full request, or block -* On write, an update request is processed -* Poll works if anything to read, and always allows write +* We have a magic /proc file - /proc/sunrpc/<cachename>/channel. +* On read, you get a full request, or block. +* On write, an update request is processed. +* Poll works if anything to read, and always allows write. * * Implemented by linked list of requests. Each open file has -* a ->private that also exists in this list. New request are added +* a ->private that also exists in this list. New requests are added * to the end and may wakeup and preceding readers. * New readers are added to the head. If, on read, an item is found with * CACHE_UPCALLING clear, we free it from the list.
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 15/100 nfsd: Fix handling of negative lengths in read_buf()
The length "nbytes" passed into read_buf should never be negative, but we check only for too-large values of "nbytes", not for too-small values. Make nbytes unsigned, so it's clear that the former tests are sufficient. (Despite this read_buf() currently correctly returns an xdr error in the case of a negative length, thanks to an unsigned comparison with size_of() and bounds-checking in kmalloc(). This seems very fragile, though.)
--- fs/nfsd/nfs4xdr.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
fs/nfsd/nfs4xdr.c +6 -1
@@ -148,7 +148,7 @@ xdr_error: \ } \ }while (0 ) -static __be32 *read_buf(struct nfsd4_compoundargs *argp, int nbytes) +static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes) {/* We want more bytes than seem to be available. * Maybe we need a new page, maybe we have just run out
@@ -169,6 +169,11 @@ static __be32 *read_buf(struct nfsd4_compoundargs *argp, int nbytes)return NULL ; } +/* +* The following memcpy is safe because read_buf is always +* called with nbytes > avail, and the two cases above both +* guarantee p points to at least nbytes bytes. +*/ memcpy (p, argp->p, avail);/* step to next page */ argp->p =page_address (argp->pagelist[0 ]);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 16/100 knfsd: cleanup nfsd4 properly on module init failure
We forgot to shut down the nfs4 state and idmapping code in this case.
--- fs/nfsd/nfsctl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
fs/nfsd/nfsctl.c +2 -0
@@ -695,12 +695,14 @@ static int __init init_nfsd(void) } retval =register_filesystem (&nfsd_fs_type);if (retval) { +nfsd_idmap_shutdown ();nfsd_export_shutdown ();nfsd_cache_shutdown ();remove_proc_entry ("fs/nfs/exports" ,NULL );remove_proc_entry ("fs/nfs" ,NULL );nfsd_stat_shutdown ();nfsd_lockd_shutdown (); +nfsd4_free_slabs (); }return retval; }
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 17/100 nfsd: cleanup nfsd module initialization cleanup
Handle the failure case here with something closer to the standard kernel style.
Doesn't really matter for now, but I'd like to add a few more failure cases, and then this'll help.
--- fs/nfsd/nfsctl.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-)
fs/nfsd/nfsctl.c +12 -10
@@ -694,16 +694,18 @@ static int __init init_nfsd(void) entry->proc_fops = &exports_operations; } retval =register_filesystem (&nfsd_fs_type); -if (retval) { -nfsd_idmap_shutdown (); -nfsd_export_shutdown (); -nfsd_cache_shutdown (); -remove_proc_entry ("fs/nfs/exports" ,NULL ); -remove_proc_entry ("fs/nfs" ,NULL ); -nfsd_stat_shutdown (); -nfsd_lockd_shutdown (); -nfsd4_free_slabs (); - } +if (retval) + goto out_free_all; +return 0 ; +out_free_all: +nfsd_idmap_shutdown (); +nfsd_export_shutdown (); +nfsd_cache_shutdown (); +remove_proc_entry ("fs/nfs/exports" ,NULL ); +remove_proc_entry ("fs/nfs" ,NULL ); +nfsd_stat_shutdown (); +nfsd_lockd_shutdown (); +nfsd4_free_slabs ();return retval; }
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 18/100 nfsd: fail module init on reply cache init failure
If the reply cache initialization fails due to a kmalloc failure, currently we try to soldier on with a reduced (or nonexistant) reply cache.
Better to just fail immediately: the failure is then much easier to understand and debug, and it could save us complexity in some later code. (But actually, it doesn't help currently because the cache is also turned off in some odd failure cases; we should probably find a better way to handle those failure cases some day.)
Fix some minor style problems while we're at it, and rename nfsd_cache_init() to remove the need for a comment describing it.
--- fs/nfsd/nfscache.c | 28 +++++++++++++--------------- fs/nfsd/nfsctl.c | 11 +++++++---- include/linux/nfsd/cache.h | 4 ++-- 3 files changed, 22 insertions(+), 21 deletions(-)
fs/nfsd/nfscache.c +13 -15
@@ -44,17 +44,18 @@ static int nfsd_cache_append(struct svc_rqst *rqstp, struct kvec *vec);*/ static DEFINE_SPINLOCK (cache_lock); -void -nfsd_cache_init (void ) +int +nfsd_reply_cache_init (void ) {struct svc_cacherep *rp;int i;INIT_LIST_HEAD (&lru_head); i =CACHESIZE ; -while (i) { +while (i) { rp =kmalloc (sizeof (*rp),GFP_KERNEL ); -if (!rp)break ; +if (!rp) + goto out_nomem;list_add (&rp->c_lru, &lru_head); rp->c_state =RC_UNUSED ; rp->c_type =RC_NOCACHE ;
@@ -62,23 +63,20 @@ nfsd_cache_init(void) i--; } -if (i) -printk (KERN_ERR "nfsd: cannot allocate all %d cache entries, only got %d\n" , -CACHESIZE ,CACHESIZE -i); - hash_list =kcalloc (HASHSIZE ,sizeof (struct hlist_head ),GFP_KERNEL ); -if (!hash_list) { -nfsd_cache_shutdown (); -printk (KERN_ERR "nfsd: cannot allocate %Zd bytes for hash list\n" , -HASHSIZE *sizeof (struct hlist_head )); -return ; - } +if (!hash_list) + goto out_nomem; cache_disabled =0 ; +return 0 ; +out_nomem: +printk (KERN_ERR "nfsd: failed to allocate reply cache\n" ); +nfsd_reply_cache_shutdown (); +return -ENOMEM ; }void -nfsd_cache_shutdown (void ) +nfsd_reply_cache_shutdown (void ) {struct svc_cacherep *rp;
fs/nfsd/nfsctl.c +7 -4
@@ -683,7 +683,9 @@ static int __init init_nfsd(void)if (retval)return retval;nfsd_stat_init ();/* Statistics */ -nfsd_cache_init ();/* RPC reply cache */ + retval =nfsd_reply_cache_init (); +if (retval) + goto out_free_stat;nfsd_export_init ();/* Exports table */ nfsd_lockd_init ();/* lockd->nfsd callbacks */ nfsd_idmap_init ();/* Name to ID mapping */
@@ -700,11 +702,12 @@ static int __init init_nfsd(void) out_free_all:nfsd_idmap_shutdown ();nfsd_export_shutdown (); -nfsd_cache_shutdown (); +nfsd_reply_cache_shutdown ();remove_proc_entry ("fs/nfs/exports" ,NULL );remove_proc_entry ("fs/nfs" ,NULL ); -nfsd_stat_shutdown ();nfsd_lockd_shutdown (); +out_free_stat: +nfsd_stat_shutdown ();nfsd4_free_slabs ();return retval; }
@@ -712,7 +715,7 @@ out_free_all: static void __exit exit_nfsd(void) {nfsd_export_shutdown (); -nfsd_cache_shutdown (); +nfsd_reply_cache_shutdown ();remove_proc_entry ("fs/nfs/exports" ,NULL );remove_proc_entry ("fs/nfs" ,NULL );nfsd_stat_shutdown ();
include/linux/nfsd/cache.h +2 -2
@@ -72,8 +72,8 @@ enum {*/ #define RC_DELAY (HZ/5) -void nfsd_cache_init (void ); -void nfsd_cache_shutdown (void ); +int nfsd_reply_cache_init (void ); +void nfsd_reply_cache_shutdown (void );int nfsd_cache_lookup (struct svc_rqst *,int );void nfsd_cache_update (struct svc_rqst *,int ,__be32 *);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 19/100 knfsd: cache unregistration needn't return error
There's really nothing much the caller can do if cache unregistration fails. And indeed, all any caller does in this case is print an error and continue. So just return void and move the printk's inside cache_unregister.
--- fs/nfsd/export.c | 6 ++---- fs/nfsd/nfs4idmap.c | 6 ++---- include/linux/sunrpc/cache.h | 2 +- net/sunrpc/auth_gss/svcauth_gss.c | 6 ++---- net/sunrpc/cache.c | 8 +++++--- net/sunrpc/sunrpc_syms.c | 6 ++---- 6 files changed, 14 insertions(+), 20 deletions(-)
fs/nfsd/export.c +2 -4
@@ -1670,10 +1670,8 @@ nfsd_export_shutdown(void)exp_writelock (); -if (cache_unregister (&svc_expkey_cache)) -printk (KERN_ERR "nfsd: failed to unregister expkey cache\n" ); -if (cache_unregister (&svc_export_cache)) -printk (KERN_ERR "nfsd: failed to unregister export cache\n" ); +cache_unregister (&svc_expkey_cache); +cache_unregister (&svc_export_cache);svcauth_unix_purge ();exp_writeunlock ();
fs/nfsd/nfs4idmap.c +2 -4
@@ -474,10 +474,8 @@ nfsd_idmap_init(void)void nfsd_idmap_shutdown (void ) { -if (cache_unregister (&idtoname_cache)) -printk (KERN_ERR "nfsd: failed to unregister idtoname cache\n" ); -if (cache_unregister (&nametoid_cache)) -printk (KERN_ERR "nfsd: failed to unregister nametoid cache\n" ); +cache_unregister (&idtoname_cache); +cache_unregister (&nametoid_cache); }/*
include/linux/sunrpc/cache.h +1 -1
@@ -170,7 +170,7 @@ extern void cache_flush(void);extern void cache_purge (struct cache_detail *detail);#define NEVER (0x7FFFFFFF)extern void cache_register (struct cache_detail *cd); -extern int cache_unregister (struct cache_detail *cd); +extern void cache_unregister (struct cache_detail *cd);extern void qword_add (char **bpp,int *lp,char *str);extern void qword_addhex (char **bpp,int *lp,char *buf,int blen);
net/sunrpc/auth_gss/svcauth_gss.c +2 -4
@@ -1396,9 +1396,7 @@ gss_svc_init(void)void gss_svc_shutdown (void ) { -if (cache_unregister (&rsc_cache)) -printk (KERN_ERR "auth_rpcgss: failed to unregister rsc cache\n" ); -if (cache_unregister (&rsi_cache)) -printk (KERN_ERR "auth_rpcgss: failed to unregister rsi cache\n" ); +cache_unregister (&rsc_cache); +cache_unregister (&rsi_cache);svc_auth_unregister (RPC_AUTH_GSS ); }
net/sunrpc/cache.c +5 -3
@@ -343,7 +343,7 @@ void cache_register(struct cache_detail *cd)schedule_delayed_work (&cache_cleaner,0 ); } -int cache_unregister (struct cache_detail *cd) +void cache_unregister (struct cache_detail *cd) {cache_purge (cd);spin_lock (&cache_list_lock);
@@ -351,7 +351,7 @@ int cache_unregister(struct cache_detail *cd)if (cd->entries ||atomic_read (&cd->inuse)) {write_unlock (&cd->hash_lock);spin_unlock (&cache_list_lock); -return -EBUSY ; + goto out; }if (current_detail == cd) current_detail =NULL ;
@@ -373,7 +373,9 @@ int cache_unregister(struct cache_detail *cd)/* module must be being unloaded so its safe to kill the worker */ cancel_delayed_work_sync (&cache_cleaner); } -return 0 ; +return ; +out: +printk (KERN_ERR "nfsd: failed to unregister %s cache\n" , cd->name); }/* clean cache tries to find something to clean
net/sunrpc/sunrpc_syms.c +2 -4
@@ -164,10 +164,8 @@ cleanup_sunrpc(void)cleanup_socket_xprt ();unregister_rpc_pipefs ();rpc_destroy_mempool (); -if (cache_unregister (&ip_map_cache)) -printk (KERN_ERR "sunrpc: failed to unregister ip_map cache\n" ); -if (cache_unregister (&unix_gid_cache)) -printk (KERN_ERR "sunrpc: failed to unregister unix_gid cache\n" ); +cache_unregister (&ip_map_cache); +cache_unregister (&unix_gid_cache);#ifdef RPC_DEBUG rpc_unregister_sysctl ();#endif
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 20/100 nfsd: select CONFIG_PROC_FS in nfsv4 and gss server cases
The server depends on upcalls under /proc to support nfsv4 and gss.
--- fs/Kconfig | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
fs/Kconfig +2 -0
@@ -1679,6 +1679,8 @@ config NFSD select CRYPTO_MD5 if NFSD_V4 select CRYPTO if NFSD_V4 select FS_POSIX_ACL if NFSD_V4 + select PROC_FS if NFSD_V4 + select PROC_FS if SUNRPC_GSS help If you want your Linux box to act as an NFS *server*, so that other computers on your local network which support NFS can access certain
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 21/100 nfsd: fail init on /proc/fs/nfs/exports creation failure
I assume the reason failure of creation was ignored here was just to continue support embedded systems that want nfsd but not proc.
However, in cases where proc is supported it would be clearer to fail entirely than to come up with some features disabled.
--- fs/nfsd/nfsctl.c | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-)
fs/nfsd/nfsctl.c +28 -9
@@ -674,6 +674,27 @@ static struct file_system_type nfsd_fs_type = { .kill_sb = kill_litter_super, }; +#ifdef CONFIG_PROC_FS +static inline int create_proc_exports_entry (void ) +{ +struct proc_dir_entry *entry; + + entry =proc_mkdir ("fs/nfs" ,NULL ); +if (!entry) +return -ENOMEM ; + entry =create_proc_entry ("fs/nfs/exports" ,0 ,NULL ); +if (!entry) +return -ENOMEM ; + entry->proc_fops = &exports_operations; +return 0 ; +} +#else /* CONFIG_PROC_FS */ +static inline int create_proc_exports_entry (void ) +{ +return 0 ; +} +#endif +static int __init init_nfsd (void ) {int retval;
@@ -689,23 +710,21 @@ static int __init init_nfsd(void)nfsd_export_init ();/* Exports table */ nfsd_lockd_init ();/* lockd->nfsd callbacks */ nfsd_idmap_init ();/* Name to ID mapping */ -if (proc_mkdir ("fs/nfs" ,NULL )) { -struct proc_dir_entry *entry; - entry =create_proc_entry ("fs/nfs/exports" ,0 ,NULL ); -if (entry) - entry->proc_fops = &exports_operations; - } + retval =create_proc_exports_entry (); +if (retval) + goto out_free_idmap; retval =register_filesystem (&nfsd_fs_type);if (retval) goto out_free_all;return 0 ; out_free_all: -nfsd_idmap_shutdown (); -nfsd_export_shutdown (); -nfsd_reply_cache_shutdown ();remove_proc_entry ("fs/nfs/exports" ,NULL );remove_proc_entry ("fs/nfs" ,NULL ); +nfsd_idmap_shutdown (); +out_free_idmap:nfsd_lockd_shutdown (); +nfsd_export_shutdown (); +nfsd_reply_cache_shutdown (); out_free_stat:nfsd_stat_shutdown ();nfsd4_free_slabs ();
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 22/100 nfsd: move cache proc (un)registration to separate function
Just some minor cleanup.
Also I don't see much point in trying to register further proc entries if initial entries fail; so just stop trying in that case.
--- net/sunrpc/cache.c | 99 ++++++++++++++++++++++++++++----------------------- 1 files changed, 54 insertions(+), 45 deletions(-)
net/sunrpc/cache.c +54 -45
@@ -290,44 +290,63 @@ static const struct file_operations cache_flush_operations;static void do_cache_clean (struct work_struct *work); static DECLARE_DELAYED_WORK(cache_cleaner, do_cache_clean); -void cache_register (struct cache_detail *cd) +void remove_cache_proc_entries (struct cache_detail *cd) { - cd->proc_ent =proc_mkdir (cd->name, proc_net_rpc); -if (cd->proc_ent) { -struct proc_dir_entry *p; - cd->proc_ent->owner = cd->owner; - cd->channel_ent = cd->content_ent =NULL ; +if (cd->proc_ent ==NULL ) +return ; +if (cd->flush_ent) +remove_proc_entry ("flush" , cd->proc_ent); +if (cd->channel_ent) +remove_proc_entry ("channel" , cd->proc_ent); +if (cd->content_ent) +remove_proc_entry ("content" , cd->proc_ent); + cd->proc_ent =NULL ; +remove_proc_entry (cd->name, proc_net_rpc); +} - p =create_proc_entry ("flush" ,S_IFREG |S_IRUSR |S_IWUSR , - cd->proc_ent); - cd->flush_ent = p; -if (p) { - p->proc_fops = &cache_flush_operations; - p->owner = cd->owner; - p->data = cd; - } +void create_cache_proc_entries (struct cache_detail *cd) +{ +struct proc_dir_entry *p; -if (cd->cache_request || cd->cache_parse) { - p =create_proc_entry ("channel" ,S_IFREG |S_IRUSR |S_IWUSR , - cd->proc_ent); - cd->channel_ent = p; -if (p) { - p->proc_fops = &cache_file_operations; - p->owner = cd->owner; - p->data = cd; - } - } -if (cd->cache_show) { - p =create_proc_entry ("content" ,S_IFREG |S_IRUSR |S_IWUSR , - cd->proc_ent); - cd->content_ent = p; -if (p) { - p->proc_fops = &content_file_operations; - p->owner = cd->owner; - p->data = cd; - } - } + cd->proc_ent =proc_mkdir (cd->name, proc_net_rpc); +if (cd->proc_ent ==NULL ) +return ; + cd->proc_ent->owner = cd->owner; + cd->channel_ent = cd->content_ent =NULL ; + + p =create_proc_entry ("flush" ,S_IFREG |S_IRUSR |S_IWUSR , cd->proc_ent); + cd->flush_ent = p; +if (p ==NULL ) +return ; + p->proc_fops = &cache_flush_operations; + p->owner = cd->owner; + p->data = cd; + +if (cd->cache_request || cd->cache_parse) { + p =create_proc_entry ("channel" ,S_IFREG |S_IRUSR |S_IWUSR , + cd->proc_ent); + cd->channel_ent = p; +if (p ==NULL ) +return ; + p->proc_fops = &cache_file_operations; + p->owner = cd->owner; + p->data = cd; + } +if (cd->cache_show) { + p =create_proc_entry ("content" ,S_IFREG |S_IRUSR |S_IWUSR , + cd->proc_ent); + cd->content_ent = p; +if (p ==NULL ) +return ; + p->proc_fops = &content_file_operations; + p->owner = cd->owner; + p->data = cd; } +} + +void cache_register (struct cache_detail *cd) +{ +create_cache_proc_entries (cd);rwlock_init (&cd->hash_lock);INIT_LIST_HEAD (&cd->queue);spin_lock (&cache_list_lock);
@@ -358,17 +377,7 @@ void cache_unregister(struct cache_detail *cd)list_del_init (&cd->others);write_unlock (&cd->hash_lock);spin_unlock (&cache_list_lock); -if (cd->proc_ent) { -if (cd->flush_ent) -remove_proc_entry ("flush" , cd->proc_ent); -if (cd->channel_ent) -remove_proc_entry ("channel" , cd->proc_ent); -if (cd->content_ent) -remove_proc_entry ("content" , cd->proc_ent); - - cd->proc_ent =NULL ; -remove_proc_entry (cd->name, proc_net_rpc); - } +remove_cache_proc_entries (cd);if (list_empty (&cache_list)) {/* module must be being unloaded so its safe to kill the worker */ cancel_delayed_work_sync (&cache_cleaner);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 23/100 knfsd: allow cache_register to return error on failure
Newer server features such as nfsv4 and gss depend on proc to work, so a failure to initialize the proc files they need should be treated as fatal.
Thanks to Andrew Morton for style fix and compile fix in case where CONFIG_NFSD_V4 is undefined.
--- fs/nfsd/export.c | 12 +++++++++--- fs/nfsd/nfs4idmap.c | 13 ++++++++++--- fs/nfsd/nfsctl.c | 12 +++++++++--- include/linux/nfsd/export.h | 2 +- include/linux/nfsd_idmap.h | 11 ++++++++--- include/linux/sunrpc/cache.h | 2 +- net/sunrpc/auth_gss/svcauth_gss.c | 17 +++++++++++++---- net/sunrpc/cache.c | 30 +++++++++++++++++++++++------- 8 files changed, 74 insertions(+), 25 deletions(-)
fs/nfsd/export.c +9 -3
@@ -1637,13 +1637,19 @@ exp_verify_string(char *cp, int max)/* * Initialize the exports module. */ -void +int nfsd_export_init (void ) { +int rv;dprintk ("nfsd: initializing export module.\n" ); -cache_register (&svc_export_cache); -cache_register (&svc_expkey_cache); + rv =cache_register (&svc_export_cache); +if (rv) +return rv; + rv =cache_register (&svc_expkey_cache); +if (rv) +cache_unregister (&svc_export_cache); +return rv; }
fs/nfsd/nfs4idmap.c +10 -3
@@ -464,11 +464,18 @@ nametoid_update(struct ent *new, struct ent *old)* Exported API */ -void +int nfsd_idmap_init (void ) { -cache_register (&idtoname_cache); -cache_register (&nametoid_cache); +int rv; + + rv =cache_register (&idtoname_cache); +if (rv) +return rv; + rv =cache_register (&nametoid_cache); +if (rv) +cache_unregister (&idtoname_cache); +return rv; }void
fs/nfsd/nfsctl.c +9 -3
@@ -707,9 +707,13 @@ static int __init init_nfsd(void) retval =nfsd_reply_cache_init ();if (retval) goto out_free_stat; -nfsd_export_init ();/* Exports table */ + retval =nfsd_export_init (); +if (retval) + goto out_free_cache;nfsd_lockd_init ();/* lockd->nfsd callbacks */ -nfsd_idmap_init ();/* Name to ID mapping */ + retval =nfsd_idmap_init (); +if (retval) + goto out_free_lockd; retval =create_proc_exports_entry ();if (retval) goto out_free_idmap;
@@ -720,10 +724,12 @@ static int __init init_nfsd(void) out_free_all:remove_proc_entry ("fs/nfs/exports" ,NULL );remove_proc_entry ("fs/nfs" ,NULL ); -nfsd_idmap_shutdown (); out_free_idmap: +nfsd_idmap_shutdown (); +out_free_lockd:nfsd_lockd_shutdown ();nfsd_export_shutdown (); +out_free_cache:nfsd_reply_cache_shutdown (); out_free_stat:nfsd_stat_shutdown ();
include/linux/nfsd/export.h +1 -1
@@ -122,7 +122,7 @@ __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp);/* * Function declarations */ -void nfsd_export_init (void ); +int nfsd_export_init (void );void nfsd_export_shutdown (void );void nfsd_export_flush (void );void exp_readlock (void );
include/linux/nfsd_idmap.h +8 -3
@@ -44,11 +44,16 @@#define IDMAP_NAMESZ 128#ifdef CONFIG_NFSD_V4 -void nfsd_idmap_init (void ); +int nfsd_idmap_init (void );void nfsd_idmap_shutdown (void );#else -static inline void nfsd_idmap_init (void ) {}; -static inline void nfsd_idmap_shutdown (void ) {}; +static inline int nfsd_idmap_init (void ) +{ +return 0 ; +} +static inline void nfsd_idmap_shutdown (void ) +{ +}#endif int nfsd_map_name_to_uid (struct svc_rqst *,const char *,size_t ,__u32 *);
include/linux/sunrpc/cache.h +1 -1
@@ -169,7 +169,7 @@ extern int cache_check(struct cache_detail *detail,extern void cache_flush (void );extern void cache_purge (struct cache_detail *detail);#define NEVER (0x7FFFFFFF) -extern void cache_register (struct cache_detail *cd); +extern int cache_register (struct cache_detail *cd);extern void cache_unregister (struct cache_detail *cd);extern void qword_add (char **bpp,int *lp,char *str);
net/sunrpc/auth_gss/svcauth_gss.c +13 -4
@@ -1386,10 +1386,19 @@ intgss_svc_init (void) {int rv =svc_auth_register (RPC_AUTH_GSS , &svcauthops_gss); -if (rv ==0 ) { -cache_register (&rsc_cache); -cache_register (&rsi_cache); - } +if (rv) +return rv; + rv =cache_register (&rsc_cache); +if (rv) + goto out1; + rv =cache_register (&rsi_cache); +if (rv) + goto out2; +return 0 ; +out2: +cache_unregister (&rsc_cache); +out1: +svc_auth_unregister (RPC_AUTH_GSS );return rv; }
net/sunrpc/cache.c +23 -7
@@ -304,20 +304,21 @@ void remove_cache_proc_entries(struct cache_detail *cd)remove_proc_entry (cd->name, proc_net_rpc); } -void create_cache_proc_entries (struct cache_detail *cd) +#ifdef CONFIG_PROC_FS +int create_cache_proc_entries (struct cache_detail *cd) {struct proc_dir_entry *p; cd->proc_ent =proc_mkdir (cd->name, proc_net_rpc);if (cd->proc_ent ==NULL ) -return ; + goto out_nomem; cd->proc_ent->owner = cd->owner; cd->channel_ent = cd->content_ent =NULL ; p =create_proc_entry ("flush" ,S_IFREG |S_IRUSR |S_IWUSR , cd->proc_ent); cd->flush_ent = p;if (p ==NULL ) -return ; + goto out_nomem; p->proc_fops = &cache_flush_operations; p->owner = cd->owner; p->data = cd;
@@ -327,7 +328,7 @@ void create_cache_proc_entries(struct cache_detail *cd) cd->proc_ent); cd->channel_ent = p;if (p ==NULL ) -return ; + goto out_nomem; p->proc_fops = &cache_file_operations; p->owner = cd->owner; p->data = cd;
@@ -337,16 +338,30 @@ void create_cache_proc_entries(struct cache_detail *cd) cd->proc_ent); cd->content_ent = p;if (p ==NULL ) -return ; + goto out_nomem; p->proc_fops = &content_file_operations; p->owner = cd->owner; p->data = cd; } +return 0 ; +out_nomem: +remove_cache_proc_entries (cd); +return -ENOMEM ; } +#else /* CONFIG_PROC_FS */ +int create_cache_proc_entries (struct cache_detail *cd) +{ +return 0 ; +} +#endif -void cache_register (struct cache_detail *cd) +int cache_register (struct cache_detail *cd) { -create_cache_proc_entries (cd); +int ret; + + ret =create_cache_proc_entries (cd); +if (ret) +return ret;rwlock_init (&cd->hash_lock);INIT_LIST_HEAD (&cd->queue);spin_lock (&cache_list_lock);
@@ -360,6 +375,7 @@ void cache_register(struct cache_detail *cd)/* start the cleaning process */ schedule_delayed_work (&cache_cleaner,0 ); +return 0 ; }void cache_unregister (struct cache_detail *cd)
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 24/100 nfsd: move nfsd/auth.h into fs/nfsd
This header is used only in a few places in fs/nfsd, so there seems to be little point to having it in include/. (Thanks to Robert Day for pointing this out.)
--- fs/nfsd/auth.h | 27 +++++++++++++++++++++++++++ fs/nfsd/nfs3xdr.c | 1 + fs/nfsd/nfsfh.c | 1 + fs/nfsd/nfsxdr.c | 1 + include/linux/nfsd/Kbuild | 1 - include/linux/nfsd/auth.h | 27 --------------------------- include/linux/nfsd/nfsd.h | 1 - include/linux/nfsd/syscall.h | 1 - 8 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 fs/nfsd/auth.h delete mode 100644 include/linux/nfsd/auth.h
fs/nfsd/auth.h new file +27 -0
@@ -0,0 +1,27 @@ +/* +* include/linux/nfsd/auth.h +* +* nfsd-specific authentication stuff. +* uid/gid mapping not yet implemented. +* +* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> +*/ + +#ifndef LINUX_NFSD_AUTH_H +#define LINUX_NFSD_AUTH_H + +#ifdef __KERNEL__ + +#define nfsd_luid (rq, uid) ((u32)(uid)) +#define nfsd_lgid (rq, gid) ((u32)(gid)) +#define nfsd_ruid (rq, uid) ((u32)(uid)) +#define nfsd_rgid (rq, gid) ((u32)(gid)) + +/* +* Set the current process's fsuid/fsgid etc to those of the NFS +* client user +*/ +int nfsd_setuser (struct svc_rqst *,struct svc_export *); + +#endif /* __KERNEL__ */ +#endif /* LINUX_NFSD_AUTH_H */
fs/nfsd/nfs3xdr.c +1 -0
@@ -21,6 +21,7 @@#include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/xdr3.h> +#include "auth.h" #define NFSDDBG_FACILITY NFSDDBG_XDR
fs/nfsd/nfsfh.c +1 -0
@@ -22,6 +22,7 @@#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svcauth_gss.h> #include <linux/nfsd/nfsd.h> +#include "auth.h" #define NFSDDBG_FACILITY NFSDDBG_FH
fs/nfsd/nfsxdr.c +1 -0
@@ -15,6 +15,7 @@#include <linux/nfsd/nfsd.h> #include <linux/nfsd/xdr.h> #include <linux/mm.h> +#include "auth.h" #define NFSDDBG_FACILITY NFSDDBG_XDR
include/linux/nfsd/Kbuild +0 -1
@@ -4,4 +4,3 @@ unifdef-y += stats.h unifdef-y += syscall.h unifdef-y += nfsfh.h unifdef-y += debug.h -unifdef-y += auth.h
include/linux/nfsd/auth.h deleted +0 -27
@@ -1,27 +0,0 @@ -/* -* include/linux/nfsd/auth.h -* -* nfsd-specific authentication stuff. -* uid/gid mapping not yet implemented. -* -* Copyright (C) 1995, 1996 Olaf Kirch <[email protected]> -*/ - -#ifndef LINUX_NFSD_AUTH_H -#define LINUX_NFSD_AUTH_H - -#ifdef __KERNEL__ - -#define nfsd_luid (rq, uid) ((u32)(uid)) -#define nfsd_lgid (rq, gid) ((u32)(gid)) -#define nfsd_ruid (rq, uid) ((u32)(uid)) -#define nfsd_rgid (rq, gid) ((u32)(gid)) - -/* -* Set the current process's fsuid/fsgid etc to those of the NFS -* client user -*/ -int nfsd_setuser (struct svc_rqst *,struct svc_export *); - -#endif /* __KERNEL__ */ -#endif /* LINUX_NFSD_AUTH_H */
include/linux/nfsd/nfsd.h +0 -1
@@ -20,7 +20,6 @@#include <linux/nfsd/debug.h> #include <linux/nfsd/nfsfh.h> #include <linux/nfsd/export.h> -#include <linux/nfsd/auth.h> #include <linux/nfsd/stats.h> /* * nfsd version
include/linux/nfsd/syscall.h +0 -1
@@ -18,7 +18,6 @@#include <linux/nfsd/const.h> #include <linux/nfsd/export.h> #include <linux/nfsd/nfsfh.h> -#include <linux/nfsd/auth.h> /* * Version of the syscall interface
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 25/100 nfsd: minor fs/nfsd/auth.h cleanup
While we're here, let's remove the redundant (and now wrong) pathname in the comment, and the #ifdef __KERNEL__'s.
--- fs/nfsd/auth.h | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)
fs/nfsd/auth.h +0 -5
@@ -1,6 +1,4 @@/* -* include/linux/nfsd/auth.h -* * nfsd-specific authentication stuff. * uid/gid mapping not yet implemented. *
@@ -10,8 +8,6 @@#ifndef LINUX_NFSD_AUTH_H #define LINUX_NFSD_AUTH_H -#ifdef __KERNEL__ -#define nfsd_luid (rq, uid) ((u32)(uid))#define nfsd_lgid (rq, gid) ((u32)(gid))#define nfsd_ruid (rq, uid) ((u32)(uid))
@@ -23,5 +19,4 @@*/ int nfsd_setuser (struct svc_rqst *,struct svc_export *); -#endif /* __KERNEL__ */ #endif /* LINUX_NFSD_AUTH_H */
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 26/100 nfsd4: kill some unneeded setclientid comments
Most of these comments just summarize the code.
The matching of code to the cases described in the RFC may still be useful, though; add specific section references to make that easier to follow. Also update references to the outdated RFC 3010.
--- fs/nfsd/nfs4state.c | 136 +++++++++++++++------------------------------------ 1 files changed, 40 insertions(+), 96 deletions(-)
fs/nfsd/nfs4state.c +40 -96
@@ -683,39 +683,6 @@ out_err:return ; } -/* -* RFC 3010 has a complex implmentation description of processing a -* SETCLIENTID request consisting of 5 bullets, labeled as -* CASE0 - CASE4 below. -* -* NOTES: -* callback information will be processed in a future patch -* -* an unconfirmed record is added when: -* NORMAL (part of CASE 4): there is no confirmed nor unconfirmed record. -* CASE 1: confirmed record found with matching name, principal, -* verifier, and clientid. -* CASE 2: confirmed record found with matching name, principal, -* and there is no unconfirmed record with matching -* name and principal -* -* an unconfirmed record is replaced when: -* CASE 3: confirmed record found with matching name, principal, -* and an unconfirmed record is found with matching -* name, principal, and with clientid and -* confirm that does not match the confirmed record. -* CASE 4: there is no confirmed record with matching name and -* principal. there is an unconfirmed record with -* matching name, principal. -* -* an unconfirmed record is deleted when: -* CASE 1: an unconfirmed record that matches input name, verifier, -* and confirmed clientid. -* CASE 4: any unconfirmed records with matching name and principal -* that exist after an unconfirmed record has been replaced -* as described above. -* -*/ __be32 nfsd4_setclientid (struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate,struct nfsd4_setclientid *setclid)
@@ -748,11 +715,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,nfs4_lock_state (); conf =find_confirmed_client_by_str (dname, strhashval);if (conf) { -/* -* CASE 0: -* clname match, confirmed, different principal -* or different ip_address -*/ +/* RFC 3530 14.2.33 CASE 0: */ status = nfserr_clid_inuse;if (!same_creds (&conf->cl_cred, &rqstp->rq_cred) || conf->cl_addr != sin->sin_addr.s_addr) {
@@ -761,12 +724,17 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, goto out; } } +/* +* section 14.2.33 of RFC 3530 (under the heading "IMPLEMENTATION") +* has a description of SETCLIENTID request processing consisting +* of 5 bullet points, labeled as CASE0 - CASE4 below. +*/ unconf =find_unconfirmed_client_by_str (dname, strhashval); status = nfserr_resource;if (!conf) { -/* -* CASE 4: -* placed first, because it is the normal case. +/* +* RFC 3530 14.2.33 CASE 4: +* placed first, because it is the normal case */ if (unconf)expire_client (unconf);
@@ -776,17 +744,8 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,gen_clid (new); }else if (same_verf (&conf->cl_verifier, &clverifier)) {/* -* CASE 1: -* cl_name match, confirmed, principal match -* verifier match: probable callback update -* -* remove any unconfirmed nfs4_client with -* matching cl_name, cl_verifier, and cl_clientid -* -* create and insert an unconfirmed nfs4_client with same -* cl_name, cl_verifier, and cl_clientid as existing -* nfs4_client, but with the new callback info and a -* new cl_confirm +* RFC 3530 14.2.33 CASE 1: +* probable callback update */ if (unconf) {/* Note this is removing unconfirmed {*x***},
@@ -802,32 +761,19 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,copy_clid (new, conf); }else if (!unconf) {/* -* CASE 2: -* clname match, confirmed, principal match -* verfier does not match -* no unconfirmed. create a new unconfirmed nfs4_client -* using input clverifier, clname, and callback info -* and generate a new cl_clientid and cl_confirm. +* RFC 3530 14.2.33 CASE 2: +* probable client reboot; state will be removed if +* confirmed. */ new =create_client (clname, dname);if (new ==NULL ) goto out;gen_clid (new); }else if (!same_verf (&conf->cl_confirm, &unconf->cl_confirm)) { -/* -* CASE3: -* confirmed found (name, principal match) -* confirmed verifier does not match input clverifier -* -* unconfirmed found (name match) -* confirmed->cl_confirm != unconfirmed->cl_confirm -* -* remove unconfirmed. -* -* create an unconfirmed nfs4_client -* with same cl_name as existing confirmed nfs4_client, -* but with new callback info, new cl_clientid, -* new cl_verifier and a new cl_confirm +/* +* RFC 3530 14.2.33 CASE 3: +* probable client reboot; state will be removed if +* confirmed. */ expire_client (unconf); new =create_client (clname, dname);
@@ -857,11 +803,9 @@ out:/* -* RFC 3010 has a complex implmentation description of processing a -* SETCLIENTID_CONFIRM request consisting of 4 bullets describing -* processing on a DRC miss, labeled as CASE1 - CASE4 below. -* -* NOTE: callback information will be processed here in a future patch +* Section 14.2.34 of RFC 3530 (under the heading "IMPLEMENTATION") has +* a description of SETCLIENTID_CONFIRM request processing consisting of 4 +* bullets, labeled as CASE1 - CASE4 below. */ __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
@@ -892,16 +836,20 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,if (unconf && unconf->cl_addr != sin->sin_addr.s_addr) goto out; +/* +* section 14.2.34 of RFC 3530 has a description of +* SETCLIENTID_CONFIRM request processing consisting +* of 4 bullet points, labeled as CASE1 - CASE4 below. +*/ if ((conf && unconf) && (same_verf (&unconf->cl_confirm, &confirm)) && (same_verf (&conf->cl_verifier, &unconf->cl_verifier)) && (same_name (conf->cl_recdir,unconf->cl_recdir)) && (!same_verf (&conf->cl_confirm, &unconf->cl_confirm))) { -/* CASE 1: -* unconf record that matches input clientid and input confirm. -* conf record that matches input clientid. -* conf and unconf records match names, verifiers -*/ +/* +* RFC 3530 14.2.34 CASE 1: +* callback update +*/ if (!same_creds (&conf->cl_cred, &unconf->cl_cred)) status = nfserr_clid_inuse;else {
@@ -918,11 +866,10 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, ((conf && unconf) && (!same_verf(&conf->cl_verifier, &unconf->cl_verifier) || !same_name(conf->cl_recdir, unconf->cl_recdir)))) { -/* CASE 2: -* conf record that matches input clientid. -* if unconf record matches input clientid, then -* unconf->cl_name or unconf->cl_verifier don't match the -* conf record. +/* +* RFC 3530 14.2.34 CASE 2: +* probable retransmitted request; play it safe and +* do nothing. */ if (!same_creds (&conf->cl_cred, &rqstp->rq_cred)) status = nfserr_clid_inuse;
@@ -930,10 +877,9 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, status = nfs_ok; }else if (!conf && unconf &&same_verf (&unconf->cl_confirm, &confirm)) { -/* CASE 3: -* conf record not found. -* unconf record found. -* unconf->cl_confirm matches input confirm +/* +* RFC 3530 14.2.34 CASE 3: +* Normal case; new or rebooted client: */ if (!same_creds (&unconf->cl_cred, &rqstp->rq_cred)) { status = nfserr_clid_inuse;
@@ -954,11 +900,9 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, }else if ((!conf || (conf && !same_verf (&conf->cl_confirm, &confirm))) && (!unconf || (unconf && !same_verf (&unconf->cl_confirm, &confirm)))) { -/* CASE 4: -* conf record not found, or if conf, conf->cl_confirm does not -* match input confirm. -* unconf record not found, or if unconf, unconf->cl_confirm -* does not match input confirm. +/* +* RFC 3530 14.2.34 CASE 4: +* Client probably hasn't noticed that we rebooted yet. */ status = nfserr_stale_clientid; }else {
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 27/100 nfsd: eliminate final bogus case from setclientid logic
We're supposed to generate a different cl_confirm verifier for each new client, so these to cl_confirm values should never be the same.
--- fs/nfsd/nfs4state.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-)
fs/nfsd/nfs4state.c +1 -6
@@ -769,7 +769,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (new ==NULL ) goto out;gen_clid (new); - }else if (!same_verf (&conf->cl_confirm, &unconf->cl_confirm)) { + }else {/* * RFC 3530 14.2.33 CASE 3: * probable client reboot; state will be removed if
@@ -780,11 +780,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (new ==NULL ) goto out;gen_clid (new); - }else { -/* No cases hit !!! */ - status = nfserr_inval; - goto out; - }copy_verf (new, &clverifier); new->cl_addr = sin->sin_addr.s_addr;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 28/100 nfsd: uniquify cl_confirm values
Using a counter instead of the nanoseconds value seems more likely to produce a unique cl_confirm.
--- fs/nfsd/nfs4state.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-)
fs/nfsd/nfs4state.c +6 -7
@@ -491,15 +491,14 @@ gen_clid(struct nfs4_client *clp) { clp->cl_clientid.cl_id = current_clientid++; } -static void -gen_confirm (struct nfs4_client *clp) { -struct timespec tv; -u32 * p; +static void gen_confirm (struct nfs4_client *clp) +{ +static u32 i =0 ; +u32 *p; - tv =CURRENT_TIME ; p = (u32 *)clp->cl_confirm.data; - *p++ = tv.tv_sec; - *p++ = tv.tv_nsec; + *p++ =get_seconds (); + *p++ = i++; } static int
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 29/100 nfsd4: kill unnecessary same_name() in setclientid_confirm
If conf and unconf are both found in the lookup by cl_clientid, then they share the same cl_clientid. We always create a unique new cl_clientid field when creating a new client--the only exception is the "probable callback update" case in setclientid, where we copy the old cl_clientid from another clientid with the same name.
Therefore two clients with the same cl_client field also always share the same cl_name field, and a couple of the checks here are redundant.
--- fs/nfsd/nfs4state.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
fs/nfsd/nfs4state.c +1 -3
@@ -838,7 +838,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,if ((conf && unconf) && (same_verf (&unconf->cl_confirm, &confirm)) && (same_verf (&conf->cl_verifier, &unconf->cl_verifier)) && - (same_name (conf->cl_recdir,unconf->cl_recdir)) && (!same_verf (&conf->cl_confirm, &unconf->cl_confirm))) {/* * RFC 3530 14.2.34 CASE 1:
@@ -858,8 +857,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, } }else if ((conf && !unconf) || ((conf && unconf) && - (!same_verf (&conf->cl_verifier, &unconf->cl_verifier) || - !same_name (conf->cl_recdir, unconf->cl_recdir)))) { + !same_verf(&conf->cl_verifier, &unconf->cl_verifier)) {/* * RFC 3530 14.2.34 CASE 2: * probable retransmitted request; play it safe and
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 30/100 nfsd4: remove unnecessary cl_verifier check from setclientid_confirm
Again, the only way conf and unconf can have the same clientid is if they were created in the "probable callback update" case of setclientid, in which case we already know that the cl_verifier fields must agree.
--- fs/nfsd/nfs4state.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
fs/nfsd/nfs4state.c +1 -4
@@ -837,7 +837,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,*/ if ((conf && unconf) && (same_verf (&unconf->cl_confirm, &confirm)) && - (same_verf (&conf->cl_verifier, &unconf->cl_verifier)) && (!same_verf (&conf->cl_confirm, &unconf->cl_confirm))) {/* * RFC 3530 14.2.34 CASE 1:
@@ -855,9 +854,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, status = nfs_ok; } - }else if ((conf && !unconf) || - ((conf && unconf) && - !same_verf(&conf->cl_verifier, &unconf->cl_verifier)) { + }else if (conf && !unconf) {/* * RFC 3530 14.2.34 CASE 2: * probable retransmitted request; play it safe and
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 31/100 nfsd4: kill unneeded cl_confirm check
We generate a unique cl_confirm for every new client; so if we've already checked that this cl_confirm agrees with the cl_confirm of unconf, then we already know that it does not agree with the cl_confirm of conf.
--- fs/nfsd/nfs4state.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
fs/nfsd/nfs4state.c +1 -3
@@ -835,9 +835,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,* SETCLIENTID_CONFIRM request processing consisting * of 4 bullet points, labeled as CASE1 - CASE4 below. */ -if ((conf && unconf) && - (same_verf (&unconf->cl_confirm, &confirm)) && - (!same_verf (&conf->cl_confirm, &unconf->cl_confirm))) { +if (conf && unconf &&same_verf (&confirm, &unconf->cl_confirm)) {/* * RFC 3530 14.2.34 CASE 1: * callback update
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 32/100 nfsd: fix encode_entryplus_baggage() indentation
Fix bizarre indentation.
--- fs/nfsd/nfs3xdr.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
fs/nfsd/nfs3xdr.c +5 -5
@@ -817,11 +817,11 @@ static __be32 * encode_entryplus_baggage(struct nfsd3_readdirres *cd, __be32 *p, struct svc_fh *fhp) { - p =encode_post_op_attr (cd->rqstp, p, fhp); - *p++ = xdr_one;/* yes, a file handle follows */ - p =encode_fh (p, fhp); -fh_put (fhp); -return p; + p =encode_post_op_attr (cd->rqstp, p, fhp); + *p++ = xdr_one;/* yes, a file handle follows */ + p =encode_fh (p, fhp); +fh_put (fhp); +return p; } static int
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 33/100 nfsd4: make current_clientid local
Declare this variable in the one function where it's used, and clean up some minor style problems.
--- fs/nfsd/nfs4state.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
fs/nfsd/nfs4state.c +4 -3
@@ -61,7 +61,6 @@ static time_t lease_time = 90; /* default lease time */static time_t user_lease_time =90 ;static time_t boot_time;static int in_grace =1 ; -static u32 current_clientid =1 ;static u32 current_ownerid =1 ;static u32 current_fileid =1 ;static u32 current_delegid =1 ;
@@ -485,8 +484,10 @@ same_creds(struct svc_cred *cr1, struct svc_cred *cr2)return cr1->cr_uid == cr2->cr_uid; } -static void -gen_clid (struct nfs4_client *clp) { +static void gen_clid (struct nfs4_client *clp) +{ +static u32 current_clientid =1 ; + clp->cl_clientid.cl_boot = boot_time; clp->cl_clientid.cl_id = current_clientid++; }
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 34/100 nfsd4: miscellaneous nfs4state.c style fixes
Fix various minor style violations.
--- fs/nfsd/nfs4state.c | 55 ++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 29 deletions(-)
fs/nfsd/nfs4state.c +26 -29
@@ -339,21 +339,20 @@ STALE_CLIENTID(clientid_t *clid)* This type of memory management is somewhat inefficient, but we use it * anyway since SETCLIENTID is not a common operation. */ -static inline struct nfs4_client * -alloc_client (struct xdr_netobj name) +static inline struct nfs4_client *alloc_client (struct xdr_netobj name) {struct nfs4_client *clp; -if ((clp =kzalloc (sizeof (struct nfs4_client ),GFP_KERNEL ))!=NULL ) { -if ((clp->cl_name.data =kmalloc (name.len,GFP_KERNEL )) !=NULL ) { -memcpy (clp->cl_name.data, name.data, name.len); - clp->cl_name.len = name.len; - } -else { -kfree (clp); - clp =NULL ; - } + clp =kzalloc (sizeof (struct nfs4_client ),GFP_KERNEL ); +if (clp ==NULL ) +return NULL ; + clp->cl_name.data =kmalloc (name.len,GFP_KERNEL ); +if (clp->cl_name.data ==NULL ) { +kfree (clp); +return NULL ; } +memcpy (clp->cl_name.data, name.data, name.len); + clp->cl_name.len = name.len;return clp; }
@@ -421,12 +420,13 @@ expire_client(struct nfs4_client *clp)put_nfs4_client (clp); } -static struct nfs4_client * -create_client (struct xdr_netobj name,char *recdir) { +static struct nfs4_client *create_client (struct xdr_netobj name,char *recdir) +{struct nfs4_client *clp; -if (!(clp =alloc_client (name))) - goto out; + clp =alloc_client (name); +if (clp ==NULL ) +return NULL ;memcpy (clp->cl_recdir, recdir,HEXDIR_LEN );atomic_set (&clp->cl_count,1 );atomic_set (&clp->cl_callback.cb_set,0 );
@@ -435,32 +435,30 @@ create_client(struct xdr_netobj name, char *recdir) {INIT_LIST_HEAD (&clp->cl_openowners);INIT_LIST_HEAD (&clp->cl_delegations);INIT_LIST_HEAD (&clp->cl_lru); -out:return clp; } -static void -copy_verf (struct nfs4_client *target,nfs4_verifier *source) { -memcpy (target->cl_verifier.data, source->data,sizeof (target->cl_verifier.data)); +static void copy_verf (struct nfs4_client *target,nfs4_verifier *source) +{ +memcpy (target->cl_verifier.data, source->data, +sizeof (target->cl_verifier.data)); } -static void -copy_clid (struct nfs4_client *target,struct nfs4_client *source) { +static void copy_clid (struct nfs4_client *target,struct nfs4_client *source) +{ target->cl_clientid.cl_boot = source->cl_clientid.cl_boot; target->cl_clientid.cl_id = source->cl_clientid.cl_id; } -static void -copy_cred (struct svc_cred *target,struct svc_cred *source) { - +static void copy_cred (struct svc_cred *target,struct svc_cred *source) +{ target->cr_uid = source->cr_uid; target->cr_gid = source->cr_gid; target->cr_group_info = source->cr_group_info;get_group_info (target->cr_group_info); } -static inline int -same_name (const char *n1,const char *n2) +static inline int same_name (const char *n1,const char *n2) {return 0 ==memcmp (n1, n2,HEXDIR_LEN ); }
@@ -502,9 +500,8 @@ static void gen_confirm(struct nfs4_client *clp) *p++ = i++; } -static int -check_name (struct xdr_netobj name) { - +static int check_name (struct xdr_netobj name) +{if (name.len ==0 )return 0 ;if (name.len >NFS4_OPAQUE_LIMIT ) {
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 35/100 nfsd4: recognize callback channel failure earlier
When the callback channel fails, we inform the client of that by returning a cb_path_down error the next time it tries to renew its lease.
If we wait most of a lease period before deciding that a callback has failed and that the callback channel is down, then we decrease the chances that the client will find out in time to do anything about it.
So, mark the channel down as soon as we recognize that an rpc has failed. However, continue trying to recall delegations anyway, in hopes it will come back up. This will prevent more delegations from being given out, and ensure cb_path_down is returned to renew calls earlier, while still making the best effort to deliver recalls of existing delegations.
Also fix a couple comments and remove a dprink that doesn't seem likely to be useful.
--- fs/nfsd/nfs4callback.c | 13 +++++-------- fs/nfsd/nfs4state.c | 5 ++++- 2 files changed, 9 insertions(+), 9 deletions(-)
fs/nfsd/nfs4callback.c +5 -8
@@ -457,9 +457,6 @@ nfsd4_cb_recall(struct nfs4_delegation *dp)int retries =1 ;int status =0 ; -if ((!atomic_read (&clp->cl_callback.cb_set)) || !clnt) -return ; - cbr->cbr_trunc =0 ;/* XXX need to implement truncate optimization */ cbr->cbr_dp = dp;
@@ -468,6 +465,7 @@ nfsd4_cb_recall(struct nfs4_delegation *dp)switch (status) {case -EIO :/* Network partition? */ +atomic_set (&clp->cl_callback.cb_set,0 );case -EBADHANDLE :case -NFS4ERR_BAD_STATEID :/* Race: client probably got cb_recall
@@ -480,11 +478,10 @@ nfsd4_cb_recall(struct nfs4_delegation *dp) status =rpc_call_sync (clnt, &msg,RPC_TASK_SOFT ); } out_put_cred: -if (status == -EIO ) -atomic_set (&clp->cl_callback.cb_set,0 ); -/* Success or failure, now we're either waiting for lease expiration -* or deleg_return. */ -dprintk ("NFSD: nfs4_cb_recall: dp %p dl_flock %p dl_count %d\n" ,dp, dp->dl_flock,atomic_read (&dp->dl_count)); +/* +* Success or failure, now we're either waiting for lease expiration +* or deleg_return. +*/ put_nfs4_client (clp);nfs4_put_delegation (dp);return ;
fs/nfsd/nfs4state.c +4 -1
@@ -361,8 +361,11 @@ shutdown_callback_client(struct nfs4_client *clp) {struct rpc_clnt *clnt = clp->cl_callback.cb_client; -/* shutdown rpc client, ending any outstanding recall rpcs */ if (clnt) { +/* +* Callback threads take a reference on the client, so there +* should be no outstanding callbacks at this point. +*/ clp->cl_callback.cb_client =NULL ;rpc_shutdown_client (clnt); }
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 36/100 lockd: fix reference count leaks in async locking case
From: Oleg Drokin <green-SOTZviwpzew/[email protected]>
In a number of places where we wish only to translate nlm_drop_reply to rpc_drop_reply errors we instead return early with rpc_drop_reply, skipping some important end-of-function cleanup.
This results in reference count leaks when lockd is doing posix locking on GFS2.
--- fs/lockd/svc4proc.c | 20 ++++++++++++-------- fs/lockd/svcproc.c | 22 +++++++++++++--------- 2 files changed, 25 insertions(+), 17 deletions(-)
fs/lockd/svc4proc.c +12 -8
@@ -84,6 +84,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, {struct nlm_host *host;struct nlm_file *file; +int rc = rpc_success;dprintk ("lockd: TEST4 called\n" ); resp->cookie = argp->cookie;
@@ -91,7 +92,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,/* Don't accept test requests during grace period */ if (nlmsvc_grace_period) { resp->status = nlm_lck_denied_grace_period; -return rpc_success; +return rc; }/* Obtain client and file */
@@ -101,12 +102,13 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,/* Now check for conflicting locks */ resp->status =nlmsvc_testlock (rqstp, file, &argp->lock, &resp->lock, &resp->cookie);if (resp->status == nlm_drop_reply) -return rpc_drop_reply; + rc = rpc_drop_reply; +else +dprintk ("lockd: TEST4 status %d\n" ,ntohl (resp->status)); -dprintk ("lockd: TEST4 status %d\n" ,ntohl (resp->status));nlm_release_host (host);nlm_release_file (file); -return rpc_success; +return rc; } static __be32
@@ -115,6 +117,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, {struct nlm_host *host;struct nlm_file *file; +int rc = rpc_success;dprintk ("lockd: LOCK called\n" );
@@ -123,7 +126,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,/* Don't accept new lock requests during grace period */ if (nlmsvc_grace_period && !argp->reclaim) { resp->status = nlm_lck_denied_grace_period; -return rpc_success; +return rc; }/* Obtain client and file */
@@ -146,12 +149,13 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, resp->status =nlmsvc_lock (rqstp, file, &argp->lock, argp->block, &argp->cookie);if (resp->status == nlm_drop_reply) -return rpc_drop_reply; + rc = rpc_drop_reply; +else +dprintk ("lockd: LOCK status %d\n" ,ntohl (resp->status)); -dprintk ("lockd: LOCK status %d\n" ,ntohl (resp->status));nlm_release_host (host);nlm_release_file (file); -return rpc_success; +return rc; } static __be32
fs/lockd/svcproc.c +13 -9
@@ -113,6 +113,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, {struct nlm_host *host;struct nlm_file *file; +int rc = rpc_success;dprintk ("lockd: TEST called\n" ); resp->cookie = argp->cookie;
@@ -120,7 +121,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,/* Don't accept test requests during grace period */ if (nlmsvc_grace_period) { resp->status = nlm_lck_denied_grace_period; -return rpc_success; +return rc; }/* Obtain client and file */
@@ -130,13 +131,14 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,/* Now check for conflicting locks */ resp->status =cast_status (nlmsvc_testlock (rqstp, file, &argp->lock, &resp->lock, &resp->cookie));if (resp->status == nlm_drop_reply) -return rpc_drop_reply; + rc = rpc_drop_reply; +else +dprintk ("lockd: TEST status %d vers %d\n" , +ntohl (resp->status), rqstp->rq_vers); -dprintk ("lockd: TEST status %d vers %d\n" , -ntohl (resp->status), rqstp->rq_vers);nlm_release_host (host);nlm_release_file (file); -return rpc_success; +return rc; } static __be32
@@ -145,6 +147,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, {struct nlm_host *host;struct nlm_file *file; +int rc = rpc_success;dprintk ("lockd: LOCK called\n" );
@@ -153,7 +156,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,/* Don't accept new lock requests during grace period */ if (nlmsvc_grace_period && !argp->reclaim) { resp->status = nlm_lck_denied_grace_period; -return rpc_success; +return rc; }/* Obtain client and file */
@@ -176,12 +179,13 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, resp->status =cast_status (nlmsvc_lock (rqstp, file, &argp->lock, argp->block, &argp->cookie));if (resp->status == nlm_drop_reply) -return rpc_drop_reply; + rc = rpc_drop_reply; +else +dprintk ("lockd: LOCK status %d\n" ,ntohl (resp->status)); -dprintk ("lockd: LOCK status %d\n" ,ntohl (resp->status));nlm_release_host (host);nlm_release_file (file); -return rpc_success; +return rc; } static __be32
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 37/100 nfsd4: fix bad seqid on lock request incompatible with open mode
The failure to return a stateowner from nfs4_preprocess_seqid_op() means in the case where a lock request is of a type incompatible with an open (due to, e.g., an application attempting a write lock on a file open for read), means that fs/nfsd/nfs4xdr.c:ENCODE_SEQID_OP_TAIL() never bumps the seqid as it should. The client, attempting to close the file afterwards, then gets an (incorrect) bad sequence id error. Worse, this prevents the open file from ever being closed, so we leak state.
Thanks to Benny Halevy and Trond Myklebust for analysis, and to Steven Wilton for the report and extensive data-gathering.
--- fs/nfsd/nfs4state.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
fs/nfsd/nfs4state.c +3 -4
@@ -2093,8 +2093,10 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei goto check_replay; } + *stpp = stp; + *sopp = sop = stp->st_stateowner; +if (lock) { -struct nfs4_stateowner *sop = stp->st_stateowner;clientid_t *lockclid = &lock->v.new.clientid;struct nfs4_client *clp = sop->so_client;int lkflg =0 ;
@@ -2124,9 +2126,6 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *stateireturn nfserr_bad_stateid; } - *stpp = stp; - *sopp = sop = stp->st_stateowner; -/* * We now validate the seqid and stateid generation numbers. * For the moment, we ignore the possibility of
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 38/100 nfsd: Allow AIX client to read dir containing mountpoints
From: Frank Filz <[email protected]>
This patch addresses a compatibility issue with a Linux NFS server and AIX NFS client.
I have exported /export as fsid=0 with sec=krb5:krb5i I have mount --bind /home onto /export/home
I have exported /export/home with sec=krb5i
The AIX client mounts / -o sec=krb5:krb5i onto /mnt
If I do an ls /mnt, the AIX client gets a permission error. Looking at the network traceIwe see a READDIR looking for attributes FATTR4_RDATTR_ERROR and FATTR4_MOUNTED_ON_FILEID. The response gives a NFS4ERR_WRONGSEC which the AIX client is not expecting.
Since the AIX client is only asking for an attribute that is an attribute of the parent file system (pseudo root in my example), it seems reasonable that there should not be an error.
In discussing this issue with Bruce Fields, I initially proposed ignoring the error in nfsd4_encode_dirent_fattr() if all that was being asked for was FATTR4_RDATTR_ERROR and FATTR4_MOUNTED_ON_FILEID, however, Bruce suggested that we avoid calling cross_mnt() if only these attributes are requested.
The following patch implements bypassing cross_mnt() if only FATTR4_RDATTR_ERROR and FATTR4_MOUNTED_ON_FILEID are called. Since there is some complexity in the code in nfsd4_encode_fattr(), I didn't want to duplicate code (and introduce a maintenance nightmare), so I added a parameter to nfsd4_encode_fattr() that indicates whether it should ignore cross mounts and simply fill in the attribute using the passed in dentry as opposed to it's parent.
--- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4xdr.c | 27 ++++++++++++++++++++++----- include/linux/nfsd/xdr4.h | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-)
fs/nfsd/nfs4proc.c +1 -1
@@ -750,7 +750,7 @@ _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, cstate->current_fh.fh_export, cstate->current_fh.fh_dentry, buf, &count, verify->ve_bmval, - rqstp); + rqstp, 0);/* this means that nfsd4_encode_fattr() ran out of space */ if (status == nfserr_resource && count ==0 )
fs/nfsd/nfs4xdr.c +22 -5
@@ -1453,7 +1453,7 @@ static __be32 fattr_handle_absent_fs(u32 *bmval0, u32 *bmval1, u32 *rdattr_err)__be32 nfsd4_encode_fattr (struct svc_fh *fhp,struct svc_export *exp,struct dentry *dentry,__be32 *buffer,int *countp,u32 *bmval, -struct svc_rqst *rqstp) +struct svc_rqst *rqstp,int ignore_crossmnt) {u32 bmval0 = bmval[0 ];u32 bmval1 = bmval[1 ];
@@ -1833,7 +1833,12 @@ out_acl:if (bmval1 &FATTR4_WORD1_MOUNTED_ON_FILEID ) {if ((buflen -=8 ) <0 ) goto out_resource; -if (exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) { +/* +* Get parent's attributes if not ignoring crossmount +* and this is the root of a cross-mounted filesystem. +*/ +if (ignore_crossmnt ==0 && + exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) { err =vfs_getattr (exp->ex_mnt->mnt_parent, exp->ex_mnt->mnt_mountpoint, &stat);if (err)
@@ -1869,13 +1874,25 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,struct svc_export *exp = cd->rd_fhp->fh_export;struct dentry *dentry;__be32 nfserr; +int ignore_crossmnt =0 ; dentry =lookup_one_len (name, cd->rd_fhp->fh_dentry, namlen);if (IS_ERR (dentry))return nfserrno (PTR_ERR (dentry));exp_get (exp); -if (d_mountpoint (dentry)) { +/* +* In the case of a mountpoint, the client may be asking for +* attributes that are only properties of the underlying filesystem +* as opposed to the cross-mounted file system. In such a case, +* we will not follow the cross mount and will fill the attribtutes +* directly from the mountpoint dentry. +*/ +if (d_mountpoint (dentry) && + (cd->rd_bmval[0 ] & ~FATTR4_WORD0_RDATTR_ERROR ) ==0 && + (cd->rd_bmval[1 ] & ~FATTR4_WORD1_MOUNTED_ON_FILEID ) ==0 ) + ignore_crossmnt =1 ; +else if (d_mountpoint (dentry)) {int err;/*
@@ -1894,7 +1911,7 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, } nfserr =nfsd4_encode_fattr (NULL , exp, dentry, p, buflen, cd->rd_bmval, - cd->rd_rqstp); + cd->rd_rqstp, ignore_crossmnt); out_put:dput (dentry);exp_put (exp);
@@ -2048,7 +2065,7 @@ nfsd4_encode_getattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4 buflen = resp->end - resp->p - (COMPOUND_ERR_SLACK_SPACE >>2 ); nfserr =nfsd4_encode_fattr (fhp, fhp->fh_export, fhp->fh_dentry, resp->p, &buflen, getattr->ga_bmval, - resp->rqstp); + resp->rqstp,0 );if (!nfserr) resp->p += buflen;return nfserr;
include/linux/nfsd/xdr4.h +1 -1
@@ -441,7 +441,7 @@ void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *);void nfsd4_encode_replay (struct nfsd4_compoundres *resp,struct nfsd4_op *op);__be32 nfsd4_encode_fattr (struct svc_fh *fhp,struct svc_export *exp,struct dentry *dentry,__be32 *buffer,int *countp, -u32 *bmval,struct svc_rqst *); +u32 *bmval,struct svc_rqst *,int ignore_crossmnt);extern __be32 nfsd4_setclientid (struct svc_rqst *rqstp,struct nfsd4_compound_state *,struct nfsd4_setclientid *setclid);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 39/100 lockd: fix a leak in nlmsvc_testlock asynchronous request handling
From: Oleg Drokin <Oleg.Drokin-UdXhSnd/[email protected]>
Without the patch, there is a leakage of nlmblock structure refcount that holds a reference nlmfile structure, that holds a reference to struct file, when async GETFL is used (-EINPROGRESS return from file_ops->lock()), and also in some error cases.
Fix up a style nit while we're here.
--- fs/lockd/svclock.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-)
fs/lockd/svclock.c +11 -7
@@ -501,25 +501,29 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, block, block->b_flags, block->b_fl);if (block->b_flags &B_TIMED_OUT ) {nlmsvc_unlink_block (block); -return nlm_lck_denied; + ret = nlm_lck_denied; + goto out; }if (block->b_flags &B_GOT_CALLBACK ) {if (block->b_fl !=NULL && block->b_fl->fl_type !=F_UNLCK ) { lock->fl = *block->b_fl; goto conf_lock; - } -else { + }else {nlmsvc_unlink_block (block); -return nlm_granted; + ret = nlm_granted; + goto out; } } -return nlm_drop_reply; + ret = nlm_drop_reply; + goto out; } error =vfs_test_lock (file->f_file, &lock->fl); -if (error == -EINPROGRESS ) -return nlmsvc_defer_lock_rqst (rqstp, block); +if (error == -EINPROGRESS ) { + ret =nlmsvc_defer_lock_rqst (rqstp, block); + goto out; + }if (error) { ret = nlm_lck_denied_nolocks; goto out;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 40/100 nfsd: allow root to set uid and gid on create
The server silently ignores attempts to set the uid and gid on create. Based on the comment, this appears to have been done to prevent some overly-clever IRIX client from causing itself problems.
Perhaps we should remove that hack completely. For now, at least, it makes sense to allow root (when no_root_squash is set) to set uid and gid.
While we're there, since nfsd_create and nfsd_create_v3 share the same logic, pull that out into a separate function. And spell out the individual modifications of ia_valid instead of doing them both at once inside a conditional.
Thanks to Roger Willcocks <[email protected]> for the bug report and original patch on which this is based.
--- fs/nfsd/vfs.c | 47 ++++++++++++++++++++++++++++------------------- 1 files changed, 28 insertions(+), 19 deletions(-)
fs/nfsd/vfs.c +28 -19
@@ -1151,6 +1151,26 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, }#endif /* CONFIG_NFSD_V3 */ +__be32 +nfsd_create_setattr (struct svc_rqst *rqstp,struct svc_fh *resfhp, +struct iattr *iap) +{ +/* +* Mode has already been set earlier in create: +*/ + iap->ia_valid &= ~ATTR_MODE ; +/* +* Setting uid/gid works only for root. Irix appears to +* send along the gid on create when it tries to implement +* setgid directories via NFS: +*/ +if (current->fsuid !=0 ) + iap->ia_valid &= ~(ATTR_UID |ATTR_GID ); +if (iap->ia_valid) +return nfsd_setattr (rqstp, resfhp, iap,0 , (time_t )0 ); +return 0 ; +} +/* * Create a file (regular, directory, device, fifo); UNIX sockets * not yet implemented.
@@ -1167,6 +1187,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,struct dentry *dentry, *dchild =NULL ;struct inode *dirp;__be32 err; +__be32 err2;int host_err; err = nfserr_perm;
@@ -1257,16 +1278,9 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, } -/* Set file attributes. Mode has already been set and -* setting uid/gid works only for root. Irix appears to -* send along the gid when it tries to implement setgid -* directories via NFS. -*/ -if ((iap->ia_valid &= ~(ATTR_UID |ATTR_GID |ATTR_MODE )) !=0 ) { -__be32 err2 =nfsd_setattr (rqstp, resfhp, iap,0 , (time_t )0 ); -if (err2) - err = err2; - } + err2 =nfsd_create_setattr (rqstp, resfhp, iap); +if (err2) + err = err2;/* * Update the file handle to get the new inode info. */
@@ -1295,6 +1309,7 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp,struct dentry *dentry, *dchild =NULL ;struct inode *dirp;__be32 err; +__be32 err2;int host_err;__u32 v_mtime=0 , v_atime=0 ;
@@ -1399,16 +1414,10 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp, iap->ia_atime.tv_nsec =0 ; } -/* Set file attributes. -* Irix appears to send along the gid when it tries to -* implement setgid directories via NFS. Clear out all that cruft. -*/ set_attr: -if ((iap->ia_valid &= ~(ATTR_UID |ATTR_GID |ATTR_MODE )) !=0 ) { -__be32 err2 =nfsd_setattr (rqstp, resfhp, iap,0 , (time_t )0 ); -if (err2) - err = err2; - } + err2 =nfsd_create_setattr (rqstp, resfhp, iap); +if (err2) + err = err2;/* * Update the filehandle to get the new inode info.
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 41/100 nfsd: fix rsi_cache reference count leak
For some reason we haven't been put()'ing the reference count here.
--- net/sunrpc/auth_gss/svcauth_gss.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
net/sunrpc/auth_gss/svcauth_gss.c +11 -6
@@ -975,6 +975,7 @@ static int svcauth_gss_handle_init(struct svc_rqst *rqstp,struct kvec *resv = &rqstp->rq_res.head[0 ];struct xdr_netobj tmpobj;struct rsi *rsip, rsikey; +int ret;/* Read the verifier; should be NULL: */ *authp = rpc_autherr_badverf;
@@ -1014,23 +1015,27 @@ static int svcauth_gss_handle_init(struct svc_rqst *rqstp,/* No upcall result: */ return SVC_DROP ;case 0 : + ret =SVC_DROP ;/* Got an answer to the upcall; use it: */ if (gss_write_init_verf (rqstp, rsip)) -return SVC_DROP ; + goto out;if (resv->iov_len +4 >PAGE_SIZE ) -return SVC_DROP ; + goto out;svc_putnl (resv,RPC_SUCCESS );if (svc_safe_putnetobj (resv, &rsip->out_handle)) -return SVC_DROP ; + goto out;if (resv->iov_len +3 *4 >PAGE_SIZE ) -return SVC_DROP ; + goto out;svc_putnl (resv, rsip->major_status);svc_putnl (resv, rsip->minor_status);svc_putnl (resv,GSS_SEQ_WIN );if (svc_safe_putnetobj (resv, &rsip->out_token)) -return SVC_DROP ; + goto out; } -return SVC_COMPLETE ; + ret =SVC_COMPLETE ; +out: +cache_put (&rsip->h, &rsi_cache); +return ret; }/*
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 42/100 knfsd: change mailing list for nfsd in MAINTAINERS
From: Neil Brown <[email protected]>
[email protected] is being decommissioned.
--- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
MAINTAINERS +1 -1
@@ -2214,7 +2214,7 @@ P: J. Bruce Fields M: [email protected] P: Neil Brown M: [email protected] -L: [email protected] +L: [email protected] W: http://nfs.sourceforge.net/ S: Supported
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 43/100 sunrpc: gss: simplify rsi_parse logic
Make an obvious simplification that removes a few lines and some unnecessary indentation; no change in behavior.
--- net/sunrpc/auth_gss/svcauth_gss.c | 52 +++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 28 deletions(-)
net/sunrpc/auth_gss/svcauth_gss.c +24 -28
@@ -224,38 +224,34 @@ static int rsi_parse(struct cache_detail *cd,/* major/minor */ len =qword_get (&mesg, buf, mlen); -if (len <0 ) +if (len <=0 ) goto out; -if (len ==0 ) { + rsii.major_status =simple_strtoul (buf, &ep,10 ); +if (*ep) + goto out; + len =qword_get (&mesg, buf, mlen); +if (len <=0 ) + goto out; + rsii.minor_status =simple_strtoul (buf, &ep,10 ); +if (*ep) goto out; - }else { - rsii.major_status =simple_strtoul (buf, &ep,10 ); -if (*ep) - goto out; - len =qword_get (&mesg, buf, mlen); -if (len <=0 ) - goto out; - rsii.minor_status =simple_strtoul (buf, &ep,10 ); -if (*ep) - goto out; -/* out_handle */ - len =qword_get (&mesg, buf, mlen); -if (len <0 ) - goto out; - status = -ENOMEM ; -if (dup_to_netobj (&rsii.out_handle, buf, len)) - goto out; +/* out_handle */ + len =qword_get (&mesg, buf, mlen); +if (len <0 ) + goto out; + status = -ENOMEM ; +if (dup_to_netobj (&rsii.out_handle, buf, len)) + goto out; -/* out_token */ - len =qword_get (&mesg, buf, mlen); - status = -EINVAL ; -if (len <0 ) - goto out; - status = -ENOMEM ; -if (dup_to_netobj (&rsii.out_token, buf, len)) - goto out; - } +/* out_token */ + len =qword_get (&mesg, buf, mlen); + status = -EINVAL ; +if (len <0 ) + goto out; + status = -ENOMEM ; +if (dup_to_netobj (&rsii.out_token, buf, len)) + goto out; rsii.h.expiry_time = expiry; rsip =rsi_update (&rsii, rsip); status =0 ;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 44/100 nfsd4: clean up access_valid, deny_valid checks.
Document these checks a little better and inline, as suggested by Neil Brown (note both functions have two callers). Remove an obviously bogus check while we're there (checking whether unsigned value is negative).
--- fs/nfsd/nfs4state.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
fs/nfsd/nfs4state.c +9 -4
@@ -1157,14 +1157,19 @@ find_file(struct inode *ino)return NULL ; } -static int access_valid (u32 x) +static inline int access_valid (u32 x) { -return (x >0 && x <4 ); +if (x <NFS4_SHARE_ACCESS_READ ) +return 0 ; +if (x >NFS4_SHARE_ACCESS_BOTH ) +return 0 ; +return 1 ; } -static int deny_valid (u32 x) +static inline int deny_valid (u32 x) { -return (x >=0 && x <5 ); +/* Note: unlike access bits, deny bits may be zero. */ +return x <=NFS4_SHARE_DENY_BOTH ; } static void
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 45/100 Leak in nlmsvc_testlock for async GETFL case
From: Oleg Drokin <Oleg.Drokin-UdXhSnd/[email protected]>
Fix nlm_block leak for the case of supplied blocking lock info.
--- fs/lockd/svclock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/lockd/svclock.c +1 -1
@@ -505,12 +505,12 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, goto out; }if (block->b_flags &B_GOT_CALLBACK ) { +nlmsvc_unlink_block (block);if (block->b_fl !=NULL && block->b_fl->fl_type !=F_UNLCK ) { lock->fl = *block->b_fl; goto conf_lock; }else { -nlmsvc_unlink_block (block); ret = nlm_granted; goto out; }
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 46/100 svcrpc: ensure gss DESTROY tokens free contexts from cache
If we don't do this then we'll end up with a pointless unusable context sitting in the cache until the time the original context would have expired.
--- net/sunrpc/auth_gss/svcauth_gss.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
net/sunrpc/auth_gss/svcauth_gss.c +1 -0
@@ -1126,6 +1126,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)case RPC_GSS_PROC_DESTROY :if (gss_write_verf (rqstp, rsci->mechctx, gc->gc_seq)) goto auth_err; + rsci->h.expiry_time =get_seconds ();set_bit (CACHE_NEGATIVE , &rsci->h.flags);if (resv->iov_len +4 >PAGE_SIZE ) goto drop;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 47/100 svc: Add an svc transport class
From: Tom Tucker <[email protected]>
The transport class (svc_xprt_class) represents a type of transport, e.g. udp, tcp, rdma. A transport class has a unique name and a set of transport operations kept in the svc_xprt_ops structure.
A transport class can be dynamically registered and unregisterd. The svc_xprt_class represents the module that implements the transport type and keeps reference counts on the module to avoid unloading while there are active users.
The endpoint (svc_xprt) is a generic, transport independent endpoint that can be used to send and receive data for an RPC service. It inherits it's operations from the transport class.
A transport driver module registers and unregisters itself with svc sunrpc by calling svc_reg_xprt_class, and svc_unreg_xprt_class respectively.
--- include/linux/sunrpc/debug.h | 1 + include/linux/sunrpc/svc_xprt.h | 31 ++++++++++++++ net/sunrpc/Makefile | 3 +- net/sunrpc/svc_xprt.c | 83 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 117 insertions(+), 1 deletions(-) create mode 100644 include/linux/sunrpc/svc_xprt.h create mode 100644 net/sunrpc/svc_xprt.c
include/linux/sunrpc/debug.h +1 -0
@@ -21,6 +21,7 @@#define RPCDBG_SCHED 0x0040#define RPCDBG_TRANS 0x0080#define RPCDBG_SVCSOCK 0x0100 +#define RPCDBG_SVCXPRT 0x0100#define RPCDBG_SVCDSP 0x0200#define RPCDBG_MISC 0x0400#define RPCDBG_CACHE 0x0800
include/linux/sunrpc/svc_xprt.h new file +31 -0
@@ -0,0 +1,31 @@ +/* +* linux/include/linux/sunrpc/svc_xprt.h +* +* RPC server transport I/O +*/ + +#ifndef SUNRPC_SVC_XPRT_H +#define SUNRPC_SVC_XPRT_H + +#include <linux/sunrpc/svc.h> + +struct svc_xprt_ops { +}; + +struct svc_xprt_class { +const char *xcl_name; +struct module *xcl_owner; +struct svc_xprt_ops *xcl_ops; +struct list_head xcl_list; +}; + +struct svc_xprt { +struct svc_xprt_class *xpt_class; +struct svc_xprt_ops *xpt_ops; +}; + +int svc_reg_xprt_class (struct svc_xprt_class *); +void svc_unreg_xprt_class (struct svc_xprt_class *); +void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *); + +#endif /* SUNRPC_SVC_XPRT_H */
net/sunrpc/Makefile +2 -1
@@ -11,6 +11,7 @@ sunrpc-y := clnt.o xprt.o socklib.o xprtsock.o sched.o \ auth.o auth_null.o auth_unix.o \ svc.o svcsock.o svcauth.o svcauth_unix.o \ rpcb_clnt.o timer.o xdr.o \ - sunrpc_syms.o cache.o rpc_pipe.o + sunrpc_syms.o cache.o rpc_pipe.o \ + svc_xprt.o sunrpc-$(CONFIG_PROC_FS) += stats.o sunrpc-$(CONFIG_SYSCTL) += sysctl.o
net/sunrpc/svc_xprt.c new file +83 -0
83 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 48/100 svc: Make svc_sock the tcp/udp transport
From: Tom Tucker <[email protected]>
Make TCP and UDP svc_sock transports, and register them with the svc transport core.
A transport type (svc_sock) has an svc_xprt as its first member, and calls svc_xprt_init to initialize this field.
--- include/linux/sunrpc/debug.h | 1 - include/linux/sunrpc/svcsock.h | 4 ++++ net/sunrpc/sunrpc_syms.c | 4 +++- net/sunrpc/svcsock.c | 32 +++++++++++++++++++++++++++++++- 4 files changed, 38 insertions(+), 3 deletions(-)
include/linux/sunrpc/debug.h +0 -1
@@ -20,7 +20,6 @@#define RPCDBG_BIND 0x0020#define RPCDBG_SCHED 0x0040#define RPCDBG_TRANS 0x0080 -#define RPCDBG_SVCSOCK 0x0100#define RPCDBG_SVCXPRT 0x0100#define RPCDBG_SVCDSP 0x0200#define RPCDBG_MISC 0x0400
include/linux/sunrpc/svcsock.h +4 -0
@@ -10,11 +10,13 @@#define SUNRPC_SVCSOCK_H #include <linux/sunrpc/svc.h> +#include <linux/sunrpc/svc_xprt.h> /* * RPC server socket. */ struct svc_sock { +struct svc_xprt sk_xprt;struct list_head sk_ready;/* list of ready sockets */ struct list_head sk_list;/* list of all sockets */ struct socket * sk_sock;/* berkeley socket layer */
@@ -78,6 +80,8 @@ int svc_addsock(struct svc_serv *serv,int fd, char *name_return, int *proto); +void svc_init_xprt_sock (void ); +void svc_cleanup_xprt_sock (void );/* * svc_makesock socket characteristics
net/sunrpc/sunrpc_syms.c +3 -1
@@ -151,7 +151,8 @@ init_sunrpc(void)#endif cache_register (&ip_map_cache);cache_register (&unix_gid_cache); -init_socket_xprt (); +svc_init_xprt_sock ();/* svc sock transport */ +init_socket_xprt ();/* clnt sock transport */ rpcauth_init_module (); out:return err;
@@ -162,6 +163,7 @@ cleanup_sunrpc(void) {rpcauth_remove_module ();cleanup_socket_xprt (); +svc_cleanup_xprt_sock ();unregister_rpc_pipefs ();rpc_destroy_mempool ();cache_unregister (&ip_map_cache);
net/sunrpc/svcsock.c +31 -1
@@ -75,7 +75,7 @@* */ -#define RPCDBG_FACILITY RPCDBG_SVCSOCK +#define RPCDBG_FACILITY RPCDBG_SVCXPRT static struct svc_sock *svc_setup_socket(struct svc_serv *, struct socket *,
@@ -900,12 +900,21 @@ svc_udp_sendto(struct svc_rqst *rqstp)return error; } +static struct svc_xprt_ops svc_udp_ops = { +}; + +static struct svc_xprt_class svc_udp_class = { + .xcl_name ="udp" , + .xcl_ops = &svc_udp_ops, +}; +static void svc_udp_init (struct svc_sock *svsk) {int one =1 ;mm_segment_t oldfs; +svc_xprt_init (&svc_udp_class, &svsk->sk_xprt); svsk->sk_sk->sk_data_ready = svc_udp_data_ready; svsk->sk_sk->sk_write_space = svc_write_space; svsk->sk_recvfrom = svc_udp_recvfrom;
@@ -1344,12 +1353,33 @@ svc_tcp_sendto(struct svc_rqst *rqstp)return sent; } +static struct svc_xprt_ops svc_tcp_ops = { +}; + +static struct svc_xprt_class svc_tcp_class = { + .xcl_name ="tcp" , + .xcl_ops = &svc_tcp_ops, +}; + +void svc_init_xprt_sock (void ) +{ +svc_reg_xprt_class (&svc_tcp_class); +svc_reg_xprt_class (&svc_udp_class); +} + +void svc_cleanup_xprt_sock (void ) +{ +svc_unreg_xprt_class (&svc_tcp_class); +svc_unreg_xprt_class (&svc_udp_class); +} +static void svc_tcp_init (struct svc_sock *svsk) {struct sock *sk = svsk->sk_sk;struct tcp_sock *tp =tcp_sk (sk); +svc_xprt_init (&svc_tcp_class, &svsk->sk_xprt); svsk->sk_recvfrom = svc_tcp_recvfrom; svsk->sk_sendto = svc_tcp_sendto;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 49/100 svc: Change the svc_sock in the rqstp structure to a transport
From: Tom Tucker <[email protected]>
The rqstp structure contains a pointer to the transport for the RPC request. This functionaly trivial patch adds an unamed union with pointers to both svc_sock and svc_xprt. Ultimately the union will be removed and only the rq_xprt field will remain. This allows incrementally extracting transport independent interfaces without one gigundo patch.
--- include/linux/sunrpc/svc.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
include/linux/sunrpc/svc.h +4 -1
@@ -204,7 +204,10 @@ union svc_addr_u {struct svc_rqst {struct list_head rq_list;/* idle list */ struct list_head rq_all;/* all threads list */ -struct svc_sock * rq_sock;/* socket */ +union { +struct svc_xprt * rq_xprt;/* transport ptr */ +struct svc_sock * rq_sock;/* socket ptr */ + };struct sockaddr_storage rq_addr;/* peer address */ size_t rq_addrlen;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 50/100 svc: Add a max payload value to the transport
From: Tom Tucker <[email protected]>
The svc_max_payload function currently looks at the socket type to determine the max payload. Add a max payload value to svc_xprt_class so it can be returned directly.
--- include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svc.c | 4 +--- net/sunrpc/svcsock.c | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -17,6 +17,7 @@ struct svc_xprt_class {struct module *xcl_owner;struct svc_xprt_ops *xcl_ops;struct list_head xcl_list; +u32 xcl_max_payload; };struct svc_xprt {
net/sunrpc/svc.c +1 -3
@@ -1054,10 +1054,8 @@ err_bad:*/ u32 svc_max_payload (const struct svc_rqst *rqstp) { -int max =RPCSVC_MAXPAYLOAD_TCP ; +u32 max = rqstp->rq_xprt->xpt_class->xcl_max_payload; -if (rqstp->rq_sock->sk_sock->type ==SOCK_DGRAM ) - max =RPCSVC_MAXPAYLOAD_UDP ;if (rqstp->rq_server->sv_max_payload < max) max = rqstp->rq_server->sv_max_payload;return max;
net/sunrpc/svcsock.c +2 -0
@@ -906,6 +906,7 @@ static struct svc_xprt_ops svc_udp_ops = {static struct svc_xprt_class svc_udp_class = { .xcl_name ="udp" , .xcl_ops = &svc_udp_ops, + .xcl_max_payload =RPCSVC_MAXPAYLOAD_UDP , }; static void
@@ -1359,6 +1360,7 @@ static struct svc_xprt_ops svc_tcp_ops = {static struct svc_xprt_class svc_tcp_class = { .xcl_name ="tcp" , .xcl_ops = &svc_tcp_ops, + .xcl_max_payload =RPCSVC_MAXPAYLOAD_TCP , };void svc_init_xprt_sock (void )
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 51/100 svc: Move sk_sendto and sk_recvfrom to svc_xprt_class
From: Tom Tucker <[email protected]>
The sk_sendto and sk_recvfrom are function pointers that allow svc_sock to be used for both UDP and TCP. Move these function pointers to the svc_xprt_ops structure.
--- include/linux/sunrpc/svc_xprt.h | 2 ++ include/linux/sunrpc/svcsock.h | 3 --- net/sunrpc/svcsock.c | 12 ++++++------ 3 files changed, 8 insertions(+), 9 deletions(-)
include/linux/sunrpc/svc_xprt.h +2 -0
@@ -10,6 +10,8 @@#include <linux/sunrpc/svc.h> struct svc_xprt_ops { +int (*xpo_recvfrom)(struct svc_rqst *); +int (*xpo_sendto)(struct svc_rqst *); };struct svc_xprt_class {
include/linux/sunrpc/svcsock.h +0 -3
@@ -45,9 +45,6 @@ struct svc_sock {* be revisted */ struct mutex sk_mutex;/* to serialize sending data */ -int (*sk_recvfrom)(struct svc_rqst *rqstp); -int (*sk_sendto)(struct svc_rqst *rqstp); -/* We keep the old state_change and data_ready CB's here */ void (*sk_ostate)(struct sock *);void (*sk_odata)(struct sock *,int bytes);
net/sunrpc/svcsock.c +6 -6
@@ -901,6 +901,8 @@ svc_udp_sendto(struct svc_rqst *rqstp) }static struct svc_xprt_ops svc_udp_ops = { + .xpo_recvfrom = svc_udp_recvfrom, + .xpo_sendto = svc_udp_sendto, };static struct svc_xprt_class svc_udp_class = {
@@ -918,8 +920,6 @@ svc_udp_init(struct svc_sock *svsk)svc_xprt_init (&svc_udp_class, &svsk->sk_xprt); svsk->sk_sk->sk_data_ready = svc_udp_data_ready; svsk->sk_sk->sk_write_space = svc_write_space; - svsk->sk_recvfrom = svc_udp_recvfrom; - svsk->sk_sendto = svc_udp_sendto;/* initialise setting must have enough space to * receive and respond to one request.
@@ -1355,6 +1355,8 @@ svc_tcp_sendto(struct svc_rqst *rqstp) }static struct svc_xprt_ops svc_tcp_ops = { + .xpo_recvfrom = svc_tcp_recvfrom, + .xpo_sendto = svc_tcp_sendto, };static struct svc_xprt_class svc_tcp_class = {
@@ -1382,8 +1384,6 @@ svc_tcp_init(struct svc_sock *svsk)struct tcp_sock *tp =tcp_sk (sk);svc_xprt_init (&svc_tcp_class, &svsk->sk_xprt); - svsk->sk_recvfrom = svc_tcp_recvfrom; - svsk->sk_sendto = svc_tcp_sendto;if (sk->sk_state ==TCP_LISTEN ) {dprintk ("setting up TCP socket for listening\n" );
@@ -1531,7 +1531,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)dprintk ("svc: server %p, pool %u, socket %p, inuse=%d\n" , rqstp, pool->sp_id, svsk,atomic_read (&svsk->sk_inuse)); - len = svsk->sk_recvfrom (rqstp); + len = svsk->sk_xprt.xpt_ops->xpo_recvfrom (rqstp);dprintk ("svc: got len=%d\n" , len);/* No data, incomplete (TCP) read, or accept() */
@@ -1591,7 +1591,7 @@ svc_send(struct svc_rqst *rqstp)if (test_bit (SK_DEAD , &svsk->sk_flags)) len = -ENOTCONN ;else - len = svsk->sk_sendto (rqstp); + len = svsk->sk_xprt.xpt_ops->xpo_sendto (rqstp);mutex_unlock (&svsk->sk_mutex);svc_sock_release (rqstp);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 52/100 svc: Add transport specific xpo_release function
From: Tom Tucker <[email protected]>
The svc_sock_release function releases pages allocated to a thread. For UDP this frees the receive skb. For RDMA it will post a receive WR and bump the client credit count.
--- include/linux/sunrpc/svc.h | 2 +- include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svcsock.c | 17 +++++++++-------- 3 files changed, 11 insertions(+), 9 deletions(-)
include/linux/sunrpc/svc.h +1 -1
@@ -217,7 +217,7 @@ struct svc_rqst {struct auth_ops * rq_authop;/* authentication flavour */ u32 rq_flavor;/* pseudoflavor */ struct svc_cred rq_cred;/* auth info */ -struct sk_buff * rq_skbuff;/* fast recv inet buffer */ +void * rq_xprt_ctxt;/* transport specific context ptr */ struct svc_deferred_req *rq_deferred;/* deferred request we are replaying */ struct xdr_buf rq_arg;
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -12,6 +12,7 @@struct svc_xprt_ops {int (*xpo_recvfrom)(struct svc_rqst *);int (*xpo_sendto)(struct svc_rqst *); +void (*xpo_release_rqst)(struct svc_rqst *); };struct svc_xprt_class {
net/sunrpc/svcsock.c +9 -8
@@ -185,14 +185,13 @@ svc_thread_dequeue(struct svc_pool *pool, struct svc_rqst *rqstp)/* * Release an skbuff after use */ -static inline void -svc_release_skb (struct svc_rqst *rqstp) +static void svc_release_skb (struct svc_rqst *rqstp) { -struct sk_buff *skb = rqstp->rq_skbuff; +struct sk_buff *skb = rqstp->rq_xprt_ctxt;struct svc_deferred_req *dr = rqstp->rq_deferred;if (skb) { - rqstp->rq_skbuff =NULL ; + rqstp->rq_xprt_ctxt =NULL ;dprintk ("svc: service %p, releasing skb %p\n" , rqstp, skb);skb_free_datagram (rqstp->rq_sock->sk_sk, skb);
@@ -395,7 +394,7 @@ svc_sock_release(struct svc_rqst *rqstp) {struct svc_sock *svsk = rqstp->rq_sock; -svc_release_skb (rqstp); + rqstp->rq_xprt->xpt_ops->xpo_release_rqst (rqstp);svc_free_res_pages (rqstp); rqstp->rq_res.page_len =0 ;
@@ -867,7 +866,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)skb_free_datagram (svsk->sk_sk, skb);return 0 ; } - rqstp->rq_skbuff = skb; + rqstp->rq_xprt_ctxt = skb; } rqstp->rq_arg.page_base =0 ;
@@ -903,6 +902,7 @@ svc_udp_sendto(struct svc_rqst *rqstp)static struct svc_xprt_ops svc_udp_ops = { .xpo_recvfrom = svc_udp_recvfrom, .xpo_sendto = svc_udp_sendto, + .xpo_release_rqst = svc_release_skb, };static struct svc_xprt_class svc_udp_class = {
@@ -1291,7 +1291,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) rqstp->rq_arg.page_len = len - rqstp->rq_arg.head[0 ].iov_len; } - rqstp->rq_skbuff =NULL ; + rqstp->rq_xprt_ctxt =NULL ; rqstp->rq_prot =IPPROTO_TCP ;/* Reset TCP read info */
@@ -1357,6 +1357,7 @@ svc_tcp_sendto(struct svc_rqst *rqstp)static struct svc_xprt_ops svc_tcp_ops = { .xpo_recvfrom = svc_tcp_recvfrom, .xpo_sendto = svc_tcp_sendto, + .xpo_release_rqst = svc_release_skb, };static struct svc_xprt_class svc_tcp_class = {
@@ -1578,7 +1579,7 @@ svc_send(struct svc_rqst *rqstp) }/* release the receive skb before sending the reply */ -svc_release_skb (rqstp); + rqstp->rq_xprt->xpt_ops->xpo_release_rqst (rqstp);/* calculate over-all length */ xb = & rqstp->rq_res;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 53/100 svc: Add per-transport delete functions
From: Tom Tucker <[email protected]>
Add transport specific xpo_detach and xpo_free functions. The xpo_detach function causes the transport to stop delivering data-ready events and enqueing the transport for I/O.
The xpo_free function frees all resources associated with the particular transport instance.
--- include/linux/sunrpc/svc_xprt.h | 2 + net/sunrpc/svcsock.c | 56 ++++++++++++++++++++++++++++++--------- 2 files changed, 45 insertions(+), 13 deletions(-)
include/linux/sunrpc/svc_xprt.h +2 -0
@@ -13,6 +13,8 @@ struct svc_xprt_ops {int (*xpo_recvfrom)(struct svc_rqst *);int (*xpo_sendto)(struct svc_rqst *);void (*xpo_release_rqst)(struct svc_rqst *); +void (*xpo_detach)(struct svc_xprt *); +void (*xpo_free)(struct svc_xprt *); };struct svc_xprt_class {
net/sunrpc/svcsock.c +43 -13
92 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 54/100 svc: Add xpo_prep_reply_hdr
From: Tom Tucker <[email protected]>
Some transports add fields to the RPC header for replies, e.g. the TCP record length. This function is called when preparing the reply header to allow each transport to add whatever fields it requires.
--- include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svc.c | 6 +++--- net/sunrpc/svcsock.c | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -11,6 +11,7 @@struct svc_xprt_ops {int (*xpo_recvfrom)(struct svc_rqst *); +void (*xpo_prep_reply_hdr)(struct svc_rqst *);int (*xpo_sendto)(struct svc_rqst *);void (*xpo_release_rqst)(struct svc_rqst *);void (*xpo_detach)(struct svc_xprt *);
net/sunrpc/svc.c +3 -3
@@ -839,9 +839,9 @@ svc_process(struct svc_rqst *rqstp) rqstp->rq_res.tail[0 ].iov_len =0 ;/* Will be turned off only in gss privacy case: */ rqstp->rq_splice_ok =1 ; -/* tcp needs a space for the record length... */ -if (rqstp->rq_prot ==IPPROTO_TCP ) -svc_putnl (resv,0 ); + +/* Setup reply header */ + rqstp->rq_xprt->xpt_ops->xpo_prep_reply_hdr (rqstp); rqstp->rq_xid =svc_getu32 (argv);svc_putu32 (resv, rqstp->rq_xid);
net/sunrpc/svcsock.c +17 -0
@@ -893,12 +893,17 @@ svc_udp_sendto(struct svc_rqst *rqstp)return error; } +static void svc_udp_prep_reply_hdr (struct svc_rqst *rqstp) +{ +} +static struct svc_xprt_ops svc_udp_ops = { .xpo_recvfrom = svc_udp_recvfrom, .xpo_sendto = svc_udp_sendto, .xpo_release_rqst = svc_release_skb, .xpo_detach = svc_sock_detach, .xpo_free = svc_sock_free, + .xpo_prep_reply_hdr = svc_udp_prep_reply_hdr, };static struct svc_xprt_class svc_udp_class = {
@@ -1350,12 +1355,24 @@ svc_tcp_sendto(struct svc_rqst *rqstp)return sent; } +/* +* Setup response header. TCP has a 4B record length field. +*/ +static void svc_tcp_prep_reply_hdr (struct svc_rqst *rqstp) +{ +struct kvec *resv = &rqstp->rq_res.head[0 ]; + +/* tcp needs a space for the record length... */ +svc_putnl (resv,0 ); +} +static struct svc_xprt_ops svc_tcp_ops = { .xpo_recvfrom = svc_tcp_recvfrom, .xpo_sendto = svc_tcp_sendto, .xpo_release_rqst = svc_release_skb, .xpo_detach = svc_sock_detach, .xpo_free = svc_sock_free, + .xpo_prep_reply_hdr = svc_tcp_prep_reply_hdr, };static struct svc_xprt_class svc_tcp_class = {
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 55/100 svc: Add a transport function that checks for write space
From: Tom Tucker <[email protected]>
In order to avoid blocking a service thread, the receive side checks to see if there is sufficient write space to reply to the request. Each transport has a different mechanism for determining if there is enough write space to reply.
The code that checked for write space was coupled with code that checked for CLOSE and CONN. These checks have been broken out into separate statements to make the code easier to read.
--- include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svcsock.c | 82 ++++++++++++++++++++++++++------------ 2 files changed, 57 insertions(+), 26 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -10,6 +10,7 @@#include <linux/sunrpc/svc.h> struct svc_xprt_ops { +int (*xpo_has_wspace)(struct svc_xprt *);int (*xpo_recvfrom)(struct svc_rqst *);void (*xpo_prep_reply_hdr)(struct svc_rqst *);int (*xpo_sendto)(struct svc_rqst *);
net/sunrpc/svcsock.c +56 -26
124 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 56/100 svc: Move close processing to a single place
From: Tom Tucker <[email protected]>
Close handling was duplicated in the UDP and TCP recvfrom methods. This code has been moved to the transport independent svc_recv function.
--- net/sunrpc/svcsock.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-)
net/sunrpc/svcsock.c +11 -15
@@ -776,11 +776,6 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)return svc_deferred_recv (rqstp); } -if (test_bit (SK_CLOSE , &svsk->sk_flags)) { -svc_delete_socket (svsk); -return 0 ; - } -clear_bit (SK_DATA , &svsk->sk_flags); skb =NULL ; err = kernel_recvmsg(svsk->sk_sock, &msg, NULL,
@@ -1181,11 +1176,6 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)return svc_deferred_recv (rqstp); } -if (test_bit (SK_CLOSE , &svsk->sk_flags)) { -svc_delete_socket (svsk); -return 0 ; - } -if (svsk->sk_sk->sk_state ==TCP_LISTEN ) {svc_tcp_accept (svsk);svc_sock_received (svsk);
@@ -1311,7 +1301,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)return len; err_delete: -svc_delete_socket (svsk); +set_bit (SK_CLOSE , &svsk->sk_flags);return -EAGAIN ; error:
@@ -1575,10 +1565,16 @@ svc_recv(struct svc_rqst *rqstp, long timeout) }spin_unlock_bh (&pool->sp_lock); -dprintk ("svc: server %p, pool %u, socket %p, inuse=%d\n" , - rqstp, pool->sp_id, svsk,atomic_read (&svsk->sk_inuse)); - len = svsk->sk_xprt.xpt_ops->xpo_recvfrom (rqstp); -dprintk ("svc: got len=%d\n" , len); + len =0 ; +if (test_bit (SK_CLOSE , &svsk->sk_flags)) { +dprintk ("svc_recv: found SK_CLOSE\n" ); +svc_delete_socket (svsk); + }else { +dprintk ("svc: server %p, pool %u, socket %p, inuse=%d\n" , + rqstp, pool->sp_id, svsk,atomic_read (&svsk->sk_inuse)); + len = svsk->sk_xprt.xpt_ops->xpo_recvfrom (rqstp); +dprintk ("svc: got len=%d\n" , len); + }/* No data, incomplete (TCP) read, or accept() */ if (len ==0 || len == -EAGAIN ) {
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 57/100 svc: Add xpo_accept transport function
From: Tom Tucker <[email protected]>
Previously, the accept logic looked into the socket state to determine whether to call accept or recv when data-ready was indicated on an endpoint. Since some transports don't use sockets, this logic now uses a flag bit (SK_LISTENER) to identify listening endpoints. A transport function (xpo_accept) allows each transport to define its own accept processing. A transport's initialization logic is reponsible for setting the SK_LISTENER bit. I didn't see any way to do this in transport independent logic since the passive side of a UDP connection doesn't listen and always recv's.
In the svc_recv function, if the SK_LISTENER bit is set, the transport xpo_accept function is called to handle accept processing.
Note that all functions are defined even if they don't make sense for a given transport. For example, accept doesn't mean anything for UDP. The function is defined anyway and bug checks if called. The UDP transport should never set the SK_LISTENER bit.
--- include/linux/sunrpc/svc_xprt.h | 1 + include/linux/sunrpc/svcsock.h | 1 + net/sunrpc/svcsock.c | 31 +++++++++++++++++++------------ 3 files changed, 21 insertions(+), 12 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -10,6 +10,7 @@#include <linux/sunrpc/svc.h> struct svc_xprt_ops { +struct svc_xprt *(*xpo_accept)(struct svc_xprt *);int (*xpo_has_wspace)(struct svc_xprt *);int (*xpo_recvfrom)(struct svc_rqst *);void (*xpo_prep_reply_hdr)(struct svc_rqst *);
include/linux/sunrpc/svcsock.h +1 -0
@@ -36,6 +36,7 @@ struct svc_sock {#define SK_DEFERRED 8/* request on sk_deferred */ #define SK_OLD 9/* used for temp socket aging mark+sweep */ #define SK_DETACHED 10/* detached from tempsocks list */ +#define SK_LISTENER 11/* listening endpoint */ atomic_t sk_reserved;/* space on outq that is reserved */
net/sunrpc/svcsock.c +19 -12
@@ -896,6 +896,12 @@ static int svc_udp_has_wspace(struct svc_xprt *xprt)return 1 ; } +static struct svc_xprt *svc_udp_accept (struct svc_xprt *xprt) +{ +BUG (); +return NULL ; +} +static struct svc_xprt_ops svc_udp_ops = { .xpo_recvfrom = svc_udp_recvfrom, .xpo_sendto = svc_udp_sendto,
@@ -904,6 +910,7 @@ static struct svc_xprt_ops svc_udp_ops = { .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_udp_prep_reply_hdr, .xpo_has_wspace = svc_udp_has_wspace, + .xpo_accept = svc_udp_accept, };static struct svc_xprt_class svc_udp_class = {
@@ -1028,9 +1035,9 @@ static inline int svc_port_is_privileged(struct sockaddr *sin)/* * Accept a TCP connection */ -static void -svc_tcp_accept (struct svc_sock *svsk) +static struct svc_xprt *svc_tcp_accept (struct svc_xprt *xprt) { + struct svc_sock *svsk = container_of(xprt, struct svc_sock, sk_xprt);struct sockaddr_storage addr;struct sockaddr *sin = (struct sockaddr *) &addr;struct svc_serv *serv = svsk->sk_server;
@@ -1042,7 +1049,7 @@ svc_tcp_accept(struct svc_sock *svsk)dprintk ("svc: tcp_accept %p sock %p\n" , svsk, sock);if (!sock) -return ; +return NULL ;clear_bit (SK_CONN , &svsk->sk_flags); err =kernel_accept (sock, &newsock,O_NONBLOCK );
@@ -1053,7 +1060,7 @@ svc_tcp_accept(struct svc_sock *svsk)else if (err != -EAGAIN &&net_ratelimit ())printk (KERN_WARNING "%s: accept failed (err %d)!\n" , serv->sv_name, -err); -return ; +return NULL ; }set_bit (SK_CONN , &svsk->sk_flags);
@@ -1147,11 +1154,11 @@ svc_tcp_accept(struct svc_sock *svsk)if (serv->sv_stats) serv->sv_stats->nettcpconn++; -return ; +return &newsvsk->sk_xprt; failed:sock_release (newsock); -return ; +return NULL ; }/*
@@ -1176,12 +1183,6 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)return svc_deferred_recv (rqstp); } -if (svsk->sk_sk->sk_state ==TCP_LISTEN ) { -svc_tcp_accept (svsk); -svc_sock_received (svsk); -return 0 ; - } -if (test_and_clear_bit (SK_CHNGBUF , &svsk->sk_flags))/* sndbuf needs to have room for one request * per thread, otherwise we can stall even when the
@@ -1393,6 +1394,7 @@ static struct svc_xprt_ops svc_tcp_ops = { .xpo_free = svc_sock_free, .xpo_prep_reply_hdr = svc_tcp_prep_reply_hdr, .xpo_has_wspace = svc_tcp_has_wspace, + .xpo_accept = svc_tcp_accept, };static struct svc_xprt_class svc_tcp_class = {
@@ -1423,6 +1425,7 @@ svc_tcp_init(struct svc_sock *svsk)if (sk->sk_state ==TCP_LISTEN ) {dprintk ("setting up TCP socket for listening\n" ); +set_bit (SK_LISTENER , &svsk->sk_flags); sk->sk_data_ready = svc_tcp_listen_data_ready;set_bit (SK_CONN , &svsk->sk_flags); }else {
@@ -1569,6 +1572,10 @@ svc_recv(struct svc_rqst *rqstp, long timeout)if (test_bit (SK_CLOSE , &svsk->sk_flags)) {dprintk ("svc_recv: found SK_CLOSE\n" );svc_delete_socket (svsk); + }else if (test_bit (SK_LISTENER , &svsk->sk_flags)) { +struct svc_xprt *newxpt; + newxpt = svsk->sk_xprt.xpt_ops->xpo_accept (&svsk->sk_xprt); +svc_sock_received (svsk); }else {dprintk ("svc: server %p, pool %u, socket %p, inuse=%d\n" , rqstp, pool->sp_id, svsk,atomic_read (&svsk->sk_inuse));
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 58/100 svc: Remove unnecessary call to svc_sock_enqueue
From: Tom Tucker <[email protected]>
The svc_tcp_accept function calls svc_sock_enqueue after setting the SK_CONN bit. This doesn't actually do anything because the SK_BUSY bit is still set. The call is unnecessary anyway because the generic code in svc_recv calls svc_sock_received after calling the accept function.
--- net/sunrpc/svcsock.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
net/sunrpc/svcsock.c +0 -1
@@ -1064,7 +1064,6 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt) }set_bit (SK_CONN , &svsk->sk_flags); -svc_sock_enqueue (svsk); err =kernel_getpeername (newsock, sin, &slen);if (err <0 ) {
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 59/100 svc: Move connection limit checking to its own function
From: Tom Tucker <[email protected]>
Move the code that poaches connections when the connection limit is hit to a subroutine to make the accept logic path easier to follow. Since this is in the new connection path, it should not be a performance issue.
--- net/sunrpc/svcsock.c | 57 +++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 28 deletions(-)
net/sunrpc/svcsock.c +29 -28
@@ -1105,17 +1105,30 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt)svc_sock_received (newsvsk); -/* make sure that we don't have too many active connections. -* If we have, something must be dropped. -* -* There's no point in trying to do random drop here for -* DoS prevention. The NFS clients does 1 reconnect in 15 -* seconds. An attacker can easily beat that. -* -* The only somewhat efficient mechanism would be if drop -* old connections from the same IP first. But right now -* we don't even record the client IP in svc_sock. -*/ +if (serv->sv_stats) + serv->sv_stats->nettcpconn++; + +return &newsvsk->sk_xprt; + +failed: +sock_release (newsock); +return NULL ; +} + +/* +* Make sure that we don't have too many active connections. If we +* have, something must be dropped. +* +* There's no point in trying to do random drop here for DoS +* prevention. The NFS clients does 1 reconnect in 15 seconds. An +* attacker can easily beat that. +* +* The only somewhat efficient mechanism would be if drop old +* connections from the same IP first. But right now we don't even +* record the client IP in svc_sock. +*/ +static void svc_check_conn_limits (struct svc_serv *serv) +{if (serv->sv_tmpcnt > (serv->sv_nrthreads+3 )*20 ) {struct svc_sock *svsk =NULL ;spin_lock_bh (&serv->sv_lock);
@@ -1123,13 +1136,9 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt)if (net_ratelimit ()) {/* Try to help the admin */ printk (KERN_NOTICE "%s: too many open TCP " -"sockets, consider increasing the " -"number of nfsd threads\n" , - serv->sv_name); -printk (KERN_NOTICE -"%s: last TCP connect from %s\n" , - serv->sv_name,__svc_print_addr (sin, - buf,sizeof (buf))); +"sockets, consider increasing the " +"number of nfsd threads\n" , + serv->sv_name); }/* * Always select the oldest socket. It's not fair,
@@ -1147,17 +1156,7 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt)svc_sock_enqueue (svsk);svc_sock_put (svsk); } - } - -if (serv->sv_stats) - serv->sv_stats->nettcpconn++; - -return &newsvsk->sk_xprt; - -failed: -sock_release (newsock); -return NULL ; }/*
@@ -1574,6 +1573,8 @@ svc_recv(struct svc_rqst *rqstp, long timeout) }else if (test_bit (SK_LISTENER , &svsk->sk_flags)) {struct svc_xprt *newxpt; newxpt = svsk->sk_xprt.xpt_ops->xpo_accept (&svsk->sk_xprt); +if (newxpt) +svc_check_conn_limits (svsk->sk_server);svc_sock_received (svsk); }else { dprintk("svc: server %p, pool %u, socket %p, inuse=%d\n",
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 60/100 svc: Add a generic transport svc_create_xprt function
From: Tom Tucker <[email protected]>
The svc_create_xprt function is a transport independent version of the svc_makesock function.
Since transport instance creation contains transport dependent and independent components, add an xpo_create transport function. The transport implementation of this function allocates the memory for the endpoint, implements the transport dependent initialization logic, and calls svc_xprt_init to initialize the transport independent field (svc_xprt) in it's data structure.
--- include/linux/sunrpc/svc_xprt.h | 4 ++ net/sunrpc/svc_xprt.c | 37 ++++++++++++++++++++++++ net/sunrpc/svcsock.c | 59 +++++++++++++++++++++++++++++---------- 3 files changed, 85 insertions(+), 15 deletions(-)
include/linux/sunrpc/svc_xprt.h +4 -0
@@ -10,6 +10,9 @@#include <linux/sunrpc/svc.h> struct svc_xprt_ops { +struct svc_xprt *(*xpo_create)(struct svc_serv *, +struct sockaddr *,int , +int );struct svc_xprt *(*xpo_accept)(struct svc_xprt *);int (*xpo_has_wspace)(struct svc_xprt *);int (*xpo_recvfrom)(struct svc_rqst *);
@@ -36,5 +39,6 @@ struct svc_xprt {int svc_reg_xprt_class (struct svc_xprt_class *);void svc_unreg_xprt_class (struct svc_xprt_class *);void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *); +int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int );#endif /* SUNRPC_SVC_XPRT_H */
net/sunrpc/svc_xprt.c +37 -0
@@ -81,3 +81,40 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt) xprt->xpt_ops = xcl->xcl_ops; }EXPORT_SYMBOL_GPL (svc_xprt_init); + +int svc_create_xprt (struct svc_serv *serv,char *xprt_name,unsigned short port, +int flags) +{ +struct svc_xprt_class *xcl; +int ret = -ENOENT ; +struct sockaddr_in sin = { + .sin_family =AF_INET , + .sin_addr.s_addr =INADDR_ANY , + .sin_port =htons (port), + }; +dprintk ("svc: creating transport %s[%d]\n" , xprt_name, port); +spin_lock (&svc_xprt_class_lock); +list_for_each_entry (xcl, &svc_xprt_class_list, xcl_list) { +if (strcmp (xprt_name, xcl->xcl_name) ==0 ) { +spin_unlock (&svc_xprt_class_lock); +if (try_module_get (xcl->xcl_owner)) { +struct svc_xprt *newxprt; + ret =0 ; + newxprt = xcl->xcl_ops->xpo_create + (serv, + (struct sockaddr *)&sin,sizeof (sin), + flags); +if (IS_ERR (newxprt)) { +module_put (xcl->xcl_owner); + ret =PTR_ERR (newxprt); + } + } + goto out; + } + } +spin_unlock (&svc_xprt_class_lock); +dprintk ("svc: transport %s not found\n" , xprt_name); + out: +return ret; +} +EXPORT_SYMBOL_GPL (svc_create_xprt);
net/sunrpc/svcsock.c +44 -15
139 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 61/100 svc: Change services to use new svc_create_xprt service
From: Tom Tucker <[email protected]>
Modify the various kernel RPC svcs to use the svc_create_xprt service.
--- fs/lockd/svc.c | 17 ++++++++--------- fs/nfs/callback.c | 4 ++-- fs/nfsd/nfssvc.c | 4 ++-- include/linux/sunrpc/svcsock.h | 1 - net/sunrpc/sunrpc_syms.c | 1 - net/sunrpc/svcsock.c | 22 ---------------------- 6 files changed, 12 insertions(+), 37 deletions(-)
fs/lockd/svc.c +8 -9
@@ -219,13 +219,12 @@ lockd(struct svc_rqst *rqstp)module_put_and_exit (0 ); } - -static int find_socket (struct svc_serv *serv,int proto) +static int find_xprt (struct svc_serv *serv,char *proto) {struct svc_sock *svsk;int found =0 ;list_for_each_entry (svsk, &serv->sv_permsocks, sk_list) -if (svsk->sk_sk->sk_protocol == proto) { +if (strcmp (svsk->sk_xprt.xpt_class->xcl_name, proto) ==0 ) { found =1 ;break ; }
@@ -243,13 +242,13 @@ static int make_socks(struct svc_serv *serv, int proto)int err =0 ;if (proto ==IPPROTO_UDP || nlm_udpport) -if (!find_socket (serv,IPPROTO_UDP )) - err =svc_makesock (serv,IPPROTO_UDP , nlm_udpport, -SVC_SOCK_DEFAULTS ); +if (!find_xprt (serv,"udp" )) + err =svc_create_xprt (serv,"udp" , nlm_udpport, +SVC_SOCK_DEFAULTS );if (err >=0 && (proto ==IPPROTO_TCP || nlm_tcpport)) -if (!find_socket (serv,IPPROTO_TCP )) - err =svc_makesock (serv,IPPROTO_TCP , nlm_tcpport, -SVC_SOCK_DEFAULTS ); +if (!find_xprt (serv,"tcp" )) + err =svc_create_xprt (serv,"tcp" , nlm_tcpport, +SVC_SOCK_DEFAULTS );if (err >=0 ) { warned =0 ;
fs/nfs/callback.c +2 -2
@@ -123,8 +123,8 @@ int nfs_callback_up(void)if (!serv) goto out_err; - ret =svc_makesock (serv,IPPROTO_TCP , nfs_callback_set_tcpport, -SVC_SOCK_ANONYMOUS ); + ret =svc_create_xprt (serv,"tcp" , nfs_callback_set_tcpport, +SVC_SOCK_ANONYMOUS );if (ret <=0 ) goto out_destroy; nfs_callback_tcpport = ret;
fs/nfsd/nfssvc.c +2 -2
@@ -236,7 +236,7 @@ static int nfsd_init_socks(int port) error =lockd_up (IPPROTO_UDP );if (error >=0 ) { - error =svc_makesock (nfsd_serv,IPPROTO_UDP , port, + error =svc_create_xprt (nfsd_serv,"udp" , port,SVC_SOCK_DEFAULTS );if (error <0 )lockd_down ();
@@ -247,7 +247,7 @@ static int nfsd_init_socks(int port)#ifdef CONFIG_NFSD_TCP error =lockd_up (IPPROTO_TCP );if (error >=0 ) { - error =svc_makesock (nfsd_serv,IPPROTO_TCP , port, + error =svc_create_xprt (nfsd_serv,"tcp" , port,SVC_SOCK_DEFAULTS );if (error <0 )lockd_down ();
include/linux/sunrpc/svcsock.h +0 -1
@@ -67,7 +67,6 @@ struct svc_sock {/* * Function prototypes. */ -int svc_makesock (struct svc_serv *,int ,unsigned short ,int flags);void svc_force_close_socket (struct svc_sock *);int svc_recv (struct svc_rqst *,long );int svc_send (struct svc_rqst *);
net/sunrpc/sunrpc_syms.c +0 -1
@@ -72,7 +72,6 @@ EXPORT_SYMBOL(svc_drop);EXPORT_SYMBOL (svc_process);EXPORT_SYMBOL (svc_recv);EXPORT_SYMBOL (svc_wake_up); -EXPORT_SYMBOL (svc_makesock);EXPORT_SYMBOL (svc_reserve);EXPORT_SYMBOL (svc_auth_register);EXPORT_SYMBOL (auth_domain_lookup);
net/sunrpc/svcsock.c +0 -22
@@ -1988,28 +1988,6 @@ void svc_force_close_socket(struct svc_sock *svsk)svc_close_socket (svsk); } -/** -* svc_makesock - Make a socket for nfsd and lockd -* @serv: RPC server structure -* @protocol: transport protocol to use -* @port: port to use -* @flags: requested socket characteristics -* -*/ -int svc_makesock (struct svc_serv *serv,int protocol,unsigned short port, -int flags) -{ -dprintk ("svc: creating socket proto = %d\n" , protocol); -switch (protocol) { -case IPPROTO_TCP : -return svc_create_xprt (serv,"tcp" , port, flags); -case IPPROTO_UDP : -return svc_create_xprt (serv,"udp" , port, flags); -default : -return -EINVAL ; - } -} -/* * Handle defer and revisit of requests */
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 62/100 svc: Change sk_inuse to a kref
From: Tom Tucker <[email protected]>
Change the atomic_t reference count to a kref and move it to the transport indepenent svc_xprt structure. Change the reference count wrapper names to be generic.
--- include/linux/sunrpc/svc_xprt.h | 8 ++ include/linux/sunrpc/svcsock.h | 1 - net/sunrpc/svc_xprt.c | 16 +++++ net/sunrpc/svcsock.c | 138 ++++++++++++++++++--------------------- 4 files changed, 87 insertions(+), 76 deletions(-)
include/linux/sunrpc/svc_xprt.h +8 -0
@@ -8,6 +8,7 @@#define SUNRPC_SVC_XPRT_H #include <linux/sunrpc/svc.h> +#include <linux/module.h> struct svc_xprt_ops { struct svc_xprt *(*xpo_create)(struct svc_serv *,
@@ -34,11 +35,18 @@ struct svc_xprt_class {struct svc_xprt {struct svc_xprt_class *xpt_class;struct svc_xprt_ops *xpt_ops; +struct kref xpt_ref; };int svc_reg_xprt_class (struct svc_xprt_class *);void svc_unreg_xprt_class (struct svc_xprt_class *);void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *);int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int ); +void svc_xprt_put (struct svc_xprt *xprt); + +static inline void svc_xprt_get (struct svc_xprt *xprt) +{ +kref_get (&xprt->xpt_ref); +}#endif /* SUNRPC_SVC_XPRT_H */
include/linux/sunrpc/svcsock.h +0 -1
@@ -24,7 +24,6 @@ struct svc_sock {struct svc_pool * sk_pool;/* current pool iff queued */ struct svc_serv * sk_server;/* service for this socket */ -atomic_t sk_inuse;/* use count */ unsigned long sk_flags;#define SK_BUSY 0/* enqueued/receiving */ #define SK_CONN 1/* conn pending */
net/sunrpc/svc_xprt.c +16 -0
@@ -70,6 +70,21 @@ void svc_unreg_xprt_class(struct svc_xprt_class *xcl) }EXPORT_SYMBOL_GPL (svc_unreg_xprt_class); +static void svc_xprt_free (struct kref *kref) +{ +struct svc_xprt *xprt = + container_of(kref, struct svc_xprt, xpt_ref); +struct module *owner = xprt->xpt_class->xcl_owner; + xprt->xpt_ops->xpo_free (xprt); +module_put (owner); +} + +void svc_xprt_put (struct svc_xprt *xprt) +{ +kref_put (&xprt->xpt_ref, svc_xprt_free); +} +EXPORT_SYMBOL_GPL (svc_xprt_put); +/* * Called by transport drivers to initialize the transport independent * portion of the transport instance.
@@ -79,6 +94,7 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt)memset (xprt,0 ,sizeof (*xprt)); xprt->xpt_class = xcl; xprt->xpt_ops = xcl->xcl_ops; +kref_init (&xprt->xpt_ref); }EXPORT_SYMBOL_GPL (svc_xprt_init);
net/sunrpc/svcsock.c +63 -75
245 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 63/100 svc: Move sk_flags to the svc_xprt structure
From: Tom Tucker <[email protected]>
This functionally trivial change moves the transport independent sk_flags field to the transport independent svc_xprt structure.
--- include/linux/sunrpc/svc_xprt.h | 12 +++ include/linux/sunrpc/svcsock.h | 13 ---- net/sunrpc/svcsock.c | 151 ++++++++++++++++++++------------------- 3 files changed, 88 insertions(+), 88 deletions(-)
include/linux/sunrpc/svc_xprt.h +12 -0
@@ -36,6 +36,18 @@ struct svc_xprt {struct svc_xprt_class *xpt_class;struct svc_xprt_ops *xpt_ops;struct kref xpt_ref; +unsigned long xpt_flags; +#define XPT_BUSY 0/* enqueued/receiving */ +#define XPT_CONN 1/* conn pending */ +#define XPT_CLOSE 2/* dead or dying */ +#define XPT_DATA 3/* data pending */ +#define XPT_TEMP 4/* connected transport */ +#define XPT_DEAD 6/* transport closed */ +#define XPT_CHNGBUF 7/* need to change snd/rcv buf sizes */ +#define XPT_DEFERRED 8/* deferred request pending */ +#define XPT_OLD 9/* used for xprt aging mark+sweep */ +#define XPT_DETACHED 10/* detached from tempsocks list */ +#define XPT_LISTENER 11/* listening endpoint */ };int svc_reg_xprt_class (struct svc_xprt_class *);
include/linux/sunrpc/svcsock.h +0 -13
@@ -24,19 +24,6 @@ struct svc_sock {struct svc_pool * sk_pool;/* current pool iff queued */ struct svc_serv * sk_server;/* service for this socket */ -unsigned long sk_flags; -#define SK_BUSY 0/* enqueued/receiving */ -#define SK_CONN 1/* conn pending */ -#define SK_CLOSE 2/* dead or dying */ -#define SK_DATA 3/* data pending */ -#define SK_TEMP 4/* temp (TCP) socket */ -#define SK_DEAD 6/* socket closed */ -#define SK_CHNGBUF 7/* need to change snd/rcv buffer sizes */ -#define SK_DEFERRED 8/* request on sk_deferred */ -#define SK_OLD 9/* used for temp socket aging mark+sweep */ -#define SK_DETACHED 10/* detached from tempsocks list */ -#define SK_LISTENER 11/* listening endpoint */ -atomic_t sk_reserved;/* space on outq that is reserved */ spinlock_t sk_lock;/* protects sk_deferred and
net/sunrpc/svcsock.c +76 -75
464 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 64/100 svc: Move sk_server and sk_pool to svc_xprt
From: Tom Tucker <[email protected]>
This is another incremental change that moves transport independent fields from svc_sock to the svc_xprt structure. The changes should be functionally null.
--- include/linux/sunrpc/svc_xprt.h | 6 +++- include/linux/sunrpc/svcsock.h | 2 - net/sunrpc/svc_xprt.c | 4 ++- net/sunrpc/svcsock.c | 57 ++++++++++++++++++-------------------- 4 files changed, 35 insertions(+), 34 deletions(-)
include/linux/sunrpc/svc_xprt.h +5 -1
@@ -48,11 +48,15 @@ struct svc_xprt {#define XPT_OLD 9/* used for xprt aging mark+sweep */ #define XPT_DETACHED 10/* detached from tempsocks list */ #define XPT_LISTENER 11/* listening endpoint */ + +struct svc_pool *xpt_pool;/* current pool iff queued */ +struct svc_serv *xpt_server;/* service for transport */ };int svc_reg_xprt_class (struct svc_xprt_class *);void svc_unreg_xprt_class (struct svc_xprt_class *); -void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *); +void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *, +struct svc_serv *);int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int );void svc_xprt_put (struct svc_xprt *xprt);
include/linux/sunrpc/svcsock.h +0 -2
@@ -22,8 +22,6 @@ struct svc_sock {struct socket * sk_sock;/* berkeley socket layer */ struct sock * sk_sk;/* INET layer */ -struct svc_pool * sk_pool;/* current pool iff queued */ -struct svc_serv * sk_server;/* service for this socket */ atomic_t sk_reserved;/* space on outq that is reserved */ spinlock_t sk_lock;/* protects sk_deferred and
net/sunrpc/svc_xprt.c +3 -1
@@ -89,12 +89,14 @@ EXPORT_SYMBOL_GPL(svc_xprt_put);* Called by transport drivers to initialize the transport independent * portion of the transport instance. */ -void svc_xprt_init (struct svc_xprt_class *xcl,struct svc_xprt *xprt) +void svc_xprt_init (struct svc_xprt_class *xcl,struct svc_xprt *xprt, +struct svc_serv *serv) {memset (xprt,0 ,sizeof (*xprt)); xprt->xpt_class = xcl; xprt->xpt_ops = xcl->xcl_ops;kref_init (&xprt->xpt_ref); + xprt->xpt_server = serv; }EXPORT_SYMBOL_GPL (svc_xprt_init);
net/sunrpc/svcsock.c +27 -30
196 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 65/100 svc: Make close transport independent
From: Tom Tucker <[email protected]>
Move sk_list and sk_ready to svc_xprt. This involves close because these lists are walked by svcs when closing all their transports. So I combined the moving of these lists to svc_xprt with making close transport independent.
The svc_force_sock_close has been changed to svc_close_all and takes a list as an argument. This removes some svc internals knowledge from the svcs.
This code races with module removal and transport addition.
--- fs/lockd/svc.c | 6 +- fs/nfsd/nfssvc.c | 4 +- include/linux/sunrpc/svc_xprt.h | 2 + include/linux/sunrpc/svcsock.h | 4 +- net/sunrpc/svc.c | 9 +--- net/sunrpc/svc_xprt.c | 2 + net/sunrpc/svcsock.c | 102 +++++++++++++++++++-------------------- 7 files changed, 61 insertions(+), 68 deletions(-)
fs/lockd/svc.c +3 -3
@@ -221,10 +221,10 @@ lockd(struct svc_rqst *rqstp)static int find_xprt (struct svc_serv *serv,char *proto) { -struct svc_sock *svsk; +struct svc_xprt *xprt;int found =0 ; -list_for_each_entry (svsk, &serv->sv_permsocks, sk_list) -if (strcmp (svsk->sk_xprt.xpt_class->xcl_name, proto) ==0 ) { +list_for_each_entry (xprt, &serv->sv_permsocks, xpt_list) +if (strcmp (xprt->xpt_class->xcl_name, proto) ==0 ) { found =1 ;break ; }
fs/nfsd/nfssvc.c +2 -2
@@ -155,8 +155,8 @@ static int killsig; /* signal that was used to kill last nfsd */static void nfsd_last_thread (struct svc_serv *serv) {/* When last nfsd thread exits we need to do some clean-up */ -struct svc_sock *svsk; -list_for_each_entry (svsk, &serv->sv_permsocks, sk_list) +struct svc_xprt *xprt; +list_for_each_entry (xprt, &serv->sv_permsocks, xpt_list)lockd_down (); nfsd_serv =NULL ;nfsd_racache_shutdown ();
include/linux/sunrpc/svc_xprt.h +2 -0
@@ -36,6 +36,8 @@ struct svc_xprt {struct svc_xprt_class *xpt_class;struct svc_xprt_ops *xpt_ops;struct kref xpt_ref; +struct list_head xpt_list; +struct list_head xpt_ready;unsigned long xpt_flags;#define XPT_BUSY 0/* enqueued/receiving */ #define XPT_CONN 1/* conn pending */
include/linux/sunrpc/svcsock.h +1 -3
@@ -17,8 +17,6 @@*/ struct svc_sock {struct svc_xprt sk_xprt; -struct list_head sk_ready;/* list of ready sockets */ -struct list_head sk_list;/* list of all sockets */ struct socket * sk_sock;/* berkeley socket layer */ struct sock * sk_sk;/* INET layer */
@@ -51,7 +49,7 @@ struct svc_sock {/* * Function prototypes. */ -void svc_force_close_socket (struct svc_sock *); +void svc_close_all (struct list_head *);int svc_recv (struct svc_rqst *,long );int svc_send (struct svc_rqst *);void svc_drop (struct svc_rqst *);
net/sunrpc/svc.c +2 -7
@@ -458,9 +458,6 @@ svc_create_pooled(struct svc_program *prog, unsigned int bufsize,void svc_destroy (struct svc_serv *serv) { -struct svc_sock *svsk; -struct svc_sock *tmp; -dprintk ("svc: svc_destroy(%s, %d)\n" , serv->sv_program->pg_name, serv->sv_nrthreads);
@@ -475,14 +472,12 @@ svc_destroy(struct svc_serv *serv)del_timer_sync (&serv->sv_temptimer); -list_for_each_entry_safe (svsk, tmp, &serv->sv_tempsocks, sk_list) -svc_force_close_socket (svsk); +svc_close_all (&serv->sv_tempsocks);if (serv->sv_shutdown) serv->sv_shutdown (serv); -list_for_each_entry_safe (svsk, tmp, &serv->sv_permsocks, sk_list) -svc_force_close_socket (svsk); +svc_close_all (&serv->sv_permsocks);BUG_ON (!list_empty (&serv->sv_permsocks));BUG_ON (!list_empty (&serv->sv_tempsocks));
net/sunrpc/svc_xprt.c +2 -0
@@ -97,6 +97,8 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt, xprt->xpt_ops = xcl->xcl_ops;kref_init (&xprt->xpt_ref); xprt->xpt_server = serv; +INIT_LIST_HEAD (&xprt->xpt_list); +INIT_LIST_HEAD (&xprt->xpt_ready); }EXPORT_SYMBOL_GPL (svc_xprt_init);
net/sunrpc/svcsock.c +49 -53
218 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 66/100 svc: Move sk_reserved to svc_xprt
From: Tom Tucker <[email protected]>
This functionally trivial patch moves the sk_reserved field to the transport independent svc_xprt structure.
--- include/linux/sunrpc/svc_xprt.h | 1 + include/linux/sunrpc/svcsock.h | 2 -- net/sunrpc/svcsock.c | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -53,6 +53,7 @@ struct svc_xprt {struct svc_pool *xpt_pool;/* current pool iff queued */ struct svc_serv *xpt_server;/* service for transport */ +atomic_t xpt_reserved;/* space on outq that is rsvd */ };int svc_reg_xprt_class (struct svc_xprt_class *);
include/linux/sunrpc/svcsock.h +0 -2
@@ -20,8 +20,6 @@ struct svc_sock {struct socket * sk_sock;/* berkeley socket layer */ struct sock * sk_sk;/* INET layer */ -atomic_t sk_reserved;/* space on outq that is reserved */ -spinlock_t sk_lock;/* protects sk_deferred and * sk_info_authunix */ struct list_head sk_deferred;/* deferred requests that need to
net/sunrpc/svcsock.c +5 -5
@@ -288,7 +288,7 @@ svc_sock_enqueue(struct svc_sock *svsk) rqstp->rq_sock = svsk;svc_xprt_get (&svsk->sk_xprt); rqstp->rq_reserved = serv->sv_max_mesg; -atomic_add (rqstp->rq_reserved, &svsk->sk_reserved); +atomic_add (rqstp->rq_reserved, &svsk->sk_xprt.xpt_reserved);BUG_ON (svsk->sk_xprt.xpt_pool != pool);wake_up (&rqstp->rq_wait); }else {
@@ -353,7 +353,7 @@ void svc_reserve(struct svc_rqst *rqstp, int space)if (space < rqstp->rq_reserved) {struct svc_sock *svsk = rqstp->rq_sock; -atomic_sub ((rqstp->rq_reserved - space), &svsk->sk_reserved); +atomic_sub ((rqstp->rq_reserved - space), &svsk->sk_xprt.xpt_reserved); rqstp->rq_reserved = space;svc_sock_enqueue (svsk);
@@ -881,7 +881,7 @@ static int svc_udp_has_wspace(struct svc_xprt *xprt)* sock space. */ set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); - required =atomic_read (&svsk->sk_reserved) + serv->sv_max_mesg; + required =atomic_read (&svsk->sk_xprt.xpt_reserved) + serv->sv_max_mesg;if (required*2 >sock_wspace (svsk->sk_sk))return 0 ;clear_bit (SOCK_NOSPACE , &svsk->sk_sock->flags);
@@ -1327,7 +1327,7 @@ static int svc_tcp_has_wspace(struct svc_xprt *xprt)* sock space. */ set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); - required =atomic_read (&svsk->sk_reserved) + serv->sv_max_mesg; + required =atomic_read (&svsk->sk_xprt.xpt_reserved) + serv->sv_max_mesg; wspace =sk_stream_wspace (svsk->sk_sk);if (wspace <sk_stream_min_wspace (svsk->sk_sk))
@@ -1544,7 +1544,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout) rqstp->rq_sock = svsk;svc_xprt_get (&svsk->sk_xprt); rqstp->rq_reserved = serv->sv_max_mesg; -atomic_add (rqstp->rq_reserved, &svsk->sk_reserved); +atomic_add (rqstp->rq_reserved, &svsk->sk_xprt.xpt_reserved); }else {/* No data pending. Go to sleep */ svc_thread_enqueue (pool, rqstp);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 67/100 svc: Make the enqueue service transport neutral and export it.
From: Tom Tucker <[email protected]>
The svc_sock_enqueue function is now transport independent since all of the fields it touches have been moved to the transport independent svc_xprt structure. Change the function to use the svc_xprt structure directly instead of the transport specific svc_sock structure.
Transport specific data-ready handlers need to call this function, so export it.
--- net/sunrpc/svcsock.c | 94 +++++++++++++++++++++++++------------------------ 1 files changed, 48 insertions(+), 46 deletions(-)
net/sunrpc/svcsock.c +48 -46
@@ -5,7 +5,7 @@* * The server scheduling algorithm does not always distribute the load * evenly when servicing a single client. May need to modify the -* svc_sock_enqueue procedure... +* svc_xprt_enqueue procedure... * * TCP support is largely untested and may be a little slow. The problem * is that we currently do two separate recvfrom's, one for the 4-byte
@@ -63,7 +63,7 @@* providing that certain rules are followed: * * XPT_CONN, XPT_DATA, can be set or cleared at any time. -* after a set, svc_sock_enqueue must be called. +* after a set, svc_xprt_enqueue must be called. * after a clear, the socket must be read/accepted * if this succeeds, it must be set again. * XPT_CLOSE can set at any time. It is never cleared.
@@ -212,22 +212,21 @@ static void svc_release_skb(struct svc_rqst *rqstp)* processes, wake 'em up. * */ -static void -svc_sock_enqueue (struct svc_sock *svsk) +void svc_xprt_enqueue (struct svc_xprt *xprt) { -struct svc_serv *serv = svsk->sk_xprt.xpt_server; +struct svc_serv *serv = xprt->xpt_server;struct svc_pool *pool;struct svc_rqst *rqstp;int cpu; -if (!(svsk->sk_xprt.xpt_flags & +if (!(xprt->xpt_flags & ((1 <<XPT_CONN )|(1 <<XPT_DATA )|(1 <<XPT_CLOSE )|(1 <<XPT_DEFERRED ))))return ; -if (test_bit (XPT_DEAD , &svsk->sk_xprt.xpt_flags)) +if (test_bit (XPT_DEAD , &xprt->xpt_flags))return ; cpu =get_cpu (); - pool =svc_pool_for_cpu (svsk->sk_xprt.xpt_server, cpu); + pool =svc_pool_for_cpu (xprt->xpt_server, cpu);put_cpu ();spin_lock_bh (&pool->sp_lock);
@@ -235,11 +234,12 @@ svc_sock_enqueue(struct svc_sock *svsk)if (!list_empty (&pool->sp_threads) && !list_empty (&pool->sp_sockets))printk (KERN_ERR -"svc_sock_enqueue: threads and sockets both waiting??\n" ); +"svc_xprt_enqueue: " +"threads and transports both waiting??\n" ); -if (test_bit (XPT_DEAD , &svsk->sk_xprt.xpt_flags)) { +if (test_bit (XPT_DEAD , &xprt->xpt_flags)) {/* Don't enqueue dead sockets */ -dprintk ("svc: socket %p is dead, not enqueued\n" , svsk->sk_sk); +dprintk ("svc: transport %p is dead, not enqueued\n" , xprt); goto out_unlock; }
@@ -248,28 +248,29 @@ svc_sock_enqueue(struct svc_sock *svsk)* on the idle list. We update XPT_BUSY atomically because * it also guards against trying to enqueue the svc_sock twice. */ -if (test_and_set_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags)) { +if (test_and_set_bit (XPT_BUSY , &xprt->xpt_flags)) {/* Don't enqueue socket while already enqueued */ -dprintk ("svc: socket %p busy, not enqueued\n" , svsk->sk_sk); +dprintk ("svc: transport %p busy, not enqueued\n" , xprt); goto out_unlock; } -BUG_ON (svsk->sk_xprt.xpt_pool !=NULL ); - svsk->sk_xprt.xpt_pool = pool; +BUG_ON (xprt->xpt_pool !=NULL ); + xprt->xpt_pool = pool;/* Handle pending connection */ -if (test_bit (XPT_CONN , &svsk->sk_xprt.xpt_flags)) +if (test_bit (XPT_CONN , &xprt->xpt_flags)) goto process;/* Handle close in-progress */ -if (test_bit (XPT_CLOSE , &svsk->sk_xprt.xpt_flags)) +if (test_bit (XPT_CLOSE , &xprt->xpt_flags)) goto process;/* Check if we have space to reply to a request */ -if (!svsk->sk_xprt.xpt_ops->xpo_has_wspace (&svsk->sk_xprt)) { +if (!xprt->xpt_ops->xpo_has_wspace (xprt)) {/* Don't enqueue while not enough space for reply */ -dprintk ("svc: no write space, socket %p not enqueued\n" , svsk); - svsk->sk_xprt.xpt_pool =NULL ; -clear_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags); +dprintk ("svc: no write space, transport %p not enqueued\n" , + xprt); + xprt->xpt_pool =NULL ; +clear_bit (XPT_BUSY , &xprt->xpt_flags); goto out_unlock; }
@@ -278,28 +279,29 @@ svc_sock_enqueue(struct svc_sock *svsk) rqstp =list_entry (pool->sp_threads.next, struct svc_rqst, rq_list); -dprintk ("svc: socket %p served by daemon %p\n" , - svsk->sk_sk, rqstp); +dprintk ("svc: transport %p served by daemon %p\n" , + xprt, rqstp);svc_thread_dequeue (pool, rqstp); -if (rqstp->rq_sock) +if (rqstp->rq_xprt)printk (KERN_ERR -"svc_sock_enqueue: server %p, rq_sock=%p!\n" , - rqstp, rqstp->rq_sock); - rqstp->rq_sock = svsk; -svc_xprt_get (&svsk->sk_xprt); +"svc_xprt_enqueue: server %p, rq_xprt=%p!\n" , + rqstp, rqstp->rq_xprt); + rqstp->rq_xprt = xprt; +svc_xprt_get (xprt); rqstp->rq_reserved = serv->sv_max_mesg; -atomic_add (rqstp->rq_reserved, &svsk->sk_xprt.xpt_reserved); -BUG_ON (svsk->sk_xprt.xpt_pool != pool); +atomic_add (rqstp->rq_reserved, &xprt->xpt_reserved); +BUG_ON (xprt->xpt_pool != pool);wake_up (&rqstp->rq_wait); }else { -dprintk ("svc: socket %p put into queue\n" , svsk->sk_sk); -list_add_tail (&svsk->sk_xprt.xpt_ready, &pool->sp_sockets); -BUG_ON (svsk->sk_xprt.xpt_pool != pool); +dprintk ("svc: transport %p put into queue\n" , xprt); +list_add_tail (&xprt->xpt_ready, &pool->sp_sockets); +BUG_ON (xprt->xpt_pool != pool); } out_unlock:spin_unlock_bh (&pool->sp_lock); } +EXPORT_SYMBOL_GPL (svc_xprt_enqueue);/* * Dequeue the first socket. Must be called with the pool->sp_lock held.
@@ -333,7 +335,7 @@ svc_sock_received(struct svc_sock *svsk) { svsk->sk_xprt.xpt_pool =NULL ;clear_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); }
@@ -352,11 +354,11 @@ void svc_reserve(struct svc_rqst *rqstp, int space) space += rqstp->rq_res.head[0 ].iov_len;if (space < rqstp->rq_reserved) { -struct svc_sock *svsk = rqstp->rq_sock; -atomic_sub ((rqstp->rq_reserved - space), &svsk->sk_xprt.xpt_reserved); +struct svc_xprt *xprt = rqstp->rq_xprt; +atomic_sub ((rqstp->rq_reserved - space), &xprt->xpt_reserved); rqstp->rq_reserved = space; -svc_sock_enqueue (svsk); +svc_xprt_enqueue (xprt); } }
@@ -684,7 +686,7 @@ svc_udp_data_ready(struct sock *sk, int count) svsk, sk, count, test_bit(XPT_BUSY, &svsk->sk_xprt.xpt_flags));set_bit (XPT_DATA , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); }if (sk->sk_sleep &&waitqueue_active (sk->sk_sleep))wake_up_interruptible (sk->sk_sleep);
@@ -701,7 +703,7 @@ svc_write_space(struct sock *sk)if (svsk) {dprintk ("svc: socket %p(inet %p), write_space busy=%d\n" , svsk, sk,test_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags)); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); }if (sk->sk_sleep &&waitqueue_active (sk->sk_sleep)) {
@@ -973,7 +975,7 @@ svc_tcp_listen_data_ready(struct sock *sk, int count_unused)if (sk->sk_state ==TCP_LISTEN ) {if (svsk) {set_bit (XPT_CONN , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); }else printk ("svc: socket %p: no user data\n" , sk); }
@@ -997,7 +999,7 @@ svc_tcp_state_change(struct sock *sk)printk ("svc: socket %p: no user data\n" , sk); else {set_bit (XPT_CLOSE , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); }if (sk->sk_sleep &&waitqueue_active (sk->sk_sleep))wake_up_interruptible_all (sk->sk_sleep);
@@ -1012,7 +1014,7 @@ svc_tcp_data_ready(struct sock *sk, int count) sk, sk->sk_user_data);if (svsk) {set_bit (XPT_DATA , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt); }if (sk->sk_sleep &&waitqueue_active (sk->sk_sleep))wake_up_interruptible (sk->sk_sleep);
@@ -1298,7 +1300,7 @@ svc_tcp_sendto(struct svc_rqst *rqstp) (sent<0 )?"got error" :"sent only" , sent, xbufp->len);set_bit (XPT_CLOSE , &rqstp->rq_sock->sk_xprt.xpt_flags); -svc_sock_enqueue (rqstp->rq_sock); +svc_xprt_enqueue (rqstp->rq_xprt); sent = -EAGAIN ; }return sent;
@@ -1476,7 +1478,7 @@ static void svc_check_conn_limits(struct svc_serv *serv)spin_unlock_bh (&serv->sv_lock);if (svsk) { -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt);svc_xprt_put (&svsk->sk_xprt); } }
@@ -1709,7 +1711,7 @@ svc_age_temp_sockets(unsigned long closure) svsk, get_seconds() - svsk->sk_lastrecv);/* a thread will dequeue and close it soon */ -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt);svc_xprt_put (&svsk->sk_xprt); }
@@ -1991,7 +1993,7 @@ static void svc_revisit(struct cache_deferred_req *dreq, int too_many)list_add (&dr->handle.recent, &svsk->sk_deferred);spin_unlock (&svsk->sk_lock);set_bit (XPT_DEFERRED , &svsk->sk_xprt.xpt_flags); -svc_sock_enqueue (svsk); +svc_xprt_enqueue (&svsk->sk_xprt);svc_xprt_put (&svsk->sk_xprt); }
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 68/100 svc: Make svc_send transport neutral
From: Tom Tucker <[email protected]>
Move the sk_mutex field to the transport independent svc_xprt structure. Now all the fields that svc_send touches are transport neutral. Change the svc_send function to use the transport independent svc_xprt directly instead of the transport dependent svc_sock structure.
--- include/linux/sunrpc/svc_xprt.h | 1 + include/linux/sunrpc/svcsock.h | 1 - net/sunrpc/svc_xprt.c | 1 + net/sunrpc/svcsock.c | 19 ++++++++----------- 4 files changed, 10 insertions(+), 12 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -54,6 +54,7 @@ struct svc_xprt {struct svc_pool *xpt_pool;/* current pool iff queued */ struct svc_serv *xpt_server;/* service for transport */ atomic_t xpt_reserved;/* space on outq that is rsvd */ +struct mutex xpt_mutex;/* to serialize sending data */ };int svc_reg_xprt_class (struct svc_xprt_class *);
include/linux/sunrpc/svcsock.h +0 -1
@@ -24,7 +24,6 @@ struct svc_sock {* sk_info_authunix */ struct list_head sk_deferred;/* deferred requests that need to * be revisted */ -struct mutex sk_mutex;/* to serialize sending data */ /* We keep the old state_change and data_ready CB's here */ void (*sk_ostate)(struct sock *);
net/sunrpc/svc_xprt.c +1 -0
@@ -99,6 +99,7 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt, xprt->xpt_server = serv;INIT_LIST_HEAD (&xprt->xpt_list);INIT_LIST_HEAD (&xprt->xpt_ready); +mutex_init (&xprt->xpt_mutex); }EXPORT_SYMBOL_GPL (svc_xprt_init);
net/sunrpc/svcsock.c +8 -11
@@ -1632,15 +1632,13 @@ svc_drop(struct svc_rqst *rqstp)int svc_send (struct svc_rqst *rqstp) { -struct svc_sock *svsk; +struct svc_xprt *xprt;int len;struct xdr_buf *xb; -if ((svsk = rqstp->rq_sock) ==NULL ) { -printk (KERN_WARNING "NULL socket pointer in %s:%d\n" , - __FILE__, __LINE__); + xprt = rqstp->rq_xprt; +if (!xprt)return -EFAULT ; - }/* release the receive skb before sending the reply */ rqstp->rq_xprt->xpt_ops->xpo_release_rqst (rqstp);
@@ -1651,13 +1649,13 @@ svc_send(struct svc_rqst *rqstp) xb->page_len + xb->tail[0 ].iov_len; -/* Grab svsk->sk_mutex to serialize outgoing data. */ -mutex_lock (&svsk->sk_mutex); -if (test_bit (XPT_DEAD , &svsk->sk_xprt.xpt_flags)) +/* Grab mutex to serialize outgoing data. */ +mutex_lock (&xprt->xpt_mutex); +if (test_bit (XPT_DEAD , &xprt->xpt_flags)) len = -ENOTCONN ;else - len = svsk->sk_xprt.xpt_ops->xpo_sendto (rqstp); -mutex_unlock (&svsk->sk_mutex); + len = xprt->xpt_ops->xpo_sendto (rqstp); +mutex_unlock (&xprt->xpt_mutex);svc_sock_release (rqstp);if (len == -ECONNREFUSED || len == -ENOTCONN || len == -EAGAIN )
@@ -1759,7 +1757,6 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv, svsk->sk_lastrecv =get_seconds ();spin_lock_init (&svsk->sk_lock);INIT_LIST_HEAD (&svsk->sk_deferred); -mutex_init (&svsk->sk_mutex);/* Initialize the socket */ if (sock->type ==SOCK_DGRAM )
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 69/100 svc: Change svc_sock_received to svc_xprt_received and export it
From: Tom Tucker <[email protected]>
All fields touched by svc_sock_received are now transport independent. Change it to use svc_xprt directly. This function is called from transport dependent code, so export it.
Update the comment to clearly state the rules for calling this function.
--- include/linux/sunrpc/svc_xprt.h | 2 +- net/sunrpc/svcsock.c | 46 ++++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 23 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -1
@@ -62,8 +62,8 @@ void svc_unreg_xprt_class(struct svc_xprt_class *);void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *,struct svc_serv *);int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int ); +void svc_xprt_received (struct svc_xprt *);void svc_xprt_put (struct svc_xprt *xprt); -static inline void svc_xprt_get (struct svc_xprt *xprt) {kref_get (&xprt->xpt_ref);
net/sunrpc/svcsock.c +24 -22
127 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 70/100 svc: Move accept call to svc_xprt_received to common code
From: Tom Tucker <[email protected]>
Now that the svc_xprt_received function handles transports, the call to svc_xprt_received in the xpo_tcp_accept function can be moved to common code.
--- net/sunrpc/svcsock.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
net/sunrpc/svcsock.c +1 -2
@@ -1106,8 +1106,6 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt) }memcpy (&newsvsk->sk_local, sin, slen); -svc_xprt_received (&newsvsk->sk_xprt); -if (serv->sv_stats) serv->sv_stats->nettcpconn++;
@@ -1591,6 +1589,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)*/ __module_get (newxpt->xpt_class->xcl_owner);svc_check_conn_limits (svsk->sk_xprt.xpt_server); +svc_xprt_received (newxpt); }svc_xprt_received (&svsk->sk_xprt); }else {
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 71/100 svc: Remove sk_lastrecv
From: Tom Tucker <[email protected]>
With the implementation of the new mark and sweep algorithm for shutting down old connections, the sk_lastrecv field is no longer needed.
--- include/linux/sunrpc/svcsock.h | 1 - net/sunrpc/svcsock.c | 5 +---- 2 files changed, 1 insertions(+), 5 deletions(-)
include/linux/sunrpc/svcsock.h +0 -1
@@ -33,7 +33,6 @@ struct svc_sock {/* private TCP part */ int sk_reclen;/* length of record */ int sk_tcplen;/* current read length */ -time_t sk_lastrecv;/* time of last received request */ /* cache of various info for TCP sockets */ void *sk_info_authunix;
net/sunrpc/svcsock.c +1 -4
@@ -1606,7 +1606,6 @@ svc_recv(struct svc_rqst *rqstp, long timeout)svc_sock_release (rqstp);return -EAGAIN ; } - svsk->sk_lastrecv =get_seconds ();clear_bit (XPT_OLD , &svsk->sk_xprt.xpt_flags); rqstp->rq_secure =svc_port_is_privileged (svc_addr (rqstp));
@@ -1706,8 +1705,7 @@ svc_age_temp_sockets(unsigned long closure)list_del_init (le); svsk = list_entry(le, struct svc_sock, sk_xprt.xpt_list); -dprintk ("queuing svsk %p for closing, %lu seconds old\n" , - svsk,get_seconds () - svsk->sk_lastrecv); +dprintk ("queuing svsk %p for closing\n" , svsk);/* a thread will dequeue and close it soon */ svc_xprt_enqueue (&svsk->sk_xprt);
@@ -1755,7 +1753,6 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv, svsk->sk_ostate = inet->sk_state_change; svsk->sk_odata = inet->sk_data_ready; svsk->sk_owspace = inet->sk_write_space; - svsk->sk_lastrecv =get_seconds ();spin_lock_init (&svsk->sk_lock);INIT_LIST_HEAD (&svsk->sk_deferred);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 72/100 svc: Move the authinfo cache to svc_xprt.
From: Tom Tucker <[email protected]>
Move the authinfo cache to svc_xprt. This allows both the TCP and RDMA transports to share this logic. A flag bit is used to determine if auth information is to be cached or not. Previously, this code looked at the transport protocol.
I've also changed the spin_lock/unlock logic so that a lock is not taken for transports that are not caching auth info.
--- include/linux/sunrpc/svc_xprt.h | 4 +++ include/linux/sunrpc/svcsock.h | 5 --- net/sunrpc/svc_xprt.c | 4 +++ net/sunrpc/svcauth_unix.c | 56 +++++++++++++++++++++------------------ net/sunrpc/svcsock.c | 22 ++++++++------- 5 files changed, 50 insertions(+), 41 deletions(-)
include/linux/sunrpc/svc_xprt.h +4 -0
@@ -50,11 +50,15 @@ struct svc_xprt {#define XPT_OLD 9/* used for xprt aging mark+sweep */ #define XPT_DETACHED 10/* detached from tempsocks list */ #define XPT_LISTENER 11/* listening endpoint */ +#define XPT_CACHE_AUTH 12/* cache auth info */ struct svc_pool *xpt_pool;/* current pool iff queued */ struct svc_serv *xpt_server;/* service for transport */ atomic_t xpt_reserved;/* space on outq that is rsvd */ struct mutex xpt_mutex;/* to serialize sending data */ +spinlock_t xpt_lock;/* protects sk_deferred +* and xpt_auth_cache */ +void *xpt_auth_cache;/* auth cache */ };int svc_reg_xprt_class (struct svc_xprt_class *);
include/linux/sunrpc/svcsock.h +0 -5
@@ -20,8 +20,6 @@ struct svc_sock {struct socket * sk_sock;/* berkeley socket layer */ struct sock * sk_sk;/* INET layer */ -spinlock_t sk_lock;/* protects sk_deferred and -* sk_info_authunix */ struct list_head sk_deferred;/* deferred requests that need to * be revisted */
@@ -34,9 +32,6 @@ struct svc_sock {int sk_reclen;/* length of record */ int sk_tcplen;/* current read length */ -/* cache of various info for TCP sockets */ -void *sk_info_authunix; -struct sockaddr_storage sk_local;/* local address */ struct sockaddr_storage sk_remote;/* remote peer's address */ int sk_remotelen;/* length of address */
net/sunrpc/svc_xprt.c +4 -0
@@ -75,6 +75,9 @@ static void svc_xprt_free(struct kref *kref)struct svc_xprt *xprt = container_of(kref, struct svc_xprt, xpt_ref);struct module *owner = xprt->xpt_class->xcl_owner; +if (test_bit (XPT_CACHE_AUTH , &xprt->xpt_flags) + && xprt->xpt_auth_cache !=NULL ) +svcauth_unix_info_release (xprt->xpt_auth_cache); xprt->xpt_ops->xpo_free (xprt);module_put (owner); }
@@ -100,6 +103,7 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt,INIT_LIST_HEAD (&xprt->xpt_list);INIT_LIST_HEAD (&xprt->xpt_ready);mutex_init (&xprt->xpt_mutex); +spin_lock_init (&xprt->xpt_lock); }EXPORT_SYMBOL_GPL (svc_xprt_init);
net/sunrpc/svcauth_unix.c +29 -25
70 lines not on this page · raw message
net/sunrpc/svcsock.c +12 -10
@@ -113,12 +113,16 @@ static inline void svc_reclassify_socket(struct socket *sock)switch (sk->sk_family) {case AF_INET :sock_lock_init_class_and_name (sk,"slock-AF_INET-NFSD" , - &svc_slock_key[0 ],"sk_lock-AF_INET-NFSD" , &svc_key[0 ]); + &svc_slock_key[0 ], +"sk_xprt.xpt_lock-AF_INET-NFSD" , + &svc_key[0 ]);break ;case AF_INET6 :sock_lock_init_class_and_name (sk,"slock-AF_INET6-NFSD" , - &svc_slock_key[1 ],"sk_lock-AF_INET6-NFSD" , &svc_key[1 ]); + &svc_slock_key[1 ], +"sk_xprt.xpt_lock-AF_INET6-NFSD" , + &svc_key[1 ]);break ;default :
@@ -930,6 +934,7 @@ static void svc_udp_init(struct svc_sock *svsk, struct svc_serv *serv)mm_segment_t oldfs;svc_xprt_init (&svc_udp_class, &svsk->sk_xprt, serv); +clear_bit (XPT_CACHE_AUTH , &svsk->sk_xprt.xpt_flags); svsk->sk_sk->sk_data_ready = svc_udp_data_ready; svsk->sk_sk->sk_write_space = svc_write_space;
@@ -1385,7 +1390,7 @@ static void svc_tcp_init(struct svc_sock *svsk, struct svc_serv *serv)struct tcp_sock *tp =tcp_sk (sk);svc_xprt_init (&svc_tcp_class, &svsk->sk_xprt, serv); - +set_bit (XPT_CACHE_AUTH , &svsk->sk_xprt.xpt_flags);if (sk->sk_state ==TCP_LISTEN ) {dprintk ("setting up TCP socket for listening\n" );set_bit (XPT_LISTENER , &svsk->sk_xprt.xpt_flags);
@@ -1753,7 +1758,6 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv, svsk->sk_ostate = inet->sk_state_change; svsk->sk_odata = inet->sk_data_ready; svsk->sk_owspace = inet->sk_write_space; -spin_lock_init (&svsk->sk_lock);INIT_LIST_HEAD (&svsk->sk_deferred);/* Initialize the socket */
@@ -1898,8 +1902,6 @@ static void svc_sock_free(struct svc_xprt *xprt) struct svc_sock *svsk = container_of(xprt, struct svc_sock, sk_xprt);dprintk ("svc: svc_sock_free(%p)\n" , svsk); -if (svsk->sk_info_authunix !=NULL ) -svcauth_unix_info_release (svsk->sk_info_authunix);if (svsk->sk_sock->file)sockfd_put (svsk->sk_sock);else
@@ -1984,9 +1986,9 @@ static void svc_revisit(struct cache_deferred_req *dreq, int too_many)dprintk ("revisit queued\n" ); svsk = dr->svsk; dr->svsk =NULL ; -spin_lock (&svsk->sk_lock); +spin_lock (&svsk->sk_xprt.xpt_lock);list_add (&dr->handle.recent, &svsk->sk_deferred); -spin_unlock (&svsk->sk_lock); +spin_unlock (&svsk->sk_xprt.xpt_lock);set_bit (XPT_DEFERRED , &svsk->sk_xprt.xpt_flags);svc_xprt_enqueue (&svsk->sk_xprt);svc_xprt_put (&svsk->sk_xprt);
@@ -2052,7 +2054,7 @@ static struct svc_deferred_req *svc_deferred_dequeue(struct svc_sock *svsk)if (!test_bit (XPT_DEFERRED , &svsk->sk_xprt.xpt_flags))return NULL ; -spin_lock (&svsk->sk_lock); +spin_lock (&svsk->sk_xprt.xpt_lock);clear_bit (XPT_DEFERRED , &svsk->sk_xprt.xpt_flags);if (!list_empty (&svsk->sk_deferred)) { dr = list_entry(svsk->sk_deferred.next,
@@ -2061,6 +2063,6 @@ static struct svc_deferred_req *svc_deferred_dequeue(struct svc_sock *svsk)list_del_init (&dr->handle.recent);set_bit (XPT_DEFERRED , &svsk->sk_xprt.xpt_flags); } -spin_unlock (&svsk->sk_lock); +spin_unlock (&svsk->sk_xprt.xpt_lock);return dr; }
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 73/100 svc: Make deferral processing xprt independent
From: Tom Tucker <[email protected]>
This patch moves the transport independent sk_deferred list to the svc_xprt structure and updates the svc_deferred_req structure to keep pointers to svc_xprt's directly. The deferral processing code is also moved out of the transport dependent recvfrom functions and into the generic svc_recv path.
--- include/linux/sunrpc/svc.h | 2 +- include/linux/sunrpc/svc_xprt.h | 2 + include/linux/sunrpc/svcsock.h | 3 -- net/sunrpc/svc_xprt.c | 1 + net/sunrpc/svcsock.c | 57 +++++++++++++++++---------------------- 5 files changed, 29 insertions(+), 36 deletions(-)
include/linux/sunrpc/svc.h +1 -1
@@ -320,7 +320,7 @@ static inline void svc_free_res_pages(struct svc_rqst *rqstp)struct svc_deferred_req {u32 prot;/* protocol (UDP or TCP) */ -struct svc_sock *svsk; +struct svc_xprt *xprt;struct sockaddr_storage addr;/* where reply must go */ size_t addrlen;union svc_addr_u daddr;/* where reply must come from */
include/linux/sunrpc/svc_xprt.h +2 -0
@@ -59,6 +59,8 @@ struct svc_xprt {spinlock_t xpt_lock;/* protects sk_deferred * and xpt_auth_cache */ void *xpt_auth_cache;/* auth cache */ +struct list_head xpt_deferred;/* deferred requests that need +* to be revisted */ };int svc_reg_xprt_class (struct svc_xprt_class *);
include/linux/sunrpc/svcsock.h +0 -3
@@ -20,9 +20,6 @@ struct svc_sock {struct socket * sk_sock;/* berkeley socket layer */ struct sock * sk_sk;/* INET layer */ -struct list_head sk_deferred;/* deferred requests that need to -* be revisted */ -/* We keep the old state_change and data_ready CB's here */ void (*sk_ostate)(struct sock *);void (*sk_odata)(struct sock *,int bytes);
net/sunrpc/svc_xprt.c +1 -0
@@ -102,6 +102,7 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt, xprt->xpt_server = serv;INIT_LIST_HEAD (&xprt->xpt_list);INIT_LIST_HEAD (&xprt->xpt_ready); +INIT_LIST_HEAD (&xprt->xpt_deferred);mutex_init (&xprt->xpt_mutex);spin_lock_init (&xprt->xpt_lock); }
net/sunrpc/svcsock.c +25 -32
118 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 74/100 svc: Move the sockaddr information to svc_xprt
From: Tom Tucker <[email protected]>
This patch moves the transport sockaddr to the svc_xprt structure. Convenience functions are added to set and get the local and remote addresses of a transport from the transport provider as well as determine the length of a sockaddr.
A transport is responsible for setting the xpt_local and xpt_remote addresses in the svc_xprt structure as part of transport creation and xpo_accept processing. This cannot be done in a generic way and in fact varies between TCP, UDP and RDMA. A set of xpo_ functions (e.g. getlocalname, getremotename) could have been added but this would have resulted in additional caching and copying of the addresses around. Note that the xpt_local address should also be set on listening endpoints; for TCP/RDMA this is done as part of endpoint creation.
For connected transports like TCP and RDMA, the addresses never change and can be set once and copied into the rqstp structure for each request. For UDP, however, the local and remote addresses may change for each request. In this case, the address information is obtained from the UDP recvmsg info and copied into the rqstp structure from there.
A svc_xprt_local_port function was also added that returns the local port given a transport. This is used by svc_create_xprt when returning the port associated with a newly created transport, and later when creating a generic find transport service to check if a service is already listening on a given port.
--- include/linux/sunrpc/svc_xprt.h | 51 +++++++++++++++++++++++++++++++++++ include/linux/sunrpc/svcsock.h | 4 --- net/sunrpc/svc_xprt.c | 31 ++++++++++++++++++++- net/sunrpc/svcsock.c | 56 +++++++++++++++++++++------------------ 4 files changed, 110 insertions(+), 32 deletions(-)
include/linux/sunrpc/svc_xprt.h +51 -0
@@ -61,6 +61,10 @@ struct svc_xprt {void *xpt_auth_cache;/* auth cache */ struct list_head xpt_deferred;/* deferred requests that need * to be revisted */ +struct sockaddr_storage xpt_local;/* local address */ +size_t xpt_locallen;/* length of address */ +struct sockaddr_storage xpt_remote;/* remote peer's address */ +size_t xpt_remotelen;/* length of address */ };int svc_reg_xprt_class (struct svc_xprt_class *);
@@ -70,9 +74,56 @@ void svc_xprt_init(struct svc_xprt_class *, struct svc_xprt *,int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int );void svc_xprt_received (struct svc_xprt *);void svc_xprt_put (struct svc_xprt *xprt); +void svc_xprt_copy_addrs (struct svc_rqst *rqstp,struct svc_xprt *xprt);static inline void svc_xprt_get (struct svc_xprt *xprt) {kref_get (&xprt->xpt_ref); } +static inline void svc_xprt_set_local (struct svc_xprt *xprt, +struct sockaddr *sa,int salen) +{ +memcpy (&xprt->xpt_local, sa, salen); + xprt->xpt_locallen = salen; +} +static inline void svc_xprt_set_remote (struct svc_xprt *xprt, +struct sockaddr *sa,int salen) +{ +memcpy (&xprt->xpt_remote, sa, salen); + xprt->xpt_remotelen = salen; +} +static inline unsigned short svc_addr_port (struct sockaddr *sa) +{ +unsigned short ret =0 ; +switch (sa->sa_family) { +case AF_INET : + ret =ntohs (((struct sockaddr_in *)sa)->sin_port); +break ; +case AF_INET6 : + ret =ntohs (((struct sockaddr_in6 *)sa)->sin6_port); +break ; + } +return ret; +} + +static inline size_t svc_addr_len (struct sockaddr *sa) +{ +switch (sa->sa_family) { +case AF_INET : +return sizeof (struct sockaddr_in ); +case AF_INET6 : +return sizeof (struct sockaddr_in6 ); + } +return -EAFNOSUPPORT ; +} + +static inline unsigned short svc_xprt_local_port (struct svc_xprt *xprt) +{ +return svc_addr_port ((struct sockaddr *)&xprt->xpt_local); +} + +static inline unsigned short svc_xprt_remote_port (struct svc_xprt *xprt) +{ +return svc_addr_port ((struct sockaddr *)&xprt->xpt_remote); +}#endif /* SUNRPC_SVC_XPRT_H */
include/linux/sunrpc/svcsock.h +0 -4
@@ -28,10 +28,6 @@ struct svc_sock {/* private TCP part */ int sk_reclen;/* length of record */ int sk_tcplen;/* current read length */ - -struct sockaddr_storage sk_local;/* local address */ -struct sockaddr_storage sk_remote;/* remote peer's address */ -int sk_remotelen;/* length of address */ };/*
net/sunrpc/svc_xprt.c +29 -2
@@ -125,7 +125,6 @@ int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port,spin_unlock (&svc_xprt_class_lock);if (try_module_get (xcl->xcl_owner)) {struct svc_xprt *newxprt; - ret =0 ; newxprt = xcl->xcl_ops->xpo_create (serv, (struct sockaddr *)&sin, sizeof(sin),
@@ -133,7 +132,8 @@ int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port,if (IS_ERR (newxprt)) {module_put (xcl->xcl_owner); ret =PTR_ERR (newxprt); - } + }else + ret =svc_xprt_local_port (newxprt); } goto out; }
@@ -144,3 +144,30 @@ int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port,return ret; }EXPORT_SYMBOL_GPL (svc_create_xprt); + +/* +* Copy the local and remote xprt addresses to the rqstp structure +*/ +void svc_xprt_copy_addrs (struct svc_rqst *rqstp,struct svc_xprt *xprt) +{ +struct sockaddr *sin; + +memcpy (&rqstp->rq_addr, &xprt->xpt_remote, xprt->xpt_remotelen); + rqstp->rq_addrlen = xprt->xpt_remotelen; + +/* +* Destination address in request is needed for binding the +* source address in RPC replies/callbacks later. +*/ + sin = (struct sockaddr *)&xprt->xpt_local; +switch (sin->sa_family) { +case AF_INET : + rqstp->rq_daddr.addr = ((struct sockaddr_in *)sin)->sin_addr; +break ; +case AF_INET6 : + rqstp->rq_daddr.addr6 = ((struct sockaddr_in6 *)sin)->sin6_addr; +break ; + } +} +EXPORT_SYMBOL_GPL (svc_xprt_copy_addrs); +
net/sunrpc/svcsock.c +30 -26
122 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 75/100 svc: Make svc_sock_release svc_xprt_release
From: Tom Tucker <[email protected]>
The svc_sock_release function only touches transport independent fields. Change the function to manipulate svc_xprt directly instead of the transport dependent svc_sock structure.
--- net/sunrpc/svcsock.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-)
net/sunrpc/svcsock.c +7 -9
@@ -368,10 +368,9 @@ void svc_reserve(struct svc_rqst *rqstp, int space) } } -static void -svc_sock_release (struct svc_rqst *rqstp) +static void svc_xprt_release (struct svc_rqst *rqstp) { -struct svc_sock *svsk = rqstp->rq_sock; +struct svc_xprt *xprt = rqstp->rq_xprt; rqstp->rq_xprt->xpt_ops->xpo_release_rqst (rqstp);
@@ -379,7 +378,6 @@ svc_sock_release(struct svc_rqst *rqstp) rqstp->rq_res.page_len =0 ; rqstp->rq_res.page_base =0 ; -/* Reset response buffer and release * the reservation. * But first, check that enough space was reserved
@@ -392,9 +390,9 @@ svc_sock_release(struct svc_rqst *rqstp) rqstp->rq_res.head[0 ].iov_len =0 ;svc_reserve (rqstp,0 ); - rqstp->rq_sock =NULL ; + rqstp->rq_xprt =NULL ; -svc_xprt_put (&svsk->sk_xprt); +svc_xprt_put (xprt); }/*
@@ -1593,7 +1591,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)/* No data, incomplete (TCP) read, or accept() */ if (len ==0 || len == -EAGAIN ) { rqstp->rq_res.len =0 ; -svc_sock_release (rqstp); +svc_xprt_release (rqstp);return -EAGAIN ; }clear_bit (XPT_OLD , &svsk->sk_xprt.xpt_flags);
@@ -1613,7 +1611,7 @@ void svc_drop(struct svc_rqst *rqstp) {dprintk ("svc: socket %p dropped request\n" , rqstp->rq_sock); -svc_sock_release (rqstp); +svc_xprt_release (rqstp); }/*
@@ -1646,7 +1644,7 @@ svc_send(struct svc_rqst *rqstp)else len = xprt->xpt_ops->xpo_sendto (rqstp);mutex_unlock (&xprt->xpt_mutex); -svc_sock_release (rqstp); +svc_xprt_release (rqstp);if (len == -ECONNREFUSED || len == -ENOTCONN || len == -EAGAIN )return 0 ;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 76/100 svc: Make svc_recv transport neutral
From: Tom Tucker <[email protected]>
All of the transport field and functions used by svc_recv are now transport independent. Change the svc_recv function to use the svc_xprt structure directly instead of the transport specific svc_sock structure.
--- net/sunrpc/svcsock.c | 61 +++++++++++++++++++++++++------------------------ 1 files changed, 31 insertions(+), 30 deletions(-)
net/sunrpc/svcsock.c +31 -30
@@ -310,22 +310,21 @@ EXPORT_SYMBOL_GPL(svc_xprt_enqueue);/* * Dequeue the first socket. Must be called with the pool->sp_lock held. */ -static inline struct svc_sock * -svc_sock_dequeue (struct svc_pool *pool) +static struct svc_xprt *svc_xprt_dequeue (struct svc_pool *pool) { -struct svc_sock *svsk; +struct svc_xprt *xprt;if (list_empty (&pool->sp_sockets))return NULL ; - svsk =list_entry (pool->sp_sockets.next, - struct svc_sock, sk_xprt.xpt_ready); -list_del_init (&svsk->sk_xprt.xpt_ready); + xprt =list_entry (pool->sp_sockets.next, + struct svc_xprt, xpt_ready); +list_del_init (&xprt->xpt_ready); -dprintk ("svc: socket %p dequeued, inuse=%d\n" , - svsk->sk_sk,atomic_read (&svsk->sk_xprt.xpt_ref.refcount)); +dprintk ("svc: transport %p dequeued, inuse=%d\n" , + xprt,atomic_read (&xprt->xpt_ref.refcount)); -return svsk; +return xprt; }/*
@@ -1475,20 +1474,20 @@ static void svc_check_conn_limits(struct svc_serv *serv)int svc_recv (struct svc_rqst *rqstp,long timeout) { -struct svc_sock *svsk =NULL ; +struct svc_xprt *xprt =NULL ;struct svc_serv *serv = rqstp->rq_server;struct svc_pool *pool = rqstp->rq_pool;int len, i; -int pages; +int pages;struct xdr_buf *arg;DECLARE_WAITQUEUE (wait, current);dprintk ("svc: server %p waiting for data (to = %ld)\n" , rqstp, timeout); -if (rqstp->rq_sock) +if (rqstp->rq_xprt)printk (KERN_ERR -"svc_recv: service %p, socket not NULL!\n" , +"svc_recv: service %p, transport not NULL!\n" , rqstp);if (waitqueue_active (&rqstp->rq_wait)) printk(KERN_ERR
@@ -1525,11 +1524,12 @@ svc_recv(struct svc_rqst *rqstp, long timeout)return -EINTR ;spin_lock_bh (&pool->sp_lock); -if ((svsk =svc_sock_dequeue (pool)) !=NULL ) { - rqstp->rq_sock = svsk; -svc_xprt_get (&svsk->sk_xprt); + xprt =svc_xprt_dequeue (pool); +if (xprt) { + rqstp->rq_xprt = xprt; +svc_xprt_get (xprt); rqstp->rq_reserved = serv->sv_max_mesg; -atomic_add (rqstp->rq_reserved, &svsk->sk_xprt.xpt_reserved); +atomic_add (rqstp->rq_reserved, &xprt->xpt_reserved); }else {/* No data pending. Go to sleep */ svc_thread_enqueue (pool, rqstp);
@@ -1549,7 +1549,8 @@ svc_recv(struct svc_rqst *rqstp, long timeout)spin_lock_bh (&pool->sp_lock);remove_wait_queue (&rqstp->rq_wait, &wait); -if (!(svsk = rqstp->rq_sock)) { + xprt = rqstp->rq_xprt; +if (!xprt) {svc_thread_dequeue (pool, rqstp);spin_unlock_bh (&pool->sp_lock);dprintk ("svc: server %p, no data yet\n" , rqstp);
@@ -1559,12 +1560,12 @@ svc_recv(struct svc_rqst *rqstp, long timeout)spin_unlock_bh (&pool->sp_lock); len =0 ; -if (test_bit (XPT_CLOSE , &svsk->sk_xprt.xpt_flags)) { +if (test_bit (XPT_CLOSE , &xprt->xpt_flags)) {dprintk ("svc_recv: found XPT_CLOSE\n" ); -svc_delete_xprt (&svsk->sk_xprt); - }else if (test_bit (XPT_LISTENER , &svsk->sk_xprt.xpt_flags)) { +svc_delete_xprt (xprt); + }else if (test_bit (XPT_LISTENER , &xprt->xpt_flags)) {struct svc_xprt *newxpt; - newxpt = svsk->sk_xprt.xpt_ops->xpo_accept (&svsk->sk_xprt); + newxpt = xprt->xpt_ops->xpo_accept (xprt);if (newxpt) {/* * We know this module_get will succeed because the
@@ -1574,17 +1575,17 @@ svc_recv(struct svc_rqst *rqstp, long timeout)svc_check_conn_limits (svsk->sk_xprt.xpt_server);svc_xprt_received (newxpt); } -svc_xprt_received (&svsk->sk_xprt); +svc_xprt_received (xprt); }else { -dprintk ("svc: server %p, pool %u, socket %p, inuse=%d\n" , - rqstp, pool->sp_id, svsk, -atomic_read (&svsk->sk_xprt.xpt_ref.refcount)); - rqstp->rq_deferred =svc_deferred_dequeue (&svsk->sk_xprt); +dprintk ("svc: server %p, pool %u, transport %p, inuse=%d\n" , + rqstp, pool->sp_id, xprt, +atomic_read (&xprt->xpt_ref.refcount)); + rqstp->rq_deferred =svc_deferred_dequeue (xprt);if (rqstp->rq_deferred) { -svc_xprt_received (&svsk->sk_xprt); +svc_xprt_received (xprt); len =svc_deferred_recv (rqstp); }else - len = svsk->sk_xprt.xpt_ops->xpo_recvfrom (rqstp); + len = xprt->xpt_ops->xpo_recvfrom (rqstp);dprintk ("svc: got len=%d\n" , len); }
@@ -1594,7 +1595,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)svc_xprt_release (rqstp);return -EAGAIN ; } -clear_bit (XPT_OLD , &svsk->sk_xprt.xpt_flags); +clear_bit (XPT_OLD , &xprt->xpt_flags); rqstp->rq_secure =svc_port_is_privileged (svc_addr (rqstp)); rqstp->rq_chandle.defer = svc_defer;
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 77/100 svc: Make svc_age_temp_sockets svc_age_temp_transports
From: Tom Tucker <[email protected]>
This function is transport independent. Change it to use svc_xprt directly and change it's name to reflect this.
--- net/sunrpc/svcsock.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-)
net/sunrpc/svcsock.c +19 -18
@@ -1656,49 +1656,50 @@ svc_send(struct svc_rqst *rqstp)* Timer function to close old temporary sockets, using * a mark-and-sweep algorithm. */ -static void -svc_age_temp_sockets (unsigned long closure) +static void svc_age_temp_xprts (unsigned long closure) {struct svc_serv *serv = (struct svc_serv *)closure; -struct svc_sock *svsk; +struct svc_xprt *xprt;struct list_head *le, *next;LIST_HEAD (to_be_aged); -dprintk ("svc_age_temp_sockets\n" ); +dprintk ("svc_age_temp_xprts\n" );if (!spin_trylock_bh (&serv->sv_lock)) {/* busy, try again 1 sec later */ -dprintk ("svc_age_temp_sockets: busy\n" ); +dprintk ("svc_age_temp_xprts: busy\n" );mod_timer (&serv->sv_temptimer, jiffies +HZ );return ; }list_for_each_safe (le, next, &serv->sv_tempsocks) { - svsk = list_entry(le, struct svc_sock, sk_xprt.xpt_list); + xprt = list_entry(le, struct svc_xprt, xpt_list); -if (!test_and_set_bit (XPT_OLD , &svsk->sk_xprt.xpt_flags)) +/* First time through, just mark it OLD. Second time +* through, close it. */ +if (!test_and_set_bit (XPT_OLD , &xprt->xpt_flags))continue ; -if (atomic_read (&svsk->sk_xprt.xpt_ref.refcount) >1 - ||test_bit (XPT_BUSY , &svsk->sk_xprt.xpt_flags)) +if (atomic_read (&xprt->xpt_ref.refcount) >1 + ||test_bit (XPT_BUSY , &xprt->xpt_flags))continue ; -svc_xprt_get (&svsk->sk_xprt); +svc_xprt_get (xprt);list_move (le, &to_be_aged); -set_bit (XPT_CLOSE , &svsk->sk_xprt.xpt_flags); -set_bit (XPT_DETACHED , &svsk->sk_xprt.xpt_flags); +set_bit (XPT_CLOSE , &xprt->xpt_flags); +set_bit (XPT_DETACHED , &xprt->xpt_flags); }spin_unlock_bh (&serv->sv_lock);while (!list_empty (&to_be_aged)) { le = to_be_aged.next; -/* fiddling the sk_xprt.xpt_list node is safe 'cos we're XPT_DETACHED */ +/* fiddling the xpt_list node is safe 'cos we're XPT_DETACHED */ list_del_init (le); - svsk = list_entry(le, struct svc_sock, sk_xprt.xpt_list); + xprt = list_entry(le, struct svc_xprt, xpt_list); -dprintk ("queuing svsk %p for closing\n" , svsk); +dprintk ("queuing xprt %p for closing\n" , xprt);/* a thread will dequeue and close it soon */ -svc_xprt_enqueue (&svsk->sk_xprt); -svc_xprt_put (&svsk->sk_xprt); +svc_xprt_enqueue (xprt); +svc_xprt_put (xprt); }mod_timer (&serv->sv_temptimer, jiffies + svc_conn_age_period *HZ );
@@ -1756,7 +1757,7 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv, serv->sv_tmpcnt++;if (serv->sv_temptimer.function ==NULL ) {/* setup timer to age temp sockets */ -setup_timer (&serv->sv_temptimer, svc_age_temp_sockets, +setup_timer (&serv->sv_temptimer, svc_age_temp_xprts, (unsigned long )serv);mod_timer (&serv->sv_temptimer, jiffies + svc_conn_age_period *HZ );
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 78/100 svc: Move create logic to common code
From: Tom Tucker <[email protected]>
Move the svc transport list logic into common transport creation code. Refactor this code path to make the flow of control easier to read.
Move the setting and clearing of the BUSY_BIT during transport creation to common code.
--- net/sunrpc/svc_xprt.c | 43 +++++++++++++++++++++++++------------------ net/sunrpc/svcsock.c | 41 +++++++++++++++++++---------------------- 2 files changed, 44 insertions(+), 40 deletions(-)
net/sunrpc/svc_xprt.c +25 -18
@@ -105,6 +105,7 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt,INIT_LIST_HEAD (&xprt->xpt_deferred);mutex_init (&xprt->xpt_mutex);spin_lock_init (&xprt->xpt_lock); +set_bit (XPT_BUSY , &xprt->xpt_flags); }EXPORT_SYMBOL_GPL (svc_xprt_init);
@@ -112,7 +113,6 @@ int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port, int flags) {struct svc_xprt_class *xcl; -int ret = -ENOENT ;struct sockaddr_in sin = { .sin_family =AF_INET , .sin_addr.s_addr =INADDR_ANY ,
@@ -121,27 +121,34 @@ int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port,dprintk ("svc: creating transport %s[%d]\n" , xprt_name, port);spin_lock (&svc_xprt_class_lock);list_for_each_entry (xcl, &svc_xprt_class_list, xcl_list) { -if (strcmp (xprt_name, xcl->xcl_name) ==0 ) { -spin_unlock (&svc_xprt_class_lock); -if (try_module_get (xcl->xcl_owner)) { -struct svc_xprt *newxprt; - newxprt = xcl->xcl_ops->xpo_create - (serv, - (struct sockaddr *)&sin,sizeof (sin), - flags); -if (IS_ERR (newxprt)) { -module_put (xcl->xcl_owner); - ret =PTR_ERR (newxprt); - }else - ret =svc_xprt_local_port (newxprt); - } - goto out; +struct svc_xprt *newxprt; + +if (strcmp (xprt_name, xcl->xcl_name)) +continue ; + +if (!try_module_get (xcl->xcl_owner)) + goto err; + +spin_unlock (&svc_xprt_class_lock); + newxprt = xcl->xcl_ops-> +xpo_create (serv, (struct sockaddr *)&sin,sizeof (sin), + flags); +if (IS_ERR (newxprt)) { +module_put (xcl->xcl_owner); +return PTR_ERR (newxprt); } + +clear_bit (XPT_TEMP , &newxprt->xpt_flags); +spin_lock_bh (&serv->sv_lock); +list_add (&newxprt->xpt_list, &serv->sv_permsocks); +spin_unlock_bh (&serv->sv_lock); +clear_bit (XPT_BUSY , &newxprt->xpt_flags); +return svc_xprt_local_port (newxprt); } + err:spin_unlock (&svc_xprt_class_lock);dprintk ("svc: transport %s not found\n" , xprt_name); - out: -return ret; +return -ENOENT ; }EXPORT_SYMBOL_GPL (svc_create_xprt);
net/sunrpc/svcsock.c +19 -22
83 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 79/100 svc: Removing remaining references to rq_sock in rqstp
From: Tom Tucker <[email protected]>
This functionally empty patch removes rq_sock and unamed union from rqstp structure.
--- include/linux/sunrpc/svc.h | 5 +---- net/sunrpc/svcsock.c | 38 ++++++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 18 deletions(-)
include/linux/sunrpc/svc.h +1 -4
@@ -204,10 +204,7 @@ union svc_addr_u {struct svc_rqst {struct list_head rq_list;/* idle list */ struct list_head rq_all;/* all threads list */ -union { -struct svc_xprt * rq_xprt;/* transport ptr */ -struct svc_sock * rq_sock;/* socket ptr */ - }; +struct svc_xprt * rq_xprt;/* transport ptr */ struct sockaddr_storage rq_addr;/* peer address */ size_t rq_addrlen;
net/sunrpc/svcsock.c +24 -14
@@ -201,10 +201,12 @@ static void svc_release_skb(struct svc_rqst *rqstp)struct svc_deferred_req *dr = rqstp->rq_deferred;if (skb) { +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt); rqstp->rq_xprt_ctxt =NULL ;dprintk ("svc: service %p, releasing skb %p\n" , rqstp, skb); -skb_free_datagram (rqstp->rq_sock->sk_sk, skb); +skb_free_datagram (svsk->sk_sk, skb); }if (dr) { rqstp->rq_deferred =NULL ;
@@ -418,7 +420,7 @@ svc_wake_up(struct svc_serv *serv)dprintk ("svc: daemon %p woken up.\n" , rqstp);/* svc_thread_dequeue(pool, rqstp); -rqstp->rq_sock = NULL; +rqstp->rq_xprt = NULL; */ wake_up (&rqstp->rq_wait); }
@@ -435,7 +437,9 @@ union svc_pktinfo_u {static void svc_set_cmsg_data (struct svc_rqst *rqstp,struct cmsghdr *cmh) { -switch (rqstp->rq_sock->sk_sk->sk_family) { +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt); +switch (svsk->sk_sk->sk_family) {case AF_INET : {struct in_pktinfo *pki =CMSG_DATA (cmh);
@@ -468,7 +472,8 @@ static void svc_set_cmsg_data(struct svc_rqst *rqstp, struct cmsghdr *cmh)static int svc_sendto (struct svc_rqst *rqstp,struct xdr_buf *xdr) { -struct svc_sock *svsk = rqstp->rq_sock; +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);struct socket *sock = svsk->sk_sock;int slen;union {
@@ -541,7 +546,7 @@ svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr) } out:dprintk ("svc: socket %p sendto([%p %Zu... ], %d) = %d (addr %s)\n" , - rqstp->rq_sock, xdr->head[0 ].iov_base, xdr->head[0 ].iov_len, + svsk, xdr->head[0 ].iov_base, xdr->head[0 ].iov_len, xdr->len, len,svc_print_addr (rqstp, buf,sizeof (buf)));return len;
@@ -617,7 +622,8 @@ svc_recv_available(struct svc_sock *svsk)static int svc_recvfrom (struct svc_rqst *rqstp,struct kvec *iov,int nr,int buflen) { -struct svc_sock *svsk = rqstp->rq_sock; +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);struct msghdr msg = { .msg_flags =MSG_DONTWAIT , };
@@ -707,7 +713,9 @@ svc_write_space(struct sock *sk)static void svc_udp_get_dest_address (struct svc_rqst *rqstp,struct cmsghdr *cmh) { -switch (rqstp->rq_sock->sk_sk->sk_family) { +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt); +switch (svsk->sk_sk->sk_family) {case AF_INET : {struct in_pktinfo *pki =CMSG_DATA (cmh); rqstp->rq_daddr.addr.s_addr = pki->ipi_spec_dst.s_addr;
@@ -727,7 +735,8 @@ static void svc_udp_get_dest_address(struct svc_rqst *rqstp,static int svc_udp_recvfrom (struct svc_rqst *rqstp) { -struct svc_sock *svsk = rqstp->rq_sock; +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);struct svc_serv *serv = svsk->sk_xprt.xpt_server;struct sk_buff *skb;union {
@@ -1109,7 +1118,8 @@ failed:static int svc_tcp_recvfrom (struct svc_rqst *rqstp) { -struct svc_sock *svsk = rqstp->rq_sock; +struct svc_sock *svsk = + container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);struct svc_serv *serv = svsk->sk_xprt.xpt_server;int len;struct kvec *vec;
@@ -1273,16 +1283,16 @@ svc_tcp_sendto(struct svc_rqst *rqstp) reclen =htonl (0x80000000 |((xbufp->len ) -4 ));memcpy (xbufp->head[0 ].iov_base, &reclen,4 ); -if (test_bit (XPT_DEAD , &rqstp->rq_sock->sk_xprt.xpt_flags)) +if (test_bit (XPT_DEAD , &rqstp->rq_xprt->xpt_flags))return -ENOTCONN ; sent =svc_sendto (rqstp, &rqstp->rq_res);if (sent != xbufp->len) {printk (KERN_NOTICE "rpc-srv/tcp: %s: %s %d when sending %d bytes - shutting down socket\n" , - rqstp->rq_sock->sk_xprt.xpt_server->sv_name, + rqstp->rq_xprt->xpt_server->sv_name, (sent<0 )?"got error" :"sent only" , sent, xbufp->len); -set_bit (XPT_CLOSE , &rqstp->rq_sock->sk_xprt.xpt_flags); +set_bit (XPT_CLOSE , &rqstp->rq_xprt->xpt_flags);svc_xprt_enqueue (rqstp->rq_xprt); sent = -EAGAIN ; }
@@ -1302,7 +1312,7 @@ static void svc_tcp_prep_reply_hdr(struct svc_rqst *rqstp)static int svc_tcp_has_wspace (struct svc_xprt *xprt) { - struct svc_sock *svsk = container_of(xprt, struct svc_sock, sk_xprt); + struct svc_sock *svsk = container_of(xprt, struct svc_sock, sk_xprt);struct svc_serv *serv = svsk->sk_xprt.xpt_server;int required;int wspace;
@@ -1625,7 +1635,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)void svc_drop (struct svc_rqst *rqstp) { -dprintk ("svc: socket %p dropped request\n" , rqstp->rq_sock); +dprintk ("svc: xprt %p dropped request\n" , rqstp->rq_xprt);svc_xprt_release (rqstp); }
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 80/100 svc: Make svc_check_conn_limits xprt independent
From: Tom Tucker <[email protected]>
The svc_check_conn_limits function only manipulates xprt fields. Change references to svc_sock->sk_xprt to svc_xprt directly.
--- net/sunrpc/svcsock.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
net/sunrpc/svcsock.c +12 -12
@@ -1448,31 +1448,31 @@ svc_sock_update_bufs(struct svc_serv *serv)static void svc_check_conn_limits (struct svc_serv *serv) {if (serv->sv_tmpcnt > (serv->sv_nrthreads+3 )*20 ) { -struct svc_sock *svsk =NULL ; +struct svc_xprt *xprt =NULL ;spin_lock_bh (&serv->sv_lock);if (!list_empty (&serv->sv_tempsocks)) {if (net_ratelimit ()) {/* Try to help the admin */ -printk (KERN_NOTICE "%s: too many open TCP " -"sockets, consider increasing the " +printk (KERN_NOTICE "%s: too many open " +"connections, consider increasing the " "number of nfsd threads\n" , serv->sv_name); }/* -* Always select the oldest socket. It's not fair, +* Always select the oldest connection. It's not fair, * but so is life */ - svsk =list_entry (serv->sv_tempsocks.prev, - struct svc_sock, - sk_xprt.xpt_list); -set_bit (XPT_CLOSE , &svsk->sk_xprt.xpt_flags); -svc_xprt_get (&svsk->sk_xprt); + xprt =list_entry (serv->sv_tempsocks.prev, + struct svc_xprt, + xpt_list); +set_bit (XPT_CLOSE , &xprt->xpt_flags); +svc_xprt_get (xprt); }spin_unlock_bh (&serv->sv_lock); -if (svsk) { -svc_xprt_enqueue (&svsk->sk_xprt); -svc_xprt_put (&svsk->sk_xprt); +if (xprt) { +svc_xprt_enqueue (xprt); +svc_xprt_put (xprt); } } }
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 81/100 svc: Move the xprt independent code to the svc_xprt.c file
From: Tom Tucker <[email protected]>
This functionally trivial patch moves all of the transport independent functions from the svcsock.c file to the transport independent svc_xprt.c file.
In addition the following formatting changes were made:
- White space cleanup
- Function signatures on single line
- The inline directive was removed
- Lines over 80 columns were reformatted
- The term 'socket' was changed to 'transport' in comments
- The SMP comment was moved and updated.
--- include/linux/sunrpc/svc_xprt.h | 27 ++ net/sunrpc/svc_xprt.c | 753 +++++++++++++++++++++++++++++++++++ net/sunrpc/svcsock.c | 834 ++------------------------------------- 3 files changed, 804 insertions(+), 810 deletions(-)
include/linux/sunrpc/svc_xprt.h +27 -0
@@ -72,9 +72,14 @@ void svc_unreg_xprt_class(struct svc_xprt_class *);void svc_xprt_init (struct svc_xprt_class *,struct svc_xprt *,struct svc_serv *);int svc_create_xprt (struct svc_serv *,char *,unsigned short ,int ); +void svc_xprt_enqueue (struct svc_xprt *xprt);void svc_xprt_received (struct svc_xprt *);void svc_xprt_put (struct svc_xprt *xprt);void svc_xprt_copy_addrs (struct svc_rqst *rqstp,struct svc_xprt *xprt); +void svc_close_xprt (struct svc_xprt *xprt); +void svc_delete_xprt (struct svc_xprt *xprt); +int svc_port_is_privileged (struct sockaddr *sin); +static inline void svc_xprt_get (struct svc_xprt *xprt) {kref_get (&xprt->xpt_ref);
@@ -126,4 +131,26 @@ static inline unsigned short svc_xprt_remote_port(struct svc_xprt *xprt)return svc_addr_port ((struct sockaddr *)&xprt->xpt_remote); } +static inline char *__svc_print_addr (struct sockaddr *addr, +char *buf,size_t len) +{ +switch (addr->sa_family) { +case AF_INET : +snprintf (buf, len,"%u.%u.%u.%u, port=%u" , +NIPQUAD (((struct sockaddr_in *) addr)->sin_addr), +ntohs (((struct sockaddr_in *) addr)->sin_port)); +break ; + +case AF_INET6 : +snprintf (buf, len,"%x:%x:%x:%x:%x:%x:%x:%x, port=%u" , +NIP6 (((struct sockaddr_in6 *) addr)->sin6_addr), +ntohs (((struct sockaddr_in6 *) addr)->sin6_port)); +break ; + +default : +snprintf (buf, len,"unknown address type: %d" , addr->sa_family); +break ; + } +return buf; +}#endif /* SUNRPC_SVC_XPRT_H */
net/sunrpc/svc_xprt.c +753 -0
766 lines not on this page · raw message
net/sunrpc/svcsock.c +24 -810
984 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 82/100 svc: Add transport hdr size for defer/revisit
From: Tom Tucker <[email protected]>
Some transports have a header in front of the RPC header. The current defer/revisit processing considers only the iov_len and arg_len to determine how much to back up when saving the original request to revisit. Add a field to the rqstp structure to save the size of the transport header so svc_defer can correctly compute the start of a request.
--- include/linux/sunrpc/svc.h | 2 ++ net/sunrpc/svc_xprt.c | 36 +++++++++++++++++++++++++++--------- net/sunrpc/svcsock.c | 2 ++ 3 files changed, 31 insertions(+), 9 deletions(-)
include/linux/sunrpc/svc.h +2 -0
@@ -217,6 +217,7 @@ struct svc_rqst {void * rq_xprt_ctxt;/* transport specific context ptr */ struct svc_deferred_req *rq_deferred;/* deferred request we are replaying */ +size_t rq_xprt_hlen;/* xprt header len */ struct xdr_buf rq_arg;struct xdr_buf rq_res;struct page * rq_pages[RPCSVC_MAXPAGES ];
@@ -322,6 +323,7 @@ struct svc_deferred_req {size_t addrlen;union svc_addr_u daddr;/* where reply must come from */ struct cache_deferred_req handle; +size_t xprt_hlen;int argslen;__be32 args[0 ]; };
net/sunrpc/svc_xprt.c +27 -9
@@ -29,7 +29,6 @@#include <linux/sunrpc/types.h> #include <linux/sunrpc/clnt.h> #include <linux/sunrpc/xdr.h> -#include <linux/sunrpc/svcsock.h> #include <linux/sunrpc/stats.h> #include <linux/sunrpc/svc_xprt.h>
@@ -859,10 +858,18 @@ static void svc_revisit(struct cache_deferred_req *dreq, int too_many)svc_xprt_put (xprt); } +/* +* Save the request off for later processing. The request buffer looks +* like this: +* +* <xprt-header><rpc-header><rpc-pagelist><rpc-tail> +* +* This code can only handle requests that consist of an xprt-header +* and rpc-header. +*/ static struct cache_deferred_req *svc_defer (struct cache_req *req) { struct svc_rqst *rqstp = container_of(req, struct svc_rqst, rq_chandle); -int size =sizeof (struct svc_deferred_req ) + (rqstp->rq_arg.len);struct svc_deferred_req *dr;if (rqstp->rq_arg.page_len)
@@ -871,8 +878,10 @@ static struct cache_deferred_req *svc_defer(struct cache_req *req) dr = rqstp->rq_deferred; rqstp->rq_deferred =NULL ; }else { -int skip = rqstp->rq_arg.len - rqstp->rq_arg.head[0 ].iov_len; +size_t skip; +size_t size;/* FIXME maybe discard if size too large */ + size =sizeof (struct svc_deferred_req ) + rqstp->rq_arg.len; dr =kmalloc (size,GFP_KERNEL );if (dr ==NULL )return NULL ;
@@ -883,8 +892,12 @@ static struct cache_deferred_req *svc_defer(struct cache_req *req) dr->addrlen = rqstp->rq_addrlen; dr->daddr = rqstp->rq_daddr; dr->argslen = rqstp->rq_arg.len >>2 ; -memcpy (dr->args, rqstp->rq_arg.head[0 ].iov_base-skip, - dr->argslen<<2 ); + dr->xprt_hlen = rqstp->rq_xprt_hlen; + +/* back up head to the start of the buffer and copy */ + skip = rqstp->rq_arg.len - rqstp->rq_arg.head[0 ].iov_len; +memcpy (dr->args, rqstp->rq_arg.head[0 ].iov_base - skip, + dr->argslen <<2 ); }svc_xprt_get (rqstp->rq_xprt); dr->xprt = rqstp->rq_xprt;
@@ -900,16 +913,21 @@ static int svc_deferred_recv(struct svc_rqst *rqstp) {struct svc_deferred_req *dr = rqstp->rq_deferred; - rqstp->rq_arg.head[0 ].iov_base = dr->args; - rqstp->rq_arg.head[0 ].iov_len = dr->argslen<<2 ; +/* setup iov_base past transport header */ + rqstp->rq_arg.head[0 ].iov_base = dr->args + (dr->xprt_hlen>>2 ); +/* The iov_len does not include the transport header bytes */ + rqstp->rq_arg.head[0 ].iov_len = (dr->argslen<<2 ) - dr->xprt_hlen; rqstp->rq_arg.page_len =0 ; - rqstp->rq_arg.len = dr->argslen<<2 ; +/* The rq_arg.len includes the transport header bytes */ + rqstp->rq_arg.len = dr->argslen<<2 ; rqstp->rq_prot = dr->prot;memcpy (&rqstp->rq_addr, &dr->addr, dr->addrlen); rqstp->rq_addrlen = dr->addrlen; +/* Save off transport header len in case we get deferred again */ + rqstp->rq_xprt_hlen = dr->xprt_hlen; rqstp->rq_daddr = dr->daddr; rqstp->rq_respages = rqstp->rq_pages; -return dr->argslen<<2 ; +return (dr->argslen<<2 ) - dr->xprt_hlen; }
net/sunrpc/svcsock.c +2 -0
@@ -315,6 +315,8 @@ static int svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, };int len; + rqstp->rq_xprt_hlen =0 ; + len =kernel_recvmsg (svsk->sk_sock, &msg, iov, nr, buflen, msg.msg_flags);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 83/100 svc: Add /proc/sys/sunrpc/transport files
From: Tom Tucker <[email protected]>
Add a file that when read lists the set of registered svc transports.
--- include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svc_xprt.c | 28 ++++++++++++++++++++++++++++ net/sunrpc/sysctl.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 0 deletions(-)
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -79,6 +79,7 @@ void svc_xprt_copy_addrs(struct svc_rqst *rqstp, struct svc_xprt *xprt);void svc_close_xprt (struct svc_xprt *xprt);void svc_delete_xprt (struct svc_xprt *xprt);int svc_port_is_privileged (struct sockaddr *sin); +int svc_print_xprts (char *buf,int maxlen);static inline void svc_xprt_get (struct svc_xprt *xprt) {
net/sunrpc/svc_xprt.c +28 -0
@@ -112,6 +112,34 @@ void svc_unreg_xprt_class(struct svc_xprt_class *xcl) }EXPORT_SYMBOL_GPL (svc_unreg_xprt_class); +/* +* Format the transport list for printing +*/ +int svc_print_xprts (char *buf,int maxlen) +{ +struct list_head *le; +char tmpstr[80 ]; +int len =0 ; + buf[0 ] ='\0' ; + +spin_lock (&svc_xprt_class_lock); +list_for_each (le, &svc_xprt_class_list) { +int slen; +struct svc_xprt_class *xcl = + list_entry(le, struct svc_xprt_class, xcl_list); + +sprintf (tmpstr,"%s %d\n" , xcl->xcl_name, xcl->xcl_max_payload); + slen =strlen (tmpstr); +if (len + slen > maxlen) +break ; + len += slen; +strcat (buf, tmpstr); + } +spin_unlock (&svc_xprt_class_lock); + +return len; +} +static void svc_xprt_free (struct kref *kref) { struct svc_xprt *xprt =
net/sunrpc/sysctl.c +31 -0
@@ -18,6 +18,7 @@#include <linux/sunrpc/types.h> #include <linux/sunrpc/sched.h> #include <linux/sunrpc/stats.h> +#include <linux/sunrpc/svc_xprt.h> /* * Declare the debug flags here
@@ -48,6 +49,30 @@ rpc_unregister_sysctl(void) } } +static int proc_do_xprt (ctl_table *table,int write,struct file *file, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +char tmpbuf[256 ]; +int len; +if ((*ppos && !write) || !*lenp) { + *lenp =0 ; +return 0 ; + } +if (write) +return -EINVAL ; +else { + len =svc_print_xprts (tmpbuf,sizeof (tmpbuf)); +if (!access_ok (VERIFY_WRITE , buffer, len)) +return -EFAULT ; + +if (__copy_to_user (buffer, tmpbuf, len)) +return -EFAULT ; + } + *lenp -= len; + *ppos += len; +return 0 ; +} +static int proc_dodebug (ctl_table *table,int write,struct file *file,void __user *buffer,size_t *lenp,loff_t *ppos)
@@ -140,6 +165,12 @@ static ctl_table debug_table[] = { .mode = 0644, .proc_handler = &proc_dodebug }, + { + .procname = "transports", + .maxlen = 256, + .mode = 0444, + .proc_handler = &proc_do_xprt, + }, { .ctl_name = 0 } };
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 84/100 svc: Add svc API that queries for a transport instance
From: Tom Tucker <[email protected]>
Add a new svc function that allows a service to query whether a transport instance has already been created. This is used in lockd to determine whether or not a transport needs to be created when a lockd instance is brought up.
Specifying 0 for the address family or port is effectively a wild-card, and will result in matching the first transport in the service's list that has a matching class name.
--- fs/lockd/svc.c | 16 ++-------------- include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svc_xprt.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 14 deletions(-)
fs/lockd/svc.c +2 -14
@@ -219,18 +219,6 @@ lockd(struct svc_rqst *rqstp)module_put_and_exit (0 ); } -static int find_xprt (struct svc_serv *serv,char *proto) -{ -struct svc_xprt *xprt; -int found =0 ; -list_for_each_entry (xprt, &serv->sv_permsocks, xpt_list) -if (strcmp (xprt->xpt_class->xcl_name, proto) ==0 ) { - found =1 ; -break ; - } -return found; -} -/* * Make any sockets that are needed but not present. * If nlm_udpport or nlm_tcpport were set as module
@@ -242,11 +230,11 @@ static int make_socks(struct svc_serv *serv, int proto)int err =0 ;if (proto ==IPPROTO_UDP || nlm_udpport) -if (!find_xprt (serv,"udp" )) +if (!svc_find_xprt (serv,"udp" ,0 ,0 )) err =svc_create_xprt (serv,"udp" , nlm_udpport,SVC_SOCK_DEFAULTS );if (err >=0 && (proto ==IPPROTO_TCP || nlm_tcpport)) -if (!find_xprt (serv,"tcp" )) +if (!svc_find_xprt (serv,"tcp" ,0 ,0 )) err =svc_create_xprt (serv,"tcp" , nlm_tcpport,SVC_SOCK_DEFAULTS );
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -80,6 +80,7 @@ void svc_close_xprt(struct svc_xprt *xprt);void svc_delete_xprt (struct svc_xprt *xprt);int svc_port_is_privileged (struct sockaddr *sin);int svc_print_xprts (char *buf,int maxlen); +struct svc_xprt *svc_find_xprt (struct svc_serv *,char *,int ,int );static inline void svc_xprt_get (struct svc_xprt *xprt) {
net/sunrpc/svc_xprt.c +35 -0
@@ -977,3 +977,38 @@ static struct svc_deferred_req *svc_deferred_dequeue(struct svc_xprt *xprt)spin_unlock (&xprt->xpt_lock);return dr; } + +/* +* Return the transport instance pointer for the endpoint accepting +* connections/peer traffic from the specified transport class, +* address family and port. +* +* Specifying 0 for the address family or port is effectively a +* wild-card, and will result in matching the first transport in the +* service's list that has a matching class name. +*/ +struct svc_xprt *svc_find_xprt (struct svc_serv *serv,char *xcl_name, +int af,int port) +{ +struct svc_xprt *xprt; +struct svc_xprt *found =NULL ; + +/* Sanity check the args */ +if (!serv || !xcl_name) +return found; + +spin_lock_bh (&serv->sv_lock); +list_for_each_entry (xprt, &serv->sv_permsocks, xpt_list) { +if (strcmp (xprt->xpt_class->xcl_name, xcl_name)) +continue ; +if (af !=AF_UNSPEC && af != xprt->xpt_local.ss_family) +continue ; +if (port && port !=svc_xprt_local_port (xprt)) +continue ; + found = xprt; +break ; + } +spin_unlock_bh (&serv->sv_lock); +return found; +} +EXPORT_SYMBOL_GPL (svc_find_xprt);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 85/100 knfsd: Support adding transports by writing portlist file
From: Tom Tucker <[email protected]>
Update the write handler for the portlist file to allow creating new listening endpoints on a transport. The general form of the string is:
<transport_name><space><port number>
For example:
echo "tcp 2049" > /proc/fs/nfsd/portlist
This is intended to support the creation of a listening endpoint for RDMA transports without adding #ifdef code to the nfssvc.c file.
Transports can also be removed as follows:
'-'<transport_name><space><port number>
For example:
echo "-tcp 2049" > /proc/fs/nfsd/portlist
Attempting to add a listener with an invalid transport string results in EPROTONOSUPPORT and a perror string of "Protocol not supported".
Attempting to remove an non-existent listener (.e.g. bad proto or port) results in ENOTCONN and a perror string of
"Transport endpoint is not connected"
--- fs/lockd/svc.c | 18 +++++++++++++----- fs/nfsd/nfsctl.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- net/sunrpc/svc_xprt.c | 2 ++ 3 files changed, 63 insertions(+), 6 deletions(-)
fs/lockd/svc.c +13 -5
@@ -227,17 +227,25 @@ lockd(struct svc_rqst *rqstp)static int make_socks (struct svc_serv *serv,int proto) {static int warned; +struct svc_xprt *xprt;int err =0 ; -if (proto ==IPPROTO_UDP || nlm_udpport) -if (!svc_find_xprt (serv,"udp" ,0 ,0 )) +if (proto ==IPPROTO_UDP || nlm_udpport) { + xprt =svc_find_xprt (serv,"udp" ,0 ,0 ); +if (!xprt) err =svc_create_xprt (serv,"udp" , nlm_udpport,SVC_SOCK_DEFAULTS ); -if (err >=0 && (proto ==IPPROTO_TCP || nlm_tcpport)) -if (!svc_find_xprt (serv,"tcp" ,0 ,0 )) +else +svc_xprt_put (xprt); + } +if (err >=0 && (proto ==IPPROTO_TCP || nlm_tcpport)) { + xprt =svc_find_xprt (serv,"tcp" ,0 ,0 ); +if (!xprt) err =svc_create_xprt (serv,"tcp" , nlm_tcpport,SVC_SOCK_DEFAULTS ); - +else +svc_xprt_put (xprt); + }if (err >=0 ) { warned =0 ; err =0 ;
fs/nfsd/nfsctl.c +48 -1
61 lines not on this page · raw message
net/sunrpc/svc_xprt.c +2 -0
@@ -842,6 +842,7 @@ void svc_close_xprt(struct svc_xprt *xprt)clear_bit (XPT_BUSY , &xprt->xpt_flags);svc_xprt_put (xprt); } +EXPORT_SYMBOL_GPL (svc_close_xprt);void svc_close_all (struct list_head *xprt_list) {
@@ -1006,6 +1007,7 @@ struct svc_xprt *svc_find_xprt(struct svc_serv *serv, char *xcl_name,if (port && port !=svc_xprt_local_port (xprt))continue ; found = xprt; +svc_xprt_get (xprt);break ; }spin_unlock_bh (&serv->sv_lock);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 86/100 svc: Add svc_xprt_names service to replace svc_sock_names
From: Tom Tucker <[email protected]>
Create a transport independent version of the svc_sock_names function.
The toclose capability of the svc_sock_names service can be implemented using the svc_xprt_find and svc_xprt_close services.
--- fs/nfsd/nfsctl.c | 2 +- include/linux/sunrpc/svc_xprt.h | 1 + net/sunrpc/svc_xprt.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletions(-)
fs/nfsd/nfsctl.c +1 -1
@@ -503,7 +503,7 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size)int len =0 ;lock_kernel ();if (nfsd_serv) - len =svc_sock_names (buf, nfsd_serv,NULL ); + len =svc_xprt_names (nfsd_serv, buf,0 );unlock_kernel ();return len; }
include/linux/sunrpc/svc_xprt.h +1 -0
@@ -81,6 +81,7 @@ void svc_delete_xprt(struct svc_xprt *xprt);int svc_port_is_privileged (struct sockaddr *sin);int svc_print_xprts (char *buf,int maxlen);struct svc_xprt *svc_find_xprt (struct svc_serv *,char *,int ,int ); +int svc_xprt_names (struct svc_serv *serv,char *buf,int buflen);static inline void svc_xprt_get (struct svc_xprt *xprt) {
net/sunrpc/svc_xprt.c +35 -0
@@ -1014,3 +1014,38 @@ struct svc_xprt *svc_find_xprt(struct svc_serv *serv, char *xcl_name,return found; }EXPORT_SYMBOL_GPL (svc_find_xprt); + +/* +* Format a buffer with a list of the active transports. A zero for +* the buflen parameter disables target buffer overflow checking. +*/ +int svc_xprt_names (struct svc_serv *serv,char *buf,int buflen) +{ +struct svc_xprt *xprt; +char xprt_str[64 ]; +int totlen =0 ; +int len; + +/* Sanity check args */ +if (!serv) +return 0 ; + +spin_lock_bh (&serv->sv_lock); +list_for_each_entry (xprt, &serv->sv_permsocks, xpt_list) { + len =snprintf (xprt_str,sizeof (xprt_str), +"%s %d\n" , xprt->xpt_class->xcl_name, +svc_xprt_local_port (xprt)); +/* If the string was truncated, replace with error string */ +if (len >=sizeof (xprt_str)) +strcpy (xprt_str,"name-too-long\n" ); +/* Don't overflow buffer */ + len =strlen (xprt_str); +if (buflen && (len + totlen >= buflen)) +break ; +strcpy (buf+totlen, xprt_str); + totlen += len; + } +spin_unlock_bh (&serv->sv_lock); +return totlen; +} +EXPORT_SYMBOL_GPL (svc_xprt_names);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 87/100 rdma: SVCRMDA Header File
From: Tom Tucker <[email protected]>
This file defines the data types used by the SVCRDMA transport module. The principle data structure is the transport specific extension to the svcxprt structure.
--- include/linux/sunrpc/svc_rdma.h | 262 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 262 insertions(+), 0 deletions(-) create mode 100644 include/linux/sunrpc/svc_rdma.h
include/linux/sunrpc/svc_rdma.h new file +262 -0
@@ -0,0 +1,262 @@ +/* +* Copyright (c) 2005-2006 Network Appliance, Inc. All rights reserved. +* +* This software is available to you under a choice of one of two +* licenses. You may choose to be licensed under the terms of the GNU +* General Public License (GPL) Version 2, available from the file +* COPYING in the main directory of this source tree, or the BSD-type +* license below: +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* +* Redistributions in binary form must reproduce the above +* copyright notice, this list of conditions and the following +* disclaimer in the documentation and/or other materials provided +* with the distribution. +* +* Neither the name of the Network Appliance, Inc. nor the names of +* its contributors may be used to endorse or promote products +* derived from this software without specific prior written +* permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +* Author: Tom Tucker <[email protected]> +*/ + +#ifndef SVC_RDMA_H +#define SVC_RDMA_H +#include <linux/sunrpc/xdr.h> +#include <linux/sunrpc/svcsock.h> +#include <linux/sunrpc/rpc_rdma.h> +#include <rdma/ib_verbs.h> +#include <rdma/rdma_cm.h> +#define SVCRDMA_DEBUG + +/* RPC/RDMA parameters and stats */ +extern unsigned int svcrdma_ord; +extern unsigned int svcrdma_max_requests; +extern unsigned int svcrdma_max_req_size; + +extern atomic_t rdma_stat_recv; +extern atomic_t rdma_stat_read; +extern atomic_t rdma_stat_write; +extern atomic_t rdma_stat_sq_starve; +extern atomic_t rdma_stat_rq_starve; +extern atomic_t rdma_stat_rq_poll; +extern atomic_t rdma_stat_rq_prod; +extern atomic_t rdma_stat_sq_poll; +extern atomic_t rdma_stat_sq_prod; + +#define RPCRDMA_VERSION 1 + +/* +* Contexts are built when an RDMA request is created and are a +* record of the resources that can be recovered when the request +* completes. +*/ +struct svc_rdma_op_ctxt { +struct svc_rdma_op_ctxt *next; +struct xdr_buf arg; +struct list_head dto_q; +enum ib_wr_opcode wr_op; +enum ib_wc_status wc_status; +u32 byte_len; +struct svcxprt_rdma *xprt; +unsigned long flags; +enum dma_data_direction direction; +int count; +struct ib_sge sge[RPCSVC_MAXPAGES ]; +struct page *pages[RPCSVC_MAXPAGES ]; +}; + +#define RDMACTXT_F_READ_DONE 1 +#define RDMACTXT_F_LAST_CTXT 2 + +struct svcxprt_rdma { +struct svc_xprt sc_xprt;/* SVC transport structure */ +struct rdma_cm_id *sc_cm_id;/* RDMA connection id */ +struct list_head sc_accept_q;/* Conn. waiting accept */ +int sc_ord;/* RDMA read limit */ +wait_queue_head_t sc_read_wait; +int sc_max_sge; + +int sc_sq_depth;/* Depth of SQ */ +atomic_t sc_sq_count;/* Number of SQ WR on queue */ + +int sc_max_requests;/* Depth of RQ */ +int sc_max_req_size;/* Size of each RQ WR buf */ + +struct ib_pd *sc_pd; + +struct svc_rdma_op_ctxt *sc_ctxt_head; +int sc_ctxt_cnt; +int sc_ctxt_bump; +int sc_ctxt_max; +spinlock_t sc_ctxt_lock; +struct list_head sc_rq_dto_q; +spinlock_t sc_rq_dto_lock; +struct ib_qp *sc_qp; +struct ib_cq *sc_rq_cq; +struct ib_cq *sc_sq_cq; +struct ib_mr *sc_phys_mr;/* MR for server memory */ + +spinlock_t sc_lock;/* transport lock */ + +wait_queue_head_t sc_send_wait;/* SQ exhaustion waitlist */ +unsigned long sc_flags; +struct list_head sc_dto_q;/* DTO tasklet I/O pending Q */ +struct list_head sc_read_complete_q; +spinlock_t sc_read_complete_lock; +}; +/* sc_flags */ +#define RDMAXPRT_RQ_PENDING 1 +#define RDMAXPRT_SQ_PENDING 2 +#define RDMAXPRT_CONN_PENDING 3 + +#define RPCRDMA_LISTEN_BACKLOG 10 +/* The default ORD value is based on two outstanding full-size writes with a +* page size of 4k, or 32k * 2 ops / 4k = 16 outstanding RDMA_READ. */ +#define RPCRDMA_ORD (64/4) +#define RPCRDMA_SQ_DEPTH_MULT 8 +#define RPCRDMA_MAX_THREADS 16 +#define RPCRDMA_MAX_REQUESTS 16 +#define RPCRDMA_MAX_REQ_SIZE 4096 + +/* svc_rdma_marshal.c */ +extern void svc_rdma_rcl_chunk_counts (struct rpcrdma_read_chunk *, +int *,int *); +extern int svc_rdma_xdr_decode_req (struct rpcrdma_msg **,struct svc_rqst *); +extern int svc_rdma_xdr_decode_deferred_req (struct svc_rqst *); +extern int svc_rdma_xdr_encode_error (struct svcxprt_rdma *, +struct rpcrdma_msg *, +enum rpcrdma_errcode ,u32 *); +extern void svc_rdma_xdr_encode_write_list (struct rpcrdma_msg *,int ); +extern void svc_rdma_xdr_encode_reply_array (struct rpcrdma_write_array *,int ); +extern void svc_rdma_xdr_encode_array_chunk (struct rpcrdma_write_array *,int , +u32 ,u64 ,u32 ); +extern void svc_rdma_xdr_encode_reply_header (struct svcxprt_rdma *, +struct rpcrdma_msg *, +struct rpcrdma_msg *, +enum rpcrdma_proc ); +extern int svc_rdma_xdr_get_reply_hdr_len (struct rpcrdma_msg *); + +/* svc_rdma_recvfrom.c */ +extern int svc_rdma_recvfrom (struct svc_rqst *); + +/* svc_rdma_sendto.c */ +extern int svc_rdma_sendto (struct svc_rqst *); + +/* svc_rdma_transport.c */ +extern int svc_rdma_send (struct svcxprt_rdma *,struct ib_send_wr *); +extern int svc_rdma_send_error (struct svcxprt_rdma *,struct rpcrdma_msg *, +enum rpcrdma_errcode ); +struct page *svc_rdma_get_page (void ); +extern int svc_rdma_post_recv (struct svcxprt_rdma *); +extern int svc_rdma_create_listen (struct svc_serv *,int ,struct sockaddr *); +extern struct svc_rdma_op_ctxt *svc_rdma_get_context (struct svcxprt_rdma *); +extern void svc_rdma_put_context (struct svc_rdma_op_ctxt *,int ); +extern void svc_sq_reap (struct svcxprt_rdma *); +extern void svc_rq_reap (struct svcxprt_rdma *); +extern struct svc_xprt_class svc_rdma_class; +extern void svc_rdma_prep_reply_hdr (struct svc_rqst *); + +/* svc_rdma.c */ +extern int svc_rdma_init (void ); +extern void svc_rdma_cleanup (void ); + +/* +* Returns the address of the first read chunk or <nul> if no read chunk is +* present +*/ +static inline struct rpcrdma_read_chunk * +svc_rdma_get_read_chunk (struct rpcrdma_msg *rmsgp) +{ +struct rpcrdma_read_chunk *ch = + (struct rpcrdma_read_chunk *)&rmsgp->rm_body.rm_chunks[0 ]; + +if (ch->rc_discrim ==0 ) +return NULL ; + +return ch; +} + +/* +* Returns the address of the first read write array element or <nul> if no +* write array list is present +*/ +static inline struct rpcrdma_write_array * +svc_rdma_get_write_array (struct rpcrdma_msg *rmsgp) +{ +if (rmsgp->rm_body.rm_chunks[0 ] !=0 + || rmsgp->rm_body.rm_chunks[1 ] ==0 ) +return NULL ; + +return (struct rpcrdma_write_array *)&rmsgp->rm_body.rm_chunks[1 ]; +} + +/* +* Returns the address of the first reply array element or <nul> if no +* reply array is present +*/ +static inline struct rpcrdma_write_array * +svc_rdma_get_reply_array (struct rpcrdma_msg *rmsgp) +{ +struct rpcrdma_read_chunk *rch; +struct rpcrdma_write_array *wr_ary; +struct rpcrdma_write_array *rp_ary; + +/* XXX: Need to fix when reply list may occur with read-list and/or +* write list */ +if (rmsgp->rm_body.rm_chunks[0 ] !=0 || + rmsgp->rm_body.rm_chunks[1 ] !=0 ) +return NULL ; + + rch =svc_rdma_get_read_chunk (rmsgp); +if (rch) { +while (rch->rc_discrim) + rch++; + +/* The reply list follows an empty write array located +* at 'rc_position' here. The reply array is at rc_target. +*/ + rp_ary = (struct rpcrdma_write_array *)&rch->rc_target; + + goto found_it; + } + + wr_ary =svc_rdma_get_write_array (rmsgp); +if (wr_ary) { + rp_ary = (struct rpcrdma_write_array *) + &wr_ary-> + wc_array[wr_ary->wc_nchunks].wc_target.rs_length; + + goto found_it; + } + +/* No read list, no write list */ + rp_ary = (struct rpcrdma_write_array *) + &rmsgp->rm_body.rm_chunks[2 ]; + + found_it: +if (rp_ary->wc_discrim ==0 ) +return NULL ; + +return rp_ary; +} +#endif
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 88/100 rdma: SVCRDMA Transport Module
From: Tom Tucker <[email protected]>
This file implements the RDMA transport module initialization and termination logic and registers the transport sysctl variables.
--- net/sunrpc/xprtrdma/svc_rdma.c | 266 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 266 insertions(+), 0 deletions(-) create mode 100644 net/sunrpc/xprtrdma/svc_rdma.c
net/sunrpc/xprtrdma/svc_rdma.c new file +266 -0
@@ -0,0 +1,266 @@ +/* +* Copyright (c) 2005-2006 Network Appliance, Inc. All rights reserved. +* +* This software is available to you under a choice of one of two +* licenses. You may choose to be licensed under the terms of the GNU +* General Public License (GPL) Version 2, available from the file +* COPYING in the main directory of this source tree, or the BSD-type +* license below: +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* +* Redistributions in binary form must reproduce the above +* copyright notice, this list of conditions and the following +* disclaimer in the documentation and/or other materials provided +* with the distribution. +* +* Neither the name of the Network Appliance, Inc. nor the names of +* its contributors may be used to endorse or promote products +* derived from this software without specific prior written +* permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +* Author: Tom Tucker <[email protected]> +*/ +#include <linux/module.h> +#include <linux/init.h> +#include <linux/fs.h> +#include <linux/sysctl.h> +#include <linux/sunrpc/clnt.h> +#include <linux/sunrpc/sched.h> +#include <linux/sunrpc/svc_rdma.h> + +#define RPCDBG_FACILITY RPCDBG_SVCXPRT + +/* RPC/RDMA parameters */ +unsigned int svcrdma_ord =RPCRDMA_ORD ; +static unsigned int min_ord =1 ; +static unsigned int max_ord =4096 ; +unsigned int svcrdma_max_requests =RPCRDMA_MAX_REQUESTS ; +static unsigned int min_max_requests =4 ; +static unsigned int max_max_requests =16384 ; +unsigned int svcrdma_max_req_size =RPCRDMA_MAX_REQ_SIZE ; +static unsigned int min_max_inline =4096 ; +static unsigned int max_max_inline =65536 ; + +atomic_t rdma_stat_recv; +atomic_t rdma_stat_read; +atomic_t rdma_stat_write; +atomic_t rdma_stat_sq_starve; +atomic_t rdma_stat_rq_starve; +atomic_t rdma_stat_rq_poll; +atomic_t rdma_stat_rq_prod; +atomic_t rdma_stat_sq_poll; +atomic_t rdma_stat_sq_prod; + +/* +* This function implements reading and resetting an atomic_t stat +* variable through read/write to a proc file. Any write to the file +* resets the associated statistic to zero. Any read returns it's +* current value. +*/ +static int read_reset_stat (ctl_table *table,int write, +struct file *filp,void __user *buffer,size_t *lenp, +loff_t *ppos) +{ +atomic_t *stat = (atomic_t *)table->data; + +if (!stat) +return -EINVAL ; + +if (write) +atomic_set (stat,0 ); +else { +char str_buf[32 ]; +char *data; +int len =snprintf (str_buf,32 ,"%d\n" ,atomic_read (stat)); +if (len >=32 ) +return -EFAULT ; + len =strlen (str_buf); +if (*ppos > len) { + *lenp =0 ; +return 0 ; + } + data = &str_buf[*ppos]; + len -= *ppos; +if (len > *lenp) + len = *lenp; +if (len &©_to_user (buffer, str_buf, len)) +return -EFAULT ; + *lenp = len; + *ppos += len; + } +return 0 ; +} + +static struct ctl_table_header *svcrdma_table_header; +static ctl_table svcrdma_parm_table[] = { + { + .procname ="max_requests" , + .data = &svcrdma_max_requests, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = &proc_dointvec_minmax, + .strategy = &sysctl_intvec, + .extra1 = &min_max_requests, + .extra2 = &max_max_requests + }, + { + .procname ="max_req_size" , + .data = &svcrdma_max_req_size, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = &proc_dointvec_minmax, + .strategy = &sysctl_intvec, + .extra1 = &min_max_inline, + .extra2 = &max_max_inline + }, + { + .procname ="max_outbound_read_requests" , + .data = &svcrdma_ord, + .maxlen =sizeof (unsigned int ), + .mode =0644 , + .proc_handler = &proc_dointvec_minmax, + .strategy = &sysctl_intvec, + .extra1 = &min_ord, + .extra2 = &max_ord, + }, + + { + .procname ="rdma_stat_read" , + .data = &rdma_stat_read, + .maxlen =sizeof (atomic_t), + .mode =0644 , + .proc_handler = &read_reset_stat, + }, + { + .procname ="rdma_stat_recv" , + .data = &rdma_stat_recv, + .maxlen =sizeof (atomic_t), + .mode =0644 , + .proc_handler = &read_reset_stat, + }, + { + .procname ="rdma_stat_write" , + .data = &rdma_stat_write, + .maxlen =sizeof (atomic_t), + .mode =0644 , + .proc_handler = &read_reset_stat, + }, + { + .procname ="rdma_stat_sq_starve" , + .data = &rdma_stat_sq_starve, + .maxlen =sizeof (atomic_t), + .mode =0644 , + .proc_handler = &read_reset_stat, + }, + { + .procname ="rdma_stat_rq_starve" , + .data = &rdma_stat_rq_starve, + .maxlen =sizeof (atomic_t), + .mode =0644 , + .proc_handler = &read_reset_stat, + }, + { + .procname ="rdma_stat_rq_poll" , + .data = &rdma_stat_rq_poll, + .maxlen =sizeof (atomic_t), + .mode =0644 , + .proc_handler = &read_reset_stat, + }, + { + .procname ="rdma_stat_rq_prod" , + .data = &rdma_stat_rq_prod, + .maxlen =sizeof (atomic_t), + .mode =0644 , + .proc_handler = &read_reset_stat, + }, + { + .procname ="rdma_stat_sq_poll" , + .data = &rdma_stat_sq_poll, + .maxlen =sizeof (atomic_t), + .mode =0644 , + .proc_handler = &read_reset_stat, + }, + { + .procname ="rdma_stat_sq_prod" , + .data = &rdma_stat_sq_prod, + .maxlen =sizeof (atomic_t), + .mode =0644 , + .proc_handler = &read_reset_stat, + }, + { + .ctl_name =0 , + }, +}; + +static ctl_table svcrdma_table[] = { + { + .procname ="svc_rdma" , + .mode =0555 , + .child = svcrdma_parm_table + }, + { + .ctl_name =0 , + }, +}; + +static ctl_table svcrdma_root_table[] = { + { + .ctl_name =CTL_SUNRPC , + .procname ="sunrpc" , + .mode =0555 , + .child = svcrdma_table + }, + { + .ctl_name =0 , + }, +}; + +void svc_rdma_cleanup (void ) +{ +dprintk ("SVCRDMA Module Removed, deregister RPC RDMA transport\n" ); +if (svcrdma_table_header) { +unregister_sysctl_table (svcrdma_table_header); + svcrdma_table_header =NULL ; + } +svc_unreg_xprt_class (&svc_rdma_class); +} + +int svc_rdma_init (void ) +{ +dprintk ("SVCRDMA Module Init, register RPC RDMA transport\n" ); +dprintk ("\tsvcrdma_ord : %d\n" , svcrdma_ord); +dprintk ("\tmax_requests : %d\n" , svcrdma_max_requests); +dprintk ("\tsq_depth : %d\n" , + svcrdma_max_requests *RPCRDMA_SQ_DEPTH_MULT ); +dprintk ("\tmax_inline : %d\n" , svcrdma_max_req_size); +if (!svcrdma_table_header) + svcrdma_table_header = +register_sysctl_table (svcrdma_root_table); + +/* Register RDMA with the SVC transport switch */ +svc_reg_xprt_class (&svc_rdma_class); +return 0 ; +} +MODULE_AUTHOR ("Tom Tucker <[email protected]>" ); +MODULE_DESCRIPTION ("SVC RDMA Transport" ); +MODULE_LICENSE ("Dual BSD/GPL" ); +module_init (svc_rdma_init); +module_exit (svc_rdma_cleanup);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 89/100 rdma: SVCRDMA Core Transport Services
From: Tom Tucker <[email protected]>
This file implements the core transport data management and I/O path. The I/O path for RDMA involves receiving callbacks on interrupt context. Since all the svc transport locks are _bh locks we enqueue the transport on a list, schedule a tasklet to dequeue data indications from the RDMA completion queue. The tasklet in turn takes _bh locks to enqueue receive data indications on a list for the transport. The svc_rdma_recvfrom transport function dequeues data from this list in an NFSD thread context.
--- net/sunrpc/xprtrdma/svc_rdma_transport.c | 1080 ++++++++++++++++++++++++++++++ 1 files changed, 1080 insertions(+), 0 deletions(-) create mode 100644 net/sunrpc/xprtrdma/svc_rdma_transport.c
net/sunrpc/xprtrdma/svc_rdma_transport.c new file +1080 -0
@@ -0,0 +1,1080 @@ +/* +* Copyright (c) 2005-2007 Network Appliance, Inc. All rights reserved. +* +* This software is available to you under a choice of one of two +* licenses. You may choose to be licensed under the terms of the GNU +* General Public License (GPL) Version 2, available from the file +* COPYING in the main directory of this source tree, or the BSD-type +* license below: +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* +* Redistributions in binary form must reproduce the above +* copyright notice, this list of conditions and the following +* disclaimer in the documentation and/or other materials provided +* with the distribution. +* +* Neither the name of the Network Appliance, Inc. nor the names of +* its contributors may be used to endorse or promote products +* derived from this software without specific prior written +* permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +* Author: Tom Tucker <[email protected]> +*/ + +#include <linux/sunrpc/svc_xprt.h> +#include <linux/sunrpc/debug.h> +#include <linux/sunrpc/rpc_rdma.h> +#include <linux/spinlock.h> +#include <rdma/ib_verbs.h> +#include <rdma/rdma_cm.h> +#include <linux/sunrpc/svc_rdma.h> + +#define RPCDBG_FACILITY RPCDBG_SVCXPRT + +static struct svc_xprt *svc_rdma_create (struct svc_serv *serv, +struct sockaddr *sa,int salen, +int flags); +static struct svc_xprt *svc_rdma_accept (struct svc_xprt *xprt); +static void svc_rdma_release_rqst (struct svc_rqst *); +static void rdma_destroy_xprt (struct svcxprt_rdma *xprt); +static void dto_tasklet_func (unsigned long data); +static void svc_rdma_detach (struct svc_xprt *xprt); +static void svc_rdma_free (struct svc_xprt *xprt); +static int svc_rdma_has_wspace (struct svc_xprt *xprt); +static void rq_cq_reap (struct svcxprt_rdma *xprt); +static void sq_cq_reap (struct svcxprt_rdma *xprt); + +DECLARE_TASKLET (dto_tasklet, dto_tasklet_func,0UL ); +static DEFINE_SPINLOCK (dto_lock); +static LIST_HEAD (dto_xprt_q); + +static struct svc_xprt_ops svc_rdma_ops = { + .xpo_create = svc_rdma_create, + .xpo_recvfrom = svc_rdma_recvfrom, + .xpo_sendto = svc_rdma_sendto, + .xpo_release_rqst = svc_rdma_release_rqst, + .xpo_detach = svc_rdma_detach, + .xpo_free = svc_rdma_free, + .xpo_prep_reply_hdr = svc_rdma_prep_reply_hdr, + .xpo_has_wspace = svc_rdma_has_wspace, + .xpo_accept = svc_rdma_accept, +}; + +struct svc_xprt_class svc_rdma_class = { + .xcl_name ="rdma" , + .xcl_owner =THIS_MODULE , + .xcl_ops = &svc_rdma_ops, + .xcl_max_payload =RPCSVC_MAXPAYLOAD_TCP , +}; + +static int rdma_bump_context_cache (struct svcxprt_rdma *xprt) +{ +int target; +int at_least_one =0 ; +struct svc_rdma_op_ctxt *ctxt; + + target =min (xprt->sc_ctxt_cnt + xprt->sc_ctxt_bump, + xprt->sc_ctxt_max); + +spin_lock_bh (&xprt->sc_ctxt_lock); +while (xprt->sc_ctxt_cnt < target) { + xprt->sc_ctxt_cnt++; +spin_unlock_bh (&xprt->sc_ctxt_lock); + + ctxt =kmalloc (sizeof (*ctxt),GFP_KERNEL ); + +spin_lock_bh (&xprt->sc_ctxt_lock); +if (ctxt) { + at_least_one =1 ; + ctxt->next = xprt->sc_ctxt_head; + xprt->sc_ctxt_head = ctxt; + }else { +/* kmalloc failed...give up for now */ + xprt->sc_ctxt_cnt--; +break ; + } + } +spin_unlock_bh (&xprt->sc_ctxt_lock); +dprintk ("svcrdma: sc_ctxt_max=%d, sc_ctxt_cnt=%d\n" , + xprt->sc_ctxt_max, xprt->sc_ctxt_cnt); +return at_least_one; +} + +struct svc_rdma_op_ctxt *svc_rdma_get_context (struct svcxprt_rdma *xprt) +{ +struct svc_rdma_op_ctxt *ctxt; + +while (1 ) { +spin_lock_bh (&xprt->sc_ctxt_lock); +if (unlikely (xprt->sc_ctxt_head ==NULL )) { +/* Try to bump my cache. */ +spin_unlock_bh (&xprt->sc_ctxt_lock); + +if (rdma_bump_context_cache (xprt)) +continue ; + +printk (KERN_INFO "svcrdma: sleeping waiting for " +"context memory on xprt=%p\n" , + xprt); +schedule_timeout_uninterruptible (msecs_to_jiffies (500 )); +continue ; + } + ctxt = xprt->sc_ctxt_head; + xprt->sc_ctxt_head = ctxt->next; +spin_unlock_bh (&xprt->sc_ctxt_lock); + ctxt->xprt = xprt; +INIT_LIST_HEAD (&ctxt->dto_q); + ctxt->count =0 ; +break ; + } +return ctxt; +} + +void svc_rdma_put_context (struct svc_rdma_op_ctxt *ctxt,int free_pages) +{ +struct svcxprt_rdma *xprt; +int i; + +BUG_ON (!ctxt); + xprt = ctxt->xprt; +if (free_pages) +for (i =0 ; i < ctxt->count; i++) +put_page (ctxt->pages[i]); + +for (i =0 ; i < ctxt->count; i++) +dma_unmap_single (xprt->sc_cm_id->device->dma_device, + ctxt->sge[i].addr, + ctxt->sge[i].length, + ctxt->direction); +spin_lock_bh (&xprt->sc_ctxt_lock); + ctxt->next = xprt->sc_ctxt_head; + xprt->sc_ctxt_head = ctxt; +spin_unlock_bh (&xprt->sc_ctxt_lock); +} + +/* ib_cq event handler */ +static void cq_event_handler (struct ib_event *event,void *context) +{ +struct svc_xprt *xprt = context; +dprintk ("svcrdma: received CQ event id=%d, context=%p\n" , + event->event, context); +set_bit (XPT_CLOSE , &xprt->xpt_flags); +} + +/* QP event handler */ +static void qp_event_handler (struct ib_event *event,void *context) +{ +struct svc_xprt *xprt = context; + +switch (event->event) { +/* These are considered benign events */ +case IB_EVENT_PATH_MIG : +case IB_EVENT_COMM_EST : +case IB_EVENT_SQ_DRAINED : +case IB_EVENT_QP_LAST_WQE_REACHED : +dprintk ("svcrdma: QP event %d received for QP=%p\n" , + event->event, event->element.qp); +break ; +/* These are considered fatal events */ +case IB_EVENT_PATH_MIG_ERR : +case IB_EVENT_QP_FATAL : +case IB_EVENT_QP_REQ_ERR : +case IB_EVENT_QP_ACCESS_ERR : +case IB_EVENT_DEVICE_FATAL : +default : +dprintk ("svcrdma: QP ERROR event %d received for QP=%p, " +"closing transport\n" , + event->event, event->element.qp); +set_bit (XPT_CLOSE , &xprt->xpt_flags); +break ; + } +} + +/* +* Data Transfer Operation Tasklet +* +* Walks a list of transports with I/O pending, removing entries as +* they are added to the server's I/O pending list. Two bits indicate +* if SQ, RQ, or both have I/O pending. The dto_lock is an irqsave +* spinlock that serializes access to the transport list with the RQ +* and SQ interrupt handlers. +*/ +static void dto_tasklet_func (unsigned long data) +{ +struct svcxprt_rdma *xprt; +unsigned long flags; + +spin_lock_irqsave (&dto_lock, flags); +while (!list_empty (&dto_xprt_q)) { + xprt =list_entry (dto_xprt_q.next, + struct svcxprt_rdma, sc_dto_q); +list_del_init (&xprt->sc_dto_q); +spin_unlock_irqrestore (&dto_lock, flags); + +if (test_and_clear_bit (RDMAXPRT_RQ_PENDING , &xprt->sc_flags)) { +ib_req_notify_cq (xprt->sc_rq_cq,IB_CQ_NEXT_COMP ); +rq_cq_reap (xprt); +set_bit (XPT_DATA , &xprt->sc_xprt.xpt_flags); +/* +* If data arrived before established event, +* don't enqueue. This defers RPC I/O until the +* RDMA connection is complete. +*/ +if (!test_bit (RDMAXPRT_CONN_PENDING , &xprt->sc_flags)) +svc_xprt_enqueue (&xprt->sc_xprt); + } + +if (test_and_clear_bit (RDMAXPRT_SQ_PENDING , &xprt->sc_flags)) { +ib_req_notify_cq (xprt->sc_sq_cq,IB_CQ_NEXT_COMP ); +sq_cq_reap (xprt); + } + +spin_lock_irqsave (&dto_lock, flags); + } +spin_unlock_irqrestore (&dto_lock, flags); +} + +/* +* Receive Queue Completion Handler +* +* Since an RQ completion handler is called on interrupt context, we +* need to defer the handling of the I/O to a tasklet +*/ +static void rq_comp_handler (struct ib_cq *cq,void *cq_context) +{ +struct svcxprt_rdma *xprt = cq_context; +unsigned long flags; + +/* +* Set the bit regardless of whether or not it's on the list +* because it may be on the list already due to an SQ +* completion. +*/ +set_bit (RDMAXPRT_RQ_PENDING , &xprt->sc_flags); + +/* +* If this transport is not already on the DTO transport queue, +* add it +*/ +spin_lock_irqsave (&dto_lock, flags); +if (list_empty (&xprt->sc_dto_q)) +list_add_tail (&xprt->sc_dto_q, &dto_xprt_q); +spin_unlock_irqrestore (&dto_lock, flags); + +/* Tasklet does all the work to avoid irqsave locks. */ +tasklet_schedule (&dto_tasklet); +} + +/* +* rq_cq_reap - Process the RQ CQ. +* +* Take all completing WC off the CQE and enqueue the associated DTO +* context on the dto_q for the transport. +*/ +static void rq_cq_reap (struct svcxprt_rdma *xprt) +{ +int ret; +struct ib_wc wc; +struct svc_rdma_op_ctxt *ctxt =NULL ; + +atomic_inc (&rdma_stat_rq_poll); + +spin_lock_bh (&xprt->sc_rq_dto_lock); +while ((ret =ib_poll_cq (xprt->sc_rq_cq,1 , &wc)) >0 ) { + ctxt = (struct svc_rdma_op_ctxt *)(unsigned long )wc.wr_id; + ctxt->wc_status = wc.status; + ctxt->byte_len = wc.byte_len; +if (wc.status !=IB_WC_SUCCESS ) { +/* Close the transport */ +set_bit (XPT_CLOSE , &xprt->sc_xprt.xpt_flags); +svc_rdma_put_context (ctxt,1 ); +continue ; + } +list_add_tail (&ctxt->dto_q, &xprt->sc_rq_dto_q); + } +spin_unlock_bh (&xprt->sc_rq_dto_lock); + +if (ctxt) +atomic_inc (&rdma_stat_rq_prod); +} + +/* +* Send Queue Completion Handler - potentially called on interrupt context. +*/ +static void sq_cq_reap (struct svcxprt_rdma *xprt) +{ +struct svc_rdma_op_ctxt *ctxt =NULL ; +struct ib_wc wc; +struct ib_cq *cq = xprt->sc_sq_cq; +int ret; + +atomic_inc (&rdma_stat_sq_poll); +while ((ret =ib_poll_cq (cq,1 , &wc)) >0 ) { + ctxt = (struct svc_rdma_op_ctxt *)(unsigned long )wc.wr_id; + xprt = ctxt->xprt; + +if (wc.status !=IB_WC_SUCCESS ) +/* Close the transport */ +set_bit (XPT_CLOSE , &xprt->sc_xprt.xpt_flags); + +/* Decrement used SQ WR count */ +atomic_dec (&xprt->sc_sq_count); +wake_up (&xprt->sc_send_wait); + +switch (ctxt->wr_op) { +case IB_WR_SEND : +case IB_WR_RDMA_WRITE : +svc_rdma_put_context (ctxt,1 ); +break ; + +case IB_WR_RDMA_READ : +if (test_bit (RDMACTXT_F_LAST_CTXT , &ctxt->flags)) { +set_bit (XPT_DATA , &xprt->sc_xprt.xpt_flags); +set_bit (RDMACTXT_F_READ_DONE , &ctxt->flags); +spin_lock_bh (&xprt->sc_read_complete_lock); +list_add_tail (&ctxt->dto_q, + &xprt->sc_read_complete_q); +spin_unlock_bh (&xprt->sc_read_complete_lock); +svc_xprt_enqueue (&xprt->sc_xprt); + } +break ; + +default : +printk (KERN_ERR "svcrdma: unexpected completion type, " +"opcode=%d, status=%d\n" , + wc.opcode, wc.status); +break ; + } + } + +if (ctxt) +atomic_inc (&rdma_stat_sq_prod); +} + +static void sq_comp_handler (struct ib_cq *cq,void *cq_context) +{ +struct svcxprt_rdma *xprt = cq_context; +unsigned long flags; + +/* +* Set the bit regardless of whether or not it's on the list +* because it may be on the list already due to an RQ +* completion. +*/ +set_bit (RDMAXPRT_SQ_PENDING , &xprt->sc_flags); + +/* +* If this transport is not already on the DTO transport queue, +* add it +*/ +spin_lock_irqsave (&dto_lock, flags); +if (list_empty (&xprt->sc_dto_q)) +list_add_tail (&xprt->sc_dto_q, &dto_xprt_q); +spin_unlock_irqrestore (&dto_lock, flags); + +/* Tasklet does all the work to avoid irqsave locks. */ +tasklet_schedule (&dto_tasklet); +} + +static void create_context_cache (struct svcxprt_rdma *xprt, +int ctxt_count,int ctxt_bump,int ctxt_max) +{ +struct svc_rdma_op_ctxt *ctxt; +int i; + + xprt->sc_ctxt_max = ctxt_max; + xprt->sc_ctxt_bump = ctxt_bump; + xprt->sc_ctxt_cnt =0 ; + xprt->sc_ctxt_head =NULL ; +for (i =0 ; i < ctxt_count; i++) { + ctxt =kmalloc (sizeof (*ctxt),GFP_KERNEL ); +if (ctxt) { + ctxt->next = xprt->sc_ctxt_head; + xprt->sc_ctxt_head = ctxt; + xprt->sc_ctxt_cnt++; + } + } +} + +static void destroy_context_cache (struct svc_rdma_op_ctxt *ctxt) +{ +struct svc_rdma_op_ctxt *next; +if (!ctxt) +return ; + +do { + next = ctxt->next; +kfree (ctxt); + ctxt = next; + }while (next); +} + +static struct svcxprt_rdma *rdma_create_xprt (struct svc_serv *serv, +int listener) +{ +struct svcxprt_rdma *cma_xprt =kzalloc (sizeof *cma_xprt,GFP_KERNEL ); + +if (!cma_xprt) +return NULL ; +svc_xprt_init (&svc_rdma_class, &cma_xprt->sc_xprt, serv); +INIT_LIST_HEAD (&cma_xprt->sc_accept_q); +INIT_LIST_HEAD (&cma_xprt->sc_dto_q); +INIT_LIST_HEAD (&cma_xprt->sc_rq_dto_q); +INIT_LIST_HEAD (&cma_xprt->sc_read_complete_q); +init_waitqueue_head (&cma_xprt->sc_send_wait); + +spin_lock_init (&cma_xprt->sc_lock); +spin_lock_init (&cma_xprt->sc_read_complete_lock); +spin_lock_init (&cma_xprt->sc_ctxt_lock); +spin_lock_init (&cma_xprt->sc_rq_dto_lock); + + cma_xprt->sc_ord = svcrdma_ord; + + cma_xprt->sc_max_req_size = svcrdma_max_req_size; + cma_xprt->sc_max_requests = svcrdma_max_requests; + cma_xprt->sc_sq_depth = svcrdma_max_requests *RPCRDMA_SQ_DEPTH_MULT ; +atomic_set (&cma_xprt->sc_sq_count,0 ); + +if (!listener) { +int reqs = cma_xprt->sc_max_requests; +create_context_cache (cma_xprt, + reqs <<1 ,/* starting size */ + reqs,/* bump amount */ + reqs + + cma_xprt->sc_sq_depth + +RPCRDMA_MAX_THREADS +1 );/* max */ +if (!cma_xprt->sc_ctxt_head) { +kfree (cma_xprt); +return NULL ; + } +clear_bit (XPT_LISTENER , &cma_xprt->sc_xprt.xpt_flags); + }else +set_bit (XPT_LISTENER , &cma_xprt->sc_xprt.xpt_flags); + +return cma_xprt; +} + +struct page *svc_rdma_get_page (void ) +{ +struct page *page; + +while ((page =alloc_page (GFP_KERNEL )) ==NULL ) { +/* If we can't get memory, wait a bit and try again */ +printk (KERN_INFO "svcrdma: out of memory...retrying in 1000 " +"jiffies.\n" ); +schedule_timeout_uninterruptible (msecs_to_jiffies (1000 )); + } +return page; +} + +int svc_rdma_post_recv (struct svcxprt_rdma *xprt) +{ +struct ib_recv_wr recv_wr, *bad_recv_wr; +struct svc_rdma_op_ctxt *ctxt; +struct page *page; +unsigned long pa; +int sge_no; +int buflen; +int ret; + + ctxt =svc_rdma_get_context (xprt); + buflen =0 ; + ctxt->direction =DMA_FROM_DEVICE ; +for (sge_no =0 ; buflen < xprt->sc_max_req_size; sge_no++) { +BUG_ON (sge_no >= xprt->sc_max_sge); + page =svc_rdma_get_page (); + ctxt->pages[sge_no] = page; + pa =ib_dma_map_page (xprt->sc_cm_id->device, + page,0 ,PAGE_SIZE , +DMA_FROM_DEVICE ); + ctxt->sge[sge_no].addr = pa; + ctxt->sge[sge_no].length =PAGE_SIZE ; + ctxt->sge[sge_no].lkey = xprt->sc_phys_mr->lkey; + buflen +=PAGE_SIZE ; + } + ctxt->count = sge_no; + recv_wr.next =NULL ; + recv_wr.sg_list = &ctxt->sge[0 ]; + recv_wr.num_sge = ctxt->count; + recv_wr.wr_id = (u64 )(unsigned long )ctxt; + + ret =ib_post_recv (xprt->sc_qp, &recv_wr, &bad_recv_wr); +return ret; +} + +/* +* This function handles the CONNECT_REQUEST event on a listening +* endpoint. It is passed the cma_id for the _new_ connection. The context in +* this cma_id is inherited from the listening cma_id and is the svc_xprt +* structure for the listening endpoint. +* +* This function creates a new xprt for the new connection and enqueues it on +* the accept queue for the listent xprt. When the listen thread is kicked, it +* will call the recvfrom method on the listen xprt which will accept the new +* connection. +*/ +static void handle_connect_req (struct rdma_cm_id *new_cma_id) +{ +struct svcxprt_rdma *listen_xprt = new_cma_id->context; +struct svcxprt_rdma *newxprt; + +/* Create a new transport */ + newxprt =rdma_create_xprt (listen_xprt->sc_xprt.xpt_server,0 ); +if (!newxprt) { +dprintk ("svcrdma: failed to create new transport\n" ); +return ; + } + newxprt->sc_cm_id = new_cma_id; + new_cma_id->context = newxprt; +dprintk ("svcrdma: Creating newxprt=%p, cm_id=%p, listenxprt=%p\n" , + newxprt, newxprt->sc_cm_id, listen_xprt); + +/* +* Enqueue the new transport on the accept queue of the listening +* transport +*/ +spin_lock_bh (&listen_xprt->sc_lock); +list_add_tail (&newxprt->sc_accept_q, &listen_xprt->sc_accept_q); +spin_unlock_bh (&listen_xprt->sc_lock); + +/* +* Can't use svc_xprt_received here because we are not on a +* rqstp thread +*/ +set_bit (XPT_CONN , &listen_xprt->sc_xprt.xpt_flags); +svc_xprt_enqueue (&listen_xprt->sc_xprt); +} + +/* +* Handles events generated on the listening endpoint. These events will be +* either be incoming connect requests or adapter removal events. +*/ +static int rdma_listen_handler (struct rdma_cm_id *cma_id, +struct rdma_cm_event *event) +{ +struct svcxprt_rdma *xprt = cma_id->context; +int ret =0 ; + +switch (event->event) { +case RDMA_CM_EVENT_CONNECT_REQUEST : +dprintk ("svcrdma: Connect request on cma_id=%p, xprt = %p, " +"event=%d\n" , cma_id, cma_id->context, event->event); +handle_connect_req (cma_id); +break ; + +case RDMA_CM_EVENT_ESTABLISHED : +/* Accept complete */ +dprintk ("svcrdma: Connection completed on LISTEN xprt=%p, " +"cm_id=%p\n" , xprt, cma_id); +break ; + +case RDMA_CM_EVENT_DEVICE_REMOVAL : +dprintk ("svcrdma: Device removal xprt=%p, cm_id=%p\n" , + xprt, cma_id); +if (xprt) +set_bit (XPT_CLOSE , &xprt->sc_xprt.xpt_flags); +break ; + +default : +dprintk ("svcrdma: Unexpected event on listening endpoint %p, " +"event=%d\n" , cma_id, event->event); +break ; + } + +return ret; +} + +static int rdma_cma_handler (struct rdma_cm_id *cma_id, +struct rdma_cm_event *event) +{ +struct svc_xprt *xprt = cma_id->context; +struct svcxprt_rdma *rdma = + container_of(xprt, struct svcxprt_rdma, sc_xprt); +switch (event->event) { +case RDMA_CM_EVENT_ESTABLISHED : +/* Accept complete */ +dprintk ("svcrdma: Connection completed on DTO xprt=%p, " +"cm_id=%p\n" , xprt, cma_id); +clear_bit (RDMAXPRT_CONN_PENDING , &rdma->sc_flags); +svc_xprt_enqueue (xprt); +break ; +case RDMA_CM_EVENT_DISCONNECTED : +dprintk ("svcrdma: Disconnect on DTO xprt=%p, cm_id=%p\n" , + xprt, cma_id); +if (xprt) { +set_bit (XPT_CLOSE , &xprt->xpt_flags); +svc_xprt_enqueue (xprt); + } +break ; +case RDMA_CM_EVENT_DEVICE_REMOVAL : +dprintk ("svcrdma: Device removal cma_id=%p, xprt = %p, " +"event=%d\n" , cma_id, xprt, event->event); +if (xprt) { +set_bit (XPT_CLOSE , &xprt->xpt_flags); +svc_xprt_enqueue (xprt); + } +break ; +default : +dprintk ("svcrdma: Unexpected event on DTO endpoint %p, " +"event=%d\n" , cma_id, event->event); +break ; + } +return 0 ; +} + +/* +* Create a listening RDMA service endpoint. +*/ +static struct svc_xprt *svc_rdma_create (struct svc_serv *serv, +struct sockaddr *sa,int salen, +int flags) +{ +struct rdma_cm_id *listen_id; +struct svcxprt_rdma *cma_xprt; +struct svc_xprt *xprt; +int ret; + +dprintk ("svcrdma: Creating RDMA socket\n" ); + + cma_xprt =rdma_create_xprt (serv,1 ); +if (!cma_xprt) +return ERR_PTR (ENOMEM ); + xprt = &cma_xprt->sc_xprt; + + listen_id =rdma_create_id (rdma_listen_handler, cma_xprt,RDMA_PS_TCP ); +if (IS_ERR (listen_id)) { +rdma_destroy_xprt (cma_xprt); +dprintk ("svcrdma: rdma_create_id failed = %ld\n" , +PTR_ERR (listen_id)); +return (void *)listen_id; + } + ret =rdma_bind_addr (listen_id, sa); +if (ret) { +rdma_destroy_xprt (cma_xprt); +rdma_destroy_id (listen_id); +dprintk ("svcrdma: rdma_bind_addr failed = %d\n" , ret); +return ERR_PTR (ret); + } + cma_xprt->sc_cm_id = listen_id; + + ret =rdma_listen (listen_id,RPCRDMA_LISTEN_BACKLOG ); +if (ret) { +rdma_destroy_id (listen_id); +rdma_destroy_xprt (cma_xprt); +dprintk ("svcrdma: rdma_listen failed = %d\n" , ret); + } + +/* +* We need to use the address from the cm_id in case the +* caller specified 0 for the port number. +*/ + sa = (struct sockaddr *)&cma_xprt->sc_cm_id->route.addr.src_addr; +svc_xprt_set_local (&cma_xprt->sc_xprt, sa, salen); + +return &cma_xprt->sc_xprt; +} + +/* +* This is the xpo_recvfrom function for listening endpoints. Its +* purpose is to accept incoming connections. The CMA callback handler +* has already created a new transport and attached it to the new CMA +* ID. +* +* There is a queue of pending connections hung on the listening +* transport. This queue contains the new svc_xprt structure. This +* function takes svc_xprt structures off the accept_q and completes +* the connection. +*/ +static struct svc_xprt *svc_rdma_accept (struct svc_xprt *xprt) +{ +struct svcxprt_rdma *listen_rdma; +struct svcxprt_rdma *newxprt =NULL ; +struct rdma_conn_param conn_param; +struct ib_qp_init_attr qp_attr; +struct ib_device_attr devattr; +struct sockaddr *sa; +int ret; +int i; + + listen_rdma = container_of(xprt, struct svcxprt_rdma, sc_xprt); +clear_bit (XPT_CONN , &xprt->xpt_flags); +/* Get the next entry off the accept list */ +spin_lock_bh (&listen_rdma->sc_lock); +if (!list_empty (&listen_rdma->sc_accept_q)) { + newxprt =list_entry (listen_rdma->sc_accept_q.next, + struct svcxprt_rdma, sc_accept_q); +list_del_init (&newxprt->sc_accept_q); + } +if (!list_empty (&listen_rdma->sc_accept_q)) +set_bit (XPT_CONN , &listen_rdma->sc_xprt.xpt_flags); +spin_unlock_bh (&listen_rdma->sc_lock); +if (!newxprt) +return NULL ; + +dprintk ("svcrdma: newxprt from accept queue = %p, cm_id=%p\n" , + newxprt, newxprt->sc_cm_id); + + ret =ib_query_device (newxprt->sc_cm_id->device, &devattr); +if (ret) { +dprintk ("svcrdma: could not query device attributes on " +"device %p, rc=%d\n" , newxprt->sc_cm_id->device, ret); + goto errout; + } + +/* Qualify the transport resource defaults with the +* capabilities of this particular device */ + newxprt->sc_max_sge =min ((size_t )devattr.max_sge, + (size_t )RPCSVC_MAXPAGES ); + newxprt->sc_max_requests =min ((size_t )devattr.max_qp_wr, + (size_t )svcrdma_max_requests); + newxprt->sc_sq_depth =RPCRDMA_SQ_DEPTH_MULT * newxprt->sc_max_requests; + + newxprt->sc_ord =min ((size_t )devattr.max_qp_rd_atom, + (size_t )svcrdma_ord); + + newxprt->sc_pd =ib_alloc_pd (newxprt->sc_cm_id->device); +if (IS_ERR (newxprt->sc_pd)) { +dprintk ("svcrdma: error creating PD for connect request\n" ); + goto errout; + } + newxprt->sc_sq_cq =ib_create_cq (newxprt->sc_cm_id->device, + sq_comp_handler, + cq_event_handler, + newxprt, + newxprt->sc_sq_depth, +0 ); +if (IS_ERR (newxprt->sc_sq_cq)) { +dprintk ("svcrdma: error creating SQ CQ for connect request\n" ); + goto errout; + } + newxprt->sc_rq_cq =ib_create_cq (newxprt->sc_cm_id->device, + rq_comp_handler, + cq_event_handler, + newxprt, + newxprt->sc_max_requests, +0 ); +if (IS_ERR (newxprt->sc_rq_cq)) { +dprintk ("svcrdma: error creating RQ CQ for connect request\n" ); + goto errout; + } + +memset (&qp_attr,0 ,sizeof qp_attr); + qp_attr.event_handler = qp_event_handler; + qp_attr.qp_context = &newxprt->sc_xprt; + qp_attr.cap.max_send_wr = newxprt->sc_sq_depth; + qp_attr.cap.max_recv_wr = newxprt->sc_max_requests; + qp_attr.cap.max_send_sge = newxprt->sc_max_sge; + qp_attr.cap.max_recv_sge = newxprt->sc_max_sge; + qp_attr.sq_sig_type =IB_SIGNAL_REQ_WR ; + qp_attr.qp_type =IB_QPT_RC ; + qp_attr.send_cq = newxprt->sc_sq_cq; + qp_attr.recv_cq = newxprt->sc_rq_cq; +dprintk ("svcrdma: newxprt->sc_cm_id=%p, newxprt->sc_pd=%p\n" +" cm_id->device=%p, sc_pd->device=%p\n" +" cap.max_send_wr = %d\n" +" cap.max_recv_wr = %d\n" +" cap.max_send_sge = %d\n" +" cap.max_recv_sge = %d\n" , + newxprt->sc_cm_id, newxprt->sc_pd, + newxprt->sc_cm_id->device, newxprt->sc_pd->device, + qp_attr.cap.max_send_wr, + qp_attr.cap.max_recv_wr, + qp_attr.cap.max_send_sge, + qp_attr.cap.max_recv_sge); + + ret =rdma_create_qp (newxprt->sc_cm_id, newxprt->sc_pd, &qp_attr); +if (ret) { +/* +* XXX: This is a hack. We need a xx_request_qp interface +* that will adjust the qp_attr's with a best-effort +* number +*/ + qp_attr.cap.max_send_sge -=2 ; + qp_attr.cap.max_recv_sge -=2 ; + ret =rdma_create_qp (newxprt->sc_cm_id, newxprt->sc_pd, + &qp_attr); +if (ret) { +dprintk ("svcrdma: failed to create QP, ret=%d\n" , ret); + goto errout; + } + newxprt->sc_max_sge = qp_attr.cap.max_send_sge; + newxprt->sc_max_sge = qp_attr.cap.max_recv_sge; + newxprt->sc_sq_depth = qp_attr.cap.max_send_wr; + newxprt->sc_max_requests = qp_attr.cap.max_recv_wr; + } + newxprt->sc_qp = newxprt->sc_cm_id->qp; + +/* Register all of physical memory */ + newxprt->sc_phys_mr =ib_get_dma_mr (newxprt->sc_pd, +IB_ACCESS_LOCAL_WRITE | +IB_ACCESS_REMOTE_WRITE ); +if (IS_ERR (newxprt->sc_phys_mr)) { +dprintk ("svcrdma: Failed to create DMA MR ret=%d\n" , ret); + goto errout; + } + +/* Post receive buffers */ +for (i =0 ; i < newxprt->sc_max_requests; i++) { + ret =svc_rdma_post_recv (newxprt); +if (ret) { +dprintk ("svcrdma: failure posting receive buffers\n" ); + goto errout; + } + } + +/* Swap out the handler */ + newxprt->sc_cm_id->event_handler = rdma_cma_handler; + +/* Accept Connection */ +set_bit (RDMAXPRT_CONN_PENDING , &newxprt->sc_flags); +memset (&conn_param,0 ,sizeof conn_param); + conn_param.responder_resources =0 ; + conn_param.initiator_depth = newxprt->sc_ord; + ret =rdma_accept (newxprt->sc_cm_id, &conn_param); +if (ret) { +dprintk ("svcrdma: failed to accept new connection, ret=%d\n" , + ret); + goto errout; + } + +dprintk ("svcrdma: new connection %p accepted with the following " +"attributes:\n" +" local_ip : %d.%d.%d.%d\n" +" local_port : %d\n" +" remote_ip : %d.%d.%d.%d\n" +" remote_port : %d\n" +" max_sge : %d\n" +" sq_depth : %d\n" +" max_requests : %d\n" +" ord : %d\n" , + newxprt, +NIPQUAD (((struct sockaddr_in *)&newxprt->sc_cm_id-> + route.addr.src_addr)->sin_addr.s_addr), +ntohs (((struct sockaddr_in *)&newxprt->sc_cm_id-> + route.addr.src_addr)->sin_port), +NIPQUAD (((struct sockaddr_in *)&newxprt->sc_cm_id-> + route.addr.dst_addr)->sin_addr.s_addr), +ntohs (((struct sockaddr_in *)&newxprt->sc_cm_id-> + route.addr.dst_addr)->sin_port), + newxprt->sc_max_sge, + newxprt->sc_sq_depth, + newxprt->sc_max_requests, + newxprt->sc_ord); + +/* Set the local and remote addresses in the transport */ + sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.dst_addr; +svc_xprt_set_remote (&newxprt->sc_xprt, sa,svc_addr_len (sa)); + sa = (struct sockaddr *)&newxprt->sc_cm_id->route.addr.src_addr; +svc_xprt_set_local (&newxprt->sc_xprt, sa,svc_addr_len (sa)); + +ib_req_notify_cq (newxprt->sc_sq_cq,IB_CQ_NEXT_COMP ); +ib_req_notify_cq (newxprt->sc_rq_cq,IB_CQ_NEXT_COMP ); +return &newxprt->sc_xprt; + + errout: +dprintk ("svcrdma: failure accepting new connection rc=%d.\n" , ret); +rdma_destroy_id (newxprt->sc_cm_id); +rdma_destroy_xprt (newxprt); +return NULL ; +} + +/* +* Post an RQ WQE to the RQ when the rqst is being released. This +* effectively returns an RQ credit to the client. The rq_xprt_ctxt +* will be null if the request is deferred due to an RDMA_READ or the +* transport had no data ready (EAGAIN). Note that an RPC deferred in +* svc_process will still return the credit, this is because the data +* is copied and no longer consume a WQE/WC. +*/ +static void svc_rdma_release_rqst (struct svc_rqst *rqstp) +{ +int err; +struct svcxprt_rdma *rdma = + container_of(rqstp->rq_xprt, struct svcxprt_rdma, sc_xprt); +if (rqstp->rq_xprt_ctxt) { +BUG_ON (rqstp->rq_xprt_ctxt != rdma); + err =svc_rdma_post_recv (rdma); +if (err) +dprintk ("svcrdma: failed to post an RQ WQE error=%d\n" , + err); + } + rqstp->rq_xprt_ctxt =NULL ; +} + +/* Disable data ready events for this connection */ +static void svc_rdma_detach (struct svc_xprt *xprt) +{ +struct svcxprt_rdma *rdma = + container_of(xprt, struct svcxprt_rdma, sc_xprt); +unsigned long flags; + +dprintk ("svc: svc_rdma_detach(%p)\n" , xprt); +/* +* Shutdown the connection. This will ensure we don't get any +* more events from the provider. +*/ +rdma_disconnect (rdma->sc_cm_id); +rdma_destroy_id (rdma->sc_cm_id); + +/* We may already be on the DTO list */ +spin_lock_irqsave (&dto_lock, flags); +if (!list_empty (&rdma->sc_dto_q)) +list_del_init (&rdma->sc_dto_q); +spin_unlock_irqrestore (&dto_lock, flags); +} + +static void svc_rdma_free (struct svc_xprt *xprt) +{ +struct svcxprt_rdma *rdma = (struct svcxprt_rdma *)xprt; +dprintk ("svcrdma: svc_rdma_free(%p)\n" , rdma); +rdma_destroy_xprt (rdma); +kfree (rdma); +} + +static void rdma_destroy_xprt (struct svcxprt_rdma *xprt) +{ +if (xprt->sc_qp && !IS_ERR (xprt->sc_qp)) +ib_destroy_qp (xprt->sc_qp); + +if (xprt->sc_sq_cq && !IS_ERR (xprt->sc_sq_cq)) +ib_destroy_cq (xprt->sc_sq_cq); + +if (xprt->sc_rq_cq && !IS_ERR (xprt->sc_rq_cq)) +ib_destroy_cq (xprt->sc_rq_cq); + +if (xprt->sc_phys_mr && !IS_ERR (xprt->sc_phys_mr)) +ib_dereg_mr (xprt->sc_phys_mr); + +if (xprt->sc_pd && !IS_ERR (xprt->sc_pd)) +ib_dealloc_pd (xprt->sc_pd); + +destroy_context_cache (xprt->sc_ctxt_head); +} + +static int svc_rdma_has_wspace (struct svc_xprt *xprt) +{ +struct svcxprt_rdma *rdma = + container_of(xprt, struct svcxprt_rdma, sc_xprt); + +/* +* If there are fewer SQ WR available than required to send a +* simple response, return false. +*/ +if ((rdma->sc_sq_depth -atomic_read (&rdma->sc_sq_count) <3 )) +return 0 ; + +/* +* ...or there are already waiters on the SQ, +* return false. +*/ +if (waitqueue_active (&rdma->sc_send_wait)) +return 0 ; + +/* Otherwise return true. */ +return 1 ; +} + +int svc_rdma_send (struct svcxprt_rdma *xprt,struct ib_send_wr *wr) +{ +struct ib_send_wr *bad_wr; +int ret; + +if (test_bit (XPT_CLOSE , &xprt->sc_xprt.xpt_flags)) +return 0 ; + +BUG_ON (wr->send_flags !=IB_SEND_SIGNALED ); +BUG_ON (((struct svc_rdma_op_ctxt *)(unsigned long )wr->wr_id)->wr_op != + wr->opcode); +/* If the SQ is full, wait until an SQ entry is available */ +while (1 ) { +spin_lock_bh (&xprt->sc_lock); +if (xprt->sc_sq_depth ==atomic_read (&xprt->sc_sq_count)) { +spin_unlock_bh (&xprt->sc_lock); +atomic_inc (&rdma_stat_sq_starve); +/* See if we can reap some SQ WR */ +sq_cq_reap (xprt); + +/* Wait until SQ WR available if SQ still full */ +wait_event (xprt->sc_send_wait, +atomic_read (&xprt->sc_sq_count) < + xprt->sc_sq_depth); +continue ; + } +/* Bumped used SQ WR count and post */ + ret =ib_post_send (xprt->sc_qp, wr, &bad_wr); +if (!ret) +atomic_inc (&xprt->sc_sq_count); +else +dprintk ("svcrdma: failed to post SQ WR rc=%d, " +"sc_sq_count=%d, sc_sq_depth=%d\n" , + ret,atomic_read (&xprt->sc_sq_count), + xprt->sc_sq_depth); +spin_unlock_bh (&xprt->sc_lock); +break ; + } +return ret; +} + +int svc_rdma_send_error (struct svcxprt_rdma *xprt,struct rpcrdma_msg *rmsgp, +enum rpcrdma_errcode err) +{ +struct ib_send_wr err_wr; +struct ib_sge sge; +struct page *p; +struct svc_rdma_op_ctxt *ctxt; +u32 *va; +int length; +int ret; + + p =svc_rdma_get_page (); + va =page_address (p); + +/* XDR encode error */ + length =svc_rdma_xdr_encode_error (xprt, rmsgp, err, va); + +/* Prepare SGE for local address */ + sge.addr =ib_dma_map_page (xprt->sc_cm_id->device, + p,0 ,PAGE_SIZE ,DMA_FROM_DEVICE ); + sge.lkey = xprt->sc_phys_mr->lkey; + sge.length = length; + + ctxt =svc_rdma_get_context (xprt); + ctxt->count =1 ; + ctxt->pages[0 ] = p; + +/* Prepare SEND WR */ +memset (&err_wr,0 ,sizeof err_wr); + ctxt->wr_op =IB_WR_SEND ; + err_wr.wr_id = (unsigned long )ctxt; + err_wr.sg_list = &sge; + err_wr.num_sge =1 ; + err_wr.opcode =IB_WR_SEND ; + err_wr.send_flags =IB_SEND_SIGNALED ; + +/* Post It */ + ret =svc_rdma_send (xprt, &err_wr); +if (ret) { +dprintk ("svcrdma: Error posting send = %d\n" , ret); +svc_rdma_put_context (ctxt,1 ); + } + +return ret; +}
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 90/100 rdma: SVCRDMA recvfrom
From: Tom Tucker <[email protected]>
This file implements the RDMA transport recvfrom function. The function dequeues work reqeust completion contexts from an I/O list that it shares with the I/O tasklet in svc_rdma_transport.c. For ONCRPC RDMA, an RPC may not be complete when it is received. Instead, the RDMA header that precedes the RPC message informs the transport where to get the RPC data from on the client and where to place it in the RPC message before it is delivered to the server. The svc_rdma_recvfrom function therefore, parses this RDMA header and issues any necessary RDMA operations to fetch the remainder of the RPC from the client.
Special handling is required when the request involves an RDMA_READ. In this case, recvfrom submits the RDMA_READ requests to the underlying transport driver and then returns 0. When the transport completes the last RDMA_READ for the request, it enqueues it on a read completion queue and enqueues the transport. The recvfrom code favors this queue over the regular DTO queue when satisfying reads.
--- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 586 +++++++++++++++++++++++++++++++ 1 files changed, 586 insertions(+), 0 deletions(-) create mode 100644 net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c new file +586 -0
@@ -0,0 +1,586 @@ +/* +* Copyright (c) 2005-2006 Network Appliance, Inc. All rights reserved. +* +* This software is available to you under a choice of one of two +* licenses. You may choose to be licensed under the terms of the GNU +* General Public License (GPL) Version 2, available from the file +* COPYING in the main directory of this source tree, or the BSD-type +* license below: +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* +* Redistributions in binary form must reproduce the above +* copyright notice, this list of conditions and the following +* disclaimer in the documentation and/or other materials provided +* with the distribution. +* +* Neither the name of the Network Appliance, Inc. nor the names of +* its contributors may be used to endorse or promote products +* derived from this software without specific prior written +* permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +* Author: Tom Tucker <[email protected]> +*/ + +#include <linux/sunrpc/debug.h> +#include <linux/sunrpc/rpc_rdma.h> +#include <linux/spinlock.h> +#include <asm/unaligned.h> +#include <rdma/ib_verbs.h> +#include <rdma/rdma_cm.h> +#include <linux/sunrpc/svc_rdma.h> + +#define RPCDBG_FACILITY RPCDBG_SVCXPRT + +/* +* Replace the pages in the rq_argpages array with the pages from the SGE in +* the RDMA_RECV completion. The SGL should contain full pages up until the +* last one. +*/ +static void rdma_build_arg_xdr (struct svc_rqst *rqstp, +struct svc_rdma_op_ctxt *ctxt, +u32 byte_count) +{ +struct page *page; +u32 bc; +int sge_no; + +/* Swap the page in the SGE with the page in argpages */ + page = ctxt->pages[0 ]; +put_page (rqstp->rq_pages[0 ]); + rqstp->rq_pages[0 ] = page; + +/* Set up the XDR head */ + rqstp->rq_arg.head[0 ].iov_base =page_address (page); + rqstp->rq_arg.head[0 ].iov_len =min (byte_count, ctxt->sge[0 ].length); + rqstp->rq_arg.len = byte_count; + rqstp->rq_arg.buflen = byte_count; + +/* Compute bytes past head in the SGL */ + bc = byte_count - rqstp->rq_arg.head[0 ].iov_len; + +/* If data remains, store it in the pagelist */ + rqstp->rq_arg.page_len = bc; + rqstp->rq_arg.page_base =0 ; + rqstp->rq_arg.pages = &rqstp->rq_pages[1 ]; + sge_no =1 ; +while (bc && sge_no < ctxt->count) { + page = ctxt->pages[sge_no]; +put_page (rqstp->rq_pages[sge_no]); + rqstp->rq_pages[sge_no] = page; + bc -=min (bc, ctxt->sge[sge_no].length); + rqstp->rq_arg.buflen += ctxt->sge[sge_no].length; + sge_no++; + } + rqstp->rq_respages = &rqstp->rq_pages[sge_no]; + +/* We should never run out of SGE because the limit is defined to +* support the max allowed RPC data length +*/ +BUG_ON (bc && (sge_no == ctxt->count)); +BUG_ON ((rqstp->rq_arg.head[0 ].iov_len + rqstp->rq_arg.page_len) + != byte_count); +BUG_ON (rqstp->rq_arg.len != byte_count); + +/* If not all pages were used from the SGL, free the remaining ones */ + bc = sge_no; +while (sge_no < ctxt->count) { + page = ctxt->pages[sge_no++]; +put_page (page); + } + ctxt->count = bc; + +/* Set up tail */ + rqstp->rq_arg.tail[0 ].iov_base =NULL ; + rqstp->rq_arg.tail[0 ].iov_len =0 ; +} + +struct chunk_sge { +int start;/* sge no for this chunk */ +int count;/* sge count for this chunk */ +}; + +/* Encode a read-chunk-list as an array of IB SGE +* +* Assumptions: +* - chunk[0]->position points to pages[0] at an offset of 0 +* - pages[] is not physically or virtually contigous and consists of +* PAGE_SIZE elements. +* +* Output: +* - sge array pointing into pages[] array. +* - chunk_sge array specifying sge index and count for each +* chunk in the read list +* +*/ +static int rdma_rcl_to_sge (struct svcxprt_rdma *xprt, +struct svc_rqst *rqstp, +struct svc_rdma_op_ctxt *head, +struct rpcrdma_msg *rmsgp, +struct ib_sge *sge, +struct chunk_sge *ch_sge_ary, +int ch_count, +int byte_count) +{ +int sge_no; +int sge_bytes; +int page_off; +int page_no; +int ch_bytes; +int ch_no; +struct rpcrdma_read_chunk *ch; + + sge_no =0 ; + page_no =0 ; + page_off =0 ; + ch = (struct rpcrdma_read_chunk *)&rmsgp->rm_body.rm_chunks[0 ]; + ch_no =0 ; + ch_bytes = ch->rc_target.rs_length; + head->arg.head[0 ] = rqstp->rq_arg.head[0 ]; + head->arg.tail[0 ] = rqstp->rq_arg.tail[0 ]; + head->arg.pages = &head->pages[head->count]; + head->sge[0 ].length = head->count;/* save count of hdr pages */ + head->arg.page_base =0 ; + head->arg.page_len = ch_bytes; + head->arg.len = rqstp->rq_arg.len + ch_bytes; + head->arg.buflen = rqstp->rq_arg.buflen + ch_bytes; + head->count++; + ch_sge_ary[0 ].start =0 ; +while (byte_count) { + sge_bytes =min_t (int,PAGE_SIZE -page_off, ch_bytes); + sge[sge_no].addr = +ib_dma_map_page (xprt->sc_cm_id->device, + rqstp->rq_arg.pages[page_no], + page_off, sge_bytes, +DMA_FROM_DEVICE ); + sge[sge_no].length = sge_bytes; + sge[sge_no].lkey = xprt->sc_phys_mr->lkey; +/* +* Don't bump head->count here because the same page +* may be used by multiple SGE. +*/ + head->arg.pages[page_no] = rqstp->rq_arg.pages[page_no]; + rqstp->rq_respages = &rqstp->rq_arg.pages[page_no+1 ]; + + byte_count -= sge_bytes; + ch_bytes -= sge_bytes; + sge_no++; +/* +* If all bytes for this chunk have been mapped to an +* SGE, move to the next SGE +*/ +if (ch_bytes ==0 ) { + ch_sge_ary[ch_no].count = + sge_no - ch_sge_ary[ch_no].start; + ch_no++; + ch++; + ch_sge_ary[ch_no].start = sge_no; + ch_bytes = ch->rc_target.rs_length; +/* If bytes remaining account for next chunk */ +if (byte_count) { + head->arg.page_len += ch_bytes; + head->arg.len += ch_bytes; + head->arg.buflen += ch_bytes; + } + } +/* +* If this SGE consumed all of the page, move to the +* next page +*/ +if ((sge_bytes + page_off) ==PAGE_SIZE ) { + page_no++; + page_off =0 ; +/* +* If there are still bytes left to map, bump +* the page count +*/ +if (byte_count) + head->count++; + }else + page_off += sge_bytes; + } +BUG_ON (byte_count !=0 ); +return sge_no; +} + +static void rdma_set_ctxt_sge (struct svc_rdma_op_ctxt *ctxt, +struct ib_sge *sge, +u64 *sgl_offset, +int count) +{ +int i; + + ctxt->count = count; +for (i =0 ; i < count; i++) { + ctxt->sge[i].addr = sge[i].addr; + ctxt->sge[i].length = sge[i].length; + *sgl_offset = *sgl_offset + sge[i].length; + } +} + +static int rdma_read_max_sge (struct svcxprt_rdma *xprt,int sge_count) +{ +#ifdef RDMA_TRANSPORT_IWARP +if ((RDMA_TRANSPORT_IWARP == +rdma_node_get_transport (xprt->sc_cm_id-> + device->node_type)) + && sge_count >1 ) +return 1 ; + else +#endif +return min_t (int, sge_count, xprt->sc_max_sge); +} + +/* +* Use RDMA_READ to read data from the advertised client buffer into the +* XDR stream starting at rq_arg.head[0].iov_base. +* Each chunk in the array +* contains the following fields: +* discrim - '1', This isn't used for data placement +* position - The xdr stream offset (the same for every chunk) +* handle - RMR for client memory region +* length - data transfer length +* offset - 64 bit tagged offset in remote memory region +* +* On our side, we need to read into a pagelist. The first page immediately +* follows the RPC header. +* +* This function returns 1 to indicate success. The data is not yet in +* the pagelist and therefore the RPC request must be deferred. The +* I/O completion will enqueue the transport again and +* svc_rdma_recvfrom will complete the request. +* +* NOTE: The ctxt must not be touched after the last WR has been posted +* because the I/O completion processing may occur on another +* processor and free / modify the context. Ne touche pas! +*/ +static int rdma_read_xdr (struct svcxprt_rdma *xprt, +struct rpcrdma_msg *rmsgp, +struct svc_rqst *rqstp, +struct svc_rdma_op_ctxt *hdr_ctxt) +{ +struct ib_send_wr read_wr; +int err =0 ; +int ch_no; +struct ib_sge *sge; +int ch_count; +int byte_count; +int sge_count; +u64 sgl_offset; +struct rpcrdma_read_chunk *ch; +struct svc_rdma_op_ctxt *ctxt =NULL ; +struct svc_rdma_op_ctxt *head; +struct svc_rdma_op_ctxt *tmp_sge_ctxt; +struct svc_rdma_op_ctxt *tmp_ch_ctxt; +struct chunk_sge *ch_sge_ary; + +/* If no read list is present, return 0 */ + ch =svc_rdma_get_read_chunk (rmsgp); +if (!ch) +return 0 ; + +/* Allocate temporary contexts to keep SGE */ +BUG_ON (sizeof (struct ib_sge ) <sizeof (struct chunk_sge )); + tmp_sge_ctxt =svc_rdma_get_context (xprt); + sge = tmp_sge_ctxt->sge; + tmp_ch_ctxt =svc_rdma_get_context (xprt); + ch_sge_ary = (struct chunk_sge *)tmp_ch_ctxt->sge; + +svc_rdma_rcl_chunk_counts (ch, &ch_count, &byte_count); + sge_count =rdma_rcl_to_sge (xprt, rqstp, hdr_ctxt, rmsgp, + sge, ch_sge_ary, + ch_count, byte_count); + head =svc_rdma_get_context (xprt); + sgl_offset =0 ; + ch_no =0 ; + +for (ch = (struct rpcrdma_read_chunk *)&rmsgp->rm_body.rm_chunks[0 ]; + ch->rc_discrim !=0 ; ch++, ch_no++) { + next_sge: +if (!ctxt) + ctxt = head; +else { + ctxt->next =svc_rdma_get_context (xprt); + ctxt = ctxt->next; + } + ctxt->next =NULL ; + ctxt->direction =DMA_FROM_DEVICE ; +clear_bit (RDMACTXT_F_READ_DONE , &ctxt->flags); +clear_bit (RDMACTXT_F_LAST_CTXT , &ctxt->flags); +if ((ch+1 )->rc_discrim ==0 ) { +/* +* Checked in sq_cq_reap to see if we need to +* be enqueued +*/ +set_bit (RDMACTXT_F_LAST_CTXT , &ctxt->flags); + ctxt->next = hdr_ctxt; + hdr_ctxt->next = head; + } + +/* Prepare READ WR */ +memset (&read_wr,0 ,sizeof read_wr); + ctxt->wr_op =IB_WR_RDMA_READ ; + read_wr.wr_id = (unsigned long )ctxt; + read_wr.opcode =IB_WR_RDMA_READ ; + read_wr.send_flags =IB_SEND_SIGNALED ; + read_wr.wr.rdma.rkey = ch->rc_target.rs_handle; + read_wr.wr.rdma.remote_addr = +get_unaligned (&(ch->rc_target.rs_offset)) + + sgl_offset; + read_wr.sg_list = &sge[ch_sge_ary[ch_no].start]; + read_wr.num_sge = +rdma_read_max_sge (xprt, ch_sge_ary[ch_no].count); +rdma_set_ctxt_sge (ctxt, &sge[ch_sge_ary[ch_no].start], + &sgl_offset, + read_wr.num_sge); + +/* Post the read */ + err =svc_rdma_send (xprt, &read_wr); +if (err) { +printk (KERN_ERR "svcrdma: Error posting send = %d\n" , + err); +/* +* Break the circular list so free knows when +* to stop if the error happened to occur on +* the last read +*/ + ctxt->next =NULL ; + goto out; + } +atomic_inc (&rdma_stat_read); + +if (read_wr.num_sge < ch_sge_ary[ch_no].count) { + ch_sge_ary[ch_no].count -= read_wr.num_sge; + ch_sge_ary[ch_no].start += read_wr.num_sge; + goto next_sge; + } + sgl_offset =0 ; + err =0 ; + } + + out: +svc_rdma_put_context (tmp_sge_ctxt,0 ); +svc_rdma_put_context (tmp_ch_ctxt,0 ); + +/* Detach arg pages. svc_recv will replenish them */ +for (ch_no =0 ; &rqstp->rq_pages[ch_no] < rqstp->rq_respages; ch_no++) + rqstp->rq_pages[ch_no] =NULL ; + +/* +* Detach res pages. svc_release must see a resused count of +* zero or it will attempt to put them. +*/ +while (rqstp->rq_resused) + rqstp->rq_respages[--rqstp->rq_resused] =NULL ; + +if (err) { +printk (KERN_ERR "svcrdma : RDMA_READ error = %d\n" , err); +set_bit (XPT_CLOSE , &xprt->sc_xprt.xpt_flags); +/* Free the linked list of read contexts */ +while (head !=NULL ) { + ctxt = head->next; +svc_rdma_put_context (head,1 ); + head = ctxt; + } +return 0 ; + } + +return 1 ; +} + +static int rdma_read_complete (struct svc_rqst *rqstp, +struct svc_rdma_op_ctxt *data) +{ +struct svc_rdma_op_ctxt *head = data->next; +int page_no; +int ret; + +BUG_ON (!head); + +/* Copy RPC pages */ +for (page_no =0 ; page_no < head->count; page_no++) { +put_page (rqstp->rq_pages[page_no]); + rqstp->rq_pages[page_no] = head->pages[page_no]; + } +/* Point rq_arg.pages past header */ + rqstp->rq_arg.pages = &rqstp->rq_pages[head->sge[0 ].length]; + rqstp->rq_arg.page_len = head->arg.page_len; + rqstp->rq_arg.page_base = head->arg.page_base; + +/* rq_respages starts after the last arg page */ + rqstp->rq_respages = &rqstp->rq_arg.pages[page_no]; + rqstp->rq_resused =0 ; + +/* Rebuild rq_arg head and tail. */ + rqstp->rq_arg.head[0 ] = head->arg.head[0 ]; + rqstp->rq_arg.tail[0 ] = head->arg.tail[0 ]; + rqstp->rq_arg.len = head->arg.len; + rqstp->rq_arg.buflen = head->arg.buflen; + +/* XXX: What should this be? */ + rqstp->rq_prot =IPPROTO_MAX ; + +/* +* Free the contexts we used to build the RDMA_READ. We have +* to be careful here because the context list uses the same +* next pointer used to chain the contexts associated with the +* RDMA_READ +*/ + data->next =NULL ;/* terminate circular list */ +do { + data = head->next; +svc_rdma_put_context (head,0 ); + head = data; + }while (head !=NULL ); + + ret = rqstp->rq_arg.head[0 ].iov_len + + rqstp->rq_arg.page_len + + rqstp->rq_arg.tail[0 ].iov_len; +dprintk ("svcrdma: deferred read ret=%d, rq_arg.len =%d, " +"rq_arg.head[0].iov_base=%p, rq_arg.head[0].iov_len = %zd\n" , + ret, rqstp->rq_arg.len, rqstp->rq_arg.head[0 ].iov_base, + rqstp->rq_arg.head[0 ].iov_len); + +/* Indicate that we've consumed an RQ credit */ + rqstp->rq_xprt_ctxt = rqstp->rq_xprt; +svc_xprt_received (rqstp->rq_xprt); +return ret; +} + +/* +* Set up the rqstp thread context to point to the RQ buffer. If +* necessary, pull additional data from the client with an RDMA_READ +* request. +*/ +int svc_rdma_recvfrom (struct svc_rqst *rqstp) +{ +struct svc_xprt *xprt = rqstp->rq_xprt; +struct svcxprt_rdma *rdma_xprt = + container_of(xprt, struct svcxprt_rdma, sc_xprt); +struct svc_rdma_op_ctxt *ctxt =NULL ; +struct rpcrdma_msg *rmsgp; +int ret =0 ; +int len; + +dprintk ("svcrdma: rqstp=%p\n" , rqstp); + +/* +* The rq_xprt_ctxt indicates if we've consumed an RQ credit +* or not. It is used in the rdma xpo_release_rqst function to +* determine whether or not to return an RQ WQE to the RQ. +*/ + rqstp->rq_xprt_ctxt =NULL ; + +spin_lock_bh (&rdma_xprt->sc_read_complete_lock); +if (!list_empty (&rdma_xprt->sc_read_complete_q)) { + ctxt =list_entry (rdma_xprt->sc_read_complete_q.next, + struct svc_rdma_op_ctxt, + dto_q); +list_del_init (&ctxt->dto_q); + } +spin_unlock_bh (&rdma_xprt->sc_read_complete_lock); +if (ctxt) +return rdma_read_complete (rqstp, ctxt); + +spin_lock_bh (&rdma_xprt->sc_rq_dto_lock); +if (!list_empty (&rdma_xprt->sc_rq_dto_q)) { + ctxt =list_entry (rdma_xprt->sc_rq_dto_q.next, + struct svc_rdma_op_ctxt, + dto_q); +list_del_init (&ctxt->dto_q); + }else { +atomic_inc (&rdma_stat_rq_starve); +clear_bit (XPT_DATA , &xprt->xpt_flags); + ctxt =NULL ; + } +spin_unlock_bh (&rdma_xprt->sc_rq_dto_lock); +if (!ctxt) { +/* This is the EAGAIN path. The svc_recv routine will +* return -EAGAIN, the nfsd thread will go to call into +* svc_recv again and we shouldn't be on the active +* transport list +*/ +if (test_bit (XPT_CLOSE , &xprt->xpt_flags)) + goto close_out; + +BUG_ON (ret); + goto out; + } +dprintk ("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n" , + ctxt, rdma_xprt, rqstp, ctxt->wc_status); +BUG_ON (ctxt->wc_status !=IB_WC_SUCCESS ); +atomic_inc (&rdma_stat_recv); + +/* Build up the XDR from the receive buffers. */ +rdma_build_arg_xdr (rqstp, ctxt, ctxt->byte_len); + +/* Decode the RDMA header. */ + len =svc_rdma_xdr_decode_req (&rmsgp, rqstp); + rqstp->rq_xprt_hlen = len; + +/* If the request is invalid, reply with an error */ +if (len <0 ) { +if (len == -ENOSYS ) + (void )svc_rdma_send_error (rdma_xprt, rmsgp,ERR_VERS ); + goto close_out; + } + +/* Read read-list data. If we would need to wait, defer +* it. Not that in this case, we don't return the RQ credit +* until after the read completes. +*/ +if (rdma_read_xdr (rdma_xprt, rmsgp, rqstp, ctxt)) { +svc_xprt_received (xprt); +return 0 ; + } + +/* Indicate we've consumed an RQ credit */ + rqstp->rq_xprt_ctxt = rqstp->rq_xprt; + + ret = rqstp->rq_arg.head[0 ].iov_len + + rqstp->rq_arg.page_len + + rqstp->rq_arg.tail[0 ].iov_len; +svc_rdma_put_context (ctxt,0 ); + out: +dprintk ("svcrdma: ret = %d, rq_arg.len =%d, " +"rq_arg.head[0].iov_base=%p, rq_arg.head[0].iov_len = %zd\n" , + ret, rqstp->rq_arg.len, + rqstp->rq_arg.head[0 ].iov_base, + rqstp->rq_arg.head[0 ].iov_len); + rqstp->rq_prot =IPPROTO_MAX ; +svc_xprt_copy_addrs (rqstp, xprt); +svc_xprt_received (xprt); +return ret; + + close_out: +if (ctxt) { +svc_rdma_put_context (ctxt,1 ); +/* Indicate we've consumed an RQ credit */ + rqstp->rq_xprt_ctxt = rqstp->rq_xprt; + } +dprintk ("svcrdma: transport %p is closing\n" , xprt); +/* +* Set the close bit and enqueue it. svc_recv will see the +* close bit and call svc_xprt_delete +*/ +set_bit (XPT_CLOSE , &xprt->xpt_flags); +svc_xprt_received (xprt); +return 0 ; +}
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 91/100 rdma: SVCRDMA sendto
From: Tom Tucker <[email protected]>
This file implements the RDMA transport sendto function. A RPC reply on an RDMA transport consists of some number of RDMA_WRITE requests followed by an RDMA_SEND request. The sendto function parses the ONCRPC RDMA reply header to determine how to send the reply back to the client. The send queue is sized so as to be able to send complete replies for requests in most cases. In the event that there are not enough SQ WR slots to reply, e.g. big data, the send will block the NFSD thread. The I/O callback functions in svc_rdma_transport.c that reap WR completions wake any waiters blocked on the SQ. In general, the goal is not to block NFSD threads and the has_wspace method stall requests when the SQ is nearly full.
--- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 520 +++++++++++++++++++++++++++++++++ 1 files changed, 520 insertions(+), 0 deletions(-) create mode 100644 net/sunrpc/xprtrdma/svc_rdma_sendto.c
net/sunrpc/xprtrdma/svc_rdma_sendto.c new file +520 -0
@@ -0,0 +1,520 @@ +/* +* Copyright (c) 2005-2006 Network Appliance, Inc. All rights reserved. +* +* This software is available to you under a choice of one of two +* licenses. You may choose to be licensed under the terms of the GNU +* General Public License (GPL) Version 2, available from the file +* COPYING in the main directory of this source tree, or the BSD-type +* license below: +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* +* Redistributions in binary form must reproduce the above +* copyright notice, this list of conditions and the following +* disclaimer in the documentation and/or other materials provided +* with the distribution. +* +* Neither the name of the Network Appliance, Inc. nor the names of +* its contributors may be used to endorse or promote products +* derived from this software without specific prior written +* permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +* Author: Tom Tucker <[email protected]> +*/ + +#include <linux/sunrpc/debug.h> +#include <linux/sunrpc/rpc_rdma.h> +#include <linux/spinlock.h> +#include <asm/unaligned.h> +#include <rdma/ib_verbs.h> +#include <rdma/rdma_cm.h> +#include <linux/sunrpc/svc_rdma.h> + +#define RPCDBG_FACILITY RPCDBG_SVCXPRT + +/* Encode an XDR as an array of IB SGE +* +* Assumptions: +* - head[0] is physically contiguous. +* - tail[0] is physically contiguous. +* - pages[] is not physically or virtually contigous and consists of +* PAGE_SIZE elements. +* +* Output: +* SGE[0] reserved for RCPRDMA header +* SGE[1] data from xdr->head[] +* SGE[2..sge_count-2] data from xdr->pages[] +* SGE[sge_count-1] data from xdr->tail. +* +*/ +static struct ib_sge *xdr_to_sge (struct svcxprt_rdma *xprt, +struct xdr_buf *xdr, +struct ib_sge *sge, +int *sge_count) +{ +/* Max we need is the length of the XDR / pagesize + one for +* head + one for tail + one for RPCRDMA header +*/ +int sge_max = (xdr->len+PAGE_SIZE -1 ) /PAGE_SIZE +3 ; +int sge_no; +u32 byte_count = xdr->len; +u32 sge_bytes; +u32 page_bytes; +int page_off; +int page_no; + +/* Skip the first sge, this is for the RPCRDMA header */ + sge_no =1 ; + +/* Head SGE */ + sge[sge_no].addr =ib_dma_map_single (xprt->sc_cm_id->device, + xdr->head[0 ].iov_base, + xdr->head[0 ].iov_len, +DMA_TO_DEVICE ); + sge_bytes =min_t (u32, byte_count, xdr->head[0 ].iov_len); + byte_count -= sge_bytes; + sge[sge_no].length = sge_bytes; + sge[sge_no].lkey = xprt->sc_phys_mr->lkey; + sge_no++; + +/* pages SGE */ + page_no =0 ; + page_bytes = xdr->page_len; + page_off = xdr->page_base; +while (byte_count && page_bytes) { + sge_bytes =min_t (u32, byte_count, (PAGE_SIZE -page_off)); + sge[sge_no].addr = +ib_dma_map_page (xprt->sc_cm_id->device, + xdr->pages[page_no], page_off, + sge_bytes,DMA_TO_DEVICE ); + sge_bytes =min (sge_bytes, page_bytes); + byte_count -= sge_bytes; + page_bytes -= sge_bytes; + sge[sge_no].length = sge_bytes; + sge[sge_no].lkey = xprt->sc_phys_mr->lkey; + + sge_no++; + page_no++; + page_off =0 ;/* reset for next time through loop */ + } + +/* Tail SGE */ +if (byte_count && xdr->tail[0 ].iov_len) { + sge[sge_no].addr = +ib_dma_map_single (xprt->sc_cm_id->device, + xdr->tail[0 ].iov_base, + xdr->tail[0 ].iov_len, +DMA_TO_DEVICE ); + sge_bytes =min_t (u32, byte_count, xdr->tail[0 ].iov_len); + byte_count -= sge_bytes; + sge[sge_no].length = sge_bytes; + sge[sge_no].lkey = xprt->sc_phys_mr->lkey; + sge_no++; + } + +BUG_ON (sge_no > sge_max); +BUG_ON (byte_count !=0 ); + + *sge_count = sge_no; +return sge; +} + + +/* Assumptions: +* - The specified write_len can be represented in sc_max_sge * PAGE_SIZE +*/ +static int send_write (struct svcxprt_rdma *xprt,struct svc_rqst *rqstp, +u32 rmr,u64 to, +u32 xdr_off,int write_len, +struct ib_sge *xdr_sge,int sge_count) +{ +struct svc_rdma_op_ctxt *tmp_sge_ctxt; +struct ib_send_wr write_wr; +struct ib_sge *sge; +int xdr_sge_no; +int sge_no; +int sge_bytes; +int sge_off; +int bc; +struct svc_rdma_op_ctxt *ctxt; +int ret =0 ; + +BUG_ON (sge_count >=32 ); +dprintk ("svcrdma: RDMA_WRITE rmr=%x, to=%llx, xdr_off=%d, " +"write_len=%d, xdr_sge=%p, sge_count=%d\n" , + rmr, to, xdr_off, write_len, xdr_sge, sge_count); + + ctxt =svc_rdma_get_context (xprt); + ctxt->count =0 ; + tmp_sge_ctxt =svc_rdma_get_context (xprt); + sge = tmp_sge_ctxt->sge; + +/* Find the SGE associated with xdr_off */ +for (bc = xdr_off, xdr_sge_no =1 ; bc && xdr_sge_no < sge_count; + xdr_sge_no++) { +if (xdr_sge[xdr_sge_no].length > bc) +break ; + bc -= xdr_sge[xdr_sge_no].length; + } + + sge_off = bc; + bc = write_len; + sge_no =0 ; + +/* Copy the remaining SGE */ +while (bc !=0 && xdr_sge_no < sge_count) { + sge[sge_no].addr = xdr_sge[xdr_sge_no].addr + sge_off; + sge[sge_no].lkey = xdr_sge[xdr_sge_no].lkey; + sge_bytes =min ((size_t )bc, + (size_t )(xdr_sge[xdr_sge_no].length-sge_off)); + sge[sge_no].length = sge_bytes; + + sge_off =0 ; + sge_no++; + xdr_sge_no++; + bc -= sge_bytes; + } + +BUG_ON (bc !=0 ); +BUG_ON (xdr_sge_no > sge_count); + +/* Prepare WRITE WR */ +memset (&write_wr,0 ,sizeof write_wr); + ctxt->wr_op =IB_WR_RDMA_WRITE ; + write_wr.wr_id = (unsigned long )ctxt; + write_wr.sg_list = &sge[0 ]; + write_wr.num_sge = sge_no; + write_wr.opcode =IB_WR_RDMA_WRITE ; + write_wr.send_flags =IB_SEND_SIGNALED ; + write_wr.wr.rdma.rkey = rmr; + write_wr.wr.rdma.remote_addr = to; + +/* Post It */ +atomic_inc (&rdma_stat_write); +if (svc_rdma_send (xprt, &write_wr)) { +svc_rdma_put_context (ctxt,1 ); +/* Fatal error, close transport */ + ret = -EIO ; + } +svc_rdma_put_context (tmp_sge_ctxt,0 ); +return ret; +} + +static int send_write_chunks (struct svcxprt_rdma *xprt, +struct rpcrdma_msg *rdma_argp, +struct rpcrdma_msg *rdma_resp, +struct svc_rqst *rqstp, +struct ib_sge *sge, +int sge_count) +{ +u32 xfer_len = rqstp->rq_res.page_len + rqstp->rq_res.tail[0 ].iov_len; +int write_len; +int max_write; +u32 xdr_off; +int chunk_off; +int chunk_no; +struct rpcrdma_write_array *arg_ary; +struct rpcrdma_write_array *res_ary; +int ret; + + arg_ary =svc_rdma_get_write_array (rdma_argp); +if (!arg_ary) +return 0 ; + res_ary = (struct rpcrdma_write_array *) + &rdma_resp->rm_body.rm_chunks[1 ]; + + max_write = xprt->sc_max_sge *PAGE_SIZE ; + +/* Write chunks start at the pagelist */ +for (xdr_off = rqstp->rq_res.head[0 ].iov_len, chunk_no =0 ; + xfer_len && chunk_no < arg_ary->wc_nchunks; + chunk_no++) { +struct rpcrdma_segment *arg_ch; +u64 rs_offset; + + arg_ch = &arg_ary->wc_array[chunk_no].wc_target; + write_len =min (xfer_len, arg_ch->rs_length); + +/* Prepare the response chunk given the length actually +* written */ + rs_offset =get_unaligned (&(arg_ch->rs_offset)); +svc_rdma_xdr_encode_array_chunk (res_ary, chunk_no, + arg_ch->rs_handle, + rs_offset, + write_len); + chunk_off =0 ; +while (write_len) { +int this_write; + this_write =min (write_len, max_write); + ret =send_write (xprt, rqstp, + arg_ch->rs_handle, + rs_offset + chunk_off, + xdr_off, + this_write, + sge, + sge_count); +if (ret) { +dprintk ("svcrdma: RDMA_WRITE failed, ret=%d\n" , + ret); +return -EIO ; + } + chunk_off += this_write; + xdr_off += this_write; + xfer_len -= this_write; + write_len -= this_write; + } + } +/* Update the req with the number of chunks actually used */ +svc_rdma_xdr_encode_write_list (rdma_resp, chunk_no); + +return rqstp->rq_res.page_len + rqstp->rq_res.tail[0 ].iov_len; +} + +static int send_reply_chunks (struct svcxprt_rdma *xprt, +struct rpcrdma_msg *rdma_argp, +struct rpcrdma_msg *rdma_resp, +struct svc_rqst *rqstp, +struct ib_sge *sge, +int sge_count) +{ +u32 xfer_len = rqstp->rq_res.len; +int write_len; +int max_write; +u32 xdr_off; +int chunk_no; +int chunk_off; +struct rpcrdma_segment *ch; +struct rpcrdma_write_array *arg_ary; +struct rpcrdma_write_array *res_ary; +int ret; + + arg_ary =svc_rdma_get_reply_array (rdma_argp); +if (!arg_ary) +return 0 ; +/* XXX: need to fix when reply lists occur with read-list and or +* write-list */ + res_ary = (struct rpcrdma_write_array *) + &rdma_resp->rm_body.rm_chunks[2 ]; + + max_write = xprt->sc_max_sge *PAGE_SIZE ; + +/* xdr offset starts at RPC message */ +for (xdr_off =0 , chunk_no =0 ; + xfer_len && chunk_no < arg_ary->wc_nchunks; + chunk_no++) { +u64 rs_offset; + ch = &arg_ary->wc_array[chunk_no].wc_target; + write_len =min (xfer_len, ch->rs_length); + + +/* Prepare the reply chunk given the length actually +* written */ + rs_offset =get_unaligned (&(ch->rs_offset)); +svc_rdma_xdr_encode_array_chunk (res_ary, chunk_no, + ch->rs_handle, rs_offset, + write_len); + chunk_off =0 ; +while (write_len) { +int this_write; + + this_write =min (write_len, max_write); + ret =send_write (xprt, rqstp, + ch->rs_handle, + rs_offset + chunk_off, + xdr_off, + this_write, + sge, + sge_count); +if (ret) { +dprintk ("svcrdma: RDMA_WRITE failed, ret=%d\n" , + ret); +return -EIO ; + } + chunk_off += this_write; + xdr_off += this_write; + xfer_len -= this_write; + write_len -= this_write; + } + } +/* Update the req with the number of chunks actually used */ +svc_rdma_xdr_encode_reply_array (res_ary, chunk_no); + +return rqstp->rq_res.len; +} + +/* This function prepares the portion of the RPCRDMA message to be +* sent in the RDMA_SEND. This function is called after data sent via +* RDMA has already been transmitted. There are three cases: +* - The RPCRDMA header, RPC header, and payload are all sent in a +* single RDMA_SEND. This is the "inline" case. +* - The RPCRDMA header and some portion of the RPC header and data +* are sent via this RDMA_SEND and another portion of the data is +* sent via RDMA. +* - The RPCRDMA header [NOMSG] is sent in this RDMA_SEND and the RPC +* header and data are all transmitted via RDMA. +* In all three cases, this function prepares the RPCRDMA header in +* sge[0], the 'type' parameter indicates the type to place in the +* RPCRDMA header, and the 'byte_count' field indicates how much of +* the XDR to include in this RDMA_SEND. +*/ +static int send_reply (struct svcxprt_rdma *rdma, +struct svc_rqst *rqstp, +struct page *page, +struct rpcrdma_msg *rdma_resp, +struct svc_rdma_op_ctxt *ctxt, +int sge_count, +int byte_count) +{ +struct ib_send_wr send_wr; +int sge_no; +int sge_bytes; +int page_no; +int ret; + +/* Prepare the context */ + ctxt->pages[0 ] = page; + ctxt->count =1 ; + +/* Prepare the SGE for the RPCRDMA Header */ + ctxt->sge[0 ].addr = +ib_dma_map_page (rdma->sc_cm_id->device, + page,0 ,PAGE_SIZE ,DMA_TO_DEVICE ); + ctxt->direction =DMA_TO_DEVICE ; + ctxt->sge[0 ].length =svc_rdma_xdr_get_reply_hdr_len (rdma_resp); + ctxt->sge[0 ].lkey = rdma->sc_phys_mr->lkey; + +/* Determine how many of our SGE are to be transmitted */ +for (sge_no =1 ; byte_count && sge_no < sge_count; sge_no++) { + sge_bytes =min ((size_t )ctxt->sge[sge_no].length, + (size_t )byte_count); + byte_count -= sge_bytes; + } +BUG_ON (byte_count !=0 ); + +/* Save all respages in the ctxt and remove them from the +* respages array. They are our pages until the I/O +* completes. +*/ +for (page_no =0 ; page_no < rqstp->rq_resused; page_no++) { + ctxt->pages[page_no+1 ] = rqstp->rq_respages[page_no]; + ctxt->count++; + rqstp->rq_respages[page_no] =NULL ; + } + +BUG_ON (sge_no > rdma->sc_max_sge); +memset (&send_wr,0 ,sizeof send_wr); + ctxt->wr_op =IB_WR_SEND ; + send_wr.wr_id = (unsigned long )ctxt; + send_wr.sg_list = ctxt->sge; + send_wr.num_sge = sge_no; + send_wr.opcode =IB_WR_SEND ; + send_wr.send_flags =IB_SEND_SIGNALED ; + + ret =svc_rdma_send (rdma, &send_wr); +if (ret) +svc_rdma_put_context (ctxt,1 ); + +return ret; +} + +void svc_rdma_prep_reply_hdr (struct svc_rqst *rqstp) +{ +} + +/* +* Return the start of an xdr buffer. +*/ +static void *xdr_start (struct xdr_buf *xdr) +{ +return xdr->head[0 ].iov_base - + (xdr->len - + xdr->page_len - + xdr->tail[0 ].iov_len - + xdr->head[0 ].iov_len); +} + +int svc_rdma_sendto (struct svc_rqst *rqstp) +{ +struct svc_xprt *xprt = rqstp->rq_xprt; +struct svcxprt_rdma *rdma = + container_of(xprt, struct svcxprt_rdma, sc_xprt); +struct rpcrdma_msg *rdma_argp; +struct rpcrdma_msg *rdma_resp; +struct rpcrdma_write_array *reply_ary; +enum rpcrdma_proc reply_type; +int ret; +int inline_bytes; +struct ib_sge *sge; +int sge_count =0 ; +struct page *res_page; +struct svc_rdma_op_ctxt *ctxt; + +dprintk ("svcrdma: sending response for rqstp=%p\n" , rqstp); + +/* Get the RDMA request header. */ + rdma_argp =xdr_start (&rqstp->rq_arg); + +/* Build an SGE for the XDR */ + ctxt =svc_rdma_get_context (rdma); + ctxt->direction =DMA_TO_DEVICE ; + sge =xdr_to_sge (rdma, &rqstp->rq_res, ctxt->sge, &sge_count); + + inline_bytes = rqstp->rq_res.len; + +/* Create the RDMA response header */ + res_page =svc_rdma_get_page (); + rdma_resp =page_address (res_page); + reply_ary =svc_rdma_get_reply_array (rdma_argp); +if (reply_ary) + reply_type =RDMA_NOMSG ; +else + reply_type =RDMA_MSG ; +svc_rdma_xdr_encode_reply_header (rdma, rdma_argp, + rdma_resp, reply_type); + +/* Send any write-chunk data and build resp write-list */ + ret =send_write_chunks (rdma, rdma_argp, rdma_resp, + rqstp, sge, sge_count); +if (ret <0 ) { +printk (KERN_ERR "svcrdma: failed to send write chunks, rc=%d\n" , + ret); + goto error; + } + inline_bytes -= ret; + +/* Send any reply-list data and update resp reply-list */ + ret =send_reply_chunks (rdma, rdma_argp, rdma_resp, + rqstp, sge, sge_count); +if (ret <0 ) { +printk (KERN_ERR "svcrdma: failed to send reply chunks, rc=%d\n" , + ret); + goto error; + } + inline_bytes -= ret; + + ret =send_reply (rdma, rqstp, res_page, rdma_resp, ctxt, sge_count, + inline_bytes); +dprintk ("svcrdma: send_reply returns %d\n" , ret); +return ret; + error: +svc_rdma_put_context (ctxt,0 ); +put_page (res_page); +return ret; +}
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 92/100 rdma: ONCRPC RDMA protocol marshalling
From: Tom Tucker <[email protected]>
This logic parses the ONCRDMA protocol headers that precede the actual RPC header. It is placed in a separate file to keep all protocol aware code in a single place.
--- net/sunrpc/xprtrdma/svc_rdma_marshal.c | 412 ++++++++++++++++++++++++++++++++ 1 files changed, 412 insertions(+), 0 deletions(-) create mode 100644 net/sunrpc/xprtrdma/svc_rdma_marshal.c
net/sunrpc/xprtrdma/svc_rdma_marshal.c new file +412 -0
@@ -0,0 +1,412 @@ +/* +* Copyright (c) 2005-2006 Network Appliance, Inc. All rights reserved. +* +* This software is available to you under a choice of one of two +* licenses. You may choose to be licensed under the terms of the GNU +* General Public License (GPL) Version 2, available from the file +* COPYING in the main directory of this source tree, or the BSD-type +* license below: +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* +* Redistributions in binary form must reproduce the above +* copyright notice, this list of conditions and the following +* disclaimer in the documentation and/or other materials provided +* with the distribution. +* +* Neither the name of the Network Appliance, Inc. nor the names of +* its contributors may be used to endorse or promote products +* derived from this software without specific prior written +* permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +* Author: Tom Tucker <[email protected]> +*/ + +#include <linux/sunrpc/xdr.h> +#include <linux/sunrpc/debug.h> +#include <asm/unaligned.h> +#include <linux/sunrpc/rpc_rdma.h> +#include <linux/sunrpc/svc_rdma.h> + +#define RPCDBG_FACILITY RPCDBG_SVCXPRT + +/* +* Decodes a read chunk list. The expected format is as follows: +* descrim : xdr_one +* position : u32 offset into XDR stream +* handle : u32 RKEY +* . . . +* end-of-list: xdr_zero +*/ +static u32 *decode_read_list (u32 *va,u32 *vaend) +{ +struct rpcrdma_read_chunk *ch = (struct rpcrdma_read_chunk *)va; + +while (ch->rc_discrim != xdr_zero) { +u64 ch_offset; + +if (((unsigned long )ch +sizeof (struct rpcrdma_read_chunk )) > + (unsigned long )vaend) { +dprintk ("svcrdma: vaend=%p, ch=%p\n" , vaend, ch); +return NULL ; + } + + ch->rc_discrim =ntohl (ch->rc_discrim); + ch->rc_position =ntohl (ch->rc_position); + ch->rc_target.rs_handle =ntohl (ch->rc_target.rs_handle); + ch->rc_target.rs_length =ntohl (ch->rc_target.rs_length); + va = (u32 *)&ch->rc_target.rs_offset; +xdr_decode_hyper (va, &ch_offset); +put_unaligned (ch_offset, (u64 *)va); + ch++; + } +return (u32 *)&ch->rc_position; +} + +/* +* Determine number of chunks and total bytes in chunk list. The chunk +* list has already been verified to fit within the RPCRDMA header. +*/ +void svc_rdma_rcl_chunk_counts (struct rpcrdma_read_chunk *ch, +int *ch_count,int *byte_count) +{ +/* compute the number of bytes represented by read chunks */ + *byte_count =0 ; + *ch_count =0 ; +for (; ch->rc_discrim !=0 ; ch++) { + *byte_count = *byte_count + ch->rc_target.rs_length; + *ch_count = *ch_count +1 ; + } +} + +/* +* Decodes a write chunk list. The expected format is as follows: +* descrim : xdr_one +* nchunks : <count> +* handle : u32 RKEY ---+ +* length : u32 <len of segment> | +* offset : remove va + <count> +* . . . | +* ---+ +*/ +static u32 *decode_write_list (u32 *va,u32 *vaend) +{ +int ch_no; +struct rpcrdma_write_array *ary = + (struct rpcrdma_write_array *)va; + +/* Check for not write-array */ +if (ary->wc_discrim == xdr_zero) +return (u32 *)&ary->wc_nchunks; + +if ((unsigned long )ary +sizeof (struct rpcrdma_write_array ) > + (unsigned long )vaend) { +dprintk ("svcrdma: ary=%p, vaend=%p\n" , ary, vaend); +return NULL ; + } + ary->wc_discrim =ntohl (ary->wc_discrim); + ary->wc_nchunks =ntohl (ary->wc_nchunks); +if (((unsigned long )&ary->wc_array[0 ] + + (sizeof (struct rpcrdma_write_chunk ) * ary->wc_nchunks)) > + (unsigned long )vaend) { +dprintk ("svcrdma: ary=%p, wc_nchunks=%d, vaend=%p\n" , + ary, ary->wc_nchunks, vaend); +return NULL ; + } +for (ch_no =0 ; ch_no < ary->wc_nchunks; ch_no++) { +u64 ch_offset; + + ary->wc_array[ch_no].wc_target.rs_handle = +ntohl (ary->wc_array[ch_no].wc_target.rs_handle); + ary->wc_array[ch_no].wc_target.rs_length = +ntohl (ary->wc_array[ch_no].wc_target.rs_length); + va = (u32 *)&ary->wc_array[ch_no].wc_target.rs_offset; +xdr_decode_hyper (va, &ch_offset); +put_unaligned (ch_offset, (u64 *)va); + } + +/* +* rs_length is the 2nd 4B field in wc_target and taking its +* address skips the list terminator +*/ +return (u32 *)&ary->wc_array[ch_no].wc_target.rs_length; +} + +static u32 *decode_reply_array (u32 *va,u32 *vaend) +{ +int ch_no; +struct rpcrdma_write_array *ary = + (struct rpcrdma_write_array *)va; + +/* Check for no reply-array */ +if (ary->wc_discrim == xdr_zero) +return (u32 *)&ary->wc_nchunks; + +if ((unsigned long )ary +sizeof (struct rpcrdma_write_array ) > + (unsigned long )vaend) { +dprintk ("svcrdma: ary=%p, vaend=%p\n" , ary, vaend); +return NULL ; + } + ary->wc_discrim =ntohl (ary->wc_discrim); + ary->wc_nchunks =ntohl (ary->wc_nchunks); +if (((unsigned long )&ary->wc_array[0 ] + + (sizeof (struct rpcrdma_write_chunk ) * ary->wc_nchunks)) > + (unsigned long )vaend) { +dprintk ("svcrdma: ary=%p, wc_nchunks=%d, vaend=%p\n" , + ary, ary->wc_nchunks, vaend); +return NULL ; + } +for (ch_no =0 ; ch_no < ary->wc_nchunks; ch_no++) { +u64 ch_offset; + + ary->wc_array[ch_no].wc_target.rs_handle = +ntohl (ary->wc_array[ch_no].wc_target.rs_handle); + ary->wc_array[ch_no].wc_target.rs_length = +ntohl (ary->wc_array[ch_no].wc_target.rs_length); + va = (u32 *)&ary->wc_array[ch_no].wc_target.rs_offset; +xdr_decode_hyper (va, &ch_offset); +put_unaligned (ch_offset, (u64 *)va); + } + +return (u32 *)&ary->wc_array[ch_no]; +} + +int svc_rdma_xdr_decode_req (struct rpcrdma_msg **rdma_req, +struct svc_rqst *rqstp) +{ +struct rpcrdma_msg *rmsgp =NULL ; +u32 *va; +u32 *vaend; +u32 hdr_len; + + rmsgp = (struct rpcrdma_msg *)rqstp->rq_arg.head[0 ].iov_base; + +/* Verify that there's enough bytes for header + something */ +if (rqstp->rq_arg.len <=RPCRDMA_HDRLEN_MIN ) { +dprintk ("svcrdma: header too short = %d\n" , + rqstp->rq_arg.len); +return -EINVAL ; + } + +/* Decode the header */ + rmsgp->rm_xid =ntohl (rmsgp->rm_xid); + rmsgp->rm_vers =ntohl (rmsgp->rm_vers); + rmsgp->rm_credit =ntohl (rmsgp->rm_credit); + rmsgp->rm_type =ntohl (rmsgp->rm_type); + +if (rmsgp->rm_vers !=RPCRDMA_VERSION ) +return -ENOSYS ; + +/* Pull in the extra for the padded case and bump our pointer */ +if (rmsgp->rm_type ==RDMA_MSGP ) { +int hdrlen; + rmsgp->rm_body.rm_padded.rm_align = +ntohl (rmsgp->rm_body.rm_padded.rm_align); + rmsgp->rm_body.rm_padded.rm_thresh = +ntohl (rmsgp->rm_body.rm_padded.rm_thresh); + + va = &rmsgp->rm_body.rm_padded.rm_pempty[4 ]; + rqstp->rq_arg.head[0 ].iov_base = va; + hdrlen = (u32)((unsigned long )va - (unsigned long )rmsgp); + rqstp->rq_arg.head[0 ].iov_len -= hdrlen; +if (hdrlen > rqstp->rq_arg.len) +return -EINVAL ; +return hdrlen; + } + +/* The chunk list may contain either a read chunk list or a write +* chunk list and a reply chunk list. +*/ + va = &rmsgp->rm_body.rm_chunks[0 ]; + vaend = (u32 *)((unsigned long )rmsgp + rqstp->rq_arg.len); + va =decode_read_list (va, vaend); +if (!va) +return -EINVAL ; + va =decode_write_list (va, vaend); +if (!va) +return -EINVAL ; + va =decode_reply_array (va, vaend); +if (!va) +return -EINVAL ; + + rqstp->rq_arg.head[0 ].iov_base = va; + hdr_len = (unsigned long )va - (unsigned long )rmsgp; + rqstp->rq_arg.head[0 ].iov_len -= hdr_len; + + *rdma_req = rmsgp; +return hdr_len; +} + +int svc_rdma_xdr_decode_deferred_req (struct svc_rqst *rqstp) +{ +struct rpcrdma_msg *rmsgp =NULL ; +struct rpcrdma_read_chunk *ch; +struct rpcrdma_write_array *ary; +u32 *va; +u32 hdrlen; + +dprintk ("svcrdma: processing deferred RDMA header on rqstp=%p\n" , + rqstp); + rmsgp = (struct rpcrdma_msg *)rqstp->rq_arg.head[0 ].iov_base; + +/* Pull in the extra for the padded case and bump our pointer */ +if (rmsgp->rm_type ==RDMA_MSGP ) { + va = &rmsgp->rm_body.rm_padded.rm_pempty[4 ]; + rqstp->rq_arg.head[0 ].iov_base = va; + hdrlen = (u32)((unsigned long )va - (unsigned long )rmsgp); + rqstp->rq_arg.head[0 ].iov_len -= hdrlen; +return hdrlen; + } + +/* +* Skip all chunks to find RPC msg. These were previously processed +*/ + va = &rmsgp->rm_body.rm_chunks[0 ]; + +/* Skip read-list */ +for (ch = (struct rpcrdma_read_chunk *)va; + ch->rc_discrim != xdr_zero; ch++); + va = (u32 *)&ch->rc_position; + +/* Skip write-list */ + ary = (struct rpcrdma_write_array *)va; +if (ary->wc_discrim == xdr_zero) + va = (u32 *)&ary->wc_nchunks; +else +/* +* rs_length is the 2nd 4B field in wc_target and taking its +* address skips the list terminator +*/ + va = (u32 *)&ary->wc_array[ary->wc_nchunks].wc_target.rs_length; + +/* Skip reply-array */ + ary = (struct rpcrdma_write_array *)va; +if (ary->wc_discrim == xdr_zero) + va = (u32 *)&ary->wc_nchunks; +else + va = (u32 *)&ary->wc_array[ary->wc_nchunks]; + + rqstp->rq_arg.head[0 ].iov_base = va; + hdrlen = (unsigned long )va - (unsigned long )rmsgp; + rqstp->rq_arg.head[0 ].iov_len -= hdrlen; + +return hdrlen; +} + +int svc_rdma_xdr_encode_error (struct svcxprt_rdma *xprt, +struct rpcrdma_msg *rmsgp, +enum rpcrdma_errcode err,u32 *va) +{ +u32 *startp = va; + + *va++ =htonl (rmsgp->rm_xid); + *va++ =htonl (rmsgp->rm_vers); + *va++ =htonl (xprt->sc_max_requests); + *va++ =htonl (RDMA_ERROR ); + *va++ =htonl (err); +if (err ==ERR_VERS ) { + *va++ =htonl (RPCRDMA_VERSION ); + *va++ =htonl (RPCRDMA_VERSION ); + } + +return (int )((unsigned long )va - (unsigned long )startp); +} + +int svc_rdma_xdr_get_reply_hdr_len (struct rpcrdma_msg *rmsgp) +{ +struct rpcrdma_write_array *wr_ary; + +/* There is no read-list in a reply */ + +/* skip write list */ + wr_ary = (struct rpcrdma_write_array *) + &rmsgp->rm_body.rm_chunks[1 ]; +if (wr_ary->wc_discrim) + wr_ary = (struct rpcrdma_write_array *) + &wr_ary->wc_array[ntohl (wr_ary->wc_nchunks)]. + wc_target.rs_length; +else + wr_ary = (struct rpcrdma_write_array *) + &wr_ary->wc_nchunks; + +/* skip reply array */ +if (wr_ary->wc_discrim) + wr_ary = (struct rpcrdma_write_array *) + &wr_ary->wc_array[ntohl (wr_ary->wc_nchunks)]; +else + wr_ary = (struct rpcrdma_write_array *) + &wr_ary->wc_nchunks; + +return (unsigned long ) wr_ary - (unsigned long ) rmsgp; +} + +void svc_rdma_xdr_encode_write_list (struct rpcrdma_msg *rmsgp,int chunks) +{ +struct rpcrdma_write_array *ary; + +/* no read-list */ + rmsgp->rm_body.rm_chunks[0 ] = xdr_zero; + +/* write-array discrim */ + ary = (struct rpcrdma_write_array *) + &rmsgp->rm_body.rm_chunks[1 ]; + ary->wc_discrim = xdr_one; + ary->wc_nchunks =htonl (chunks); + +/* write-list terminator */ + ary->wc_array[chunks].wc_target.rs_handle = xdr_zero; + +/* reply-array discriminator */ + ary->wc_array[chunks].wc_target.rs_length = xdr_zero; +} + +void svc_rdma_xdr_encode_reply_array (struct rpcrdma_write_array *ary, +int chunks) +{ + ary->wc_discrim = xdr_one; + ary->wc_nchunks =htonl (chunks); +} + +void svc_rdma_xdr_encode_array_chunk (struct rpcrdma_write_array *ary, +int chunk_no, +u32 rs_handle,u64 rs_offset, +u32 write_len) +{ +struct rpcrdma_segment *seg = &ary->wc_array[chunk_no].wc_target; + seg->rs_handle =htonl (rs_handle); + seg->rs_length =htonl (write_len); +xdr_encode_hyper ((u32 *) &seg->rs_offset, rs_offset); +} + +void svc_rdma_xdr_encode_reply_header (struct svcxprt_rdma *xprt, +struct rpcrdma_msg *rdma_argp, +struct rpcrdma_msg *rdma_resp, +enum rpcrdma_proc rdma_type) +{ + rdma_resp->rm_xid =htonl (rdma_argp->rm_xid); + rdma_resp->rm_vers =htonl (rdma_argp->rm_vers); + rdma_resp->rm_credit =htonl (xprt->sc_max_requests); + rdma_resp->rm_type =htonl (rdma_type); + +/* Encode <nul> chunks lists */ + rdma_resp->rm_body.rm_chunks[0 ] = xdr_zero; + rdma_resp->rm_body.rm_chunks[1 ] = xdr_zero; + rdma_resp->rm_body.rm_chunks[2 ] = xdr_zero; +}
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 93/100 rdma: makefile
From: Tom Tucker <[email protected]>
Add the svcrdma module to the xprtrdma makefile.
--- net/sunrpc/xprtrdma/Makefile | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
net/sunrpc/xprtrdma/Makefile +5 -0
@@ -1,3 +1,8 @@ obj-$(CONFIG_SUNRPC_XPRT_RDMA) += xprtrdma.o xprtrdma-y := transport.o rpc_rdma.o verbs.o + +obj-$(CONFIG_SUNRPC_XPRT_RDMA) += svcrdma.o + +svcrdma-y := svc_rdma.o svc_rdma_transport.o \ + svc_rdma_marshal.o svc_rdma_sendto.o svc_rdma_recvfrom.o
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 94/100 SUNRPC: spin svc_rqst initialization to its own function
From: Jeff Layton <[email protected]>
Move the initialzation in __svc_create_thread that happens prior to thread creation to a new function. Export the function to allow services to have better control over the svc_rqst structs.
Also rearrange the rqstp initialization to prevent NULL pointer dereferences in svc_exit_thread in case allocations fail.
--- include/linux/sunrpc/svc.h | 2 + net/sunrpc/svc.c | 59 +++++++++++++++++++++++++++++++------------ 2 files changed, 44 insertions(+), 17 deletions(-)
include/linux/sunrpc/svc.h +2 -0
@@ -384,6 +384,8 @@ struct svc_procedure {*/ struct svc_serv *svc_create (struct svc_program *,unsigned int ,void (*shutdown)(struct svc_serv *)); +struct svc_rqst *svc_prepare_thread (struct svc_serv *serv, +struct svc_pool *pool);int svc_create_thread (svc_thread_fn ,struct svc_serv *);void svc_exit_thread (struct svc_rqst *); struct svc_serv * svc_create_pooled(struct svc_program *, unsigned int,
net/sunrpc/svc.c +42 -17
79 lines not on this page · raw message
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 95/100 SUNRPC: export svc_sock_update_bufs
From: Jeff Layton <[email protected]>
Needed since the plan is to not have a svc_create_thread helper and to have current users of that function just call kthread_run directly.
--- net/sunrpc/svcsock.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
net/sunrpc/svcsock.c +1 -0
@@ -1101,6 +1101,7 @@ void svc_sock_update_bufs(struct svc_serv *serv) }spin_unlock_bh (&serv->sv_lock); } +EXPORT_SYMBOL (svc_sock_update_bufs);/* * Initialize socket for RPC use and create svc_sock struct
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 96/100 NLM: Convert lockd to use kthreads
From: Jeff Layton <[email protected]>
Have lockd_up start lockd using kthread_run. With this change, lockd_down now blocks until lockd actually exits, so there's no longer need for the waitqueue code at the end of lockd_down. This also means that only one lockd can be running at a time which simplifies the code within lockd's main loop.
--- fs/lockd/svc.c | 131 ++++++++++++++++++++++++------------------------------- 1 files changed, 57 insertions(+), 74 deletions(-)
fs/lockd/svc.c +57 -74
@@ -25,6 +25,7 @@#include <linux/smp.h> #include <linux/smp_lock.h> #include <linux/mutex.h> +#include <linux/kthread.h> #include <linux/freezer.h> #include <linux/sunrpc/types.h>
@@ -48,14 +49,11 @@ EXPORT_SYMBOL(nlmsvc_ops);static DEFINE_MUTEX (nlmsvc_mutex);static unsigned int nlmsvc_users; -static pid_t nlmsvc_pid; +static struct task_struct *nlmsvc_task;static struct svc_serv *nlmsvc_serv;int nlmsvc_grace_period;unsigned long nlmsvc_timeout; -static DECLARE_COMPLETION (lockd_start_done); -static DECLARE_WAIT_QUEUE_HEAD (lockd_exit); -/* * These can be set at insmod time (useful for NFS as root filesystem), * and also changed through the sysctl interface. -- Jamie Lokier, Aug 2003
@@ -111,35 +109,30 @@ static inline void clear_grace_period(void)/* * This is the lockd kernel thread */ -static void -lockd (struct svc_rqst *rqstp) +static int +lockd (void *vrqstp) {int err =0 ; +struct svc_rqst *rqstp = vrqstp;unsigned long grace_period_expire; -/* Lock module and set up kernel thread */ -/* lockd_up is waiting for us to startup, so will -* be holding a reference to this module, so it -* is safe to just claim another reference -*/ -__module_get (THIS_MODULE ); -lock_kernel (); - -/* -* Let our maker know we're running. -*/ - nlmsvc_pid = current->pid; - nlmsvc_serv = rqstp->rq_server; -complete (&lockd_start_done); - -daemonize ("lockd" ); +/* try_to_freeze() is called from svc_recv() */ set_freezable (); -/* Process request with signals blocked, but allow SIGKILL. */ +/* Allow SIGKILL to tell lockd to drop all of its locks */ allow_signal (SIGKILL );dprintk ("NFS locking service started (ver " LOCKD_VERSION ").\n" ); +/* +* FIXME: it would be nice if lockd didn't spend its entire life +* running under the BKL. At the very least, it would be good to +* have someone clarify what it's intended to protect here. I've +* seen some handwavy posts about posix locking needing to be +* done under the BKL, but it's far from clear. +*/ +lock_kernel (); +if (!nlm_timeout) nlm_timeout =LOCKD_DFLT_TIMEO ; nlmsvc_timeout = nlm_timeout *HZ ;
@@ -148,10 +141,9 @@ lockd(struct svc_rqst *rqstp)/* * The main request loop. We don't terminate until the last -* NFS mount or NFS daemon has gone away, and we've been sent a -* signal, or else another process has taken over our job. +* NFS mount or NFS daemon has gone away. */ -while ((nlmsvc_users || !signalled ()) && nlmsvc_pid == current->pid) { +while (!kthread_should_stop ()) {long timeout =MAX_SCHEDULE_TIMEOUT ;char buf[RPC_MAX_ADDRBUFLEN ];
@@ -195,28 +187,19 @@ lockd(struct svc_rqst *rqstp) }flush_signals (current); +if (nlmsvc_ops) +nlmsvc_invalidate_all (); +nlm_shutdown_hosts (); -/* -* Check whether there's a new lockd process before -* shutting down the hosts and clearing the slot. -*/ -if (!nlmsvc_pid || current->pid == nlmsvc_pid) { -if (nlmsvc_ops) -nlmsvc_invalidate_all (); -nlm_shutdown_hosts (); - nlmsvc_pid =0 ; - nlmsvc_serv =NULL ; - }else -printk (KERN_DEBUG -"lockd: new process, skipping host shutdown\n" ); -wake_up (&lockd_exit); +unlock_kernel (); + + nlmsvc_task =NULL ; + nlmsvc_serv =NULL ;/* Exit the RPC thread */ svc_exit_thread (rqstp); -/* Release module */ -unlock_kernel (); -module_put_and_exit (0 ); +return 0 ; }/*
@@ -261,14 +244,15 @@ static int make_socks(struct svc_serv *serv, int proto)int lockd_up (int proto)/* Maybe add a 'family' option when IPv6 is supported ?? */ { -struct svc_serv * serv; -int error =0 ; +struct svc_serv *serv; +struct svc_rqst *rqstp; +int error =0 ;mutex_lock (&nlmsvc_mutex);/* * Check whether we're already up and running. */ -if (nlmsvc_pid) { +if (nlmsvc_serv) {if (proto) error =make_socks (nlmsvc_serv, proto); goto out;
@@ -295,13 +279,28 @@ lockd_up(int proto) /* Maybe add a 'family' option when IPv6 is supported ?? *//* * Create the kernel thread and wait for it to start. */ - error =svc_create_thread (lockd, serv); -if (error) { + rqstp =svc_prepare_thread (serv, &serv->sv_pools[0 ]); +if (IS_ERR (rqstp)) { + error =PTR_ERR (rqstp); +printk (KERN_WARNING +"lockd_up: svc_rqst allocation failed, error=%d\n" , + error); + goto destroy_and_out; + } + +svc_sock_update_bufs (serv); + nlmsvc_serv = rqstp->rq_server; + + nlmsvc_task =kthread_run (lockd, rqstp, serv->sv_name); +if (IS_ERR (nlmsvc_task)) { + error =PTR_ERR (nlmsvc_task); + nlmsvc_task =NULL ; + nlmsvc_serv =NULL ;printk (KERN_WARNING -"lockd_up: create thread failed, error=%d\n" , error); +"lockd_up: kthread_run failed, error=%d\n" , error); +svc_exit_thread (rqstp); goto destroy_and_out; } -wait_for_completion (&lockd_start_done);/* * Note: svc_serv structures have an initial use count of 1,
@@ -323,37 +322,21 @@ EXPORT_SYMBOL(lockd_up);void lockd_down (void ) { -static int warned; -mutex_lock (&nlmsvc_mutex);if (nlmsvc_users) {if (--nlmsvc_users) goto out; - }else -printk (KERN_WARNING "lockd_down: no users! pid=%d\n" , nlmsvc_pid); - -if (!nlmsvc_pid) { -if (warned++ ==0 ) -printk (KERN_WARNING "lockd_down: no lockd running.\n" ); - goto out; + }else { +printk (KERN_ERR "lockd_down: no users! task=%p\n" , + nlmsvc_task); +BUG (); } - warned =0 ; -kill_proc (nlmsvc_pid,SIGKILL ,1 ); -/* -* Wait for the lockd process to exit, but since we're holding -* the lockd semaphore, we can't wait around forever ... -*/ -clear_thread_flag (TIF_SIGPENDING ); -interruptible_sleep_on_timeout (&lockd_exit,HZ ); -if (nlmsvc_pid) { -printk (KERN_WARNING -"lockd_down: lockd failed to exit, clearing pid\n" ); - nlmsvc_pid =0 ; +if (!nlmsvc_task) { +printk (KERN_ERR "lockd_down: no lockd running.\n" ); +BUG (); } -spin_lock_irq (¤t->sighand->siglock); -recalc_sigpending (); -spin_unlock_irq (¤t->sighand->siglock); +kthread_stop (nlmsvc_task); out:mutex_unlock (&nlmsvc_mutex); }
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 97/100 NLM: have nlm_shutdown_hosts kill off all NLM RPC tasks
From: Jeff Layton <[email protected]>
If we're shutting down all the nlm_hosts anyway, then it doesn't make sense to allow RPC calls to linger. Allowing them to do so can mean that the RPC calls can outlive the currently running lockd and can lead to a use after free situation.
--- fs/lockd/host.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
fs/lockd/host.c +3 -1
@@ -379,8 +379,10 @@ nlm_shutdown_hosts(void)/* First, make all hosts eligible for gc */ dprintk ("lockd: nuking all hosts...\n" );for (chain = nlm_hosts; chain < nlm_hosts +NLM_HOST_NRHASH ; ++chain) { -hlist_for_each_entry (host, pos, chain, h_hash) +hlist_for_each_entry (host, pos, chain, h_hash) { host->h_expires = jiffies -1 ; +rpc_killall_tasks (host->h_rpcclnt); + } }/* Then, perform a garbage collection pass */
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 98/100 knfsd: don't bother mapping putrootfh enoent to eperm
Neither EPERM and ENOENT map to valid errors for PUTROOTFH according to rfc 3530, and, if anything, ENOENT is likely to be slightly more informative; so don't bother mapping ENOENT to EPERM. (Probably this was originally done because one likely cause was that there is an fsid=0 export but that it isn't permitted to this particular client. Now that we allow WRONGSEC returns, this is somewhat less likely.)
In the long term we should work to make this situation less likely, perhaps by turning off nfsv4 service entirely in the absence of the pseudofs root, or constructing a pseudofilesystem root ourselves in the kernel as necessary.
Thanks to Benny Halevy <[email protected]> for pointing out this problem.
--- fs/nfsd/export.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
fs/nfsd/export.c +0 -2
@@ -1357,8 +1357,6 @@ exp_pseudoroot(struct svc_rqst *rqstp, struct svc_fh *fhp)mk_fsid (FSID_NUM , fsidv,0 ,0 ,0 ,NULL ); exp =rqst_exp_find (rqstp,FSID_NUM , fsidv); -if (PTR_ERR (exp) == -ENOENT ) -return nfserr_perm;if (IS_ERR (exp))return nfserrno (PTR_ERR (exp)); rv =fh_compose (fhp, exp, exp->ex_dentry,NULL );
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 99/100 lockd: minor log message fix
Wendy Cheng noticed that function name doesn't agree here.
--- fs/lockd/svcsubs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/lockd/svcsubs.c +1 -1
@@ -87,7 +87,7 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result,unsigned int hash;__be32 nfserr; -nlm_debug_print_fh ("nlm_file_lookup" , f); +nlm_debug_print_fh ("nlm_lookup_file" , f); hash =file_hash (f);
Signature · 1 line
1.5.4.rc2.60.gb2e62
PATCH 100/100 nfsd: more careful input validation in nfsctl write methods
Neil Brown points out that we're checking buf[size-1] in a couple places without first checking whether size is zero.
Actually, given the implementation of simple_transaction_get(), buf[-1] is zero, so in both of these cases the subsequent check of the value of buf[size-1] will catch this case.
But it seems fragile to depend on that, so add explicit checks for this case.
--- fs/nfsd/nfsctl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
fs/nfsd/nfsctl.c +4 -1
@@ -304,6 +304,9 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size)struct auth_domain *dom;struct knfsd_fh fh; +if (size ==0 ) +return -EINVAL ; +if (buf[size-1 ] !='\n' )return -EINVAL ; buf[size-1 ] =0 ;
@@ -663,7 +666,7 @@ static ssize_t write_recoverydir(struct file *file, char *buf, size_t size)char *recdir;int len, status; -if (size >PATH_MAX || buf[size-1 ] !='\n' ) +if (size ==0 || size >PATH_MAX || buf[size-1 ] !='\n' )return -EINVAL ; buf[size-1 ] =0 ;
Signature · 1 line
1.5.4.rc2.60.gb2e62
Re: [PATCH 097/100] NLM: have nlm_shutdown_hosts kill off all NLM RPC tasks
In reply to J. Bruce FieldsQuoted 21 lines · On Fri, 25 Jan 2008 18:17:17 -0500 "J. Bruce Fields" <[email protected]>…
From: Jeff Layton <[email protected]>
If we're shutting down all the
nlm_hostsanyway, then it doesn't make sense to allow RPC calls to linger. Allowing them to do so can mean that the RPC calls can outlive the currently running lockd and can lead to a use after free situation.Signed-off-by Jeff Layton <[email protected]>Reviewed-by NeilBrown <[email protected]>Signed-off-by J. Bruce Fields <[email protected]>--- fs/lockd/host.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)fs/lockd/host.c +0
-0@@ -379,8 +379,10 @@ nlm_shutdown_hosts(void)/* First, make all hosts eligible for gc */ dprintk ("lockd: nuking all hosts...\n" );
fs/lockd/host.c nlm_shutdown_hosts(void) · line 388
Quoted 10 lines
fs/lockd/host.c +4
-1for (chain = nlm_hosts; chain < nlm_hosts +NLM_HOST_NRHASH ; ++chain) { - hlist_for_each_entry(host, pos, chain, h_hash) +hlist_for_each_entry (host, pos, chain, h_hash) { host->h_expires = jiffies -1 ; +rpc_killall_tasks (host->h_rpcclnt); + } }/* Then, perform a garbage collection pass */
I was doing some more testing today, and noticed that the original problem that this patch is intended to fix resurfaced. I think this patch just changes the timing on the race somehow, but I haven't tracked it down completely yet.
There's also another problem -- it's possible for host->h_rpcclnt to be NULL, and that has special meaning for rpc_killall_tasks. For now, I suggest that we drop this patch until I have a chance to work on it further.
The other related patches in this series should be OK, however.
Thanks,
Signature · 1 line
Jeff Layton <[email protected]>
A message that is not in the archive (sent off-list or not yet received): 20080125185548.5363f046-RtJpwOs3+0O+kQycOl6kW4xkIHaj4LzF@public.gmane.org
Re: [PATCH 097/100] NLM: have nlm_shutdown_hosts kill off all NLM RPC tasks
Quoted 33 lines · Jeff Layton
Quoted 30 lines · On Fri, 25 Jan 2008 18:17:17 -0500 "J. Bruce Fields" <[email protected]>…
From: Jeff Layton <[email protected]>
If we're shutting down all the
nlm_hostsanyway, then it doesn't make sense to allow RPC calls to linger. Allowing them to do so can mean that the RPC calls can outlive the currently running lockd and can lead to a use after free situation.Signed-off-by Jeff Layton <[email protected]>Reviewed-by NeilBrown <[email protected]>Signed-off-by J. Bruce Fields <[email protected]>--- fs/lockd/host.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)fs/lockd/host.c +4
-1@@ -379,8 +379,10 @@ nlm_shutdown_hosts(void)/* First, make all hosts eligible for gc */ dprintk ("lockd: nuking all hosts...\n" );for (chain = nlm_hosts; chain < nlm_hosts +NLM_HOST_NRHASH ; ++chain) { - hlist_for_each_entry(host, pos, chain, h_hash) +hlist_for_each_entry (host, pos, chain, h_hash) { host->h_expires = jiffies -1 ; +rpc_killall_tasks (host->h_rpcclnt); + } }
Quoted 6 lines
Quoted 1 line
/* Then, perform a garbage collection pass */
I was doing some more testing today, and noticed that the original problem that this patch is intended to fix resurfaced. I think this patch just changes the timing on the race somehow, but I haven't tracked it down completely yet.
Hm. So you're getting oopses that look like the rpc code attempting to make calls with an rpc_client that's been freed?
Quoted 6 lines
There's also another problem -- it's possible for
host->h_rpcclntto be NULL, and that has special meaning forrpc_killall_tasks. For now, I suggest that we drop this patch until I have a chance to work on it further.The other related patches in this series should be OK, however.
OK! Dropped. Let me know what you find out.
--b.
Re: [PATCH 097/100] NLM: have nlm_shutdown_hosts kill off all NLM RPC tasks
Quoted 41 lines · On Fri, 25 Jan 2008 19:31:56 -0500 "J. Bruce Fields" <[email protected]>…
Quoted 33 lines · Jeff Layton
Quoted 30 lines · On Fri, 25 Jan 2008 18:17:17 -0500 "J. Bruce Fields" <[email protected]>…
From: Jeff Layton <[email protected]>
If we're shutting down all the
nlm_hostsanyway, then it doesn't make sense to allow RPC calls to linger. Allowing them to do so can mean that the RPC calls can outlive the currently running lockd and can lead to a use after free situation.Signed-off-by Jeff Layton <[email protected]>Reviewed-by NeilBrown <[email protected]>Signed-off-by J. Bruce Fields <[email protected]>--- fs/lockd/host.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)fs/lockd/host.c +4
-1@@ -379,8 +379,10 @@ nlm_shutdown_hosts(void)/* First, make all hosts eligible for gc */ dprintk ("lockd: nuking all hosts...\n" );for (chain = nlm_hosts; chain < nlm_hosts +NLM_HOST_NRHASH ; ++chain) { - hlist_for_each_entry(host, pos, chain, h_hash) +hlist_for_each_entry (host, pos, chain, h_hash) { host->h_expires = jiffies -1 ; +rpc_killall_tasks (host->h_rpcclnt); + } }Quoted 6 lines
Quoted 1 line
/* Then, perform a garbage collection pass */
I was doing some more testing today, and noticed that the original problem that this patch is intended to fix resurfaced. I think this patch just changes the timing on the race somehow, but I haven't tracked it down completely yet.
Quoted 3 lines
Hm. So you're getting oopses that look like the rpc code attempting to make calls with an
rpc_clientthat's been freed?
Right. The situation to reproduce this is a bit contrived and tricky, but I've been able to reproduce the same panics that I was originally seeing. The timing seems to be a bit tighter now, but I can still make it happen.
Quoted 9 lines
Quoted 6 lines
There's also another problem -- it's possible for
host->h_rpcclntto be NULL, and that has special meaning forrpc_killall_tasks. For now, I suggest that we drop this patch until I have a chance to work on it further.The other related patches in this series should be OK, however.
OK! Dropped. Let me know what you find out.
Will do, thanks!
Signature · 1 line
Jeff Layton <[email protected]>
Re: [PATCH 097/100] NLM: have nlm_shutdown_hosts kill off all NLM RPC tasks
In reply to a message not in the archiveQuoted 4 lines · Jeff Layton
There's also another problem -- it's possible for
host->h_rpcclntto be NULL, and that has special meaning forrpc_killall_tasks. For now, I suggest that we drop this patch until I have a chance to work on it further.
We really ought to create _separate_ lists for the client and server uses of struct nlm_host.
Trond
A message that is not in the archive (sent off-list or not yet received): 1201310387.4150.21.camel-rJ7iovZKK19ZJLDQqaL3InhyD016LWXt@public.gmane.org
Re: [PATCH 097/100] NLM: have nlm_shutdown_hosts kill off all NLM RPC tasks
Quoted 7 lines · On Fri, 25 Jan 2008 20:19:47 -0500 Trond Myklebust…
Quoted 4 lines · Jeff Layton
There's also another problem -- it's possible for
host->h_rpcclntto be NULL, and that has special meaning forrpc_killall_tasks. For now, I suggest that we drop this patch until I have a chance to work on it further.
Quoted 5 lines
We really ought to create _separate_ lists for the client and server uses of struct
nlm_host.Trond
Yep. lockd is in real need of further overhaul here. We're invalidating locks at lockd shutdown, but we really ought to be doing this when the last nfsd goes down.
All of that is pretty much orthogonal to this problem, I think.
Signature · 1 line
Jeff Layton <[email protected]>
Re: [PATCH 039/100] lockd: fix a leak in nlmsvc_testlock asynchronous request handling
In reply to J. Bruce FieldsQuoted 8 lines · J. Bruce Fields
From: Oleg Drokin <Oleg.Drokin-UdXhSnd/[email protected]>
Without the patch, there is a leakage of nlmblock structure refcount that holds a reference nlmfile structure, that holds a reference to struct file, when async GETFL is used (
-EINPROGRESSreturn fromfile_ops->lock()), and also in some error cases.Fix up a style nit while we're here.
Missing Signed-off-by: ?
Quoted 10 lines
Signed-off-by J. Bruce Fields <[email protected]>--- fs/lockd/svclock.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-)fs/lockd/svclock.c +0
-0
fs/lockd/svclock.c nlmsvc_testlock(struct svc_rqst *rqstp, · line 506
Quoted 7 lines
fs/lockd/svclock.c +2
-1@@ -501,25 +501,29 @@ nlmsvc_testlock(struct svc_rqst *rqstp,struct nlm_file *file, block, block->b_flags, block->b_fl);if (block->b_flags &B_TIMED_OUT ) {nlmsvc_unlink_block (block); -return nlm_lck_denied; + ret = nlm_lck_denied; + goto out;
Aren't we also leaking the memory pointed to by block->b_fl that nlmsvc_testlock just allocated?
nlmsvc_unlink_block() already invokes nlmsvc_release_block() in some cases. So now sometimes we have a double release.
fs/lockd/svclock.c nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, · line 515
Quoted 13 lines
fs/lockd/svclock.c +3
-3}if (block->b_flags &B_GOT_CALLBACK ) {if (block->b_fl !=NULL && block->b_fl->fl_type !=F_UNLCK ) { lock->fl = *block->b_fl; goto conf_lock; - } -else { + }else {nlmsvc_unlink_block (block); -return nlm_granted; + ret = nlm_granted; + goto out;
Same comment: block->b_fl leak?
Quoted 16 lines
fs/lockd/svclock.c +6
-3} } -return nlm_drop_reply; + ret = nlm_drop_reply; + goto out; } error =vfs_test_lock (file->f_file, &lock->fl); -if (error == -EINPROGRESS ) -return nlmsvc_defer_lock_rqst (rqstp, block); +if (error == -EINPROGRESS ) { + ret =nlmsvc_defer_lock_rqst (rqstp, block); + goto out; + }if (error) { ret = nlm_lck_denied_nolocks;
Quoted 1 line
goto out;
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Re: [PATCH 039/100] lockd: fix a leak in nlmsvc_testlock asynchronous request handling
Hello!
Quoted 9 lines · Chuck Lever
fs/lockd/svclock.c nlmsvc_testlock(struct svc_rqst *rqstp, · line 506
Quoted 8 lines
fs/lockd/svclock.c +2
-1@@ -501,25 +501,29 @@ nlmsvc_testlock(struct svc_rqst *rqstp,struct nlm_file *file, block, block->b_flags, block->b_fl);if (block->b_flags &B_TIMED_OUT ) {nlmsvc_unlink_block (block); -return nlm_lck_denied; + ret = nlm_lck_denied; + goto out;Aren't we also leaking the memory pointed to by
block->b_flthatnlmsvc_testlockjust allocated?
When last reference on a block goes away, nlmsvc_free_block is called that frees block->b_fl, so we are good here, I think.
Quoted 1 line
nlmsvc_unlink_block()already invokesnlmsvc_release_block()in some cases. So now sometimes we have a double release.
It in fact always calls release_block, but this is not a free function, this is sort of refput function instead. We got one reference on a block (from lookup_block/create_block) that we release after out label, and one that i consumed by a list membership. When we unlink a block from a list, we drop that reference too.
Bye,
Oleg
Re: [PATCH 038/100] nfsd: Allow AIX client to read dir containing mountpoints
In reply to J. Bruce FieldsQuoted 79 lines · J. Bruce Fields
From: Frank Filz <[email protected]>
This patch addresses a compatibility issue with a Linux NFS server and AIX NFS client.
I have exported /export as fsid=0 with sec=krb5:krb5i I have mount --bind /home onto /export/home
I have exported /export/home with sec=krb5iThe AIX client mounts / -o sec=krb5:krb5i onto /mnt
If I do an ls /mnt, the AIX client gets a permission error. Looking at the network traceIwe see a READDIR looking for attributes
FATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEID. The response gives aNFS4ERR_WRONGSECwhich the AIX client is not expecting.Since the AIX client is only asking for an attribute that is an attribute of the parent file system (pseudo root in my example), it seems reasonable that there should not be an error.
In discussing this issue with Bruce Fields, I initially proposed ignoring the error in
nfsd4_encode_dirent_fattr()if all that was being asked for wasFATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEID, however, Bruce suggested that we avoid callingcross_mnt()if only these attributes are requested.The following patch implements bypassing
cross_mnt()if onlyFATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEIDare called. Since there is some complexity in the code innfsd4_encode_fattr(), I didn't want to duplicate code (and introduce a maintenance nightmare), so I added a parameter tonfsd4_encode_fattr()that indicates whether it should ignore cross mounts and simply fill in the attribute using the passed in dentry as opposed to it's parent.Signed-off-by Frank Filz <[email protected]>Signed-off-by J. Bruce Fields <[email protected]>--- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4xdr.c | 27 ++++++++++++++++++++++----- include/linux/nfsd/xdr4.h | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-)fs/nfsd/nfs4proc.c +1
-1@@ -750,7 +750,7 @@ _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, cstate->current_fh.fh_export, cstate->current_fh.fh_dentry, buf, &count, verify->ve_bmval, - rqstp); + rqstp, 0);/* this means that nfsd4_encode_fattr() ran out of space */ fs/nfsd/nfs4proc.c +0
-0if (status == nfserr_resource && count ==0 )fs/nfsd/nfs4xdr.c +1
-1@@ -1453,7 +1453,7 @@ static __be32 fattr_handle_absent_fs(u32 *bmval0, u32 *bmval1, u32 *rdattr_err)__be32 nfsd4_encode_fattr (struct svc_fh *fhp,struct svc_export *exp,struct dentry *dentry,__be32 *buffer,int *countp,u32 *bmval, -struct svc_rqst *rqstp) +struct svc_rqst *rqstp,int ignore_crossmnt) {u32 bmval0 = bmval[0 ];fs/nfsd/nfs4xdr.c +3
-1u32 bmval1 = bmval[1 ];@@ -1833,7 +1833,12 @@ out_acl:if (bmval1 &FATTR4_WORD1_MOUNTED_ON_FILEID ) {if ((buflen -=8 ) <0 ) goto out_resource; -if (exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) { +/* +* Get parent's attributes if not ignoring crossmount +* and this is the root of a cross-mounted filesystem.
fs/nfsd/nfs4xdr.c out_acl: · line 1841
Quoted 3 lines
fs/nfsd/nfs4xdr.c +3
-0+*/ +if (ignore_crossmnt ==0 && + exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) {
More white space damage here.
fs/nfsd/nfs4xdr.c nfsd4_encode_dirent_fattr(struct · line 1878
Quoted 9 lines
fs/nfsd/nfs4xdr.c +1
-0err =vfs_getattr (exp->ex_mnt->mnt_parent, exp->ex_mnt->mnt_mountpoint, &stat);if (err)@@ -1869,13 +1874,25 @@ nfsd4_encode_dirent_fattr(structnfsd4_readdir *cd, struct svc_export *exp = cd->rd_fhp->fh_export;struct dentry *dentry;__be32 nfserr; +int ignore_crossmnt =0 ;
Nit: extra blanks here.
Quoted 9 lines
fs/nfsd/nfs4xdr.c +3
-1dentry =lookup_one_len (name, cd->rd_fhp->fh_dentry, namlen);if (IS_ERR (dentry))return nfserrno (PTR_ERR (dentry));exp_get (exp); -if (d_mountpoint (dentry)) { +/* +* In the case of a mountpoint, the client may be asking for +* attributes that are only properties of the underlying filesystem
fs/nfsd/nfs4xdr.c nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, · line 1896
Quoted 10 lines
fs/nfsd/nfs4xdr.c +9
-0+* as opposed to the cross-mounted file system. In such a case, +* we will not follow the cross mount and will fill the attribtutes +* directly from the mountpoint dentry. +*/ +if (d_mountpoint (dentry) && + (cd->rd_bmval[0 ] & ~FATTR4_WORD0_RDATTR_ERROR ) ==0 && + (cd->rd_bmval[1 ] & ~FATTR4_WORD1_MOUNTED_ON_FILEID ) ==0 ) + ignore_crossmnt =1 ; +else if (d_mountpoint (dentry)) {int err;
This seems kind of awkward. Let's invoke d_mountpoint() once instead of twice:
if (d_mountpoint(dentry)) {
if ((cd->rd_bmval[0] & ~FATTR4_WORD0_RDATTR_ERROR) == 0 &&
(cd->rd_bmval[1] & ~FATTR4_WORD1_MOUNTED_ON_FILEID) == 0)
ignore_crossmnt = 1;
else {
int err;
/*
* Why the heck aren't we just using nfsd_lookup??
* Different "."/".." handling? Something else?
* At least, add a comment here to explain....
*/
err = nfsd_cross_mnt(cd->rd_rqstp, &dentry, &exp);
if (err) {
nfserr = nfserrno(err);
goto out_put;
}
nfserr = check_nfsd_access(exp, cd->rd_rqstp);
if (nfserr)
goto out_put;
}
}Quoted 34 lines
fs/nfsd/nfs4xdr.c +1
-1@@ -1894,7 +1911,7 @@ nfsd4_encode_dirent_fattr(structnfsd4_readdir *cd, } nfserr =nfsd4_encode_fattr (NULL , exp, dentry, p, buflen, cd- >rd_bmval, - cd->rd_rqstp); + cd->rd_rqstp, ignore_crossmnt); out_put:fs/nfsd/nfs4xdr.c +1
-1dput (dentry);exp_put (exp);@@ -2048,7 +2065,7 @@ nfsd4_encode_getattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4 buflen = resp->end - resp->p - (COMPOUND_ERR_SLACK_SPACE >>2 ); nfserr =nfsd4_encode_fattr (fhp, fhp->fh_export, fhp->fh_dentry, resp->p, &buflen, getattr->ga_bmval, - resp->rqstp); + resp->rqstp,0 );if (!nfserr) resp->p += buflen;fs/nfsd/nfs4xdr.c +0
-0return nfserr;include/linux/nfsd/xdr4.h +1
-1@@ -441,7 +441,7 @@ void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *);void nfsd4_encode_replay (struct nfsd4_compoundres *resp,struct nfsd4_op *op);__be32 nfsd4_encode_fattr (struct svc_fh *fhp,struct svc_export *exp,struct dentry *dentry,__be32 *buffer,int *countp, -u32 *bmval,struct svc_rqst *); +u32 *bmval,struct svc_rqst *,int ignore_crossmnt); extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp,
include/linux/nfsd/xdr4.h void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *); · line 447
Quoted 2 lines
include/linux/nfsd/xdr4.h +0
-0struct nfsd4_compound_state *, struct nfsd4_setclientid *setclid);
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Re: [PATCH 038/100] nfsd: Allow AIX client to read dir containing mountpoints
Quoted 15 lines · Chuck Lever
fs/nfsd/nfs4xdr.c out_acl: · line 1841
Quoted 12 lines · J. Bruce Fields
fs/nfsd/nfs4xdr.c +3
-1@@ -1833,7 +1833,12 @@ out_acl:if (bmval1 &FATTR4_WORD1_MOUNTED_ON_FILEID ) {if ((buflen -=8 ) <0 ) goto out_resource; -if (exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) { +/* +* Get parent's attributes if not ignoring crossmount +* and this is the root of a cross-mounted filesystem.
fs/nfsd/nfs4xdr.c +3
-0+*/ +if (ignore_crossmnt ==0 && + exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) {More white space damage here.
Whoops, fixed; thanks.
Quoted 12 lines
fs/nfsd/nfs4xdr.c nfsd4_encode_dirent_fattr(struct nfsd4_readdir · line 1878
Quoted 10 lines
fs/nfsd/nfs4xdr.c +1
-0err =vfs_getattr (exp->ex_mnt->mnt_parent, exp->ex_mnt->mnt_mountpoint, &stat);if (err)@@ -1869,13 +1874,25 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, struct svc_export *exp = cd->rd_fhp->fh_export;struct dentry *dentry;__be32 nfserr; +int ignore_crossmnt =0 ;Nit: extra blanks here.
OK, fixed.
Quoted 15 lines
Quoted 15 lines
fs/nfsd/nfs4xdr.c +8
-1dentry =lookup_one_len (name, cd->rd_fhp->fh_dentry, namlen);if (IS_ERR (dentry))return nfserrno (PTR_ERR (dentry));exp_get (exp); -if (d_mountpoint (dentry)) { +/* +* In the case of a mountpoint, the client may be asking for +* attributes that are only properties of the underlying filesystem +* as opposed to the cross-mounted file system. In such a case, +* we will not follow the cross mount and will fill the attribtutes +* directly from the mountpoint dentry. +*/ + if (d_mountpoint(dentry) &&
Quoted 8 lines
fs/nfsd/nfs4xdr.c nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, · line 1896
Quoted 5 lines
fs/nfsd/nfs4xdr.c +4
-0+ (cd->rd_bmval[0] & ~FATTR4_WORD0_RDATTR_ERROR) == 0 && + (cd->rd_bmval[1] & ~FATTR4_WORD1_MOUNTED_ON_FILEID) == 0) + ignore_crossmnt =1 ; + else if (d_mountpoint(dentry)) {int err;This seems kind of awkward. Let's invoke
d_mountpoint()once instead of twice:
Yeah, OK. I'd rather take that as a followup patch. And I wonder if the mountpoint case could be hidden in a separate function? It'd be nice to just have something like
if (d_mountpoint(dentry)) err = handle_mountpoint(cd->rd_rqstp, &dentry, &exp);
(or whatever).
--b.
Quoted 64 lines
if (d_mountpoint(dentry)) { if ((cd->rd_bmval[0] & ~FATTR4_WORD0_RDATTR_ERROR) == 0 && (cd->rd_bmval[1] & ~FATTR4_WORD1_MOUNTED_ON_FILEID) == 0) ignore_crossmnt = 1; else { int err; /* * Why the heck aren't we just using nfsd_lookup?? * Different "."/".." handling? Something else? * At least, add a comment here to explain.... */ err = nfsd_cross_mnt(cd->rd_rqstp, &dentry, &exp); if (err) { nfserr = nfserrno(err); goto out_put; } nfserr = check_nfsd_access(exp, cd->rd_rqstp); if (nfserr) goto out_put; } }Quoted 34 lines
fs/nfsd/nfs4xdr.c +1
-1@@ -1894,7 +1911,7 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, } nfserr =nfsd4_encode_fattr (NULL , exp, dentry, p, buflen, cd- >rd_bmval, - cd->rd_rqstp); + cd->rd_rqstp, ignore_crossmnt); out_put:fs/nfsd/nfs4xdr.c +1
-1dput (dentry);exp_put (exp);@@ -2048,7 +2065,7 @@ nfsd4_encode_getattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4 buflen = resp->end - resp->p - (COMPOUND_ERR_SLACK_SPACE >>2 ); nfserr =nfsd4_encode_fattr (fhp, fhp->fh_export, fhp->fh_dentry, resp->p, &buflen, getattr->ga_bmval, - resp->rqstp); + resp->rqstp,0 );if (!nfserr) resp->p += buflen;fs/nfsd/nfs4xdr.c +0
-0return nfserr;include/linux/nfsd/xdr4.h +1
-1@@ -441,7 +441,7 @@ void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *);void nfsd4_encode_replay (struct nfsd4_compoundres *resp,struct nfsd4_op *op);__be32 nfsd4_encode_fattr (struct svc_fh *fhp,struct svc_export *exp,struct dentry *dentry,__be32 *buffer,int *countp, -u32 *bmval,struct svc_rqst *); +u32 *bmval,struct svc_rqst *,int ignore_crossmnt); extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp,include/linux/nfsd/xdr4.h void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *); · line 447
Quoted 2 lines
include/linux/nfsd/xdr4.h +0
-0struct nfsd4_compound_state *, struct nfsd4_setclientid *setclid);--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
Re: [PATCH 038/100] nfsd: Allow AIX client to read dir containing mountpoints
In reply to J. Bruce FieldsQuoted 11 lines · J. Bruce Fields
From: Frank Filz <[email protected]>
This patch addresses a compatibility issue with a Linux NFS server and AIX NFS client.
I have exported /export as fsid=0 with sec=krb5:krb5i I have mount --bind /home onto /export/home
I have exported /export/home with sec=krb5iThe AIX client mounts / -o sec=krb5:krb5i onto /mnt
Quoted 10 lines
If I do an ls /mnt, the AIX client gets a permission error. Looking at the network traceIwe see a READDIR looking for attributes
FATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEID. The response gives aNFS4ERR_WRONGSECwhich the AIX client is not expecting.Since the AIX client is only asking for an attribute that is an attribute of the parent file system (pseudo root in my example), it seems reasonable that there should not be an error.
Can we go through this explanation one more time, a little more slowly, please? I am not following it.
It is my understanding that FATTR4_RDATTR_ERROR simply says to return a magic value to indicate that the requested attributes could not be retrieved during a READDIR operation. It is also my understanding that the FATTR4_MOUNTED_ON_FILEID returns either the fileid of the entry in the directory or the fileid of the directory which is the root of the mount point which is mounted on top of the entry in the directory.
So, given all of this, why is the right thing to do to return the fileid of the entry in the directory, even though it is mounted on top of? Why isn't the right thing to do to return NFS4ERR_WRONGSEC per page 206 in rfc3530?
Perhaps I am not following the bind mount properly?
A little more below --
Quoted 75 lines
In discussing this issue with Bruce Fields, I initially proposed ignoring the error in
nfsd4_encode_dirent_fattr()if all that was being asked for wasFATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEID, however, Bruce suggested that we avoid callingcross_mnt()if only these attributes are requested.The following patch implements bypassing
cross_mnt()if onlyFATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEIDare called. Since there is some complexity in the code innfsd4_encode_fattr(), I didn't want to duplicate code (and introduce a maintenance nightmare), so I added a parameter tonfsd4_encode_fattr()that indicates whether it should ignore cross mounts and simply fill in the attribute using the passed in dentry as opposed to it's parent.Signed-off-by Frank Filz <[email protected]>Signed-off-by J. Bruce Fields <[email protected]>--- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4xdr.c | 27 ++++++++++++++++++++++----- include/linux/nfsd/xdr4.h | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-)fs/nfsd/nfs4proc.c +1
-1@@ -750,7 +750,7 @@ _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, cstate->current_fh.fh_export, cstate->current_fh.fh_dentry, buf, &count, verify->ve_bmval, - rqstp); + rqstp, 0);/* this means that nfsd4_encode_fattr() ran out of space */ if (status == nfserr_resource && count ==0 )fs/nfsd/nfs4xdr.c +9
-3@@ -1453,7 +1453,7 @@ static __be32 fattr_handle_absent_fs(u32 *bmval0, u32 *bmval1, u32 *rdattr_err)__be32 nfsd4_encode_fattr (struct svc_fh *fhp,struct svc_export *exp,struct dentry *dentry,__be32 *buffer,int *countp,u32 *bmval, -struct svc_rqst *rqstp) +struct svc_rqst *rqstp,int ignore_crossmnt) {u32 bmval0 = bmval[0 ];u32 bmval1 = bmval[1 ];@@ -1833,7 +1833,12 @@ out_acl:if (bmval1 &FATTR4_WORD1_MOUNTED_ON_FILEID ) {if ((buflen -=8 ) <0 ) goto out_resource; -if (exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) { +/* +* Get parent's attributes if not ignoring crossmount +* and this is the root of a cross-mounted filesystem. +*/ +if (ignore_crossmnt ==0 && + exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) { err =vfs_getattr (exp->ex_mnt->mnt_parent, exp->ex_mnt->mnt_mountpoint, &stat);if (err)@@ -1869,13 +1874,25 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,struct svc_export *exp = cd->rd_fhp->fh_export;struct dentry *dentry;__be32 nfserr; +int ignore_crossmnt =0 ; dentry =lookup_one_len (name, cd->rd_fhp->fh_dentry, namlen);if (IS_ERR (dentry))return nfserrno (PTR_ERR (dentry));exp_get (exp); -if (d_mountpoint (dentry)) { +/*
fs/nfsd/nfs4xdr.c nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, · line 1894
Quoted 10 lines
fs/nfsd/nfs4xdr.c +9
-0+* In the case of a mountpoint, the client may be asking for +* attributes that are only properties of the underlying filesystem +* as opposed to the cross-mounted file system. In such a case, +* we will not follow the cross mount and will fill the attribtutes +* directly from the mountpoint dentry. +*/ +if (d_mountpoint (dentry) && + (cd->rd_bmval[0 ] & ~FATTR4_WORD0_RDATTR_ERROR ) ==0 && + (cd->rd_bmval[1 ] & ~FATTR4_WORD1_MOUNTED_ON_FILEID ) ==0 )
These are some odd looking tests. What is the real intention for these tests? They don't test just for requests with just RDATTR_ERROR and MOUNTED_ON_FILEID set. They will trigger whether or not either or neither is set as well.
Thanx...
ps
Quoted 37 lines
fs/nfsd/nfs4xdr.c +2
-0+ ignore_crossmnt =1 ; + else if (d_mountpoint(dentry)) {int err;fs/nfsd/nfs4xdr.c +2
-2/* @@ -1894,7 +1911,7 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, } nfserr =nfsd4_encode_fattr (NULL , exp, dentry, p, buflen, cd->rd_bmval, - cd->rd_rqstp); + cd->rd_rqstp, ignore_crossmnt); out_put:dput (dentry);exp_put (exp);@@ -2048,7 +2065,7 @@ nfsd4_encode_getattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4 buflen = resp->end - resp->p - (COMPOUND_ERR_SLACK_SPACE >>2 ); nfserr =nfsd4_encode_fattr (fhp, fhp->fh_export, fhp->fh_dentry, resp->p, &buflen, getattr->ga_bmval, - resp->rqstp); + resp->rqstp,0 );if (!nfserr) resp->p += buflen;return nfserr;include/linux/nfsd/xdr4.h +1
-1@@ -441,7 +441,7 @@ void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *);void nfsd4_encode_replay (struct nfsd4_compoundres *resp,struct nfsd4_op *op);__be32 nfsd4_encode_fattr (struct svc_fh *fhp,struct svc_export *exp,struct dentry *dentry,__be32 *buffer,int *countp, -u32 *bmval,struct svc_rqst *); +u32 *bmval,struct svc_rqst *,int ignore_crossmnt);extern __be32 nfsd4_setclientid (struct svc_rqst *rqstp,struct nfsd4_compound_state *,struct nfsd4_setclientid *setclid);
Re: [PATCH 038/100] nfsd: Allow AIX client to read dir containing mountpoints
Quoted 26 lines · Peter Staubach
Quoted 11 lines · J. Bruce Fields
From: Frank Filz <[email protected]>
This patch addresses a compatibility issue with a Linux NFS server and AIX NFS client.
I have exported /export as fsid=0 with sec=krb5:krb5i I have mount --bind /home onto /export/home
I have exported /export/home with sec=krb5iThe AIX client mounts / -o sec=krb5:krb5i onto /mnt
Quoted 10 lines
If I do an ls /mnt, the AIX client gets a permission error. Looking at the network traceIwe see a READDIR looking for attributes
FATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEID. The response gives aNFS4ERR_WRONGSECwhich the AIX client is not expecting.Since the AIX client is only asking for an attribute that is an attribute of the parent file system (pseudo root in my example), it seems reasonable that there should not be an error.
Can we go through this explanation one more time, a little more slowly, please? I am not following it.
Quoted 7 lines
It is my understanding that
FATTR4_RDATTR_ERRORsimply says to return a magic value to indicate that the requested attributes could not be retrieved during a READDIR operation. It is also my understanding that theFATTR4_MOUNTED_ON_FILEIDreturns either the fileid of the entry in the directory or the fileid of the directory which is the root of the mount point which is mounted on top of the entry in the directory.
No, it's the fileid of the directory underneath (the mounted-on directory), not of the directory that's mounted on top of it--that would be just the regular fileid. Does that clear up the confusion?
Quoted 90 lines
So, given all of this, why is the right thing to do to return the fileid of the entry in the directory, even though it is mounted on top of? Why isn't the right thing to do to return
NFS4ERR_WRONGSECper page 206 in rfc3530?Perhaps I am not following the bind mount properly?
A little more below --
Quoted 79 lines
In discussing this issue with Bruce Fields, I initially proposed ignoring the error in
nfsd4_encode_dirent_fattr()if all that was being asked for wasFATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEID, however, Bruce suggested that we avoid callingcross_mnt()if only these attributes are requested.The following patch implements bypassing
cross_mnt()if onlyFATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEIDare called. Since there is some complexity in the code innfsd4_encode_fattr(), I didn't want to duplicate code (and introduce a maintenance nightmare), so I added a parameter tonfsd4_encode_fattr()that indicates whether it should ignore cross mounts and simply fill in the attribute using the passed in dentry as opposed to it's parent.Signed-off-by Frank Filz <[email protected]>Signed-off-by J. Bruce Fields <[email protected]>--- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4xdr.c | 27 ++++++++++++++++++++++----- include/linux/nfsd/xdr4.h | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-)fs/nfsd/nfs4proc.c +1
-1@@ -750,7 +750,7 @@ _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, cstate->current_fh.fh_export, cstate->current_fh.fh_dentry, buf, &count, verify->ve_bmval, - rqstp); + rqstp, 0);/* this means that nfsd4_encode_fattr() ran out of space */ if (status == nfserr_resource && count ==0 )fs/nfsd/nfs4xdr.c +16
-3@@ -1453,7 +1453,7 @@ static __be32 fattr_handle_absent_fs(u32 *bmval0, u32 *bmval1, u32 *rdattr_err)__be32 nfsd4_encode_fattr (struct svc_fh *fhp,struct svc_export *exp,struct dentry *dentry,__be32 *buffer,int *countp,u32 *bmval, -struct svc_rqst *rqstp) +struct svc_rqst *rqstp,int ignore_crossmnt) {u32 bmval0 = bmval[0 ];u32 bmval1 = bmval[1 ];@@ -1833,7 +1833,12 @@ out_acl:if (bmval1 &FATTR4_WORD1_MOUNTED_ON_FILEID ) {if ((buflen -=8 ) <0 ) goto out_resource; -if (exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) { +/* +* Get parent's attributes if not ignoring crossmount +* and this is the root of a cross-mounted filesystem. +*/ +if (ignore_crossmnt ==0 && + exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) { err =vfs_getattr (exp->ex_mnt->mnt_parent, exp->ex_mnt->mnt_mountpoint, &stat);if (err)@@ -1869,13 +1874,25 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,struct svc_export *exp = cd->rd_fhp->fh_export;struct dentry *dentry;__be32 nfserr; +int ignore_crossmnt =0 ; dentry =lookup_one_len (name, cd->rd_fhp->fh_dentry, namlen);if (IS_ERR (dentry))return nfserrno (PTR_ERR (dentry));exp_get (exp); -if (d_mountpoint (dentry)) { +/* +* In the case of a mountpoint, the client may be asking for +* attributes that are only properties of the underlying filesystem +* as opposed to the cross-mounted file system. In such a case, +* we will not follow the cross mount and will fill the attribtutes +* directly from the mountpoint dentry. +*/ + if (d_mountpoint(dentry) &&
Quoted 8 lines
fs/nfsd/nfs4xdr.c nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, · line 1897
Quoted 3 lines
fs/nfsd/nfs4xdr.c +2
-0+ (cd->rd_bmval[0 ] & ~FATTR4_WORD0_RDATTR_ERROR ) ==0 && + (cd->rd_bmval[1] & ~FATTR4_WORD1_MOUNTED_ON_FILEID) == 0)These are some odd looking tests. What is the real intention for these tests? They don't test just for requests with just
RDATTR_ERRORandMOUNTED_ON_FILEIDset. They will trigger whether or not either or neither is set as well.
Right. The test is meant to fail iff someone requests an attribute other than those two. (Note the different rd_bmval[] array indices.)
(Actually, I suppose we could also allow requests for lease_time. Patch welcomed....)
--b.
Re: [PATCH 038/100] nfsd: Allow AIX client to read dir containing mountpoints
Quoted 35 lines · J. Bruce Fields
Quoted 26 lines · Peter Staubach
Quoted 11 lines · J. Bruce Fields
From: Frank Filz <[email protected]>
This patch addresses a compatibility issue with a Linux NFS server and AIX NFS client.
I have exported /export as fsid=0 with sec=krb5:krb5i I have mount --bind /home onto /export/home
I have exported /export/home with sec=krb5iThe AIX client mounts / -o sec=krb5:krb5i onto /mnt
Quoted 10 lines
If I do an ls /mnt, the AIX client gets a permission error. Looking at the network traceIwe see a READDIR looking for attributes
FATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEID. The response gives aNFS4ERR_WRONGSECwhich the AIX client is not expecting.Since the AIX client is only asking for an attribute that is an attribute of the parent file system (pseudo root in my example), it seems reasonable that there should not be an error.
Can we go through this explanation one more time, a little more slowly, please? I am not following it.
Quoted 7 lines
It is my understanding that
FATTR4_RDATTR_ERRORsimply says to return a magic value to indicate that the requested attributes could not be retrieved during a READDIR operation. It is also my understanding that theFATTR4_MOUNTED_ON_FILEIDreturns either the fileid of the entry in the directory or the fileid of the directory which is the root of the mount point which is mounted on top of the entry in the directory.
Quoted 3 lines
No, it's the fileid of the directory underneath (the mounted-on directory), not of the directory that's mounted on top of it--that would be just the regular fileid. Does that clear up the confusion?
READDIR with cross-mounts is definitely confusing. Remember READDIR is reading some directory .../a/ that is part of file system #1. Within that directory is a mountpoint, .../a/fs2 for a new file system (#2). A cross mount. The client is currently using a security flavor that is valid for file system #1 but not valid for file system #2. Since .../a/fs2 is the root of a new file system, it probably has a FILEID like 2 or something. However, there is .../a/fs2 which is a file in file system #1 (perhaps with a FILEID like 356). FATTR4_MOUNTED_ON_FILEID will return 356 instead of 2. Since the client is only asking for the file names in .../a/ and their FATTR4_MOUNTED_ON_FILEID, the READDIR is clearly asking for information that does not at all depend on access to (and permission to use) file system #2 (in fact, the exports might even deny this client access to file system #2 no matter what security flavor it uses). Since the client is not asking for anything that it doesn't have permission to ask for (if file system #2 were not currently mounted, this READDIR would respond with exactly the same results, and the security of file system #2 would not come into play at all), there is no reason to report an error (and not supply the attribute).
Quoted 98 lines
Quoted 89 lines
So, given all of this, why is the right thing to do to return the fileid of the entry in the directory, even though it is mounted on top of? Why isn't the right thing to do to return
NFS4ERR_WRONGSECper page 206 in rfc3530?Perhaps I am not following the bind mount properly?
A little more below --
Quoted 79 lines
In discussing this issue with Bruce Fields, I initially proposed ignoring the error in
nfsd4_encode_dirent_fattr()if all that was being asked for wasFATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEID, however, Bruce suggested that we avoid callingcross_mnt()if only these attributes are requested.The following patch implements bypassing
cross_mnt()if onlyFATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEIDare called. Since there is some complexity in the code innfsd4_encode_fattr(), I didn't want to duplicate code (and introduce a maintenance nightmare), so I added a parameter tonfsd4_encode_fattr()that indicates whether it should ignore cross mounts and simply fill in the attribute using the passed in dentry as opposed to it's parent.Signed-off-by Frank Filz <[email protected]>Signed-off-by J. Bruce Fields <[email protected]>--- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4xdr.c | 27 ++++++++++++++++++++++----- include/linux/nfsd/xdr4.h | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-)fs/nfsd/nfs4proc.c +1
-1@@ -750,7 +750,7 @@ _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, cstate->current_fh.fh_export, cstate->current_fh.fh_dentry, buf, &count, verify->ve_bmval, - rqstp); + rqstp, 0);/* this means that nfsd4_encode_fattr() ran out of space */ if (status == nfserr_resource && count ==0 )fs/nfsd/nfs4xdr.c +16
-3@@ -1453,7 +1453,7 @@ static __be32 fattr_handle_absent_fs(u32 *bmval0, u32 *bmval1, u32 *rdattr_err)__be32 nfsd4_encode_fattr (struct svc_fh *fhp,struct svc_export *exp,struct dentry *dentry,__be32 *buffer,int *countp,u32 *bmval, -struct svc_rqst *rqstp) +struct svc_rqst *rqstp,int ignore_crossmnt) {u32 bmval0 = bmval[0 ];u32 bmval1 = bmval[1 ];@@ -1833,7 +1833,12 @@ out_acl:if (bmval1 &FATTR4_WORD1_MOUNTED_ON_FILEID ) {if ((buflen -=8 ) <0 ) goto out_resource; -if (exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) { +/* +* Get parent's attributes if not ignoring crossmount +* and this is the root of a cross-mounted filesystem. +*/ +if (ignore_crossmnt ==0 && + exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) { err =vfs_getattr (exp->ex_mnt->mnt_parent, exp->ex_mnt->mnt_mountpoint, &stat);if (err)@@ -1869,13 +1874,25 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,struct svc_export *exp = cd->rd_fhp->fh_export;struct dentry *dentry;__be32 nfserr; +int ignore_crossmnt =0 ; dentry =lookup_one_len (name, cd->rd_fhp->fh_dentry, namlen);if (IS_ERR (dentry))return nfserrno (PTR_ERR (dentry));exp_get (exp); -if (d_mountpoint (dentry)) { +/* +* In the case of a mountpoint, the client may be asking for +* attributes that are only properties of the underlying filesystem +* as opposed to the cross-mounted file system. In such a case, +* we will not follow the cross mount and will fill the attribtutes +* directly from the mountpoint dentry. +*/ + if (d_mountpoint(dentry) &&Quoted 8 lines
fs/nfsd/nfs4xdr.c nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, · line 1897
Quoted 3 lines
fs/nfsd/nfs4xdr.c +2
-0+ (cd->rd_bmval[0 ] & ~FATTR4_WORD0_RDATTR_ERROR ) ==0 && + (cd->rd_bmval[1] & ~FATTR4_WORD1_MOUNTED_ON_FILEID) == 0)These are some odd looking tests. What is the real intention for these tests? They don't test just for requests with just
RDATTR_ERRORandMOUNTED_ON_FILEIDset. They will trigger whether or not either or neither is set as well.
Quoted 5 lines
Right. The test is meant to fail iff someone requests an attribute other than those two. (Note the different rd_bmval[] array indices.)
(Actually, I suppose we could also allow requests for
lease_time. Patch welcomed....)
Yep, intention here is to bypass the crossmount if the only attributes requested are properties of file system #1 (per above discussion).
Frank Filz
Re: [PATCH 038/100] nfsd: Allow AIX client to read dir containing mountpoints
In reply to J. Bruce FieldsQuoted 38 lines · J. Bruce Fields
Quoted 27 lines · Peter Staubach
Quoted 11 lines · J. Bruce Fields
From: Frank Filz <[email protected]>
This patch addresses a compatibility issue with a Linux NFS server and AIX NFS client.
I have exported /export as fsid=0 with sec=krb5:krb5i I have mount --bind /home onto /export/home
I have exported /export/home with sec=krb5iThe AIX client mounts / -o sec=krb5:krb5i onto /mnt
Quoted 11 lines
If I do an ls /mnt, the AIX client gets a permission error. Looking at the network traceIwe see a READDIR looking for attributes
FATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEID. The response gives aNFS4ERR_WRONGSECwhich the AIX client is not expecting.Since the AIX client is only asking for an attribute that is an attribute of the parent file system (pseudo root in my example), it seems reasonable that there should not be an error.
Can we go through this explanation one more time, a little more slowly, please? I am not following it.
Quoted 8 lines
It is my understanding that
FATTR4_RDATTR_ERRORsimply says to return a magic value to indicate that the requested attributes could not be retrieved during a READDIR operation. It is also my understanding that theFATTR4_MOUNTED_ON_FILEIDreturns either the fileid of the entry in the directory or the fileid of the directory which is the root of the mount point which is mounted on top of the entry in the directory.
Quoted 5 lines
No, it's the fileid of the directory underneath (the mounted-on directory), not of the directory that's mounted on top of it--that would be just the regular fileid. Does that clear up the confusion?
Yes, that helps. I was misinterpreting the arguments in the call to vfs_getattr() to be the wrong direction.
Quoted 100 lines
Quoted 90 lines
So, given all of this, why is the right thing to do to return the fileid of the entry in the directory, even though it is mounted on top of? Why isn't the right thing to do to return
NFS4ERR_WRONGSECper page 206 in rfc3530?Perhaps I am not following the bind mount properly?
A little more below --
Quoted 79 lines
In discussing this issue with Bruce Fields, I initially proposed ignoring the error in
nfsd4_encode_dirent_fattr()if all that was being asked for wasFATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEID, however, Bruce suggested that we avoid callingcross_mnt()if only these attributes are requested.The following patch implements bypassing
cross_mnt()if onlyFATTR4_RDATTR_ERRORandFATTR4_MOUNTED_ON_FILEIDare called. Since there is some complexity in the code innfsd4_encode_fattr(), I didn't want to duplicate code (and introduce a maintenance nightmare), so I added a parameter tonfsd4_encode_fattr()that indicates whether it should ignore cross mounts and simply fill in the attribute using the passed in dentry as opposed to it's parent.Signed-off-by Frank Filz <[email protected]>Signed-off-by J. Bruce Fields <[email protected]>--- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4xdr.c | 27 ++++++++++++++++++++++----- include/linux/nfsd/xdr4.h | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-)fs/nfsd/nfs4proc.c +1
-1@@ -750,7 +750,7 @@ _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, cstate->current_fh.fh_export, cstate->current_fh.fh_dentry, buf, &count, verify->ve_bmval, - rqstp); + rqstp, 0);/* this means that nfsd4_encode_fattr() ran out of space */ if (status == nfserr_resource && count ==0 )fs/nfsd/nfs4xdr.c +16
-3@@ -1453,7 +1453,7 @@ static __be32 fattr_handle_absent_fs(u32 *bmval0, u32 *bmval1, u32 *rdattr_err)__be32 nfsd4_encode_fattr (struct svc_fh *fhp,struct svc_export *exp,struct dentry *dentry,__be32 *buffer,int *countp,u32 *bmval, -struct svc_rqst *rqstp) +struct svc_rqst *rqstp,int ignore_crossmnt) {u32 bmval0 = bmval[0 ];u32 bmval1 = bmval[1 ];@@ -1833,7 +1833,12 @@ out_acl:if (bmval1 &FATTR4_WORD1_MOUNTED_ON_FILEID ) {if ((buflen -=8 ) <0 ) goto out_resource; -if (exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) { +/* +* Get parent's attributes if not ignoring crossmount +* and this is the root of a cross-mounted filesystem. +*/ +if (ignore_crossmnt ==0 && + exp->ex_mnt->mnt_root->d_inode == dentry->d_inode) { err =vfs_getattr (exp->ex_mnt->mnt_parent, exp->ex_mnt->mnt_mountpoint, &stat);if (err)@@ -1869,13 +1874,25 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,struct svc_export *exp = cd->rd_fhp->fh_export;struct dentry *dentry;__be32 nfserr; +int ignore_crossmnt =0 ; dentry =lookup_one_len (name, cd->rd_fhp->fh_dentry, namlen);if (IS_ERR (dentry))return nfserrno (PTR_ERR (dentry));exp_get (exp); -if (d_mountpoint (dentry)) { +/* +* In the case of a mountpoint, the client may be asking for +* attributes that are only properties of the underlying filesystem +* as opposed to the cross-mounted file system. In such a case, +* we will not follow the cross mount and will fill the attribtutes +* directly from the mountpoint dentry. +*/ + if (d_mountpoint(dentry) &&Quoted 9 lines
fs/nfsd/nfs4xdr.c nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,
Quoted 4 lines
fs/nfsd/nfs4xdr.c +2
-0+ (cd->rd_bmval[0 ] & ~FATTR4_WORD0_RDATTR_ERROR ) ==0 && + (cd->rd_bmval[1] & ~FATTR4_WORD1_MOUNTED_ON_FILEID) == 0)These are some odd looking tests. What is the real intention for these tests? They don't test just for requests with just
RDATTR_ERRORandMOUNTED_ON_FILEIDset. They will trigger whether or not either or neither is set as well.
Quoted 4 lines
Right. The test is meant to fail iff someone requests an attribute other than those two. (Note the different rd_bmval[] array indices.)
So, it doesn't matter whether those options are even set then?
Thanx...
ps
Quoted 5 lines
(Actually, I suppose we could also allow requests for
lease_time. Patch welcomed....)--b.
Re: [PATCH 038/100] nfsd: Allow AIX client to read dir containing mountpoints
Quoted 14 lines · Peter Staubach
Quoted 13 lines · J. Bruce Fields
Quoted 11 lines · Peter Staubach
Can we go through this explanation one more time, a little more slowly, please? I am not following it.
It is my understanding that
FATTR4_RDATTR_ERRORsimply says to return a magic value to indicate that the requested attributes could not be retrieved during a READDIR operation. It is also my understanding that theFATTR4_MOUNTED_ON_FILEIDreturns either the fileid of the entry in the directory or the fileid of the directory which is the root of the mount point which is mounted on top of the entry in the directory.
Quoted 8 lines
Quoted 5 lines
No, it's the fileid of the directory underneath (the mounted-on directory), not of the directory that's mounted on top of it--that would be just the regular fileid. Does that clear up the confusion?
Yes, that helps. I was misinterpreting the arguments in the call to
vfs_getattr()to be the wrong direction.
Any ideas for cleanup (especially patches) are welcomed. I'd rather the code be easier to read there.
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Review
Quoted 4 lines
(quoted diff) +3
-0+ if (d_mountpoint(dentry) && + (cd->rd_bmval[0] & ~FATTR4_WORD0_RDATTR_ERROR) == 0 && + (cd->rd_bmval[1] & ~FATTR4_WORD1_MOUNTED_ON_FILEID) == 0)These are some odd looking tests. What is the real intention for these tests? They don't test just for requests with just
RDATTR_ERRORandMOUNTED_ON_FILEIDset. They will trigger whether or not either or neither is set as well.
Quoted 6 lines
Quoted 4 lines
Right. The test is meant to fail iff someone requests an attribute other than those two. (Note the different rd_bmval[] array indices.)
So, it doesn't matter whether those options are even set then?
Right.
Would something like this clarify?:
--b.
fs/nfsd/nfs4xdr.c +10 -3
@@ -1867,6 +1867,15 @@ out_serverfault: goto out; } +static inline int attributes_need_mount (u32 *bmval) +{ +if (bmval[0 ] & ~(FATTR4_WORD0_RDATTR_ERROR |FATTR4_WORD0_LEASE_TIME )) +return 1 ; +if (bmval[1 ] & ~FATTR4_WORD1_MOUNTED_ON_FILEID ) +return 1 ; +return 0 ; +} +static __be32 nfsd4_encode_dirent_fattr (struct nfsd4_readdir *cd,const char *name,int namlen,__be32 *p,int *buflen)
@@ -1888,9 +1897,7 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,* we will not follow the cross mount and will fill the attribtutes * directly from the mountpoint dentry. */ -if (d_mountpoint (dentry) && - (cd->rd_bmval[0 ] & ~FATTR4_WORD0_RDATTR_ERROR ) ==0 && - (cd->rd_bmval[1 ] & ~FATTR4_WORD1_MOUNTED_ON_FILEID ) ==0 ) +if (d_mountpoint (dentry) && !attributes_need_mount (cd->rd_bmval)) ignore_crossmnt =1 ;else if (d_mountpoint (dentry)) {int err;