From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 07/17] drm/i915: request THP for shmem backed objects Date: Tue, 16 May 2017 09:29:38 +0100 Message-ID: <20170516082948.28090-8-matthew.auld@intel.com> References: <20170516082948.28090-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 373156E2D6 for ; Tue, 16 May 2017 08:30:03 +0000 (UTC) In-Reply-To: <20170516082948.28090-1-matthew.auld@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Dave Hansen , Hugh Dickins , linux-mm@kvack.org List-Id: intel-gfx@lists.freedesktop.org RGVmYXVsdCB0byB0cmFuc3BhcmVudC1odWdlLXBhZ2VzIGZvciBzaG1lbSBiYWNrZWQgb2JqZWN0 cyB0aHJvdWdoIHRoZQpTSE1FTV9IVUdFX1dJVEhJTl9TSVpFIGh1Z2Ugb3B0aW9uLiBCZXN0IGVm Zm9ydCBvbmx5LgoKU2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50 ZWwuY29tPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwu Y29tPgpDYzogRGF2ZSBIYW5zZW4gPGRhdmUuaGFuc2VuQGludGVsLmNvbT4KQ2M6IERhbmllbCBW ZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4KQ2M6IEh1Z2ggRGlja2lucyA8aHVnaGRAZ29vZ2xlLmNv bT4KQ2M6IGxpbnV4LW1tQGt2YWNrLm9yZwotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgfCAxMCArKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDZhNWU4NjRkNzcxMC4uZTRlZTU0ZjBmNTVmIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTQzMDgsNiArNDMwOCwxNiBAQCBpOTE1X2dlbV9v YmplY3RfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTY0IHNpemUp CiAJbWFwcGluZyA9IG9iai0+YmFzZS5maWxwLT5mX21hcHBpbmc7CiAJbWFwcGluZ19zZXRfZ2Zw X21hc2sobWFwcGluZywgbWFzayk7CiAKKwkvKiBJZiBjb25maWd1cmVkIGF0dGVtcHQgdG8gdXNl IFRIUCB0aHJvdWdoIHNobWVtZnMuIFRoaXMgd2lsbAorCSAqIGVmZmVjdGl2ZWx5IGRlZmF1bHQg dG8gaHVnZS1wYWdlcyBmb3IgdGhpcyBtYXBwaW5nIGlmIGl0IG1ha2VzIHNlbnNlCisJICogZ2l2 ZW4gdGhlIG9iamVjdCBzaXplIGFuZCBIUEFHRV9QTURfU0laRS4gVGhpcyBpcyBiZXN0IGVmZm9y dCBvbmx5LgorCSAqLworI2lmZGVmIENPTkZJR19UUkFOU1BBUkVOVF9IVUdFX1BBR0VDQUNIRQor CWlmIChoYXNfdHJhbnNwYXJlbnRfaHVnZXBhZ2UoKSAmJgorCSAgICBIQVNfUEFHRV9TSVpFKGRl dl9wcml2LCBIUEFHRV9QTURfU0laRSkpCisJCVNITUVNX0kobWFwcGluZy0+aG9zdCktPmh1Z2Ug PSBTSE1FTV9IVUdFX1dJVEhJTl9TSVpFOworI2VuZGlmCisKIAlpOTE1X2dlbV9vYmplY3RfaW5p dChvYmosICZpOTE1X2dlbV9vYmplY3Rfb3BzKTsKIAogCW9iai0+YmFzZS53cml0ZV9kb21haW4g PSBJOTE1X0dFTV9ET01BSU5fQ1BVOwotLSAKMi45LjQKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 231876B02F2 for ; Tue, 16 May 2017 04:30:04 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id e8so120294335pfl.4 for ; Tue, 16 May 2017 01:30:04 -0700 (PDT) Received: from mga04.intel.com (mga04.intel.com. [192.55.52.120]) by mx.google.com with ESMTPS id p2si10265605pfg.78.2017.05.16.01.30.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 May 2017 01:30:03 -0700 (PDT) From: Matthew Auld Subject: [PATCH 07/17] drm/i915: request THP for shmem backed objects Date: Tue, 16 May 2017 09:29:38 +0100 Message-Id: <20170516082948.28090-8-matthew.auld@intel.com> In-Reply-To: <20170516082948.28090-1-matthew.auld@intel.com> References: <20170516082948.28090-1-matthew.auld@intel.com> Sender: owner-linux-mm@kvack.org List-ID: To: intel-gfx@lists.freedesktop.org Cc: Joonas Lahtinen , Dave Hansen , Daniel Vetter , Hugh Dickins , linux-mm@kvack.org Default to transparent-huge-pages for shmem backed objects through the SHMEM_HUGE_WITHIN_SIZE huge option. Best effort only. Signed-off-by: Matthew Auld Cc: Joonas Lahtinen Cc: Dave Hansen Cc: Daniel Vetter Cc: Hugh Dickins Cc: linux-mm@kvack.org --- drivers/gpu/drm/i915/i915_gem.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6a5e864d7710..e4ee54f0f55f 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4308,6 +4308,16 @@ i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size) mapping = obj->base.filp->f_mapping; mapping_set_gfp_mask(mapping, mask); + /* If configured attempt to use THP through shmemfs. This will + * effectively default to huge-pages for this mapping if it makes sense + * given the object size and HPAGE_PMD_SIZE. This is best effort only. + */ +#ifdef CONFIG_TRANSPARENT_HUGE_PAGECACHE + if (has_transparent_hugepage() && + HAS_PAGE_SIZE(dev_priv, HPAGE_PMD_SIZE)) + SHMEM_I(mapping->host)->huge = SHMEM_HUGE_WITHIN_SIZE; +#endif + i915_gem_object_init(obj, &i915_gem_object_ops); obj->base.write_domain = I915_GEM_DOMAIN_CPU; -- 2.9.4 -- 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