From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Tucker Subject: Re: [RFC,PATCH 10/20] svc: Add generic refcount services Date: Wed, 29 Aug 2007 15:19:40 -0500 Message-ID: <1188418780.7502.32.camel@trinity.ogc.int> References: <20070820162000.15224.65524.stgit@dell3.ogc.int> <20070820162342.15224.70459.stgit@dell3.ogc.int> <46D5C115.1080302@oracle.com> Reply-To: tom@opengridcomputing.com Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Cc: nfs@lists.sourceforge.net To: chuck.lever@oracle.com Return-path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list2-new.sourceforge.net with esmtp (Exim 4.43) id 1IQU29-0001vK-Kj for nfs@lists.sourceforge.net; Wed, 29 Aug 2007 13:21:01 -0700 Received: from ms-smtp-05.texas.rr.com ([24.93.47.44]) by mail.sourceforge.net with esmtp (Exim 4.44) id 1IQU2B-00053a-O8 for nfs@lists.sourceforge.net; Wed, 29 Aug 2007 13:21:06 -0700 In-Reply-To: <46D5C115.1080302@oracle.com> List-Id: "Discussion of NFS under Linux development, interoperability, and testing." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nfs-bounces@lists.sourceforge.net Errors-To: nfs-bounces@lists.sourceforge.net On Wed, 2007-08-29 at 14:55 -0400, Chuck Lever wrote: > Tom Tucker wrote: > > Add inline svc_sock_get() so that service transport code will not > > need to manipulate sk_inuse directly. Also, make svc_sock_put() > > available so that transport code outside svcsock.c can use it. > > If svc_sock_get/put is meant to be generic, then you should probably > rename them, move them to a generic source file, and have them take > something other than "svc_sock *". > > Would it make sense to add a kref to these objects instead of > manipulating a naked atomic_t reference count? I think this is interesting. Basically svc_xxx_get and put go away and we use the generic kref services instead. The cleanup code in svc_xxx_put would become the release method. I think this is a good idea. > > > Signed-off-by: Greg Banks > > Signed-off-by: Tom Tucker > > --- > > > > include/linux/sunrpc/svcsock.h | 15 +++++++++++++++ > > net/sunrpc/svcsock.c | 29 ++++++++++++++--------------- > > 2 files changed, 29 insertions(+), 15 deletions(-) > > > > diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h > > index ea8b62b..9f37f30 100644 > > --- a/include/linux/sunrpc/svcsock.h > > +++ b/include/linux/sunrpc/svcsock.h > > @@ -115,6 +115,7 @@ int svc_addsock(struct svc_serv *serv, > > int *proto); > > void svc_sock_enqueue(struct svc_sock *svsk); > > void svc_sock_received(struct svc_sock *svsk); > > +void __svc_sock_put(struct svc_sock *svsk); > > > > /* > > * svc_makesock socket characteristics > > @@ -123,4 +124,18 @@ #define SVC_SOCK_DEFAULTS (0U) > > #define SVC_SOCK_ANONYMOUS (1U << 0) /* don't register with pmap */ > > #define SVC_SOCK_TEMPORARY (1U << 1) /* flag socket as temporary */ > > > > +/* > > + * Take and drop a temporary reference count on the svc_sock. > > + */ > > +static inline void svc_sock_get(struct svc_sock *svsk) > > +{ > > + atomic_inc(&svsk->sk_inuse); > > +} > > + > > +static inline void svc_sock_put(struct svc_sock *svsk) > > +{ > > + if (atomic_dec_and_test(&svsk->sk_inuse)) > > + __svc_sock_put(svsk); > > +} > > + > > #endif /* SUNRPC_SVCSOCK_H */ > > diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c > > index dcb5c7a..02f682a 100644 > > --- a/net/sunrpc/svcsock.c > > +++ b/net/sunrpc/svcsock.c > > @@ -273,7 +273,7 @@ svc_sock_enqueue(struct svc_sock *svsk) > > "svc_sock_enqueue: server %p, rq_sock=%p!\n", > > rqstp, rqstp->rq_sock); > > rqstp->rq_sock = svsk; > > - atomic_inc(&svsk->sk_inuse); > > + svc_sock_get(svsk); > > rqstp->rq_reserved = serv->sv_max_mesg; > > atomic_add(rqstp->rq_reserved, &svsk->sk_reserved); > > BUG_ON(svsk->sk_pool != pool); > > @@ -351,17 +351,16 @@ void svc_reserve(struct svc_rqst *rqstp, > > /* > > * Release a socket after use. > > */ > > -static inline void > > -svc_sock_put(struct svc_sock *svsk) > > +void > > +__svc_sock_put(struct svc_sock *svsk) > > { > > - if (atomic_dec_and_test(&svsk->sk_inuse)) { > > - BUG_ON(! test_bit(SK_DEAD, &svsk->sk_flags)); > > + BUG_ON(! test_bit(SK_DEAD, &svsk->sk_flags)); > > > > - if (svsk->sk_info_authunix != NULL) > > - svcauth_unix_info_release(svsk->sk_info_authunix); > > - svsk->sk_xprt->xpt_free(svsk); > > - } > > + if (svsk->sk_info_authunix != NULL) > > + svcauth_unix_info_release(svsk->sk_info_authunix); > > + svsk->sk_xprt->xpt_free(svsk); > > } > > +EXPORT_SYMBOL_GPL(__svc_sock_put); > > I see here that you are integrating the detach and free methods into > "svc_sock_put". It might make sense to reorder your patches so that > this comes earlier in the series (or is integrated somehow with the > patch that introduces detach and free). > This is a good suggestion. Note comment about kref... > > static void > > svc_sock_release(struct svc_rqst *rqstp) > > @@ -1109,7 +1108,7 @@ svc_tcp_accept(struct svc_sock *svsk) > > struct svc_sock, > > sk_list); > > set_bit(SK_CLOSE, &svsk->sk_flags); > > - atomic_inc(&svsk->sk_inuse); > > + svc_sock_get(svsk); > > } > > spin_unlock_bh(&serv->sv_lock); > > > > @@ -1481,7 +1480,7 @@ svc_recv(struct svc_rqst *rqstp, long ti > > spin_lock_bh(&pool->sp_lock); > > if ((svsk = svc_sock_dequeue(pool)) != NULL) { > > rqstp->rq_sock = svsk; > > - atomic_inc(&svsk->sk_inuse); > > + svc_sock_get(svsk); > > rqstp->rq_reserved = serv->sv_max_mesg; > > atomic_add(rqstp->rq_reserved, &svsk->sk_reserved); > > } else { > > @@ -1620,7 +1619,7 @@ svc_age_temp_sockets(unsigned long closu > > continue; > > if (atomic_read(&svsk->sk_inuse) || test_bit(SK_BUSY, &svsk->sk_flags)) > > continue; > > - atomic_inc(&svsk->sk_inuse); > > + svc_sock_get(svsk); > > list_move(le, &to_be_aged); > > set_bit(SK_CLOSE, &svsk->sk_flags); > > set_bit(SK_DETACHED, &svsk->sk_flags); > > @@ -1868,7 +1867,7 @@ svc_delete_socket(struct svc_sock *svsk) > > */ > > if (!test_and_set_bit(SK_DEAD, &svsk->sk_flags)) { > > BUG_ON(atomic_read(&svsk->sk_inuse)<2); > > - atomic_dec(&svsk->sk_inuse); > > + svc_sock_put(svsk); > > if (test_bit(SK_TEMP, &svsk->sk_flags)) > > serv->sv_tmpcnt--; > > } > > @@ -1883,7 +1882,7 @@ static void svc_close_socket(struct svc_ > > /* someone else will have to effect the close */ > > return; > > > > - atomic_inc(&svsk->sk_inuse); > > + svc_sock_get(svsk); > > svc_delete_socket(svsk); > > clear_bit(SK_BUSY, &svsk->sk_flags); > > svc_sock_put(svsk); > > @@ -1976,7 +1975,7 @@ svc_defer(struct cache_req *req) > > dr->argslen = rqstp->rq_arg.len >> 2; > > memcpy(dr->args, rqstp->rq_arg.head[0].iov_base-skip, dr->argslen<<2); > > } > > - atomic_inc(&rqstp->rq_sock->sk_inuse); > > + svc_sock_get(rqstp->rq_sock); > > dr->svsk = rqstp->rq_sock; > > > > dr->handle.revisit = svc_revisit; ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ NFS maillist - NFS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nfs