knfsd: convert sk_reserved to atomic_t
Subsystems (3)
PATCH 1/1 knfsd: convert sk_reserved to atomic_t
knfsd: Convert the svc_sock->sk_inuse variable from an int protected by svc_serv->sv_lock, to an atomic. This reduces (by 1) the number of places we need to take the (effectively global) svc_serv->sv_lock.
Signed-off-by Greg Banks <[email protected]>
---
include/linux/sunrpc/svcsock.h | 2 +- net/sunrpc/svcsock.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-)
include/linux/sunrpc/svcsock.h +1 -1
@@ -34,7 +34,7 @@ struct svc_sock {#define SK_OLD 9/* used for temp socket aging mark+sweep */ #define SK_DETACHED 10/* detached from tempsocks list */ -int sk_reserved;/* space on outq that is reserved */ +atomic_t sk_reserved;/* space on outq that is reserved */ spinlock_t sk_defer_lock;/* protects sk_deferred */ struct list_head sk_deferred;/* deferred requests that need to
net/sunrpc/svcsock.c +5 -7
@@ -176,13 +176,13 @@ svc_sock_enqueue(struct svc_sock *svsk) }set_bit (SOCK_NOSPACE , &svsk->sk_sock->flags); -if (((svsk->sk_reserved + serv->sv_bufsz)*2 +if (((atomic_read (&svsk->sk_reserved) + serv->sv_bufsz)*2 >svc_sock_wspace (svsk)) && !test_bit (SK_CLOSE , &svsk->sk_flags) && !test_bit (SK_CONN , &svsk->sk_flags)) {/* Don't enqueue while not enough space for reply */ dprintk ("svc: socket %p no space, %d*2 > %ld, not enqueued\n" , - svsk->sk_sk, svsk->sk_reserved+serv->sv_bufsz, + svsk->sk_sk,atomic_read (&svsk->sk_reserved)+serv->sv_bufsz,svc_sock_wspace (svsk)); goto out_unlock; }
@@ -208,7 +208,7 @@ svc_sock_enqueue(struct svc_sock *svsk) rqstp->rq_sock = svsk;atomic_inc (&svsk->sk_inuse); rqstp->rq_reserved = serv->sv_bufsz; - svsk->sk_reserved += rqstp->rq_reserved; +atomic_add (rqstp->rq_reserved, &svsk->sk_reserved);wake_up (&rqstp->rq_wait); }else {dprintk ("svc: socket %p put into queue\n" , svsk->sk_sk);
@@ -270,10 +270,8 @@ void svc_reserve(struct svc_rqst *rqstp,if (space < rqstp->rq_reserved) {struct svc_sock *svsk = rqstp->rq_sock; -spin_lock_bh (&svsk->sk_server->sv_lock); - svsk->sk_reserved -= (rqstp->rq_reserved - space); +atomic_sub ((rqstp->rq_reserved - space), &svsk->sk_reserved); rqstp->rq_reserved = space; -spin_unlock_bh (&svsk->sk_server->sv_lock);svc_sock_enqueue (svsk); }
@@ -1189,7 +1187,7 @@ svc_recv(struct svc_serv *serv, struct s rqstp->rq_sock = svsk;atomic_inc (&svsk->sk_inuse); rqstp->rq_reserved = serv->sv_bufsz; - svsk->sk_reserved += rqstp->rq_reserved; +atomic_add (rqstp->rq_reserved, &svsk->sk_reserved); }else {/* No data pending. Go to sleep */ svc_serv_enqueue (serv, rqstp);
Signature · 13 lines
Greg Banks, R&D Software Engineer, SGI Australian Software Group. I don't speak for SGI. ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ NFS maillist - [email protected] https://lists.sourceforge.net/lists/listinfo/nfs