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 7344DCCD1AA for ; Tue, 21 Oct 2025 11:31:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A1E798E0024; Tue, 21 Oct 2025 07:31:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A8AE8E001A; Tue, 21 Oct 2025 07:31:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 848E88E0024; Tue, 21 Oct 2025 07:31:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 6EDEF8E001A for ; Tue, 21 Oct 2025 07:31:06 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2E7B686D18 for ; Tue, 21 Oct 2025 11:31:06 +0000 (UTC) X-FDA: 84021904932.23.3EAAECC Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) by imf24.hostedemail.com (Postfix) with ESMTP id 37FED180015 for ; Tue, 21 Oct 2025 11:31:04 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=FYYe8jLp; spf=pass (imf24.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=1761046264; 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=kEYRZhHrbN+WNTyHjZsu0+gGsmV/WTQ19EskUwEEmN4=; b=l0JsbImk6Rvc/E3oFYfLIzH9gQsiUOSy1oENCWwBazhETBJIKQ84H69FPKMchbMpSf7QQG 0E5nLGwQUQLKyBjBnQX/mGIfyUmhfSuKHv1oJuHHwOr7vyCL2Ee3yLmdfBteR253YwUgkr W2muQcxqWjlp2K0iGuv/WZBlevptdzk= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=FYYe8jLp; spf=pass (imf24.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=1761046264; a=rsa-sha256; cv=none; b=HxBYUFr9U5ubMjA0CO8j7hhx6QOR2JdtmCJPRjb+t22mHGgPc5COAnmVJgStOHGokb9lqr tLbW0k6fmyuqM05copN+JYOj4K5R4a+U5XD6rAEIVd7xEgfeQSatwSNaDLlawbrGi0kY7S Ed2c5tPHD+/ogXLvnCYTOasjlHOa/vY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1761046262; bh=WziPgVW+ACzrMGtAY7VcmT4aJElDI2y9aFr+UglVVN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FYYe8jLpbAcuIRvnWzU1oOmFyVk72+L0/lYJ9YkLWYKTLkxIo4EHJQdPKtBfbiY5A bc92KbBooAJaOisbJQt0WJM1POC5scyk2bKyCvG2bigx2lMspR08Gj0AvV+Tpxf/S1 laKIAP5xcedMv0G0O3MzT38T2wFNl2NH9cxZnxv0ZJCFdbgSqEaJs00c62iVpyXvHF cYmK/QeRfWsJhhKsisfgHzo/AN8AfyLLYWuYHV8/YkD+tjqpZgG1SqhGQLea0II4ra loKBseySHY0ge/Yi/HIGNjkEOkve7NhyuM9D2Wuyn/ZxC8SgRmFGiw65AI7+EGEi+4 xOaGkYutWdcdw== 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 D17F717E1562; Tue, 21 Oct 2025 13:31:01 +0200 (CEST) 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 v5 07/12] drm/v3d: Use huge tmpfs mountpoint helpers Date: Tue, 21 Oct 2025 13:30:44 +0200 Message-ID: <20251021113049.17242-8-loic.molinari@collabora.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251021113049.17242-1-loic.molinari@collabora.com> References: <20251021113049.17242-1-loic.molinari@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 37FED180015 X-Stat-Signature: wn9ugrysc4muig9ak7xp1mau4pitq4z8 X-Rspam-User: X-HE-Tag: 1761046264-554236 X-HE-Meta: U2FsdGVkX1+fho6NiA9KXQmwHo/0wbik3zqzx3wX467ej3nT3XHlr+Z8c57wgIaGR56/iEhhmPNaijnzC5j31TfZAlCPTUPXaxVmDJlVPxAnoaaMRbdKgOK2Qxsq4BOij+YgaBdgb9byfKrMbi2yAJv4hy+/sHSkFPDKkbtVsZJ0XU6k3kg0Z5D5cWRvqu0V4MmJhMbqXK28duKBBuUAK3YTjSqhc1/3fd3ncgSkuqywLYK3dMc5GMF4gOCFJD6fEkjlY9L6qinM31TQyMccmH1hV03SoChkCXUZYfIlmOX696pKmfn6RlEBtAwCXiWECI1mYULhwWj0h9Bbv4QEXJzEKzMIn29Noyyz8wJ3PXqPfDjrXDve2aIH5JeOaI8MZtBkHhSETFu2jMBP3zZy8wo6pvXFGALTqE+M/gJpnkOauCNKxYt9Al520MgkhPWQtrHhfPrNKxqNceUmxxJdRZujqzeu1HWCQ4pkYdvpxU/1VAPsYAUKz4jJ5dk5R9c1g4BbLY4mHvxWAycQ15lsDGhjbWDTi8AVVOMTy3xgFr/k7RdrERngdN5vjK2VHXHkVDCV+b8cBJnWnGYwkpZZWA++VmVQNGqJYaJv584/KRC6yxXukNaiIiPNfTrRXS1pIJwmL7DRr81LGa5bVwegnIpJIrtR0kVX7TySdTAuzmm94quXZfuhd15sklyAj77ecy9E1TlPPssSXhXbSM31igwK0tolHzkuHNlLzTxwTLC69L7j9aZ3OXjPqxjhGJoVsGIqqLtjthHDz2PpOSzubTYLnW8esYPA8EPBL6+lYt3+0dVVo63BudBfyeFSC201fTfreGvmo/8UsqcOA51AvTfXW1mpWtUf0u5TKeNefdjb9nCSjKaxj52tOycTIa+KAnaGw5vvWq3IPxM5VlYamke20d3Mo9/J3XLVEX6WdfnRtmAeCB8B3dvlq7JnBis1Y+maLtTIL9j8yj1HgLk Ubv6EGC7 BRfihWA65iX2ulL8GCu/DI343YjEii2d0kh3UWzZWnJXpeRB7tcTakubb9EE7HMoB9UXR5f386MjdKhg62SX4O7kSOlqVcKRd/QZjTPC1b9UQKSSDPHbmie0SZdW29iisboe1dtGRwNtrY05PIXe3BN+58Ji8OiVS0iyXpyDB8k6h3L5ASBzAbfAbf8iGS5Cvu+84el9acEkCtwduo1xU5WLj4/8+eeA7LVOuMAsL5A+WymHXqQZ/CIPF/sA2V0vGzvZmqq6P1jpDJiODgJSSqV8YKvOQQVRdbwOLhCh/JxMpo1l8ti04aN8Gw3U/NWb+f4Ua4G7HWY5BSjC+I/w9IwzCl0jHmnRvwQqGSAQqNxwV3YF0ud9SkwRGJRPdC34X0skSndVaKyEEUxk= 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_has_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 Signed-off-by: Loïc Molinari --- 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 | 27 +++++++++++++-- drivers/gpu/drm/v3d/v3d_gemfs.c | 60 --------------------------------- 6 files changed, 30 insertions(+), 78 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 c41476ddde68..a1e5881e8b62 100644 --- a/drivers/gpu/drm/v3d/v3d_bo.c +++ b/drivers/gpu/drm/v3d/v3d_bo.c @@ -112,7 +112,7 @@ v3d_bo_create_finish(struct drm_gem_object *obj) if (IS_ERR(sgt)) return PTR_ERR(sgt); - if (!v3d->gemfs) + if (!drm_gem_has_huge_mnt(obj->dev)) align = SZ_4K; else if (obj->size >= SZ_1M) align = SZ_1M; @@ -148,12 +148,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); + dev->huge_mnt); 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 c5a3bbbc74c5..ce82a1ceda5f 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -106,7 +106,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_has_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 bb110d35f749..b6479a8a279e 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -258,6 +258,30 @@ 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; + + /* + * By using a huge shmemfs mountpoint when the user wants to + * enable Super Pages, we can pass in mount flags that better + * match our usecase. + */ + + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && super_pages) + err = drm_gem_huge_mnt_create(&v3d->drm, "within_size"); + + if (drm_gem_has_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) { @@ -309,7 +333,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) { @@ -329,7 +353,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 c1a30166c099..000000000000 --- a/drivers/gpu/drm/v3d/v3d_gemfs.c +++ /dev/null @@ -1,60 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* Copyright (C) 2024 Raspberry Pi */ - -#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