From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joonas Lahtinen Subject: Re: [PATCH v2 3/3] drm/i915/shrinker: Hook up vmap allocation failure notifier Date: Tue, 05 Apr 2016 11:19:38 +0300 Message-ID: <1459844378.5564.12.camel@linux.intel.com> References: <1459777603-23618-1-git-send-email-chris@chris-wilson.co.uk> <1459777603-23618-4-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 0530C6E025 for ; Tue, 5 Apr 2016 08:18:49 +0000 (UTC) In-Reply-To: <1459777603-23618-4-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , intel-gfx@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Roman Pen , linux-mm@kvack.org, David Rientjes , Andrew Morton , Mel Gorman List-Id: intel-gfx@lists.freedesktop.org T24gbWEsIDIwMTYtMDQtMDQgYXQgMTQ6NDYgKzAxMDAsIENocmlzIFdpbHNvbiB3cm90ZToKPiBJ ZiB0aGUgY29yZSBydW5zIG91dCBvZiB2bWFwIGFkZHJlc3Mgc3BhY2UsIGl0IHdpbGwgY2FsbCBh IG5vdGlmaWVyIGluCj4gY2FzZSBhbnkgZHJpdmVyIGNhbiByZWFwIHNvbWUgb2YgaXRzIHZtYXBz LiBBcyBpOTE1LmtvIGlzIHBvc3NpYmlseQo+IGhvbGRpbmcgb250byB2bWFwIGFkZHJlc3Mgc3Bh Y2UgdGhhdCBjb3VsZCBiZSByZWNvdmVyZWQsIGhvb2sgaW50byB0aGUKPiBub3RpZmllciBjaGFp biBhbmQgdHJ5IGFuZCByZWFwIG9iamVjdHMgaG9sZGluZyBvbnRvIHZtYXBzLgo+IAo+IFNpZ25l ZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+IENjOiBB bmRyZXcgTW9ydG9uIDxha3BtQGxpbnV4LWZvdW5kYXRpb24ub3JnPgo+IENjOiBEYXZpZCBSaWVu dGplcyA8cmllbnRqZXNAZ29vZ2xlLmNvbT4KPiBDYzogUm9tYW4gUGVuIDxyLnBlbmlhZXZAZ21h aWwuY29tPgo+IENjOiBNZWwgR29ybWFuIDxtZ29ybWFuQHRlY2hzaW5ndWxhcml0eS5uZXQ+Cj4g Q2M6IGxpbnV4LW1tQGt2YWNrLm9yZwo+IENjOiBsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3Jn Cj4gQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4K CkEgY29tbWVudCBiZWxvdy4gQnV0IHJlZ2FyZGxlc3M7CgpSZXZpZXdlZC1ieTogSm9vbmFzIExh aHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgoKPiBDYzogVHZydGtvIFVy c3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KPiBDYzogTWlrYSBLYWhvbGEgPG1pa2Eu a2Fob2xhQGludGVsLmNvbT4KPiAtLS0KPiDCoGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmjCoMKgwqDCoMKgwqDCoMKgwqDCoHzCoMKgMSArCj4gwqBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9zaHJpbmtlci5jIHwgMzkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysK PiDCoDIgZmlsZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKQo+IAo+IGRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaAo+IGluZGV4IGRkMTg3NzI3YzgxMy4uNjQ0Mzc0NWQ0MTgyIDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCj4gQEAgLTEyNTcsNiArMTI1Nyw3IEBAIHN0cnVjdCBpOTE1X2dlbV9t bSB7Cj4gwqAJc3RydWN0IGk5MTVfaHdfcHBndHQgKmFsaWFzaW5nX3BwZ3R0Owo+IMKgCj4gwqAJ c3RydWN0IG5vdGlmaWVyX2Jsb2NrIG9vbV9ub3RpZmllcjsKPiArCXN0cnVjdCBub3RpZmllcl9i bG9jayB2bWFwX25vdGlmaWVyOwo+IMKgCXN0cnVjdCBzaHJpbmtlciBzaHJpbmtlcjsKPiDCoAli b29sIHNocmlua2VyX25vX2xvY2tfc3RlYWxpbmc7Cj4gwqAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc2hyaW5rZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX3Nocmlua2VyLmMKPiBpbmRleCBlMzkxZWUzZWM0ODYuLmJlNzUwMWFmYjU5ZSAx MDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zaHJpbmtlci5jCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc2hyaW5rZXIuYwo+IEBAIC0yOCw2 ICsyOCw3IEBACj4gwqAjaW5jbHVkZSAKPiDCoCNpbmNsdWRlIAo+IMKgI2luY2x1ZGUgCj4gKyNp bmNsdWRlIAo+IMKgI2luY2x1ZGUgCj4gwqAjaW5jbHVkZSAKPiDCoAo+IEBAIC0zNTYsNiArMzU3 LDQwIEBAIGk5MTVfZ2VtX3Nocmlua2VyX29vbShzdHJ1Y3Qgbm90aWZpZXJfYmxvY2sgKm5iLCB1 bnNpZ25lZCBsb25nIGV2ZW50LCB2b2lkICpwdHIpCj4gwqAJcmV0dXJuIE5PVElGWV9ET05FOwo+ IMKgfQo+IMKgCj4gK3N0YXRpYyBpbnQKPiAraTkxNV9nZW1fc2hyaW5rZXJfdm1hcChzdHJ1Y3Qg bm90aWZpZXJfYmxvY2sgKm5iLCB1bnNpZ25lZCBsb25nIGV2ZW50LCB2b2lkICpwdHIpCj4gK3sK PiArCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9Cj4gKwkJY29udGFpbmVyX29m KG5iLCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSwgbW0udm1hcF9ub3RpZmllcik7Cj4gKwlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKPiArCXVuc2lnbmVkIGxvbmcgdGlt ZW91dCA9IG1zZWNzX3RvX2ppZmZpZXMoNTAwMCkgKyAxOwo+ICsJdW5zaWduZWQgbG9uZyBmcmVl ZF9wYWdlczsKPiArCWJvb2wgd2FzX2ludGVycnVwdGlibGU7Cj4gKwlib29sIHVubG9jazsKPiAr Cj4gKwl3aGlsZSAoIWk5MTVfZ2VtX3Nocmlua2VyX2xvY2soZGV2LCAmdW5sb2NrKSAmJiAtLXRp bWVvdXQpIHsKPiArCQlzY2hlZHVsZV90aW1lb3V0X2tpbGxhYmxlKDEpOwo+ICsJCWlmIChmYXRh bF9zaWduYWxfcGVuZGluZyhjdXJyZW50KSkKPiArCQkJcmV0dXJuIE5PVElGWV9ET05FOwo+ICsJ fQo+ICsJaWYgKHRpbWVvdXQgPT0gMCkgewo+ICsJCXByX2VycigiVW5hYmxlIHRvIHB1cmdlIEdQ VSB2bWFwcyBkdWUgdG8gbG9jayBjb250ZW50aW9uLlxuIik7Cj4gKwkJcmV0dXJuIE5PVElGWV9E T05FOwo+ICsJfQo+ICsKPiArCXdhc19pbnRlcnJ1cHRpYmxlID0gZGV2X3ByaXYtPm1tLmludGVy cnVwdGlibGU7Cj4gKwlkZXZfcHJpdi0+bW0uaW50ZXJydXB0aWJsZSA9IGZhbHNlOwo+ICsKPiAr CWZyZWVkX3BhZ2VzID0gaTkxNV9nZW1fc2hyaW5rX2FsbChkZXZfcHJpdik7Cj4gKwo+ICsJZGV2 X3ByaXYtPm1tLmludGVycnVwdGlibGUgPSB3YXNfaW50ZXJydXB0aWJsZTsKClVwIHVudGlsIGhl cmUgdGhpcyBpcyBzYW1lIGZ1bmN0aW9uIGFzIHRoZSBvb20gc2hyaW5rZXIsIHNvIEkgd291bGQK Y29tYmluZSB0aGVzZSB0d28gYW5kIGhlcmUgZG8gImlmICh2bWFwKSBnb3RvIG91dDsiIHNvcnQg b2YgdGhpbmcuCgpXb3VsZCBqdXN0IG5lZWQgYSB3YXkgdG8gZGlzdGluY3QgYmV0d2VlbiB0d28g Y2FsbGluZyBzaXRlcy4gSSBkaWQgbm90CmNvbWUgdXAgd2l0aCBhIHF1aWNrIHNvbHV0aW9uIGFz IGJvdGggYXJlIHBhc3NpbmcgMCBhcyBldmVudC4KClJlZ2FyZHMsIEpvb25hcwoKPiArCWlmICh1 bmxvY2spCj4gKwkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4gKwo+ICsJKih1 bnNpZ25lZCBsb25nICopcHRyICs9IGZyZWVkX3BhZ2VzOwo+ICsJcmV0dXJuIE5PVElGWV9ET05F Owo+ICt9Cj4gKwo+IMKgLyoqCj4gwqAgKiBpOTE1X2dlbV9zaHJpbmtlcl9pbml0IC0gSW5pdGlh bGl6ZSBpOTE1IHNocmlua2VyCj4gwqAgKiBAZGV2X3ByaXY6IGk5MTUgZGV2aWNlCj4gQEAgLTM3 MSw2ICs0MDYsOSBAQCB2b2lkIGk5MTVfZ2VtX3Nocmlua2VyX2luaXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQo+IMKgCj4gwqAJZGV2X3ByaXYtPm1tLm9vbV9ub3RpZmllci5u b3RpZmllcl9jYWxsID0gaTkxNV9nZW1fc2hyaW5rZXJfb29tOwo+IMKgCVdBUk5fT04ocmVnaXN0 ZXJfb29tX25vdGlmaWVyKCZkZXZfcHJpdi0+bW0ub29tX25vdGlmaWVyKSk7Cj4gKwo+ICsJZGV2 X3ByaXYtPm1tLnZtYXBfbm90aWZpZXIubm90aWZpZXJfY2FsbCA9IGk5MTVfZ2VtX3Nocmlua2Vy X3ZtYXA7Cj4gKwlXQVJOX09OKHJlZ2lzdGVyX3ZtYXBfcHVyZ2Vfbm90aWZpZXIoJmRldl9wcml2 LT5tbS52bWFwX25vdGlmaWVyKSk7Cj4gwqB9Cj4gwqAKPiDCoC8qKgo+IEBAIC0zODEsNiArNDE5 LDcgQEAgdm9pZCBpOTE1X2dlbV9zaHJpbmtlcl9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKPiDCoCAqLwo+IMKgdm9pZCBpOTE1X2dlbV9zaHJpbmtlcl9jbGVhbnVwKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiDCoHsKPiArCVdBUk5fT04odW5yZWdp c3Rlcl92bWFwX3B1cmdlX25vdGlmaWVyKCZkZXZfcHJpdi0+bW0udm1hcF9ub3RpZmllcikpOwo+ IMKgCVdBUk5fT04odW5yZWdpc3Rlcl9vb21fbm90aWZpZXIoJmRldl9wcml2LT5tbS5vb21fbm90 aWZpZXIpKTsKPiDCoAl1bnJlZ2lzdGVyX3Nocmlua2VyKCZkZXZfcHJpdi0+bW0uc2hyaW5rZXIp Owo+IMKgfQotLSAKSm9vbmFzIExhaHRpbmVuCk9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVy CkludGVsIENvcnBvcmF0aW9uCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by kanga.kvack.org (Postfix) with ESMTP id CAB9C6B0005 for ; Tue, 5 Apr 2016 04:18:50 -0400 (EDT) Received: by mail-pf0-f180.google.com with SMTP id 184so6260468pff.0 for ; Tue, 05 Apr 2016 01:18:50 -0700 (PDT) Received: from mga04.intel.com (mga04.intel.com. [192.55.52.120]) by mx.google.com with ESMTP id yi4si1461583pac.177.2016.04.05.01.18.49 for ; Tue, 05 Apr 2016 01:18:50 -0700 (PDT) Message-ID: <1459844378.5564.12.camel@linux.intel.com> Subject: Re: [PATCH v2 3/3] drm/i915/shrinker: Hook up vmap allocation failure notifier From: Joonas Lahtinen Date: Tue, 05 Apr 2016 11:19:38 +0300 In-Reply-To: <1459777603-23618-4-git-send-email-chris@chris-wilson.co.uk> References: <1459777603-23618-1-git-send-email-chris@chris-wilson.co.uk> <1459777603-23618-4-git-send-email-chris@chris-wilson.co.uk> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: To: Chris Wilson , intel-gfx@lists.freedesktop.org Cc: Andrew Morton , David Rientjes , Roman Pen , Mel Gorman , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tvrtko Ursulin , Mika Kahola On ma, 2016-04-04 at 14:46 +0100, Chris Wilson wrote: > If the core runs out of vmap address space, it will call a notifier in > case any driver can reap some of its vmaps. As i915.ko is possibily > holding onto vmap address space that could be recovered, hook into the > notifier chain and try and reap objects holding onto vmaps. > > Signed-off-by: Chris Wilson > Cc: Andrew Morton > Cc: David Rientjes > Cc: Roman Pen > Cc: Mel Gorman > Cc: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org > Cc: Joonas Lahtinen A comment below. But regardless; Reviewed-by: Joonas Lahtinen > Cc: Tvrtko Ursulin > Cc: Mika Kahola > --- > A drivers/gpu/drm/i915/i915_drv.hA A A A A A A A A A |A A 1 + > A drivers/gpu/drm/i915/i915_gem_shrinker.c | 39 ++++++++++++++++++++++++++++++++ > A 2 files changed, 40 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index dd187727c813..6443745d4182 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1257,6 +1257,7 @@ struct i915_gem_mm { > A struct i915_hw_ppgtt *aliasing_ppgtt; > A > A struct notifier_block oom_notifier; > + struct notifier_block vmap_notifier; > A struct shrinker shrinker; > A bool shrinker_no_lock_stealing; > A > diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c > index e391ee3ec486..be7501afb59e 100644 > --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c > +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c > @@ -28,6 +28,7 @@ > A #include > A #include > A #include > +#include > A #include > A #include > A > @@ -356,6 +357,40 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr) > A return NOTIFY_DONE; > A } > A > +static int > +i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr) > +{ > + struct drm_i915_private *dev_priv = > + container_of(nb, struct drm_i915_private, mm.vmap_notifier); > + struct drm_device *dev = dev_priv->dev; > + unsigned long timeout = msecs_to_jiffies(5000) + 1; > + unsigned long freed_pages; > + bool was_interruptible; > + bool unlock; > + > + while (!i915_gem_shrinker_lock(dev, &unlock) && --timeout) { > + schedule_timeout_killable(1); > + if (fatal_signal_pending(current)) > + return NOTIFY_DONE; > + } > + if (timeout == 0) { > + pr_err("Unable to purge GPU vmaps due to lock contention.\n"); > + return NOTIFY_DONE; > + } > + > + was_interruptible = dev_priv->mm.interruptible; > + dev_priv->mm.interruptible = false; > + > + freed_pages = i915_gem_shrink_all(dev_priv); > + > + dev_priv->mm.interruptible = was_interruptible; Up until here this is same function as the oom shrinker, so I would combine these two and here do "if (vmap) goto out;" sort of thing. Would just need a way to distinct between two calling sites. I did not come up with a quick solution as both are passing 0 as event. Regards, Joonas > + if (unlock) > + mutex_unlock(&dev->struct_mutex); > + > + *(unsigned long *)ptr += freed_pages; > + return NOTIFY_DONE; > +} > + > A /** > A * i915_gem_shrinker_init - Initialize i915 shrinker > A * @dev_priv: i915 device > @@ -371,6 +406,9 @@ void i915_gem_shrinker_init(struct drm_i915_private *dev_priv) > A > A dev_priv->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom; > A WARN_ON(register_oom_notifier(&dev_priv->mm.oom_notifier)); > + > + dev_priv->mm.vmap_notifier.notifier_call = i915_gem_shrinker_vmap; > + WARN_ON(register_vmap_purge_notifier(&dev_priv->mm.vmap_notifier)); > A } > A > A /** > @@ -381,6 +419,7 @@ void i915_gem_shrinker_init(struct drm_i915_private *dev_priv) > A */ > A void i915_gem_shrinker_cleanup(struct drm_i915_private *dev_priv) > A { > + WARN_ON(unregister_vmap_purge_notifier(&dev_priv->mm.vmap_notifier)); > A WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier)); > A unregister_shrinker(&dev_priv->mm.shrinker); > A } -- Joonas Lahtinen Open Source Technology Center Intel Corporation -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756695AbcDEISy (ORCPT ); Tue, 5 Apr 2016 04:18:54 -0400 Received: from mga11.intel.com ([192.55.52.93]:59262 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751195AbcDEISv (ORCPT ); Tue, 5 Apr 2016 04:18:51 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,443,1455004800"; d="scan'208";a="948255026" Message-ID: <1459844378.5564.12.camel@linux.intel.com> Subject: Re: [PATCH v2 3/3] drm/i915/shrinker: Hook up vmap allocation failure notifier From: Joonas Lahtinen To: Chris Wilson , intel-gfx@lists.freedesktop.org Cc: Andrew Morton , David Rientjes , Roman Pen , Mel Gorman , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tvrtko Ursulin , Mika Kahola Date: Tue, 05 Apr 2016 11:19:38 +0300 In-Reply-To: <1459777603-23618-4-git-send-email-chris@chris-wilson.co.uk> References: <1459777603-23618-1-git-send-email-chris@chris-wilson.co.uk> <1459777603-23618-4-git-send-email-chris@chris-wilson.co.uk> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.2 (3.18.5.2-1.fc23) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On ma, 2016-04-04 at 14:46 +0100, Chris Wilson wrote: > If the core runs out of vmap address space, it will call a notifier in > case any driver can reap some of its vmaps. As i915.ko is possibily > holding onto vmap address space that could be recovered, hook into the > notifier chain and try and reap objects holding onto vmaps. > > Signed-off-by: Chris Wilson > Cc: Andrew Morton > Cc: David Rientjes > Cc: Roman Pen > Cc: Mel Gorman > Cc: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org > Cc: Joonas Lahtinen A comment below. But regardless; Reviewed-by: Joonas Lahtinen > Cc: Tvrtko Ursulin > Cc: Mika Kahola > --- >  drivers/gpu/drm/i915/i915_drv.h          |  1 + >  drivers/gpu/drm/i915/i915_gem_shrinker.c | 39 ++++++++++++++++++++++++++++++++ >  2 files changed, 40 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index dd187727c813..6443745d4182 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1257,6 +1257,7 @@ struct i915_gem_mm { >   struct i915_hw_ppgtt *aliasing_ppgtt; >   >   struct notifier_block oom_notifier; > + struct notifier_block vmap_notifier; >   struct shrinker shrinker; >   bool shrinker_no_lock_stealing; >   > diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c > index e391ee3ec486..be7501afb59e 100644 > --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c > +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c > @@ -28,6 +28,7 @@ >  #include >  #include >  #include > +#include >  #include >  #include >   > @@ -356,6 +357,40 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr) >   return NOTIFY_DONE; >  } >   > +static int > +i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr) > +{ > + struct drm_i915_private *dev_priv = > + container_of(nb, struct drm_i915_private, mm.vmap_notifier); > + struct drm_device *dev = dev_priv->dev; > + unsigned long timeout = msecs_to_jiffies(5000) + 1; > + unsigned long freed_pages; > + bool was_interruptible; > + bool unlock; > + > + while (!i915_gem_shrinker_lock(dev, &unlock) && --timeout) { > + schedule_timeout_killable(1); > + if (fatal_signal_pending(current)) > + return NOTIFY_DONE; > + } > + if (timeout == 0) { > + pr_err("Unable to purge GPU vmaps due to lock contention.\n"); > + return NOTIFY_DONE; > + } > + > + was_interruptible = dev_priv->mm.interruptible; > + dev_priv->mm.interruptible = false; > + > + freed_pages = i915_gem_shrink_all(dev_priv); > + > + dev_priv->mm.interruptible = was_interruptible; Up until here this is same function as the oom shrinker, so I would combine these two and here do "if (vmap) goto out;" sort of thing. Would just need a way to distinct between two calling sites. I did not come up with a quick solution as both are passing 0 as event. Regards, Joonas > + if (unlock) > + mutex_unlock(&dev->struct_mutex); > + > + *(unsigned long *)ptr += freed_pages; > + return NOTIFY_DONE; > +} > + >  /** >   * i915_gem_shrinker_init - Initialize i915 shrinker >   * @dev_priv: i915 device > @@ -371,6 +406,9 @@ void i915_gem_shrinker_init(struct drm_i915_private *dev_priv) >   >   dev_priv->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom; >   WARN_ON(register_oom_notifier(&dev_priv->mm.oom_notifier)); > + > + dev_priv->mm.vmap_notifier.notifier_call = i915_gem_shrinker_vmap; > + WARN_ON(register_vmap_purge_notifier(&dev_priv->mm.vmap_notifier)); >  } >   >  /** > @@ -381,6 +419,7 @@ void i915_gem_shrinker_init(struct drm_i915_private *dev_priv) >   */ >  void i915_gem_shrinker_cleanup(struct drm_i915_private *dev_priv) >  { > + WARN_ON(unregister_vmap_purge_notifier(&dev_priv->mm.vmap_notifier)); >   WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier)); >   unregister_shrinker(&dev_priv->mm.shrinker); >  } -- Joonas Lahtinen Open Source Technology Center Intel Corporation