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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6629DEFD211 for ; Wed, 25 Feb 2026 09:23:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: References:In-Reply-To:Subject:Cc:To:From:Message-ID:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jtMebXZ2StHUY51QG7Xjw+pJ0hVltz7dq/GPNEbA5sE=; b=zX7gWuGAyxEvLyEW4ql8Gzbz5M NJ8YNQkU2mU2BdFc7Ox6VbraCK1zpPms2SfCFeHI+0dhqgwmlLhPWdZtE9MtD4vsPZ3nh+E9n6RqW fuVEHbOpvyMxTMolVBke5fjMdPah3dOoyQ7JqCtsfb4/0IBBdqN88Kvz1jtv+B/ZVBM8axzQwggre +4WCqPLHPgEVO/QexWBDwtFQox9sxOd7JCVnFYAFQPK6g9zMchi4cN00pFwhxbzzrK9tcBuY7PgY9 fbQYV2eNhyypkU300HD26SuhfaMp+Qbxn3v895MTgKOLkUvw73sey65BvS/HgibtRXpcpNdHnR4Dl bGHubegA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vvB7H-00000003fbI-0rbw; Wed, 25 Feb 2026 09:23:39 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vvB7E-00000003fah-1S2U for linux-arm-kernel@lists.infradead.org; Wed, 25 Feb 2026 09:23:33 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id DDA614399F; Wed, 25 Feb 2026 09:23:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5BFAC116D0; Wed, 25 Feb 2026 09:23:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772011411; bh=JFkrWsgc/7AYlbUJ9p82QT6qyV/enHen26ELw13vgJo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=PTuzSXVarUOzvaiL8C7BVNc5bPOZEyDECIkDioAe2QDuRPzJIlvWhsYCN4M5lIrvE DH7+okLAw17sFBOdC8yrSmZtcnq33UoTJ8s72jpYlVb5Qd+LQIB3CzpXGn1AZb5zVQ fyWfwqNZ8gtZmUKTwt+i3mnYDuD4Ievc1sdB4YsPL1e00QyUWMQI6GVDcVAKL9cplP cQG7YPRIcUfB4+x/43XhIWSQWG8Wjlj3qp/90ZUYcZCqpbGKewVwNtNQcCA/45Iu2O IDvVEB0lT2n+/UPi8x8nNPVdJHm6uuvLBElZ2kAWuJVHFYYGMllxXQVZIdT7FAJn+Q lk5anG+V5sBZQ== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1vvB7B-0000000Ddvy-1k4y; Wed, 25 Feb 2026 09:23:29 +0000 Date: Wed, 25 Feb 2026 09:23:29 +0000 Message-ID: <86bjhd9nxq.wl-maz@kernel.org> From: Marc Zyngier To: Anshuman Khandual Cc: linux-arm-kernel@lists.infradead.org, Catalin Marinas , Will Deacon , Ryan Roberts , Mark Rutland , Oliver Upton , linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev Subject: Re: [PATCH 1/2] arm64/mm: Directly use TTBRx_EL1_ASID_MASK In-Reply-To: <20260225035157.1159962-2-anshuman.khandual@arm.com> References: <20260225035157.1159962-1-anshuman.khandual@arm.com> <20260225035157.1159962-2-anshuman.khandual@arm.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: anshuman.khandual@arm.com, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, will@kernel.org, ryan.roberts@arm.com, mark.rutland@arm.com, oupton@kernel.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260225_012332_424172_E92CB939 X-CRM114-Status: GOOD ( 21.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 25 Feb 2026 03:51:56 +0000, Anshuman Khandual wrote: > > Replace all TTBR_ASID_MASK macro instances with TTBRx_EL1_ASID_MASK which > is a standard field mask from tools sysreg format. Drop the now redundant > custom macro TTBR_ASID_MASK. No functional change. > > Cc: Catalin Marinas > Cc: Will Deacon > Cc: Marc Zyngier > Cc: Oliver Upton > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Cc: kvmarm@lists.linux.dev > Signed-off-by: Anshuman Khandual > --- > arch/arm64/include/asm/asm-uaccess.h | 2 +- > arch/arm64/include/asm/mmu.h | 1 - > arch/arm64/include/asm/mmu_context.h | 2 +- > arch/arm64/include/asm/uaccess.h | 6 +++--- > arch/arm64/kernel/entry.S | 2 +- > arch/arm64/kvm/at.c | 2 +- > arch/arm64/kvm/nested.c | 4 ++-- > arch/arm64/mm/context.c | 6 +++--- > 8 files changed, 12 insertions(+), 13 deletions(-) > > diff --git a/arch/arm64/include/asm/asm-uaccess.h b/arch/arm64/include/asm/asm-uaccess.h > index 9148f5a31968..12aa6a283249 100644 > --- a/arch/arm64/include/asm/asm-uaccess.h > +++ b/arch/arm64/include/asm/asm-uaccess.h > @@ -15,7 +15,7 @@ > #ifdef CONFIG_ARM64_SW_TTBR0_PAN > .macro __uaccess_ttbr0_disable, tmp1 > mrs \tmp1, ttbr1_el1 // swapper_pg_dir > - bic \tmp1, \tmp1, #TTBR_ASID_MASK > + bic \tmp1, \tmp1, #TTBRx_EL1_ASID_MASK > sub \tmp1, \tmp1, #RESERVED_SWAPPER_OFFSET // reserved_pg_dir > msr ttbr0_el1, \tmp1 // set reserved TTBR0_EL1 > add \tmp1, \tmp1, #RESERVED_SWAPPER_OFFSET > diff --git a/arch/arm64/include/asm/mmu.h b/arch/arm64/include/asm/mmu.h > index 137a173df1ff..019b36cda380 100644 > --- a/arch/arm64/include/asm/mmu.h > +++ b/arch/arm64/include/asm/mmu.h > @@ -10,7 +10,6 @@ > #define MMCF_AARCH32 0x1 /* mm context flag for AArch32 executables */ > #define USER_ASID_BIT 48 > #define USER_ASID_FLAG (UL(1) << USER_ASID_BIT) > -#define TTBR_ASID_MASK (UL(0xffff) << 48) > > #ifndef __ASSEMBLER__ > > diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h > index cc80af59c69e..5b1ecde9f14b 100644 > --- a/arch/arm64/include/asm/mmu_context.h > +++ b/arch/arm64/include/asm/mmu_context.h > @@ -210,7 +210,7 @@ static inline void update_saved_ttbr0(struct task_struct *tsk, > if (mm == &init_mm) > ttbr = phys_to_ttbr(__pa_symbol(reserved_pg_dir)); > else > - ttbr = phys_to_ttbr(virt_to_phys(mm->pgd)) | ASID(mm) << 48; > + ttbr = phys_to_ttbr(virt_to_phys(mm->pgd)) | ASID(mm) << TTBRx_EL1_ASID_SHIFT; > Could you please use FIELD_PREP() for this sort of constructs? [...] > diff --git a/arch/arm64/kvm/at.c b/arch/arm64/kvm/at.c > index 885bd5bb2f41..d5c342ccf0f9 100644 > --- a/arch/arm64/kvm/at.c > +++ b/arch/arm64/kvm/at.c > @@ -560,7 +560,7 @@ static int walk_s1(struct kvm_vcpu *vcpu, struct s1_walk_info *wi, > BUG(); > } > > - wr->asid = FIELD_GET(TTBR_ASID_MASK, asid_ttbr); > + wr->asid = FIELD_GET(TTBRx_EL1_ASID_MASK, asid_ttbr); > if (!kvm_has_feat_enum(vcpu->kvm, ID_AA64MMFR0_EL1, ASIDBITS, 16) || > !(tcr & TCR_ASID16)) > wr->asid &= GENMASK(7, 0); > diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c > index 620126d1f0dc..82558fb2685f 100644 > --- a/arch/arm64/kvm/nested.c > +++ b/arch/arm64/kvm/nested.c > @@ -1343,7 +1343,7 @@ static bool kvm_vncr_tlb_lookup(struct kvm_vcpu *vcpu) > vcpu_read_sys_reg(vcpu, TTBR0_EL2)); > u16 asid; > > - asid = FIELD_GET(TTBR_ASID_MASK, ttbr); > + asid = FIELD_GET(TTBRx_EL1_ASID_MASK, ttbr); > if (!kvm_has_feat_enum(vcpu->kvm, ID_AA64MMFR0_EL1, ASIDBITS, 16) || > !(tcr & TCR_ASID16)) > asid &= GENMASK(7, 0); > @@ -1459,7 +1459,7 @@ static void kvm_map_l1_vncr(struct kvm_vcpu *vcpu) > vcpu_read_sys_reg(vcpu, TTBR0_EL2)); > u16 asid; > > - asid = FIELD_GET(TTBR_ASID_MASK, ttbr); > + asid = FIELD_GET(TTBRx_EL1_ASID_MASK, ttbr); > if (!kvm_has_feat_enum(vcpu->kvm, ID_AA64MMFR0_EL1, ASIDBITS, 16) || > !(tcr & TCR_ASID16)) > asid &= GENMASK(7, 0); Given the 3 hunks above, there is clearly a better approach. Thanks, M. -- Without deviation from the norm, progress is not possible.