From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Zijlstra Subject: Re: [PATCH] drm/i915: annote drop_caches debugfs interface with lockdep Date: Mon, 13 Mar 2017 09:01:57 +0100 Message-ID: <20170313080157.GF3343@twins.programming.kicks-ass.net> References: <20170312192716.15172-1-daniel.vetter@ffwll.ch> <20170312205340.16202-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) by gabe.freedesktop.org (Postfix) with ESMTPS id D520E8969E for ; Mon, 13 Mar 2017 08:02:04 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20170312205340.16202-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: Daniel Vetter , Intel Graphics Development , Ingo Molnar , linux-kernel@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gU3VuLCBNYXIgMTIsIDIwMTcgYXQgMDk6NTM6NDBQTSArMDEwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKCj4gUGV0ZXIvSW5nbywKPiAKPiBXZSB3YW50IHRoaXMgdG8gdmFsaWRhdGUgdGhlIGk5 MTUgc2hyaW5rZXIgbG9ja2luZyBpbiBvdXIgZmFzdCB0ZXN0cwo+IHdpdGhvdXQgdGhyYXNoaW5n IGJhZGx5ICh0aGF0IHRha2VzIHRvbyBsb25nLCB3ZSBjYW4gb25seSB0aHJhc2ggaW4KPiB0aGUg ZXh0ZW5kZWQgcnVucykuIENhbiB5b3UgcGxzIHRha2UgYSBsb29rIGFuZCBpZiBpdCdzIG9rIGFj ayBmb3IKPiBtZXJnaW5nIHRocm91Z2ggZHJtLWludGVsLmdpdD8KCkh1cm0sIEkgd2FzIGdvaW5n IHRvIHJld29yayBhbGwgdGhhdCBzb29uaXNoOyBoYXZlIGEgbG9vayBoZXJlOgoKIGh0dHBzOi8v bGttbC5rZXJuZWwub3JnL3IvMjAxNzAzMDIxMzQwMzEuR0c2NTM2QHR3aW5zLnByb2dyYW1taW5n LmtpY2tzLWFzcy5uZXQKClRoZSBpbW1lZGlhdGUgcHJvYmxlbSBpcyB0aGF0IEkgbWFkZSB0aGUg YW5ub3RhdGlvbiBwcml2YXRlIHRvIG1tLwp0aGVyZSwgSSBzdXBwb3NlIEkgY291bGQgZml4IHRo YXQuCgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDIgKysK PiAga2VybmVsL2xvY2tpbmcvbG9ja2RlcC5jICAgICAgICAgICAgfCAyICsrCj4gIDIgZmlsZXMg Y2hhbmdlZCwgNCBpbnNlcnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz LmMKPiBpbmRleCA4MmZiMDA1YTVlMjIuLmZiZTc2MWEzZjViZCAxMDA2NDQKPiAtLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZGVidWdmcy5jCj4gQEAgLTQyNzMsNiArNDI3Myw3IEBAIGk5MTVfZHJvcF9jYWNo ZXNfc2V0KHZvaWQgKmRhdGEsIHU2NCB2YWwpCj4gIAlpZiAodmFsICYgKERST1BfUkVUSVJFIHwg RFJPUF9BQ1RJVkUpKQo+ICAJCWk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0cyhkZXZfcHJpdik7Cj4g IAo+ICsJbG9ja2RlcF9zZXRfY3VycmVudF9yZWNsYWltX3N0YXRlKEdGUF9LRVJORUwpOwo+ICAJ aWYgKHZhbCAmIERST1BfQk9VTkQpCj4gIAkJaTkxNV9nZW1fc2hyaW5rKGRldl9wcml2LCBMT05H X01BWCwgSTkxNV9TSFJJTktfQk9VTkQpOwo+ICAKPiBAQCAtNDI4MSw2ICs0MjgyLDcgQEAgaTkx NV9kcm9wX2NhY2hlc19zZXQodm9pZCAqZGF0YSwgdTY0IHZhbCkKPiAgCj4gIAlpZiAodmFsICYg RFJPUF9TSFJJTktfQUxMKQo+ICAJCWk5MTVfZ2VtX3Nocmlua19hbGwoZGV2X3ByaXYpOwo+ICsJ bG9ja2RlcF9jbGVhcl9jdXJyZW50X3JlY2xhaW1fc3RhdGUoKTsKPiAgCj4gIHVubG9jazoKPiAg CW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+IGRpZmYgLS1naXQgYS9rZXJuZWwv bG9ja2luZy9sb2NrZGVwLmMgYi9rZXJuZWwvbG9ja2luZy9sb2NrZGVwLmMKPiBpbmRleCAxMmUz OGMyMTNiNzAuLjUwOGNiZjMxZDQzZSAxMDA2NDQKPiAtLS0gYS9rZXJuZWwvbG9ja2luZy9sb2Nr ZGVwLmMKPiArKysgYi9rZXJuZWwvbG9ja2luZy9sb2NrZGVwLmMKPiBAQCAtMzg1NiwxMSArMzg1 NiwxMyBAQCB2b2lkIGxvY2tkZXBfc2V0X2N1cnJlbnRfcmVjbGFpbV9zdGF0ZShnZnBfdCBnZnBf bWFzaykKPiAgewo+ICAJY3VycmVudC0+bG9ja2RlcF9yZWNsYWltX2dmcCA9IGdmcF9tYXNrOwo+ ICB9Cj4gK0VYUE9SVF9TWU1CT0xfR1BMKGxvY2tkZXBfc2V0X2N1cnJlbnRfcmVjbGFpbV9zdGF0 ZSk7Cj4gIAo+ICB2b2lkIGxvY2tkZXBfY2xlYXJfY3VycmVudF9yZWNsYWltX3N0YXRlKHZvaWQp Cj4gIHsKPiAgCWN1cnJlbnQtPmxvY2tkZXBfcmVjbGFpbV9nZnAgPSAwOwo+ICB9Cj4gK0VYUE9S VF9TWU1CT0xfR1BMKGxvY2tkZXBfY2xlYXJfY3VycmVudF9yZWNsYWltX3N0YXRlKTsKPiAgCj4g ICNpZmRlZiBDT05GSUdfTE9DS19TVEFUCj4gIHN0YXRpYyBpbnQKPiAtLSAKPiAyLjExLjAKPiAK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751612AbdCMICS (ORCPT ); Mon, 13 Mar 2017 04:02:18 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:38363 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751072AbdCMICH (ORCPT ); Mon, 13 Mar 2017 04:02:07 -0400 Date: Mon, 13 Mar 2017 09:01:57 +0100 From: Peter Zijlstra To: Daniel Vetter Cc: Intel Graphics Development , Chris Wilson , Ingo Molnar , linux-kernel@vger.kernel.org, Daniel Vetter Subject: Re: [PATCH] drm/i915: annote drop_caches debugfs interface with lockdep Message-ID: <20170313080157.GF3343@twins.programming.kicks-ass.net> References: <20170312192716.15172-1-daniel.vetter@ffwll.ch> <20170312205340.16202-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170312205340.16202-1-daniel.vetter@ffwll.ch> User-Agent: Mutt/1.5.23.1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Mar 12, 2017 at 09:53:40PM +0100, Daniel Vetter wrote: > Peter/Ingo, > > We want this to validate the i915 shrinker locking in our fast tests > without thrashing badly (that takes too long, we can only thrash in > the extended runs). Can you pls take a look and if it's ok ack for > merging through drm-intel.git? Hurm, I was going to rework all that soonish; have a look here: https://lkml.kernel.org/r/20170302134031.GG6536@twins.programming.kicks-ass.net The immediate problem is that I made the annotation private to mm/ there, I suppose I could fix that. > --- > drivers/gpu/drm/i915/i915_debugfs.c | 2 ++ > kernel/locking/lockdep.c | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 82fb005a5e22..fbe761a3f5bd 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -4273,6 +4273,7 @@ i915_drop_caches_set(void *data, u64 val) > if (val & (DROP_RETIRE | DROP_ACTIVE)) > i915_gem_retire_requests(dev_priv); > > + lockdep_set_current_reclaim_state(GFP_KERNEL); > if (val & DROP_BOUND) > i915_gem_shrink(dev_priv, LONG_MAX, I915_SHRINK_BOUND); > > @@ -4281,6 +4282,7 @@ i915_drop_caches_set(void *data, u64 val) > > if (val & DROP_SHRINK_ALL) > i915_gem_shrink_all(dev_priv); > + lockdep_clear_current_reclaim_state(); > > unlock: > mutex_unlock(&dev->struct_mutex); > diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c > index 12e38c213b70..508cbf31d43e 100644 > --- a/kernel/locking/lockdep.c > +++ b/kernel/locking/lockdep.c > @@ -3856,11 +3856,13 @@ void lockdep_set_current_reclaim_state(gfp_t gfp_mask) > { > current->lockdep_reclaim_gfp = gfp_mask; > } > +EXPORT_SYMBOL_GPL(lockdep_set_current_reclaim_state); > > void lockdep_clear_current_reclaim_state(void) > { > current->lockdep_reclaim_gfp = 0; > } > +EXPORT_SYMBOL_GPL(lockdep_clear_current_reclaim_state); > > #ifdef CONFIG_LOCK_STAT > static int > -- > 2.11.0 >