From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Zijlstra Subject: Re: [PATCH v2 04/11] locking/ww_mutex: Set use_ww_ctx even when locking without a context Date: Tue, 6 Dec 2016 16:14:59 +0100 Message-ID: <20161206151459.GU3045@worktop.programming.kicks-ass.net> References: <1480601214-26583-1-git-send-email-nhaehnle@gmail.com> <1480601214-26583-5-git-send-email-nhaehnle@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 582566E0AD for ; Tue, 6 Dec 2016 15:15:13 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1480601214-26583-5-git-send-email-nhaehnle@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Nicolai =?iso-8859-1?Q?H=E4hnle?= Cc: Maarten Lankhorst , Nicolai =?iso-8859-1?Q?H=E4hnle?= , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Ingo Molnar List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBEZWMgMDEsIDIwMTYgYXQgMDM6MDY6NDdQTSArMDEwMCwgTmljb2xhaSBIw6Robmxl IHdyb3RlOgo+ICsrKyBiL2luY2x1ZGUvbGludXgvd3dfbXV0ZXguaAo+IEBAIC0yMjIsMTEgKzIy Miw3IEBAIGV4dGVybiBpbnQgX19tdXN0X2NoZWNrIF9fd3dfbXV0ZXhfbG9ja19pbnRlcnJ1cHRp YmxlKHN0cnVjdCB3d19tdXRleCAqbG9jaywKPiAgICovCj4gIHN0YXRpYyBpbmxpbmUgaW50IHd3 X211dGV4X2xvY2soc3RydWN0IHd3X211dGV4ICpsb2NrLCBzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHgg KmN0eCkKPiAgewo+IC0JaWYgKGN0eCkKPiAtCQlyZXR1cm4gX193d19tdXRleF9sb2NrKGxvY2ss IGN0eCk7Cj4gLQo+IC0JbXV0ZXhfbG9jaygmbG9jay0+YmFzZSk7Cj4gLQlyZXR1cm4gMDsKPiAr CXJldHVybiBfX3d3X211dGV4X2xvY2sobG9jaywgY3R4KTsKPiAgfQo+ICAKPiAgLyoqCj4gQEAg LTI2MiwxMCArMjU4LDcgQEAgc3RhdGljIGlubGluZSBpbnQgd3dfbXV0ZXhfbG9jayhzdHJ1Y3Qg d3dfbXV0ZXggKmxvY2ssIHN0cnVjdCB3d19hY3F1aXJlX2N0eCAqY3QKPiAgc3RhdGljIGlubGlu ZSBpbnQgX19tdXN0X2NoZWNrIHd3X211dGV4X2xvY2tfaW50ZXJydXB0aWJsZShzdHJ1Y3Qgd3df bXV0ZXggKmxvY2ssCj4gIAkJCQkJCQkgICBzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggKmN0eCkKPiAg ewo+IC0JaWYgKGN0eCkKPiAtCQlyZXR1cm4gX193d19tdXRleF9sb2NrX2ludGVycnVwdGlibGUo bG9jaywgY3R4KTsKPiAtCWVsc2UKPiAtCQlyZXR1cm4gbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxl KCZsb2NrLT5iYXNlKTsKPiArCXJldHVybiBfX3d3X211dGV4X2xvY2tfaW50ZXJydXB0aWJsZShs b2NrLCBjdHgpOwo+ICB9Cj4gIAoKQWZ0ZXIgdGhpcyB0aGUgZW50aXJlIHBvaW50IG9mIF9fd3df bXV0ZXhfbG9jayooKSBpcyBnb25lLCByaWdodD8gTWlnaHQKYXMgd2VsbCByZW5hbWUgdGhlbSB0 byB3d19tdXRleF9sb2NrKCkgYW5kIHJlbW92ZSB0aGlzIHBvaW50bGVzcwp3cmFwcGVyLgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753510AbcLFPPU (ORCPT ); Tue, 6 Dec 2016 10:15:20 -0500 Received: from merlin.infradead.org ([205.233.59.134]:36824 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751798AbcLFPPT (ORCPT ); Tue, 6 Dec 2016 10:15:19 -0500 Date: Tue, 6 Dec 2016 16:14:59 +0100 From: Peter Zijlstra To: Nicolai =?iso-8859-1?Q?H=E4hnle?= Cc: linux-kernel@vger.kernel.org, Nicolai =?iso-8859-1?Q?H=E4hnle?= , Ingo Molnar , Maarten Lankhorst , Daniel Vetter , Chris Wilson , dri-devel@lists.freedesktop.org Subject: Re: [PATCH v2 04/11] locking/ww_mutex: Set use_ww_ctx even when locking without a context Message-ID: <20161206151459.GU3045@worktop.programming.kicks-ass.net> References: <1480601214-26583-1-git-send-email-nhaehnle@gmail.com> <1480601214-26583-5-git-send-email-nhaehnle@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1480601214-26583-5-git-send-email-nhaehnle@gmail.com> User-Agent: Mutt/1.5.22.1 (2013-10-16) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 01, 2016 at 03:06:47PM +0100, Nicolai Hähnle wrote: > +++ b/include/linux/ww_mutex.h > @@ -222,11 +222,7 @@ extern int __must_check __ww_mutex_lock_interruptible(struct ww_mutex *lock, > */ > static inline int ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx) > { > - if (ctx) > - return __ww_mutex_lock(lock, ctx); > - > - mutex_lock(&lock->base); > - return 0; > + return __ww_mutex_lock(lock, ctx); > } > > /** > @@ -262,10 +258,7 @@ static inline int ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ct > static inline int __must_check ww_mutex_lock_interruptible(struct ww_mutex *lock, > struct ww_acquire_ctx *ctx) > { > - if (ctx) > - return __ww_mutex_lock_interruptible(lock, ctx); > - else > - return mutex_lock_interruptible(&lock->base); > + return __ww_mutex_lock_interruptible(lock, ctx); > } > After this the entire point of __ww_mutex_lock*() is gone, right? Might as well rename them to ww_mutex_lock() and remove this pointless wrapper.