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:   Wed, 17 Apr 2019 15:56:59 +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>,
        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 v4 11/16] locking/rwsem: Enable readers spinning on writer
Message-ID: <20190417135659.GH4038@hirez.programming.kicks-ass.net>
References: <20190413172259.2740-1-longman@redhat.com>
 <20190413172259.2740-12-longman@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190413172259.2740-12-longman@redhat.com>
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sat, Apr 13, 2019 at 01:22:54PM -0400, Waiman Long wrote:
> @@ -549,7 +582,7 @@ static noinline enum owner_state rwsem_spin_on_owner(struct rw_semaphore *sem)
>  	return !owner ? OWNER_NULL : OWNER_READER;
>  }
>  
> -static bool rwsem_optimistic_spin(struct rw_semaphore *sem)
> +static bool rwsem_optimistic_spin(struct rw_semaphore *sem, bool wlock)
>  {
>  	bool taken = false;
>  	bool is_rt_task = rt_task(current);
> @@ -558,9 +591,6 @@ static bool rwsem_optimistic_spin(struct rw_semaphore *sem)
>  	preempt_disable();
>  
>  	/* sem->wait_lock should not be held when doing optimistic spinning */
> -	if (!rwsem_can_spin_on_owner(sem))
> -		goto done;
> -
>  	if (!osq_lock(&sem->osq))
>  		goto done;
>  
> @@ -580,10 +610,11 @@ static bool rwsem_optimistic_spin(struct rw_semaphore *sem)
>  		/*
>  		 * Try to acquire the lock
>  		 */
> -		if (rwsem_try_write_lock_unqueued(sem)) {
> -			taken = true;
> +		taken = wlock ? rwsem_try_write_lock_unqueued(sem)
> +			      : rwsem_try_read_lock_unqueued(sem);
> +
> +		if (taken)
>  			break;
> -		}
>  
>  		/*
>  		 * An RT task cannot do optimistic spinning if it cannot

Alternatively you pass the trylock function as an argument:

static bool rwsem_optimistic_spin(struct rw_semaphore *sem,
				  bool (*trylock)(struct rw_semaphore *sem))
{
	...
		if (trylock(sem)) {
			taken = true;
			goto unlock;
		}
	...
}