From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Do not drop pagetables when empty Date: Thu, 15 Jun 2017 08:51:34 +0300 Message-ID: <87a859ztll.fsf@intel.com> References: <20170614170728.GA30101@eric-macbookpro.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id D64096E6A0 for ; Thu, 15 Jun 2017 05:51:38 +0000 (UTC) In-Reply-To: <20170614170728.GA30101@eric-macbookpro.localdomain> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Eric Blau , stable@vger.kernel.org Cc: intel-gfx@lists.freedesktop.org, Daniel Vetter , Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCAxNCBKdW4gMjAxNywgRXJpYyBCbGF1IDxlYmxhdUBlYmxhdS5jb20+IHdyb3RlOgo+ IENhbiB0aGUgZm9sbG93aW5nIHBhdGNoIHBsZWFzZSBiZSBpbmNsdWRlZCBpbiB0aGUgbmV4dCBz dGFibGUgcmVsZWFzZT8KPiBJdCBsb29rcyBsaWtlIGl0IHdhcyBzdWJtaXR0ZWQgcHJldmlvdXNs eSBieSBEYW5pZWwgVmV0dGVyLCBidXQgaGFzIG5vdAo+IGJlZW4gaW5jbHVkZWQgaW4gNC4xMS55 IHlldC4gVGhhbmtzLgoKVGhlIHByZXZpb3VzIHN1Ym1pc3Npb24gd291bGQgYmUgWzFdLiBQbGVh c2UgcmVmZXJlbmNlIHRoYXQgaW5zdGVhZCBvZgpyZXNlbmRpbmcgcGF0Y2hlcyB3aXRoIGluY29t cGxldGUgdXBzdHJlYW0gcmVmZXJlbmNlcy4gVGhhbmsgeW91LgoKQlIsCkphbmkuCgoKWzFdIGh0 dHA6Ly9taWQubWFpbC1hcmNoaXZlLmNvbS8yMDE3MDUyNjA4MjkwNi44OTgyLTEtZGFuaWVsLnZl dHRlckBmZndsbC5jaAoKPiBGcm9tIDY0YjFkODlmMzU4ZGYzNDcwMWQ5MjQ3MWI2NWY5OWY0ZWZm MWIzODQgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCj4gRnJvbTogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+Cj4gRGF0ZTogVGh1LCAxOCBNYXkgMjAxNyAxMTowMDoxNSAr MDEwMAo+IFN1YmplY3Q6IFtQQVRDSF0gZHJtL2k5MTU6IERvIG5vdCBkcm9wIHBhZ2V0YWJsZXMg d2hlbiBlbXB0eQo+IE1JTUUtVmVyc2lvbjogMS4wCj4gQ29udGVudC1UeXBlOiB0ZXh0L3BsYWlu OyBjaGFyc2V0PVVURi04Cj4gQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogOGJpdAo+Cj4gRHVl IHRvIGEgcmFjZSB3aXRoIHRoZSBzaHJpbmtlciwgd2hlbiB3ZSB0cnkgdG8gYWxsb2NhdGUgYSBw YWdldGFibGUsIHdlCj4gbWF5IGVuZCB1cCBzaHJpbmtpbmcgaXQgaW5zdGVhZC4gVGhpcyBjb21l cyBhcyBhIG5hc3R5IHN1cnByaXNlIGFzIHdlCj4gdHJ5IHRvIGRlcmVmZXJlbmNlIGl0IHRvIGZp bGwgaW4gdGhlIHBhZ2V0YWJsZSBlbnRyaWVzIGZvciB0aGUgb2JqZWN0Lgo+Cj4gSW4gbGludXMv bWFzdGVyIHRoaXMgaXMgZml4ZWQgYnkgcGlubmluZyB0aGUgcGFnZXRhYmxlcyBwcmlvciB0bwo+ IGFsbG9jYXRpb24sIGJ1dCB0aGF0IGJhY2twb3J0IGlzIHJvdWdobHkKPiAgZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgICB8ICAgIDIgKy0KPiAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZXZpY3QuYyB8ICAgMTIgKy0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZ3R0LmMgICB8IDIwMTcgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCj4g IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oICAgfCAgMTIzICstCj4gIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaCAgICAgfCAgMTA0IC0tCj4gIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfdmdwdS5jICAgICAgfCAgICA5ICstCj4gIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfdm1hLmMgICAgICAgfCAgICA5IC0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMgICAgICB8ICAgIDQgKy0KPiAgOCBmaWxlcyBjaGFuZ2VkLCA5NDYgaW5zZXJ0aW9u cygrKSwgMTMzNCBkZWxldGlvbnMoLSkKPiBpLmUuIHVuc3VpdGFibGUgZm9yIHN0YWJsZS4gSW5z dGVhZCB3ZSBuZXV0ZXIgdGhlIGNvZGUgdGhhdCB0cmllZCB0bwo+IGZyZWUgdGhlIHBhZ2V0YWJs ZXMuCj4KPiBCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTkyOTUKPiBGaXhlczogMmNlNTE3OWZlODI2ICgiZHJtL2k5MTUvZ3R0OiBGcmVlIHVu dXNlZCBsb3dlci1sZXZlbCBwYWdlIHRhYmxlcyIpCj4gU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Cj4gQ2M6IE1pY2hlbCBUaGllcnJ5IDxtaWNo ZWwudGhpZXJyeUBpbnRlbC5jb20+Cj4gQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFA aW50ZWwuY29tPgo+IENjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K PiBDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgo+ IENjOiBNaWNoYcWCIFdpbmlhcnNraSA8bWljaGFsLndpbmlhcnNraUBpbnRlbC5jb20+Cj4gQ2M6 IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgo+IENjOiBKYW5pIE5pa3Vs YSA8amFuaS5uaWt1bGFAbGludXguaW50ZWwuY29tPgo+IENjOiBpbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCj4gQ2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3JnPiAjIHY0LjEwKwo+IC0t LQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDEwIC0tLS0tLS0tLS0K PiAgMSBmaWxlIGNoYW5nZWQsIDEwIGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZ3R0LmMKPiBpbmRleCA5NmU0NWE0ZDU0NDEuLjRmNTgxYWRmMmZjZiAxMDA2NDQKPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwo+ICsrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCj4gQEAgLTc1NSwxMCArNzU1LDYgQEAgc3RhdGlj IGJvb2wgZ2VuOF9wcGd0dF9jbGVhcl9wdChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwK PiAgCUdFTV9CVUdfT04ocHRlX2VuZCA+IEdFTjhfUFRFUyk7Cj4gIAo+ICAJYml0bWFwX2NsZWFy KHB0LT51c2VkX3B0ZXMsIHB0ZSwgbnVtX2VudHJpZXMpOwo+IC0JaWYgKFVTRVNfRlVMTF9QUEdU VCh2bS0+aTkxNSkpIHsKPiAtCQlpZiAoYml0bWFwX2VtcHR5KHB0LT51c2VkX3B0ZXMsIEdFTjhf UFRFUykpCj4gLQkJCXJldHVybiB0cnVlOwo+IC0JfQo+ICAKPiAgCXB0X3ZhZGRyID0ga21hcF9w eChwdCk7Cj4gIAo+IEBAIC03OTgsOSArNzk0LDYgQEAgc3RhdGljIGJvb2wgZ2VuOF9wcGd0dF9j bGVhcl9wZChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKPiAgCQl9Cj4gIAl9Cj4gIAo+ IC0JaWYgKGJpdG1hcF9lbXB0eShwZC0+dXNlZF9wZGVzLCBJOTE1X1BERVMpKQo+IC0JCXJldHVy biB0cnVlOwo+IC0KPiAgCXJldHVybiBmYWxzZTsKPiAgfQo+ICAKPiBAQCAtODI5LDkgKzgyMiw2 IEBAIHN0YXRpYyBib29sIGdlbjhfcHBndHRfY2xlYXJfcGRwKHN0cnVjdCBpOTE1X2FkZHJlc3Nf c3BhY2UgKnZtLAo+ICAKPiAgCW1hcmtfdGxic19kaXJ0eShwcGd0dCk7Cj4gIAo+IC0JaWYgKGJp dG1hcF9lbXB0eShwZHAtPnVzZWRfcGRwZXMsIEk5MTVfUERQRVNfUEVSX1BEUChkZXZfcHJpdikp KQo+IC0JCXJldHVybiB0cnVlOwo+IC0KPiAgCXJldHVybiBmYWxzZTsKPiAgfQo+ICAKPgoKLS0g CkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com ([134.134.136.24]:20364 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751727AbdFOFvj (ORCPT ); Thu, 15 Jun 2017 01:51:39 -0400 From: Jani Nikula To: Eric Blau , stable@vger.kernel.org Cc: Chris Wilson , Michel Thierry , Mika Kuoppala , Joonas Lahtinen , =?utf-8?Q?Micha=C5=82?= Winiarski , Daniel Vetter , intel-gfx@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: Do not drop pagetables when empty In-Reply-To: <20170614170728.GA30101@eric-macbookpro.localdomain> References: <20170614170728.GA30101@eric-macbookpro.localdomain> Date: Thu, 15 Jun 2017 08:51:34 +0300 Message-ID: <87a859ztll.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: stable-owner@vger.kernel.org List-ID: On Wed, 14 Jun 2017, Eric Blau wrote: > Can the following patch please be included in the next stable release? > It looks like it was submitted previously by Daniel Vetter, but has not > been included in 4.11.y yet. Thanks. The previous submission would be [1]. Please reference that instead of resending patches with incomplete upstream references. Thank you. BR, Jani. [1] http://mid.mail-archive.com/20170526082906.8982-1-daniel.vetter@ffwll.ch > From 64b1d89f358df34701d92471b65f99f4eff1b384 Mon Sep 17 00:00:00 2001 > From: Chris Wilson > Date: Thu, 18 May 2017 11:00:15 +0100 > Subject: [PATCH] drm/i915: Do not drop pagetables when empty > MIME-Version: 1.0 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > > Due to a race with the shrinker, when we try to allocate a pagetable, we > may end up shrinking it instead. This comes as a nasty surprise as we > try to dereference it to fill in the pagetable entries for the object. > > In linus/master this is fixed by pinning the pagetables prior to > allocation, but that backport is roughly > drivers/gpu/drm/i915/i915_debugfs.c | 2 +- > drivers/gpu/drm/i915/i915_gem_evict.c | 12 +- > drivers/gpu/drm/i915/i915_gem_gtt.c | 2017 ++++++++++++++------------------- > drivers/gpu/drm/i915/i915_gem_gtt.h | 123 +- > drivers/gpu/drm/i915/i915_trace.h | 104 -- > drivers/gpu/drm/i915/i915_vgpu.c | 9 +- > drivers/gpu/drm/i915/i915_vma.c | 9 - > drivers/gpu/drm/i915/intel_lrc.c | 4 +- > 8 files changed, 946 insertions(+), 1334 deletions(-) > i.e. unsuitable for stable. Instead we neuter the code that tried to > free the pagetables. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99295 > Fixes: 2ce5179fe826 ("drm/i915/gtt: Free unused lower-level page tables") > Signed-off-by: Chris Wilson > Cc: Michel Thierry > Cc: Mika Kuoppala > Cc: Chris Wilson > Cc: Joonas Lahtinen > Cc: Michał Winiarski > Cc: Daniel Vetter > Cc: Jani Nikula > Cc: intel-gfx@lists.freedesktop.org > Cc: # v4.10+ > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index 96e45a4d5441..4f581adf2fcf 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -755,10 +755,6 @@ static bool gen8_ppgtt_clear_pt(struct i915_address_space *vm, > GEM_BUG_ON(pte_end > GEN8_PTES); > > bitmap_clear(pt->used_ptes, pte, num_entries); > - if (USES_FULL_PPGTT(vm->i915)) { > - if (bitmap_empty(pt->used_ptes, GEN8_PTES)) > - return true; > - } > > pt_vaddr = kmap_px(pt); > > @@ -798,9 +794,6 @@ static bool gen8_ppgtt_clear_pd(struct i915_address_space *vm, > } > } > > - if (bitmap_empty(pd->used_pdes, I915_PDES)) > - return true; > - > return false; > } > > @@ -829,9 +822,6 @@ static bool gen8_ppgtt_clear_pdp(struct i915_address_space *vm, > > mark_tlbs_dirty(ppgtt); > > - if (bitmap_empty(pdp->used_pdpes, I915_PDPES_PER_PDP(dev_priv))) > - return true; > - > return false; > } > > -- Jani Nikula, Intel Open Source Technology Center