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 CEDDBD116F5 for ; Fri, 28 Nov 2025 18:53:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F2F9C6B0088; Fri, 28 Nov 2025 13:53:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EE0D36B0089; Fri, 28 Nov 2025 13:53:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF54F6B008A; Fri, 28 Nov 2025 13:53:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CE0CF6B0088 for ; Fri, 28 Nov 2025 13:53:01 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4C4DE140719 for ; Fri, 28 Nov 2025 18:53:01 +0000 (UTC) X-FDA: 84160912962.08.5C03959 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) by imf24.hostedemail.com (Postfix) with ESMTP id 62ED218000F for ; Fri, 28 Nov 2025 18:52:59 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=oADkikIm; dmarc=pass (policy=none) header.from=collabora.com; 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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1764355979; a=rsa-sha256; cv=none; b=nwguI2yz6e8UHmHqrpxnzDu0dvjtub9G4GmxQbSZNeL8yIHmOSig5MeU7Fu4lRjDw7XY69 ZUD5AIgThyT/B+T4JiWPfN2VDAnVIs9j2NUSEd57FPkuVxCHLtgj2HfuMG2EIoHhvvWVx+ vyPQCYnFr401JxMe1O7fAkPj0ZFs4us= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=oADkikIm; dmarc=pass (policy=none) header.from=collabora.com; 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1764355979; 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=62D/XnEn4jQ4Rczzih2IdSvbf7Cdsd6AxgytI1+Qqy8=; b=1wb39RvKO870t/DNYwyV9p3NleSZAmX4NWCe2iv3wRK+CbVuhbI/TGsrytlB+iETygzOb8 WtwjxTn5EGE+0opRupOUTjzh7jvhwCzh7vz9Vqwn4jgnowsfEdN6xprCXxycBHV/eOi+xd qyrJaitK/XH379qMEfHMvAy0CBkjsPI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1764355977; bh=PO8gWy+x68NFPFgtgxVVBpssyG+zZ/+aShO0x1+KKAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oADkikIm+tNB++DIyc3gm46mNvrtmcw5jOQA4gm4Ok4xQu2/yhsrQiQY/XrlZZLr/ NnNbGS9U784YiFDFZje/cLi8Ce6ayHb9WbusJLlrt+3BNM/htKAbZR/9btYx2oqUze 7CxaTMCwc9bqrRYQkCsIiTO4RPHb4Q2/91N71nG7sdakSXbo1fdAeWzZBSRO3uuNXe hOiW+79f5Mk5T+uAAw2IMt2g3kK7IQwcJBtlsXhLIL15KMq/4fdTPYdOnNK9ruflBD uCT9LmCDEAaVQS6YdGv5Ib6vQ9qPDEfOFdjDVwiyKxO+8+LofbX8O/sGQNyVdPCgxH gkjR+dw+nq/8Q== Received: from debian-rockchip-rock5b-rk3588.. (unknown [IPv6:2a01:e0a:5e3:6100:2e0:4cff:fe03:d8c]) (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 E526217E1146; Fri, 28 Nov 2025 19:52:56 +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 v10 02/10] drm/shmem-helper: Map huge pages in fault handler Date: Fri, 28 Nov 2025 19:52:44 +0100 Message-ID: <20251128185252.3092-3-loic.molinari@collabora.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251128185252.3092-1-loic.molinari@collabora.com> References: <20251128185252.3092-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: 62ED218000F X-Stat-Signature: ohpbibjsyini5tiykqqwt7pfja7xiat6 X-Rspam-User: X-HE-Tag: 1764355979-678164 X-HE-Meta: U2FsdGVkX19/a4UMHUHADslyJddMIDiJD4ohoAhK0hHvcBJWTSbNKFVcd7O5TzQNNhKZAwsfcyTDB0073C4XpydsTvooLmWI0RwduTmGRiRJUZ8N4GasvJjK2GyRz85cuUYbybrXfAicXrZPamUD+oUV9WwsagaRJi4MGz+wOfYfT+WdmW4/z98CasMq4Dr9ERk53UQIT40QLr3tr1j3y0NjDtxEUOiIQrPT0WfdCAx2h9rLCYF5mb1J2dtbTY+HY1JdhYnbEnhRuW9IzyJXyuiGLPhI4NGeSaYipZajNZ6uxplZVnsf59PiXYQ07NEKCUtGmnEbV2WqshLbp4z1g1/GVamckNEpUHecUY5VG53UnK/CGJ9hS740PzdI9wJzxqHPcGBoFb5WwGtdHpbkqY83bZoP0JCRNf1GGIfhGqjqdhfagngPfpg0lwWJuRWYyMoWGUWPMYUAvF0rs439Uhm7/UMqJXYXnO4MIk6/r/P9oAmQxRzcqSYhm8BB3wjss7v9PcAoCVpOwQ5qiUV6XwyWd7o8ITChTSWiCt7jKme+Qkn/uJ7r1Rr4fPYrNwxZWDEGblZXCjHjfTBC4CM5oCWxvmP4YjLn4ojk9HgSvPBd0EHkIYqePgC15J0QGTh/82L7MOOiMO8ykzORnCJN7tlDurzXXpfqYQK0MWMIahsv9dorPs0iQdbxzxKjeSU9OOHlgsIdZ2U98hWcrYbrSoPr9SlClHqs1dElJ75hAeaMwMUBfK12fnwLGELGM2dIlKf81N8TB/m9ycwiI5QZeGBn37jMZodVpgnMZAjiwbiw7LKVdTY1HoC7DuypIHDdWzusKS82xUqWFl1sfM7APPh6QMzcecRzpeC+jzgav/ygT7HZkzS44hjFXcCSWIZygRXpxqqyAFntzopWPwuVEqO+S2YzESlBuvHI1j7dumEioGZcaN/NqF+JdZFNMHDPQ+KEf66g3dnOZnF2zv3 jW3m3oHf S5H0cKl+WUNOYpZ8sfkkMJUymvSEHEC0L4cpkFcOOCcR5Pmu2EgBww0ybAas5q7/n617jzaxeaveNZ6R14azyaK4JxBBVOhnRMrzzfChOMEuv6nh19/DpQ8I2ADLI06sEb5O4NIbECgoW8S76x8eiCrZeETSS9N1l4B9Lb92Sq5ZEbShA88rLMoSKFNi4xIkEI9Un41akySRmz5QYmf8xmhRGnJBo3VPDnZiFeOnRcsiaC7ispKP4yQSgjr38RhfMIZ2vVeH7XONhhr9UTAmtPv95unmY4y/2nVZUbdDdmhHtEYvxFQ29j3CgO0vZaq71BLPcy/T7ysIY40GiCVlfaPC5z1IKsiKytoTWFJ66WbNfNedJYr/xuvpiEPVKtLv+BPmj 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: Attempt a PMD sized PFN insertion into the VMA if the faulty address of the fault handler is part of a huge page. On builds with CONFIG_TRANSPARENT_HUGEPAGE enabled, if the mmap() user address is PMD size aligned, if the GEM object is backed by shmem buffers on mountpoints setting the 'huge=' option and if the shmem backing store manages to allocate a huge folio, CPU mapping would then benefit from significantly increased memcpy() performance. When these conditions are met on a system with 2 MiB huge pages, an aligned copy of 2 MiB would raise a single page fault instead of 4096. v4: - implement map_pages instead of huge_fault v6: - get rid of map_pages handler for now (keep it for another series along with arm64 contpte support) Signed-off-by: Loïc Molinari --- drivers/gpu/drm/drm_gem_shmem_helper.c | 55 +++++++++++++++++++++----- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index be89be1c804c..81f4ac7cb8f6 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -567,31 +567,68 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev, } EXPORT_SYMBOL_GPL(drm_gem_shmem_dumb_create); +static bool drm_gem_shmem_fault_is_valid(struct drm_gem_object *obj, + pgoff_t pgoff) +{ + struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj); + + if (drm_WARN_ON_ONCE(obj->dev, !shmem->pages) || + pgoff >= (obj->size >> PAGE_SHIFT) || + shmem->madv < 0) + return false; + + return true; +} + +static bool drm_gem_shmem_map_pmd(struct vm_fault *vmf, unsigned long addr, + struct page *page) +{ +#ifdef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP + unsigned long pfn = page_to_pfn(page); + unsigned long paddr = pfn << PAGE_SHIFT; + bool aligned = (addr & ~PMD_MASK) == (paddr & ~PMD_MASK); + + if (aligned && + pmd_none(*vmf->pmd) && + folio_test_pmd_mappable(page_folio(page))) { + pfn &= PMD_MASK >> PAGE_SHIFT; + if (vmf_insert_pfn_pmd(vmf, pfn, false) == VM_FAULT_NOPAGE) + return true; + } +#endif + + return false; +} + static vm_fault_t drm_gem_shmem_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct drm_gem_object *obj = vma->vm_private_data; struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj); - loff_t num_pages = obj->size >> PAGE_SHIFT; - vm_fault_t ret; - struct page *page; + struct page **pages = shmem->pages; pgoff_t page_offset; + unsigned long pfn; + vm_fault_t ret; /* Offset to faulty address in the VMA (without the fake offset). */ page_offset = vmf->pgoff - vma->vm_pgoff; dma_resv_lock(shmem->base.resv, NULL); - if (page_offset >= num_pages || - drm_WARN_ON_ONCE(obj->dev, !shmem->pages) || - shmem->madv < 0) { + if (unlikely(!drm_gem_shmem_fault_is_valid(obj, page_offset))) { ret = VM_FAULT_SIGBUS; - } else { - page = shmem->pages[page_offset]; + goto out; + } - ret = vmf_insert_pfn(vma, vmf->address, page_to_pfn(page)); + if (drm_gem_shmem_map_pmd(vmf, vmf->address, pages[page_offset])) { + ret = VM_FAULT_NOPAGE; + goto out; } + pfn = page_to_pfn(pages[page_offset]); + ret = vmf_insert_pfn(vma, vmf->address, pfn); + + out: dma_resv_unlock(shmem->base.resv); return ret; -- 2.47.3