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 E60ECD11704 for ; Tue, 2 Dec 2025 10:17:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E2CA76B002C; Tue, 2 Dec 2025 05:17:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CA5656B002D; Tue, 2 Dec 2025 05:17:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9BD9D6B002B; Tue, 2 Dec 2025 05:17:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 888A56B0026 for ; Tue, 2 Dec 2025 05:17:35 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id AB03D1A0533 for ; Tue, 2 Dec 2025 10:17:33 +0000 (UTC) X-FDA: 84174129186.07.CF8E37E Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) by imf17.hostedemail.com (Postfix) with ESMTP id D76DA40014 for ; Tue, 2 Dec 2025 10:17:31 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=g6+1f8Uq; spf=pass (imf17.hostedemail.com: domain of loic.molinari@collabora.com designates 148.251.105.195 as permitted sender) smtp.mailfrom=loic.molinari@collabora.com; dmarc=pass (policy=none) header.from=collabora.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1764670652; 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=LCne4kqglhfBuqjjr6AWVG8Aso8Th+5jnORfD0IXeQA=; b=zsiqID5x0O9Lbvs57cMPdSJSPh2jOmWWVzBvpA4QcylY4Zd/EFmpgiVYMpHUg9K8k8ItDp hacCw70fPX+x9hiV+5vSRq4YlibOovp1j21dZOUEW2WH9uXt2trBBl36wZf9dekKyMROl4 SiiwcSpQ9toEqFnbhsLunShbKSj+gys= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=g6+1f8Uq; spf=pass (imf17.hostedemail.com: domain of loic.molinari@collabora.com designates 148.251.105.195 as permitted sender) smtp.mailfrom=loic.molinari@collabora.com; dmarc=pass (policy=none) header.from=collabora.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1764670652; a=rsa-sha256; cv=none; b=W5kCZnZ7gGHjJyHfoLiCIGIoDuNROUCSGu3rWaXG0X/Uo+MfJHM4NwKNc2zGmftQq2ESTb DIgJvSvf/tA/Avw3RbpkZmkS2yUYB+AnvnFbylDH4mecAwllaFL7pYYRdrJ3bkiv6ozMCU ivpB+fMRVlUAC3D3wW5Lds7AqMfboVk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1764670650; bh=EuOrtawPFONPLL/kLdWEf7FrwFEddCnrCOFPNp5/XKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g6+1f8UqVj4YLg7Ziva2Veu1JPvLVDzRjzg1VNcWyW7l0Y2HF8VHQjM7CQ7g+WDJo ojbfwpzDQ7io8ff12Y9ytuw6StUB6I0tRCmXyTv+ze7InPf6c572/AfxlzVJsjAV2S zmDxBQusWR6GSs479OQDM7ZKD349rCVYmNtg8/eBQqjCGJCFVBVOyHV7JTAgRtmJkO SAkqWZU7RQVMq+KBHYYze9BwieIZFjO1p2xmf/13NQ+QL1kYNM6pAEsTWs8710VnYz wqsdULlMoIoyEWdtHK2/dNktL5upDPhPaY9fR8s1GIXl83bePKtHStdvg+nJghXiom PrJYwOAwslSoA== Received: from debian-rockchip-rock5b-rk3588.. (unknown [IPv6:2a01:e0a:5e3:6100:826d:bc07:e98c:84a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: loicmolinari) by bali.collaboradmins.com (Postfix) with ESMTPSA id 273AD17E14DD; Tue, 2 Dec 2025 11:17:29 +0100 (CET) From: =?UTF-8?q?Lo=C3=AFc=20Molinari?= To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Boris Brezillon , Rob Herring , Steven Price , Liviu Dudau , Melissa Wen , =?UTF-8?q?Ma=C3=ADra=20Canal?= , Hugh Dickins , Baolin Wang , Andrew Morton , =?UTF-8?q?Lo=C3=AFc=20Molinari?= , Al Viro , =?UTF-8?q?Miko=C5=82aj=20Wasiak?= , 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 Subject: [PATCH v11 06/10] drm/v3d: Use huge tmpfs mountpoint helpers Date: Tue, 2 Dec 2025 11:17:16 +0100 Message-ID: <20251202101720.3129-7-loic.molinari@collabora.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251202101720.3129-1-loic.molinari@collabora.com> References: <20251202101720.3129-1-loic.molinari@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Stat-Signature: 69kaz4dba85adnmmkxfeteqhzpptwzkg X-Rspam-User: X-Rspamd-Queue-Id: D76DA40014 X-Rspamd-Server: rspam09 X-HE-Tag: 1764670651-689839 X-HE-Meta: U2FsdGVkX19rnwndoqmcYQbmlYKLbTvxqEA0bT1ZDBYPsIxKqnwN6jfhgV1/5mGRd6WJ56uQrO9njCm425URAwD15oa3E93xUcZw1bYAjF0LyOqNwptDYtdOE7ty+2MtYVrsooITkf4cqnxVotBnKSkHSdmekeJeQvLewTBKuA7yfwEq3CRPeQJuPGrR9177dM3efE9jskdt+SMw2dZVBpyrbXC2NFQbdqrywD6dWMQkIZFc8qyYc8VGIp4TDvcwo/MCwcaG0v0ZsROrFtGgfbdjozLP6w4rAy2eS9565xLcdS/wmx2cY+OL0zYCxOyYGq4yjTTYdHklVDR25wjY50SovE5+l3DvaF3pIWwsEm0Gl2FTUvBT2rFjQnBcSAVo/law993j3J73J4wWQSnoskuuLJwI0Mpvq/HdiF6g8z7QuUY+p95Zzxkh3vknmzhti1AhDb4RcdjsnEtof66QBSPZG2FDyxt39fvuRcw3yNRgi9utrilyoJSDXBTPLCA8aF9Jm4UmNXw0URjYlF4c/1uWt9v+KG2Jy9I8mtd6998bPzb+YWG45GO0qAGisV4Jz2NGrnCYzLIavNG14OeuR9W03ttKfW92dJFBNwncm3QCvgC5XiRdh50RRlBnN7h+d4pw64VB1dk7nLnNa1hcuf6zZHqt0B/+VRckfrWgRlfDAYmcvATicBOVLqrMmeEzucx6ngVrwe397WTqaa9FzEM2BQOWSXKUqeshbjYz5ICIZFtl0jcX9Kl5BvJpAfoI1x7g6K3gKukxvcBbWEhHERIgbH92dtr6JUoRcVdsNdpueLznEvh4Kyj4zAqIzRrPHNXn7/FYyRLcMZ9I+DAYuWJ4kCDbUYsnw4pYb/nqPbl7PB/NCkmwdtbWEqUqyay4zGwP2cUl8xkhYbuQHC9eDGrEbKAlF2EUfblcjtD+B+0ozHhKASQalfH9i99EotlY9Ad6OCIsC8wKQWzEYju 9JxbBQZS ooZAGc0dFO5unfnDurEszC+sVpVx4KYhVf4wamutkE3AHm7uYXDDJYgbqNPdw8AK5hjCRzUMjYQ/LoU+iqxZmuoom5cvv1+GvvsWwNLInArw/ygoSZMroilBULuU3AKtxcwaiYpl270Ba3zXxcajVGpkUlHM3sQwCDTFsYAGBZQt0CKhFtPmcdwNwPgEfk+DBMlhHOJsrC2S2WOGEiATr4ZbzXluS61Yru4Sd6ciLUKogMuubDLeJvyEzWSI60YTm0aZrjGLYiOFtyOapUZJiq5ALI2W8GTZMkh5XsGqi5pWnZvDIcieyeeMPsgGcT5Yxq2xs0MMoOtTcmHwMbouzqLh3Im2ZOmzU+91yQUDvIs45BUlQkJU+82YoPIe9stDXc+7MnODeNczBIeQ1LHhLZVM5/dNv7874W04UIKHwVANCPfDxsgwbrtsriQ5h8uO1HLA6 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: 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 v3d_gemfs.c is moved into v3d_gem.c. v3: - use huge tmpfs mountpoint in drm_device - move v3d_gemfs.c into v3d_gem.c v4: - clean up mountpoint creation error handling v5: - fix CONFIG_TRANSPARENT_HUGEPAGE check - use drm_gem_has_huge_mnt() helper v8: - don't access huge_mnt field with CONFIG_TRANSPARENT_HUGEPAGE=n v9: - replace drm_gem_has_huge_mnt() by drm_gem_get_huge_mnt() v10: - get rid of CONFIG_TRANSPARENT_HUGEPAGE ifdefs v11: - remove superfluous comment - add Maíra and Boris R-bs Signed-off-by: Loïc Molinari Reviewed-by: Maíra Canal Reviewed-by: Boris Brezillon --- drivers/gpu/drm/v3d/Makefile | 3 +- drivers/gpu/drm/v3d/v3d_bo.c | 5 ++- drivers/gpu/drm/v3d/v3d_drv.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.h | 11 +----- drivers/gpu/drm/v3d/v3d_gem.c | 21 +++++++++-- drivers/gpu/drm/v3d/v3d_gemfs.c | 62 --------------------------------- 6 files changed, 24 insertions(+), 80 deletions(-) delete mode 100644 drivers/gpu/drm/v3d/v3d_gemfs.c diff --git a/drivers/gpu/drm/v3d/Makefile b/drivers/gpu/drm/v3d/Makefile index fcf710926057..b7d673f1153b 100644 --- a/drivers/gpu/drm/v3d/Makefile +++ b/drivers/gpu/drm/v3d/Makefile @@ -13,8 +13,7 @@ v3d-y := \ v3d_trace_points.o \ v3d_sched.o \ v3d_sysfs.o \ - v3d_submit.o \ - v3d_gemfs.o + v3d_submit.o v3d-$(CONFIG_DEBUG_FS) += v3d_debugfs.o diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c index d9547f5117b9..3ee8d9c36d92 100644 --- a/drivers/gpu/drm/v3d/v3d_bo.c +++ b/drivers/gpu/drm/v3d/v3d_bo.c @@ -114,7 +114,7 @@ v3d_bo_create_finish(struct drm_gem_object *obj) if (IS_ERR(sgt)) return PTR_ERR(sgt); - if (!v3d->gemfs) + if (!drm_gem_get_huge_mnt(obj->dev)) align = SZ_4K; else if (obj->size >= SZ_1M) align = SZ_1M; @@ -150,12 +150,11 @@ struct v3d_bo *v3d_bo_create(struct drm_device *dev, struct drm_file *file_priv, size_t unaligned_size) { struct drm_gem_shmem_object *shmem_obj; - struct v3d_dev *v3d = to_v3d_dev(dev); struct v3d_bo *bo; int ret; shmem_obj = drm_gem_shmem_create_with_mnt(dev, unaligned_size, - v3d->gemfs); + drm_gem_get_huge_mnt(dev)); if (IS_ERR(shmem_obj)) return ERR_CAST(shmem_obj); bo = to_v3d_bo(&shmem_obj->base); diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index e8a46c8bad8a..8faa9382846f 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -107,7 +107,7 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data, args->value = v3d->perfmon_info.max_counters; return 0; case DRM_V3D_PARAM_SUPPORTS_SUPER_PAGES: - args->value = !!v3d->gemfs; + args->value = !!drm_gem_get_huge_mnt(dev); return 0; case DRM_V3D_PARAM_GLOBAL_RESET_COUNTER: mutex_lock(&v3d->reset_lock); diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h index 1884686985b8..99a39329bb85 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -158,11 +158,6 @@ struct v3d_dev { struct drm_mm mm; spinlock_t mm_lock; - /* - * tmpfs instance used for shmem backed objects - */ - struct vfsmount *gemfs; - struct work_struct overflow_mem_work; struct v3d_queue_state queue[V3D_MAX_QUEUES]; @@ -569,6 +564,7 @@ extern const struct dma_fence_ops v3d_fence_ops; struct dma_fence *v3d_fence_create(struct v3d_dev *v3d, enum v3d_queue q); /* v3d_gem.c */ +extern bool super_pages; int v3d_gem_init(struct drm_device *dev); void v3d_gem_destroy(struct drm_device *dev); void v3d_reset_sms(struct v3d_dev *v3d); @@ -576,11 +572,6 @@ void v3d_reset(struct v3d_dev *v3d); void v3d_invalidate_caches(struct v3d_dev *v3d); void v3d_clean_caches(struct v3d_dev *v3d); -/* v3d_gemfs.c */ -extern bool super_pages; -void v3d_gemfs_init(struct v3d_dev *v3d); -void v3d_gemfs_fini(struct v3d_dev *v3d); - /* v3d_submit.c */ void v3d_job_cleanup(struct v3d_job *job); void v3d_job_put(struct v3d_job *job); diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 5a180dc6c452..697b0b3ca92c 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -259,6 +259,24 @@ v3d_invalidate_caches(struct v3d_dev *v3d) v3d_invalidate_slices(v3d, 0); } +static void +v3d_huge_mnt_init(struct v3d_dev *v3d) +{ + int err = 0; + + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && super_pages) + err = drm_gem_huge_mnt_create(&v3d->drm, "within_size"); + + if (drm_gem_get_huge_mnt(&v3d->drm)) + drm_info(&v3d->drm, "Using Transparent Hugepages\n"); + else if (err) + drm_warn(&v3d->drm, "Can't use Transparent Hugepages (%d)\n", + err); + else + drm_notice(&v3d->drm, + "Transparent Hugepage support is recommended for optimal performance on this platform!\n"); +} + int v3d_gem_init(struct drm_device *dev) { @@ -310,7 +328,7 @@ v3d_gem_init(struct drm_device *dev) v3d_init_hw_state(v3d); v3d_mmu_set_page_table(v3d); - v3d_gemfs_init(v3d); + v3d_huge_mnt_init(v3d); ret = v3d_sched_init(v3d); if (ret) { @@ -330,7 +348,6 @@ v3d_gem_destroy(struct drm_device *dev) enum v3d_queue q; v3d_sched_fini(v3d); - v3d_gemfs_fini(v3d); /* Waiting for jobs to finish would need to be done before * unregistering V3D. diff --git a/drivers/gpu/drm/v3d/v3d_gemfs.c b/drivers/gpu/drm/v3d/v3d_gemfs.c deleted file mode 100644 index bf351fc0d488..000000000000 --- a/drivers/gpu/drm/v3d/v3d_gemfs.c +++ /dev/null @@ -1,62 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* Copyright (C) 2024 Raspberry Pi */ - -#include -#include -#include - -#include - -#include "v3d_drv.h" - -void v3d_gemfs_init(struct v3d_dev *v3d) -{ - 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. However, we - * only do so on platforms which benefit from it. - */ - if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) - goto err; - - /* The user doesn't want to enable Super Pages */ - if (!super_pages) - 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; - - v3d->gemfs = gemfs; - drm_info(&v3d->drm, "Using Transparent Hugepages\n"); - - return; - -err: - v3d->gemfs = NULL; - drm_notice(&v3d->drm, - "Transparent Hugepage support is recommended for optimal performance on this platform!\n"); -} - -void v3d_gemfs_fini(struct v3d_dev *v3d) -{ - if (v3d->gemfs) - kern_unmount(v3d->gemfs); -} -- 2.47.3