From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 046BED3B7DE for ; Mon, 8 Dec 2025 07:46:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5EA856B0008; Mon, 8 Dec 2025 02:46:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 59A9A6B000A; Mon, 8 Dec 2025 02:46:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 489A36B000C; Mon, 8 Dec 2025 02:46:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2EE386B0008 for ; Mon, 8 Dec 2025 02:46:14 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C762C1345D0 for ; Mon, 8 Dec 2025 07:46:13 +0000 (UTC) X-FDA: 84195520626.28.06BCA0E Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by imf07.hostedemail.com (Postfix) with ESMTP id AD32B4000D for ; Mon, 8 Dec 2025 07:46:11 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=ursulin.net header.s=google header.b=oSqwYn7Y; spf=pass (imf07.hostedemail.com: domain of tursulin@ursulin.net designates 209.85.218.54 as permitted sender) smtp.mailfrom=tursulin@ursulin.net; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1765179971; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=6t+VWOxtn3MQgwBizgRTSl58j0LKcuP4UNwNLtEnoYI=; b=dmes0pJXMiLT1OjSMR+cc+lHm4ZSAMaAxYtOidHVRS5GZtsifdPWf6xNrvz+iQ6QYBHmcj nFVoGARrFrZIEzcojG2xGN0SgBxWLpN7fUZNmfAm3CeXtbAhCFNIY7w5JGc/gajR2Fy2Ju Ib0MLfFQ9h5oI02uc2mFde+QoWLI9M8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1765179971; a=rsa-sha256; cv=none; b=VqfVvMVCm+MFRO3zWMZ5K/ctqDjM60oVedClid4XGFggEBJP0c7qEJG35f0/r36Ixhpfnt f4qlAZstt2iQOWRt80n5saT9Imwi9j0UUSPQpRz6kK6EXFxD9n/WSmEK92IZfGn04N+qaz CYXJUo4J8Xh0mo1qWfywbclO0qLgCWI= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=ursulin.net header.s=google header.b=oSqwYn7Y; spf=pass (imf07.hostedemail.com: domain of tursulin@ursulin.net designates 209.85.218.54 as permitted sender) smtp.mailfrom=tursulin@ursulin.net; dmarc=none Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-b77030ffad9so613441566b.0 for ; Sun, 07 Dec 2025 23:46:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin.net; s=google; t=1765179970; x=1765784770; darn=kvack.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=6t+VWOxtn3MQgwBizgRTSl58j0LKcuP4UNwNLtEnoYI=; b=oSqwYn7Y/UrKxGRstKymHZHlkIhPoYwHCC9jhumJJC6Deb4+eT8UKc/CLq7HyPichn BL6+nrkFBHZ7DbzkbZleuH3zY2N3XNQaSnWUtZqUUVif9GGZTYEv6W8MCYT/RfoOx8xV lgeXO/cxfZE75XMKJwW5/WCxLtSib2HUNGHlidpINAkjQuP/sSKlS6A+qHFpgfApDFGt JOd6eWPPXoa3WtJGZxiLdhho7LmrBccUdO4OBB1fwMKV7mGt1YhJhER5nF3eMnRVOCtJ 9F0osCS0InfxqvPJbezVW2NoO943rMwMu98W3MDT0P+Skz4DoYGOX4tv1J+qHxCfg4+D f/BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765179970; x=1765784770; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6t+VWOxtn3MQgwBizgRTSl58j0LKcuP4UNwNLtEnoYI=; b=q1hSnpKcepeQOzc6JZp2QrLHZ3k3l0seIea/2wGFGDnOGI51nDFpTsrmWeaYqrM6rO bKUsDlry3+xtXEusDG4O4dr+4JtzQuWRr6e8YaRH+MQF0y7zevQMfv2AhgP89MVI3Zsg tcD9JMSKyEv/HGFpfK+Y0bM0O552aUHDcpEPi9XkUPPA7Pn73BjVTbzzBwEMlubgYuYz jykfpsdVVTBZfzcC1uyqyrtuIVjOr+RFTfxqLsphcpUcYpsQBeUQDt+7805b8uHJ3ug0 tTVVt5RqR1r6zPo8DmXwXItsVikBbr8LeKTRX2nF01IWvCHOd2VQQtzuyeokpbxUE/rG SZFg== X-Forwarded-Encrypted: i=1; AJvYcCVnIVVJniySQ+4MsZtPKh2HtGChR5xifsG8Q4cEtQqOyQdzptPBbOM88g+hqT7cbG7JQqLsImLJIA==@kvack.org X-Gm-Message-State: AOJu0YwHDVbT5R0/pzBrcoGv33aigykPEHHnKIQ6EuhPB9zybDsaVLTh XPxhV0PtOwpd7IZoJpYqwj5st8bEJbk4YhfVhYCRwUXeACC5Ra48Pr+Cj6UNn02VX8g= X-Gm-Gg: ASbGncsujcGn+NAoIeY3pWbLvOLhTqWz7jhArUU0QmGq7QEAlOAaEgnQFAMc2g0+Vnx jabxyqDuKOItkiVHK/gnFXr8m4eTmiWK0XEmU0h32zu8t6nUWdQ4+nqqDmLZqKun0mlbg78Vc0C OqLaKA0jnqVVabUdEQFk4L6zVCRYEnZWmogaHoEbFQaNp9+ZO1cH7ZaJfydYGL0SMzM00jiHho/ YdWxSEqv15eJw4S89zAiFh1lt4u/3gvn/kC2I7MSE2vH0k5rHFf/LTmd/X0HFPJ7jGfPkR5AgcP n7SuvIi9XmrS8J16OkIZIxzghYv7usOTxVnEv0oE4NIPhzQckDanhaKqisRnCxEnNFmwC6/0Q9p Fj0XZWptwNNwL1CymPCUe/yZ7fhQOHo3OcH9RwQR4PpJe/tdZpmvCukKwtbDlzn5V+5oaBFrqf6 Q80Hz+f9lJjIuuDMUX7RkLqkdVQV4/ X-Google-Smtp-Source: AGHT+IHJ4Jb9mt5MKXd+S2rnsvKPPGTJNy1tP6i6j68y8r9StJDpAB9I5hQ0c2GB6BopRUFwFApS7Q== X-Received: by 2002:a17:907:8e96:b0:b79:fc29:ebd2 with SMTP id a640c23a62f3a-b7a242bebe8mr694963666b.3.1765179969573; Sun, 07 Dec 2025 23:46:09 -0800 (PST) Received: from [192.168.1.83] ([86.33.28.86]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b79f449c375sm1058619166b.24.2025.12.07.23.46.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 07 Dec 2025 23:46:09 -0800 (PST) Message-ID: Date: Mon, 8 Dec 2025 08:46:07 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v13 05/10] drm/i915: Use huge tmpfs mountpoint helpers To: =?UTF-8?Q?Lo=C3=AFc_Molinari?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Boris Brezillon , Rob Herring , Steven Price , Liviu Dudau , Melissa Wen , =?UTF-8?Q?Ma=C3=ADra_Canal?= , Hugh Dickins , Baolin Wang , Andrew Morton , Al Viro , =?UTF-8?Q?Miko=C5=82aj_Wasiak?= , Christian Brauner , Nitin Gote , Andi Shyti , Jonathan Corbet , Christopher Healy , Matthew Wilcox , Bagas Sanjaya Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-mm@kvack.org, linux-doc@vger.kernel.org, kernel@collabora.com References: <20251205182231.194072-1-loic.molinari@collabora.com> <20251205182231.194072-6-loic.molinari@collabora.com> Content-Language: en-GB From: Tvrtko Ursulin In-Reply-To: <20251205182231.194072-6-loic.molinari@collabora.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: AD32B4000D X-Stat-Signature: 3pskc51ccychbs8yj8i7xujk49yoa8yc X-Rspam-User: X-HE-Tag: 1765179971-701014 X-HE-Meta: U2FsdGVkX18++EmlTiWdXXqDq5FRTDlL1MABe/qEqZC4Zn+Vrwnb+CpLwBj1tlIR615EUSbzsPN6eOaWtWZToNt2WCaXQ5BWowOUU/phBBCbqj552xOY2hD3cPwMC6jJIJiVftpjjIFPsMW3WY1NzjCyqKZrVR3g+Z3VeSFQ5psSv/Ywx2QVQdwkVjT20bshGkIJ8iU1q4AEzSZ+o4nzy4r+4yWtXacoOlOlSYBd5WONM/IojEHIHhX7lCZ+o2i1ubGyC1ipZMEfgj1aLMk87kUyreEoOtaJXc2qE9UmLqU6RxyLf0jik8JmFtevaPlaLEz+a8sVvH/xnmpNY7hHz8uy24hVimL+EasrDE79Sac2472/L6o/yWIqqByZxvCXpU432ZXATh2OAdyCfYWPnMIAxxjrOPiYGG/wKAbEYhEcpOuGucyAaZeu01ghPrMc2nMIdDBRPSy1Q0AaQDI03zXrWgjbVPIzzrVzClanNtaxJBEXVte+izxC7lS82EzVj/AAfbO7yo4y3EmeRT+UnjB6wS11TW66tFTMagsiPwk8YcMPZvfDh2NBZXA5crE+YKsxgfJ3G0W0FSUQr+U87XjQv8PKlH8j9A+7LSyR1bMlywpG8qnKi5awGIbAlAOSKCk7v96Nni9C2n7MEJVYwW8Ev6EMlk8efc9uo0wFh0IxufqOu2PRz97zVt/FcBv1jq9z88ycjeAezas3tr8eNR9Ie2UMoNoDoU9ksZEJRJkOYv9pyM4mmApXS4C9taJ33MK46ZjTo5FY7A4HZVYHzmqd1HLmgyw8l0NeRlGewMSl+BtMXzKfOiSdOaX8N5IlnQ95OqHloyOLmCtDJrB6qc78okVOX6XGrRV/DjWEAGgACgW2vjLL9U97TGHjpWkKG4LewKotRnxS4RX2sYTIiIeozI9jchPVlaL56UZ7lwbXvFpgxhTwOaq+v2n9I45CDawUTWlMK4tf0wVjbdC e5bas8dk PEkVgzluH7e9p1FxThbTXitqmXOHiNyBeZbNR/C4Nw5B5sqF71fdw6NuF4g3SveEzogrojyT/WCellSDBOpMq877vhuaaFad0v8Vf/+BT0aE1TuibMgxJuL+kITCmbiN3iVye6o7RNulP/IlHRpQZnEILi+Q322TcamjkdLpair0yJqz2dMcg27uX9cf2vEpNBrSSFIoGCWZS5kozvfMWBPOLpUWmXfZbq+QpKkBrCeBinzdUcZYQOp4nM2c+P7eHav2aeVuh+2K/Z7G1PlvvICwj+yaQTWpqiYCdnWQuUUQDgxLl/1XyYngJ/LaE5SAoSRvWXPV3HSnNfN3rrrWRBrIOb4mj4GFE8aUPJWHDXV7AUWEItG6sAeGJS1UBT3kVK2JDr/OqMoYa1W7dzzRx/DBr+wDLojYarvSZ/Km+PG6NjiAjw7Z2n08GFziaNnQQ4T87 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 05/12/2025 19:22, Loïc Molinari wrote: > Make use of the new drm_gem_huge_mnt_create() and > drm_gem_get_huge_mnt() helpers to avoid code duplication. Now that > it's just a few lines long, the single function in i915_gemfs.c is > moved into i915_gem_shmem.c. > > v3: > - use huge tmpfs mountpoint in drm_device > - move i915_gemfs.c into i915_gem_shmem.c > > v4: > - clean up mountpoint creation error handling > > v5: > - use drm_gem_has_huge_mnt() helper > > v7: > - include in i915_gem_shmem.c > > v8: > - keep logging notice message with CONFIG_TRANSPARENT_HUGEPAGE=n > - don't access huge_mnt field with CONFIG_TRANSPARENT_HUGEPAGE=n > > v9: > - replace drm_gem_has_huge_mnt() by drm_gem_get_huge_mnt() > - remove useless ternary op test in selftests/huge_pages.c > > v12: > - fix layering violation in selftests (Tvrtko) > - fix incorrect filename in commit message > > v13: > - add Tvrtko A-b > > Signed-off-by: Loïc Molinari > Acked-by: Tvrtko Ursulin Forgot to say - from my point of view it is okay to land this via drm-misc. I don't think there should be any conflicts in this area. Regards, Tvrtko > --- > drivers/gpu/drm/i915/Makefile | 3 +- > .../gpu/drm/i915/gem/i915_gem_object_types.h | 9 +-- > drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 58 ++++++++++----- > drivers/gpu/drm/i915/gem/i915_gemfs.c | 71 ------------------- > drivers/gpu/drm/i915/gem/i915_gemfs.h | 14 ---- > .../gpu/drm/i915/gem/selftests/huge_pages.c | 15 +--- > drivers/gpu/drm/i915/i915_drv.h | 5 -- > 7 files changed, 50 insertions(+), 125 deletions(-) > delete mode 100644 drivers/gpu/drm/i915/gem/i915_gemfs.c > delete mode 100644 drivers/gpu/drm/i915/gem/i915_gemfs.h > > diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile > index 84ec79b64960..b5a8c0a6b747 100644 > --- a/drivers/gpu/drm/i915/Makefile > +++ b/drivers/gpu/drm/i915/Makefile > @@ -169,8 +169,7 @@ gem-y += \ > gem/i915_gem_ttm_move.o \ > gem/i915_gem_ttm_pm.o \ > gem/i915_gem_userptr.o \ > - gem/i915_gem_wait.o \ > - gem/i915_gemfs.o > + gem/i915_gem_wait.o > i915-y += \ > $(gem-y) \ > i915_active.o \ > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h > index 64600aa8227f..f94409e8ec4c 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h > @@ -348,12 +348,13 @@ struct drm_i915_gem_object { > */ > #define I915_BO_ALLOC_GPU_ONLY BIT(6) > #define I915_BO_ALLOC_CCS_AUX BIT(7) > +#define I915_BO_ALLOC_NOTHP BIT(8) > /* > * Object is allowed to retain its initial data and will not be cleared on first > * access if used along with I915_BO_ALLOC_USER. This is mainly to keep > * preallocated framebuffer data intact while transitioning it to i915drmfb. > */ > -#define I915_BO_PREALLOC BIT(8) > +#define I915_BO_PREALLOC BIT(9) > #define I915_BO_ALLOC_FLAGS (I915_BO_ALLOC_CONTIGUOUS | \ > I915_BO_ALLOC_VOLATILE | \ > I915_BO_ALLOC_CPU_CLEAR | \ > @@ -363,9 +364,9 @@ struct drm_i915_gem_object { > I915_BO_ALLOC_GPU_ONLY | \ > I915_BO_ALLOC_CCS_AUX | \ > I915_BO_PREALLOC) > -#define I915_BO_READONLY BIT(9) > -#define I915_TILING_QUIRK_BIT 10 /* unknown swizzling; do not release! */ > -#define I915_BO_PROTECTED BIT(11) > +#define I915_BO_READONLY BIT(10) > +#define I915_TILING_QUIRK_BIT 11 /* unknown swizzling; do not release! */ > +#define I915_BO_PROTECTED BIT(12) > /** > * @mem_flags - Mutable placement-related flags > * > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c > index 26dda55a07ff..6ad1d6f99363 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c > @@ -9,14 +9,16 @@ > #include > > #include > +#include > +#include > > #include "gem/i915_gem_region.h" > #include "i915_drv.h" > #include "i915_gem_object.h" > #include "i915_gem_tiling.h" > -#include "i915_gemfs.h" > #include "i915_scatterlist.h" > #include "i915_trace.h" > +#include "i915_utils.h" > > /* > * Move folios to appropriate lru and release the batch, decrementing the > @@ -494,9 +496,11 @@ const struct drm_i915_gem_object_ops i915_gem_shmem_ops = { > > static int __create_shmem(struct drm_i915_private *i915, > struct drm_gem_object *obj, > - resource_size_t size) > + resource_size_t size, > + unsigned int flags) > { > - unsigned long flags = VM_NORESERVE; > + unsigned long shmem_flags = VM_NORESERVE; > + struct vfsmount *huge_mnt; > struct file *filp; > > drm_gem_private_object_init(&i915->drm, obj, size); > @@ -515,11 +519,12 @@ static int __create_shmem(struct drm_i915_private *i915, > if (BITS_PER_LONG == 64 && size > MAX_LFS_FILESIZE) > return -E2BIG; > > - if (i915->mm.gemfs) > - filp = shmem_file_setup_with_mnt(i915->mm.gemfs, "i915", size, > - flags); > + huge_mnt = drm_gem_get_huge_mnt(&i915->drm); > + if (!(flags & I915_BO_ALLOC_NOTHP) && huge_mnt) > + filp = shmem_file_setup_with_mnt(huge_mnt, "i915", size, > + shmem_flags); > else > - filp = shmem_file_setup("i915", size, flags); > + filp = shmem_file_setup("i915", size, shmem_flags); > if (IS_ERR(filp)) > return PTR_ERR(filp); > > @@ -548,7 +553,7 @@ static int shmem_object_init(struct intel_memory_region *mem, > gfp_t mask; > int ret; > > - ret = __create_shmem(i915, &obj->base, size); > + ret = __create_shmem(i915, &obj->base, size, flags); > if (ret) > return ret; > > @@ -644,21 +649,40 @@ i915_gem_object_create_shmem_from_data(struct drm_i915_private *i915, > > static int init_shmem(struct intel_memory_region *mem) > { > - i915_gemfs_init(mem->i915); > - intel_memory_region_set_name(mem, "system"); > + struct drm_i915_private *i915 = mem->i915; > > - return 0; /* We have fallback to the kernel mnt if gemfs init failed. */ > -} > + /* > + * By creating our own shmemfs mountpoint, we can pass in > + * mount flags that better match our usecase. > + * > + * One example, although it is probably better with a per-file > + * control, is selecting huge page allocations ("huge=within_size"). > + * However, we only do so on platforms which benefit from it, or to > + * offset the overhead of iommu lookups, where with latter it is a net > + * win even on platforms which would otherwise see some performance > + * regressions such a slow reads issue on Broadwell and Skylake. > + */ > > -static int release_shmem(struct intel_memory_region *mem) > -{ > - i915_gemfs_fini(mem->i915); > - return 0; > + if (GRAPHICS_VER(i915) < 11 && !i915_vtd_active(i915)) > + goto no_thp; > + > + drm_gem_huge_mnt_create(&i915->drm, "within_size"); > + if (drm_gem_get_huge_mnt(&i915->drm)) > + drm_info(&i915->drm, "Using Transparent Hugepages\n"); > + else > + drm_notice(&i915->drm, > + "Transparent Hugepage support is recommended for optimal performance%s\n", > + GRAPHICS_VER(i915) >= 11 ? " on this platform!" : > + " when IOMMU is enabled!"); > + > + no_thp: > + intel_memory_region_set_name(mem, "system"); > + > + return 0; /* We have fallback to the kernel mnt if huge mnt failed. */ > } > > static const struct intel_memory_region_ops shmem_region_ops = { > .init = init_shmem, > - .release = release_shmem, > .init_object = shmem_object_init, > }; > > diff --git a/drivers/gpu/drm/i915/gem/i915_gemfs.c b/drivers/gpu/drm/i915/gem/i915_gemfs.c > deleted file mode 100644 > index 1f1290214031..000000000000 > --- a/drivers/gpu/drm/i915/gem/i915_gemfs.c > +++ /dev/null > @@ -1,71 +0,0 @@ > -// SPDX-License-Identifier: MIT > -/* > - * Copyright © 2017 Intel Corporation > - */ > - > -#include > -#include > -#include > - > -#include > - > -#include "i915_drv.h" > -#include "i915_gemfs.h" > -#include "i915_utils.h" > - > -void i915_gemfs_init(struct drm_i915_private *i915) > -{ > - struct file_system_type *type; > - struct fs_context *fc; > - struct vfsmount *gemfs; > - int ret; > - > - /* > - * By creating our own shmemfs mountpoint, we can pass in > - * mount flags that better match our usecase. > - * > - * One example, although it is probably better with a per-file > - * control, is selecting huge page allocations ("huge=within_size"). > - * However, we only do so on platforms which benefit from it, or to > - * offset the overhead of iommu lookups, where with latter it is a net > - * win even on platforms which would otherwise see some performance > - * regressions such a slow reads issue on Broadwell and Skylake. > - */ > - > - if (GRAPHICS_VER(i915) < 11 && !i915_vtd_active(i915)) > - return; > - > - if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) > - goto err; > - > - type = get_fs_type("tmpfs"); > - if (!type) > - goto err; > - > - fc = fs_context_for_mount(type, SB_KERNMOUNT); > - if (IS_ERR(fc)) > - goto err; > - ret = vfs_parse_fs_string(fc, "source", "tmpfs"); > - if (!ret) > - ret = vfs_parse_fs_string(fc, "huge", "within_size"); > - if (!ret) > - gemfs = fc_mount_longterm(fc); > - put_fs_context(fc); > - if (ret) > - goto err; > - > - i915->mm.gemfs = gemfs; > - drm_info(&i915->drm, "Using Transparent Hugepages\n"); > - return; > - > -err: > - drm_notice(&i915->drm, > - "Transparent Hugepage support is recommended for optimal performance%s\n", > - GRAPHICS_VER(i915) >= 11 ? " on this platform!" : > - " when IOMMU is enabled!"); > -} > - > -void i915_gemfs_fini(struct drm_i915_private *i915) > -{ > - kern_unmount(i915->mm.gemfs); > -} > diff --git a/drivers/gpu/drm/i915/gem/i915_gemfs.h b/drivers/gpu/drm/i915/gem/i915_gemfs.h > deleted file mode 100644 > index 16d4333c9a4e..000000000000 > --- a/drivers/gpu/drm/i915/gem/i915_gemfs.h > +++ /dev/null > @@ -1,14 +0,0 @@ > -/* SPDX-License-Identifier: MIT */ > -/* > - * Copyright © 2017 Intel Corporation > - */ > - > -#ifndef __I915_GEMFS_H__ > -#define __I915_GEMFS_H__ > - > -struct drm_i915_private; > - > -void i915_gemfs_init(struct drm_i915_private *i915); > -void i915_gemfs_fini(struct drm_i915_private *i915); > - > -#endif > diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c > index bd08605a1611..02e9bf87f654 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c > +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c > @@ -1316,7 +1316,7 @@ typedef struct drm_i915_gem_object * > > static inline bool igt_can_allocate_thp(struct drm_i915_private *i915) > { > - return i915->mm.gemfs && has_transparent_hugepage(); > + return !!drm_gem_get_huge_mnt(&i915->drm); > } > > static struct drm_i915_gem_object * > @@ -1761,7 +1761,6 @@ static int igt_tmpfs_fallback(void *arg) > struct drm_i915_private *i915 = arg; > struct i915_address_space *vm; > struct i915_gem_context *ctx; > - struct vfsmount *gemfs = i915->mm.gemfs; > struct drm_i915_gem_object *obj; > struct i915_vma *vma; > struct file *file; > @@ -1779,15 +1778,8 @@ static int igt_tmpfs_fallback(void *arg) > } > vm = i915_gem_context_get_eb_vm(ctx); > > - /* > - * Make sure that we don't burst into a ball of flames upon falling back > - * to tmpfs, which we rely on if on the off-chance we encounter a failure > - * when setting up gemfs. > - */ > - > - i915->mm.gemfs = NULL; > - > - obj = i915_gem_object_create_shmem(i915, PAGE_SIZE); > + obj = i915_gem_object_create_region(i915->mm.regions[INTEL_REGION_SMEM], > + PAGE_SIZE, 0, I915_BO_ALLOC_NOTHP); > if (IS_ERR(obj)) { > err = PTR_ERR(obj); > goto out_restore; > @@ -1819,7 +1811,6 @@ static int igt_tmpfs_fallback(void *arg) > out_put: > i915_gem_object_put(obj); > out_restore: > - i915->mm.gemfs = gemfs; > > i915_vm_put(vm); > out: > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 95f9ddf22ce4..93a5af3de334 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -141,11 +141,6 @@ struct i915_gem_mm { > */ > atomic_t free_count; > > - /** > - * tmpfs instance used for shmem backed objects > - */ > - struct vfsmount *gemfs; > - > struct intel_memory_region *regions[INTEL_REGION_UNKNOWN]; > > struct notifier_block oom_notifier;