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, 16 Apr 2019 18:17:27 +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 06/16] locking/rwsem: Code cleanup after files merging
Message-ID: <20190416161727.GS14281@hirez.programming.kicks-ass.net>
References: <20190413172259.2740-1-longman@redhat.com>
 <20190413172259.2740-7-longman@redhat.com>
 <20190416160113.GM12232@hirez.programming.kicks-ass.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190416160113.GM12232@hirez.programming.kicks-ass.net>
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, Apr 16, 2019 at 06:01:13PM +0200, Peter Zijlstra wrote:
> @@ -794,34 +770,38 @@ static inline int __down_read_trylock(st
>   */
>  static inline void __down_write(struct rw_semaphore *sem)
>  {
> -	if (unlikely(atomic_long_cmpxchg_acquire(&sem->count, 0,
> -						 RWSEM_WRITER_LOCKED)))
> -		rwsem_down_write_failed(sem);
> +	long tmp = RWSEM_UNLOCKED_VALUE;
> +
> +	if (unlikely(atomic_long_try_cmpxchg_acquire(&sem->count, &tmp,
> +						     RWSEM_WRITER_LOCKED)))

!

> +		rwsem_down_write_slow(sem, TASK_UNINTERRUPTIBLE);
>  	rwsem_set_owner(sem);
>  }
>  
>  static inline int __down_write_killable(struct rw_semaphore *sem)
>  {
> -	if (unlikely(atomic_long_cmpxchg_acquire(&sem->count, 0,
> -						 RWSEM_WRITER_LOCKED)))
> -		if (IS_ERR(rwsem_down_write_failed_killable(sem)))
> +	long tmp = RWSEM_UNLOCKED_VALUE;
> +
> +	if (unlikely(atomic_long_try_cmpxchg_acquire(&sem->count, &tmp,
> +						     RWSEM_WRITER_LOCKED))) {

also !

> +		if (IS_ERR(rwsem_down_write_slow(sem, TASK_KILLABLE)))
>  			return -EINTR;
> +	}
>  	rwsem_set_owner(sem);
>  	return 0;
>  }

I'm having a great day it seems, it's like back in uni, trying to find
all the missing - signs in this page-long DE.