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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90326C4167B for ; Mon, 4 Dec 2023 10:55:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C2B46B02A5; Mon, 4 Dec 2023 05:55:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 272EA6B02A7; Mon, 4 Dec 2023 05:55:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13AE36B02A8; Mon, 4 Dec 2023 05:55:21 -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 034296B02A5 for ; Mon, 4 Dec 2023 05:55:21 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CF5CB1401A2 for ; Mon, 4 Dec 2023 10:55:20 +0000 (UTC) X-FDA: 81528829200.03.BD32CC8 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf01.hostedemail.com (Postfix) with ESMTP id 2661640015 for ; Mon, 4 Dec 2023 10:55:18 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701687319; a=rsa-sha256; cv=none; b=gGpcOC9xRMVXKuJjI1UfqIhRluPJrLm/PKU9+f5e9wN+ZgHp4xc5z0NhC802FtD7XGdE/G +dHRHmbQK26idT7xa/V0AoT7JesYdxJVc1zrtFgtCbsMfu0JFV0r1Yi9Z6xcnN/xGisCm0 CMXXKiuB/YWah/+fFxhEkDSRM6FHfOs= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701687319; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g7RKJubwZGuwzYxXs5rxmgWa6Yt6X+DHtCiVrTsfCrg=; b=R5PxrGSIqTgo1UhPDGQtWEP1p/dGkDQR5NmYzT4KT+kqoJY6hpsenOLWbz0xKZq68VLuXM 6aHUsyBkLDqIRG329z7i3IxaJhy5Is/JeGLOFBpLbeQf/3j/1bko71yhji4zfwBEzcv45l ie1baT+d0gG6aR0bjIZkrVKGIjkeYu0= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A2EA61650; Mon, 4 Dec 2023 02:56:05 -0800 (PST) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EF7523F6C4; Mon, 4 Dec 2023 02:55:14 -0800 (PST) From: Ryan Roberts To: Catalin Marinas , Will Deacon , Ard Biesheuvel , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Andrew Morton , Anshuman Khandual , Matthew Wilcox , Yu Zhao , Mark Rutland , David Hildenbrand , Kefeng Wang , John Hubbard , Zi Yan , Barry Song <21cnbao@gmail.com>, Alistair Popple , Yang Shi Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 06/15] arm64/mm: ptep_get_and_clear(): New layer to manage contig bit Date: Mon, 4 Dec 2023 10:54:31 +0000 Message-Id: <20231204105440.61448-7-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231204105440.61448-1-ryan.roberts@arm.com> References: <20231204105440.61448-1-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 2661640015 X-Stat-Signature: xmd9aifiqoubsk5z3k6ueixgxk59uict X-HE-Tag: 1701687318-752425 X-HE-Meta: U2FsdGVkX18psnixsOWlzPbdEDdvG6GxpNojjFKI8dYsK9QJ04/7xij3/0pcr8K+nCzt9U5+LY/C+ZJlyeroEidGJWnUVjGFMRyppdeWojdYj1IHUKMokVWYnJ/kQtjcmwfZ7BINPveDac61s7JxH3OuzyfSxEfa93TspFEbLSLnYWhneVBPjjFktcfDUlL0REeeS0PCN9rEQOFUGPfxcl7dvEKQhaVdkDkLxEoQ3BXGLHWkbwV0JkzMAXotgZ7sTGh7LkjHrFsU7qKJSZB55w6dHc9Az9qOrwgrUJvGVg4F/F9JNxAbRQCc10ljh0Qf84dJF29fdh05ek66dWRq/n4gUc0pnJS+lX0+x0OQe/R8f226OdUFCEFpQ9Am+cq8DXw937jPesGFcZiuGl6o3XpubP4WqpU1UEPs3iw5TBRPUU1/I7fSKaCm4nZAjviTlXkkhg6gCyJYwYp8vQZXnUTsDZhqoIK2SY9ZauKd7YBzf4zOdyDT+DVkju50CWPB8ko4mDIdL6UZo1jieQnGIo8zCktEEEXmusm9TAFS8EblIldvk8h+EiPy24++QGgnkVbWKKuSVwOM1pQ0Zn9oIKbcRfl4UaxlvNquC68iZW67shItunl15oXytTxhvfsk18iaek5vHNZ53Hu1YpdSe8vBRTsMtChcZ7PyQfhQ68agGMvzJZd4pvoWUKBKEf0gRZ+FIR+FDYs0eOKtgiTCigmxevcWAG54EPt+T0+prRyToeTkkQJzyoO/v4sVlDssmVJtBSu2r6z1c6RIS7Diw31uKK37TYYlQKNxRYeiAyY5XIjQy8k2V+Ln/+fG6AnjOzdh1AFL0P4dA0hPZ4+y+MsHJEoeJQrP1WREz1+wPuMAGTFqe/W75hPI89nJQFBOBqW1ojNMcMmuqz2JrBCuaJMLbg8/zce3YCsy/p60cvDCNLSG34zPynaygkr5aAN1yi5JYnyazY0TOZEu3j4 Rwlqxqn4 UdbXGArzHm+o/6tlS6+XFUufEX6tL8XaJORKX5luyJRxAMZy+ZJTSrzOQK5JKX4rHzzi5wOx/RZ5JE2zizZEeQ9Xxwa0+4ReDoknAdwROVrLKR9hOt9ApvfRSGopnF9c9ESjALfThDsvrMus1lMFD1/HPk4xBx/viJu2lkQi1NH/sXe3OxL+no9A9ON+txbuduRIlRb6kWy1vZknGkaaf1IGiLwukBHPvuFQPETcwiP5EgYWc0u+U/gGsboObDwQesE9+fqWb7pyoNfqt1AeZEuZ2yw== 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: Create a new layer for the in-table PTE manipulation APIs. For now, The existing API is prefixed with double underscore to become the arch-private API and the public API is just a simple wrapper that calls the private API. The public API implementation will subsequently be used to transparently manipulate the contiguous bit where appropriate. But since there are already some contig-aware users (e.g. hugetlb, kernel mapper), we must first ensure those users use the private API directly so that the future contig-bit manipulations in the public API do not interfere with those existing uses. Signed-off-by: Ryan Roberts --- arch/arm64/include/asm/pgtable.h | 5 +++-- arch/arm64/mm/hugetlbpage.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 1464e990580a..994597a0bb0f 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -941,8 +941,7 @@ static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma, } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ -#define __HAVE_ARCH_PTEP_GET_AND_CLEAR -static inline pte_t ptep_get_and_clear(struct mm_struct *mm, +static inline pte_t __ptep_get_and_clear(struct mm_struct *mm, unsigned long address, pte_t *ptep) { pte_t pte = __pte(xchg_relaxed(&pte_val(*ptep), 0)); @@ -1122,6 +1121,8 @@ extern void ptep_modify_prot_commit(struct vm_area_struct *vma, #define set_pte __set_pte #define set_ptes __set_ptes #define pte_clear __pte_clear +#define __HAVE_ARCH_PTEP_GET_AND_CLEAR +#define ptep_get_and_clear __ptep_get_and_clear #endif /* !__ASSEMBLY__ */ diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 510b2d4b89a9..c2a753541d13 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -188,7 +188,7 @@ static pte_t get_clear_contig(struct mm_struct *mm, unsigned long i; for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) { - pte_t pte = ptep_get_and_clear(mm, addr, ptep); + pte_t pte = __ptep_get_and_clear(mm, addr, ptep); /* * If HW_AFDBM is enabled, then the HW could turn on @@ -236,7 +236,7 @@ static void clear_flush(struct mm_struct *mm, unsigned long i, saddr = addr; for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) - ptep_clear(mm, addr, ptep); + __ptep_get_and_clear(mm, addr, ptep); flush_tlb_range(&vma, saddr, addr); } @@ -411,7 +411,7 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, pte_t orig_pte = ptep_get(ptep); if (!pte_cont(orig_pte)) - return ptep_get_and_clear(mm, addr, ptep); + return __ptep_get_and_clear(mm, addr, ptep); ncontig = find_num_contig(mm, addr, ptep, &pgsize); -- 2.25.1