Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 4 Jun 2019 11:03:09 +0200
From:   Peter Zijlstra <peterz@infradead.org>
To:     Waiman Long <longman@redhat.com>
Cc:     Ingo Molnar <mingo@redhat.com>, Will Deacon <will.deacon@arm.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Borislav Petkov <bp@alien8.de>,
        "H. Peter Anvin" <hpa@zytor.com>, linux-kernel@vger.kernel.org,
        x86@kernel.org, Davidlohr Bueso <dave@stgolabs.net>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Tim Chen <tim.c.chen@linux.intel.com>,
        huang ying <huang.ying.caritas@gmail.com>
Subject: Re: [PATCH v8 14/19] locking/rwsem: Enable time-based spinning on
 reader-owned rwsem
Message-ID: <20190604090309.GG3402@hirez.programming.kicks-ass.net>
References: <20190520205918.22251-1-longman@redhat.com>
 <20190520205918.22251-15-longman@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190520205918.22251-15-longman@redhat.com>
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, May 20, 2019 at 04:59:13PM -0400, Waiman Long wrote:
> +static inline void rwsem_set_nonspinnable(struct rw_semaphore *sem)
> +{
> +	long owner = atomic_long_read(&sem->owner);
> +
> +	while (owner & RWSEM_READER_OWNED) {
> +		if (owner & RWSEM_NONSPINNABLE)
> +			break;
> +		owner = atomic_long_cmpxchg(&sem->owner, owner,
> +					    owner | RWSEM_NONSPINNABLE);
> +	}
> +}

--- a/kernel/locking/rwsem.c
+++ b/kernel/locking/rwsem.c
@@ -206,12 +206,13 @@ static inline void rwsem_set_nonspinnabl
 {
 	long owner = atomic_long_read(&sem->owner);
 
-	while (owner & RWSEM_READER_OWNED) {
+	do {
+		if (!(owner & RWSEM_READER_OWNED))
+			break;
 		if (owner & RWSEM_NONSPINNABLE)
 			break;
-		owner = atomic_long_cmpxchg(&sem->owner, owner,
-					    owner | RWSEM_NONSPINNABLE);
-	}
+	} while (!atomic_long_try_cmpxchg(&sem->owner, &owner,
+					  owner | RWSEM_NONSPINNABLE));
 }
 
 /*