]> git.dujemihanovic.xyz Git - linux.git/commitdiff
sunrpc: don't take ->sv_lock when updating ->sv_nrthreads.
authorNeilBrown <neilb@suse.de>
Mon, 15 Jul 2024 07:14:19 +0000 (17:14 +1000)
committerChuck Lever <chuck.lever@oracle.com>
Fri, 20 Sep 2024 23:31:03 +0000 (19:31 -0400)
As documented in svc_xprt.c, sv_nrthreads is protected by the service
mutex, and it does not need ->sv_lock.
(->sv_lock is needed only for sv_permsocks, sv_tempsocks, and
sv_tmpcnt).

So remove the unnecessary locking.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
net/sunrpc/svc.c

index 9442ebf38bbd930aabec87b38a04e3f785e87af6..f30eeae56c448d107675ceca13ce887ec46ae5cb 100644 (file)
@@ -721,10 +721,7 @@ svc_prepare_thread(struct svc_serv *serv, struct svc_pool *pool, int node)
        if (!rqstp)
                return ERR_PTR(-ENOMEM);
 
-       spin_lock_bh(&serv->sv_lock);
        serv->sv_nrthreads += 1;
-       spin_unlock_bh(&serv->sv_lock);
-
        pool->sp_nrthreads += 1;
 
        /* Protected by whatever lock the service uses when calling
@@ -959,10 +956,7 @@ svc_exit_thread(struct svc_rqst *rqstp)
        list_del_rcu(&rqstp->rq_all);
 
        pool->sp_nrthreads -= 1;
-
-       spin_lock_bh(&serv->sv_lock);
        serv->sv_nrthreads -= 1;
-       spin_unlock_bh(&serv->sv_lock);
        svc_sock_update_bufs(serv);
 
        svc_rqst_free(rqstp);