lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] knfsd: convert sk_reserved to atomic_t

Browse Source 
Convert the svc_sock->sk_reserved 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 <gnb@melbourne.sgi.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Greg Banks
2006-10-02 02:17:56 -07:00
committed by Linus Torvalds
parent 1a68d952af
commit 5685f0fa1c
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/sunrpc/svcsock.h
View File

@@ -34,7 +34,7 @@ struct svc_sock {
#define SK_OLD 9 /* used for temp socket aging mark+sweep */ #define SK_OLD 9 /* used for temp socket aging mark+sweep */
#define SK_DETACHED 10 /* detached from tempsocks list */ #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 */ spinlock_t sk_defer_lock; /* protects sk_deferred */
struct list_head sk_deferred; /* deferred requests that need to struct list_head sk_deferred; /* deferred requests that need to

12
net/sunrpc/svcsock.c
View File

@@ -177,13 +177,13 @@ svc_sock_enqueue(struct svc_sock *svsk)
} }
set_bit(SOCK_NOSPACE, &svsk->sk_sock->flags); 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)) > svc_sock_wspace(svsk))
&& !test_bit(SK_CLOSE, &svsk->sk_flags) && !test_bit(SK_CLOSE, &svsk->sk_flags)
&& !test_bit(SK_CONN, &svsk->sk_flags)) { && !test_bit(SK_CONN, &svsk->sk_flags)) {
/* Don't enqueue while not enough space for reply */ /* Don't enqueue while not enough space for reply */
dprintk("svc: socket %p no space, %d*2 > %ld, not enqueued\n", 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)); svc_sock_wspace(svsk));
goto out_unlock; goto out_unlock;
} }
@@ -209,7 +209,7 @@ svc_sock_enqueue(struct svc_sock *svsk)
rqstp->rq_sock = svsk; rqstp->rq_sock = svsk;
atomic_inc(&svsk->sk_inuse); atomic_inc(&svsk->sk_inuse);
rqstp->rq_reserved = serv->sv_bufsz; 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); wake_up(&rqstp->rq_wait);
} else { } else {
dprintk("svc: socket %p put into queue\n", svsk->sk_sk); dprintk("svc: socket %p put into queue\n", svsk->sk_sk);
@@ -271,10 +271,8 @@ void svc_reserve(struct svc_rqst *rqstp, int space)
if (space < rqstp->rq_reserved) { if (space < rqstp->rq_reserved) {
struct svc_sock *svsk = rqstp->rq_sock; struct svc_sock *svsk = rqstp->rq_sock;
spin_lock_bh(&svsk->sk_server->sv_lock); atomic_sub((rqstp->rq_reserved - space), &svsk->sk_reserved);
svsk->sk_reserved -= (rqstp->rq_reserved - space);
rqstp->rq_reserved = space; rqstp->rq_reserved = space;
spin_unlock_bh(&svsk->sk_server->sv_lock);
svc_sock_enqueue(svsk); svc_sock_enqueue(svsk);
} }
@@ -1226,7 +1224,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)
rqstp->rq_sock = svsk; rqstp->rq_sock = svsk;
atomic_inc(&svsk->sk_inuse); atomic_inc(&svsk->sk_inuse);
rqstp->rq_reserved = serv->sv_bufsz; rqstp->rq_reserved = serv->sv_bufsz;
svsk->sk_reserved += rqstp->rq_reserved; atomic_add(rqstp->rq_reserved, &svsk->sk_reserved);
} else { } else {
/* No data pending. Go to sleep */ /* No data pending. Go to sleep */
svc_serv_enqueue(serv, rqstp); svc_serv_enqueue(serv, rqstp);