From nobody Thu Apr 9 03:14:39 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 839ADC433FE for ; Wed, 2 Nov 2022 09:14:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231429AbiKBJOe (ORCPT ); Wed, 2 Nov 2022 05:14:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230425AbiKBJNI (ORCPT ); Wed, 2 Nov 2022 05:13:08 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED4C128E31; Wed, 2 Nov 2022 02:12:47 -0700 (PDT) Date: Wed, 02 Nov 2022 09:12:45 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667380366; h=from:from:sender:sender:reply-to: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; bh=/hOgdQEqHCc4kXSqZe5ZrwcVNawTBjvm+c+P7ud1s2Q=; b=1ckZz3/9tAdL/SLYmxBwfK1f81QtJno0voeIR4WF/H1LT+tBbcLuZAOQzU/IloR5dp+sEb PbweuQ0uiqSaeKOozKtWtn0/4+B39TBScbSIzzh9zcuU32ZocuKCsDwsLyWhEatH9eq4a/ CgIggUKC5C0UU0SipYqE7cYFtYq4OxJT7YRaGrvmIB/C7VBv87mbzLfyjgGkASFmXXoorm 3rc7ZpTIGipS2tkbHScd0vHIGeC2YYfaS4j/3/qU6tMezcPhSwIIcYoys508mZqPzunugM GltnCtmL9WcseoH1VdyQePOx6Pn9TRJBV1QP1+MLXSwDuxpdFQ9j2dGJj8vYJw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667380366; h=from:from:sender:sender:reply-to: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; bh=/hOgdQEqHCc4kXSqZe5ZrwcVNawTBjvm+c+P7ud1s2Q=; b=/xuwCnD2eMSxWRW8ZVFKmPjCYtGuYcPTCgv2q2lQC8qOYzU1bEBRzQLcQjU7PGtBa2nJPC mf0c0GPn759kYMDA== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] x86/mm/pae: Make pmd_t similar to pte_t Cc: "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <166738036528.7716.4800701229121974327.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/mm branch of tip: Commit-ID: f8c40885e40fd8f5d96c58f4dfca7072fe09a37b Gitweb: https://git.kernel.org/tip/f8c40885e40fd8f5d96c58f4dfca7072f= e09a37b Author: Peter Zijlstra AuthorDate: Thu, 26 Nov 2020 17:02:29 +01:00 Committer: Peter Zijlstra CommitterDate: Tue, 01 Nov 2022 13:44:00 +01:00 x86/mm/pae: Make pmd_t similar to pte_t Instead of mucking about with at least 2 different ways of fudging it, do the same thing we do for pte_t. Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20221022114424.580310787%40infradead.org --- arch/x86/include/asm/pgtable-3level.h | 42 ++++++-------------- arch/x86/include/asm/pgtable-3level_types.h | 7 +++- arch/x86/include/asm/pgtable_64_types.h | 1 +- arch/x86/include/asm/pgtable_types.h | 4 +-- 4 files changed, 23 insertions(+), 31 deletions(-) diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/p= gtable-3level.h index 28421a8..28556d2 100644 --- a/arch/x86/include/asm/pgtable-3level.h +++ b/arch/x86/include/asm/pgtable-3level.h @@ -87,7 +87,7 @@ static inline pmd_t pmd_read_atomic(pmd_t *pmdp) ret |=3D ((pmdval_t)*(tmp + 1)) << 32; } =20 - return (pmd_t) { ret }; + return (pmd_t) { .pmd =3D ret }; } =20 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) @@ -121,12 +121,11 @@ static inline void native_pte_clear(struct mm_struct = *mm, unsigned long addr, ptep->pte_high =3D 0; } =20 -static inline void native_pmd_clear(pmd_t *pmd) +static inline void native_pmd_clear(pmd_t *pmdp) { - u32 *tmp =3D (u32 *)pmd; - *tmp =3D 0; + pmdp->pmd_low =3D 0; smp_wmb(); - *(tmp + 1) =3D 0; + pmdp->pmd_high =3D 0; } =20 static inline void native_pud_clear(pud_t *pudp) @@ -162,25 +161,17 @@ static inline pte_t native_ptep_get_and_clear(pte_t *= ptep) #define native_ptep_get_and_clear(xp) native_local_ptep_get_and_clear(xp) #endif =20 -union split_pmd { - struct { - u32 pmd_low; - u32 pmd_high; - }; - pmd_t pmd; -}; - #ifdef CONFIG_SMP static inline pmd_t native_pmdp_get_and_clear(pmd_t *pmdp) { - union split_pmd res, *orig =3D (union split_pmd *)pmdp; + pmd_t res; =20 /* xchg acts as a barrier before setting of the high bits */ - res.pmd_low =3D xchg(&orig->pmd_low, 0); - res.pmd_high =3D orig->pmd_high; - orig->pmd_high =3D 0; + res.pmd_low =3D xchg(&pmdp->pmd_low, 0); + res.pmd_high =3D READ_ONCE(pmdp->pmd_high); + WRITE_ONCE(pmdp->pmd_high, 0); =20 - return res.pmd; + return res; } #else #define native_pmdp_get_and_clear(xp) native_local_pmdp_get_and_clear(xp) @@ -199,17 +190,12 @@ static inline pmd_t pmdp_establish(struct vm_area_str= uct *vma, * anybody. */ if (!(pmd_val(pmd) & _PAGE_PRESENT)) { - union split_pmd old, new, *ptr; - - ptr =3D (union split_pmd *)pmdp; - - new.pmd =3D pmd; - /* xchg acts as a barrier before setting of the high bits */ - old.pmd_low =3D xchg(&ptr->pmd_low, new.pmd_low); - old.pmd_high =3D ptr->pmd_high; - ptr->pmd_high =3D new.pmd_high; - return old.pmd; + old.pmd_low =3D xchg(&pmdp->pmd_low, pmd.pmd_low); + old.pmd_high =3D READ_ONCE(pmdp->pmd_high); + WRITE_ONCE(pmdp->pmd_high, pmd.pmd_high); + + return old; } =20 do { diff --git a/arch/x86/include/asm/pgtable-3level_types.h b/arch/x86/include= /asm/pgtable-3level_types.h index 56baf43..8091134 100644 --- a/arch/x86/include/asm/pgtable-3level_types.h +++ b/arch/x86/include/asm/pgtable-3level_types.h @@ -18,6 +18,13 @@ typedef union { }; pteval_t pte; } pte_t; + +typedef union { + struct { + unsigned long pmd_low, pmd_high; + }; + pmdval_t pmd; +} pmd_t; #endif /* !__ASSEMBLY__ */ =20 #define SHARED_KERNEL_PMD (!static_cpu_has(X86_FEATURE_PTI)) diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm= /pgtable_64_types.h index 04f3606..38bf837 100644 --- a/arch/x86/include/asm/pgtable_64_types.h +++ b/arch/x86/include/asm/pgtable_64_types.h @@ -19,6 +19,7 @@ typedef unsigned long pgdval_t; typedef unsigned long pgprotval_t; =20 typedef struct { pteval_t pte; } pte_t; +typedef struct { pmdval_t pmd; } pmd_t; =20 #ifdef CONFIG_X86_5LEVEL extern unsigned int __pgtable_l5_enabled; diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pg= table_types.h index aa174fe..447d4be 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -361,11 +361,9 @@ static inline pudval_t native_pud_val(pud_t pud) #endif =20 #if CONFIG_PGTABLE_LEVELS > 2 -typedef struct { pmdval_t pmd; } pmd_t; - static inline pmd_t native_make_pmd(pmdval_t val) { - return (pmd_t) { val }; + return (pmd_t) { .pmd =3D val }; } =20 static inline pmdval_t native_pmd_val(pmd_t pmd)