From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 04/22] drm/i915/gemfs: enable THP Date: Mon, 25 Sep 2017 19:47:19 +0100 Message-ID: <20170925184737.8807-5-matthew.auld@intel.com> References: <20170925184737.8807-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 06F8F6E3A6 for ; Mon, 25 Sep 2017 18:47:50 +0000 (UTC) In-Reply-To: <20170925184737.8807-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: linux-mm@kvack.org, Hugh Dickins , Dave Hansen , "Kirill A . Shutemov" , Andrew Morton List-Id: intel-gfx@lists.freedesktop.org RW5hYmxlIHRyYW5zcGFyZW50LWh1Z2UtcGFnZXMgdGhyb3VnaCBnZW1mcyBieSBtb3VudGluZyB3 aXRoCmh1Z2U9d2l0aGluX3NpemUuCgp2MjogcHJlZmVyIGtlcm5fbW91bnRfZGF0YQoKU2lnbmVk LW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgpDYzogSm9vbmFz IExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpDYzogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBEYXZlIEhhbnNlbiA8ZGF2ZS5oYW5z ZW5AaW50ZWwuY29tPgpDYzogS2lyaWxsIEEuIFNodXRlbW92IDxraXJpbGxAc2h1dGVtb3YubmFt ZT4KQ2M6IEFuZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRhdGlvbi5vcmc+CkNjOiBIdWdo IERpY2tpbnMgPGh1Z2hkQGdvb2dsZS5jb20+CkNjOiBsaW51eC1tbUBrdmFjay5vcmcKLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbWZzLmMgfCA4ICsrKysrKystCiAxIGZpbGUgY2hh bmdlZCwgNyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1mcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1mcy5jCmluZGV4IDE2OGQwYmQ5OGY2MC4uZGMzNTcxOTgxNGYwIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbWZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1mcy5jCkBAIC0yNCw2ICsyNCw3IEBACiAKICNpbmNsdWRlIDxsaW51eC9mcy5oPgog I2luY2x1ZGUgPGxpbnV4L21vdW50Lmg+CisjaW5jbHVkZSA8bGludXgvcGFnZW1hcC5oPgogCiAj aW5jbHVkZSAiaTkxNV9kcnYuaCIKICNpbmNsdWRlICJpOTE1X2dlbWZzLmgiCkBAIC0zMiwxMiAr MzMsMTcgQEAgaW50IGk5MTVfZ2VtZnNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSkKIHsKIAlzdHJ1Y3QgZmlsZV9zeXN0ZW1fdHlwZSAqdHlwZTsKIAlzdHJ1Y3QgdmZzbW91bnQg KmdlbWZzOworCWNoYXIgd2l0aGluX3NpemVbXSA9ICJodWdlPXdpdGhpbl9zaXplIjsKKwljaGFy ICpvcHRpb25zID0gTlVMTDsKIAogCXR5cGUgPSBnZXRfZnNfdHlwZSgidG1wZnMiKTsKIAlpZiAo IXR5cGUpCiAJCXJldHVybiAtRU5PREVWOwogCi0JZ2VtZnMgPSBrZXJuX21vdW50KHR5cGUpOwor CWlmIChoYXNfdHJhbnNwYXJlbnRfaHVnZXBhZ2UoKSkKKwkJb3B0aW9ucyA9IHdpdGhpbl9zaXpl OworCisJZ2VtZnMgPSBrZXJuX21vdW50X2RhdGEodHlwZSwgb3B0aW9ucyk7CiAJaWYgKElTX0VS UihnZW1mcykpCiAJCXJldHVybiBQVFJfRVJSKGdlbWZzKTsKIAotLSAKMi4xMy41CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f197.google.com (mail-pf0-f197.google.com [209.85.192.197]) by kanga.kvack.org (Postfix) with ESMTP id 0E3F76B025F for ; Mon, 25 Sep 2017 14:48:08 -0400 (EDT) Received: by mail-pf0-f197.google.com with SMTP id y77so14632615pfd.2 for ; Mon, 25 Sep 2017 11:48:08 -0700 (PDT) Received: from mga03.intel.com (mga03.intel.com. [134.134.136.65]) by mx.google.com with ESMTPS id f10si4527532pgr.778.2017.09.25.11.48.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Sep 2017 11:48:07 -0700 (PDT) From: Matthew Auld Subject: [PATCH 04/22] drm/i915/gemfs: enable THP Date: Mon, 25 Sep 2017 19:47:19 +0100 Message-Id: <20170925184737.8807-5-matthew.auld@intel.com> In-Reply-To: <20170925184737.8807-1-matthew.auld@intel.com> References: <20170925184737.8807-1-matthew.auld@intel.com> Sender: owner-linux-mm@kvack.org List-ID: To: intel-gfx@lists.freedesktop.org Cc: Joonas Lahtinen , Chris Wilson , Dave Hansen , "Kirill A . Shutemov" , Andrew Morton , Hugh Dickins , linux-mm@kvack.org Enable transparent-huge-pages through gemfs by mounting with huge=within_size. v2: prefer kern_mount_data Signed-off-by: Matthew Auld Cc: Joonas Lahtinen Cc: Chris Wilson Cc: Dave Hansen Cc: Kirill A. Shutemov Cc: Andrew Morton Cc: Hugh Dickins Cc: linux-mm@kvack.org --- drivers/gpu/drm/i915/i915_gemfs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gemfs.c b/drivers/gpu/drm/i915/i915_gemfs.c index 168d0bd98f60..dc35719814f0 100644 --- a/drivers/gpu/drm/i915/i915_gemfs.c +++ b/drivers/gpu/drm/i915/i915_gemfs.c @@ -24,6 +24,7 @@ #include #include +#include #include "i915_drv.h" #include "i915_gemfs.h" @@ -32,12 +33,17 @@ int i915_gemfs_init(struct drm_i915_private *i915) { struct file_system_type *type; struct vfsmount *gemfs; + char within_size[] = "huge=within_size"; + char *options = NULL; type = get_fs_type("tmpfs"); if (!type) return -ENODEV; - gemfs = kern_mount(type); + if (has_transparent_hugepage()) + options = within_size; + + gemfs = kern_mount_data(type, options); if (IS_ERR(gemfs)) return PTR_ERR(gemfs); -- 2.13.5 -- 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