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 2AD35C4345F for ; Fri, 3 May 2024 13:02:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B55316B0099; Fri, 3 May 2024 09:02:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B051A6B009A; Fri, 3 May 2024 09:02:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1B3D6B009B; Fri, 3 May 2024 09:02:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8A6216B0099 for ; Fri, 3 May 2024 09:02:19 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id DC98B160D0A for ; Fri, 3 May 2024 13:02:17 +0000 (UTC) X-FDA: 82077097914.12.B8A822C Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf15.hostedemail.com (Postfix) with ESMTP id 1D395A003D for ; Fri, 3 May 2024 13:02:15 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf15.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714741336; 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=NyED+DBvvFHRV6yjjoolrEgVtOiqM/VX8VwTXZjwix4=; b=tWL1UCf0cMjmK3WmkCBMAZCD38usDosZlXOvbwkTrUaxMczQ4Gc6kzovPigGGgzPYqKET1 PSvIywmPLK2woyr2d4iZ8HzZbAoEEYQQUwZdEDNdcewXPkLX2XyZF1cY+XekAaGtphu43F LU7ZWbYyz67A1YYK/S9QAeFxITiZxlQ= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf15.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714741336; a=rsa-sha256; cv=none; b=rf9vOKEiAYS0jrO3ylMsa/OgKqFyFtuSeuyj5p1hkdwgCpqmYuv2bDpkW9ic+6SEuO01g2 L+Jb1CkoDLpWNsgDAWtBMTg9tO0Y5AuH9smWc2zeorTAx6EPp+OfOL4S7Klih+txTRLnVH h/nmdOXLZITTJmO3/qzI03P338N1O4k= 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 A58911650; Fri, 3 May 2024 06:02:40 -0700 (PDT) Received: from e124191.cambridge.arm.com (e124191.cambridge.arm.com [10.1.197.45]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 54B283F73F; Fri, 3 May 2024 06:02:12 -0700 (PDT) From: Joey Gouly To: linux-arm-kernel@lists.infradead.org Cc: akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, bp@alien8.de, broonie@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, hpa@zytor.com, joey.gouly@arm.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, maz@kernel.org, mingo@redhat.com, mpe@ellerman.id.au, naveen.n.rao@linux.ibm.com, npiggin@gmail.com, oliver.upton@linux.dev, shuah@kernel.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev Subject: [PATCH v4 06/29] arm64: context switch POR_EL0 register Date: Fri, 3 May 2024 14:01:24 +0100 Message-Id: <20240503130147.1154804-7-joey.gouly@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240503130147.1154804-1-joey.gouly@arm.com> References: <20240503130147.1154804-1-joey.gouly@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam01 X-Stat-Signature: d9gg7aqaj8othhpsgcuhbjx3x4ohw6ei X-Rspam-User: X-Rspamd-Queue-Id: 1D395A003D X-HE-Tag: 1714741335-420929 X-HE-Meta: U2FsdGVkX19wXr0BGsovgLnzqoqFXN4PE3jaC1MTiVbhYRoWZDusxkI0tkhISyZsexzeD0y2GUiLut3QRoOie03jzBXUvjQZ2gK0bWyC/6LtBPb+4lNoA6l4uuWiGc98E6s3mhNoIY4/UAdecljo9wWdZ8M42P8cZm38G5/Qd671R2xGzj/Ww92SB0Ru77VzoGFxXo2dVD23ln7XQ0Wl5QgW8dTOvRWqknPsUk65EoMEl1mxP86qWQjeuowaYvUua9dlKl7Nsumtv5IDMiLuNwASyIVDXZRpOOu9Jyjaoa4uYHDrVU4ZkCn1RAXSnEYiPOC7JlfdipxwBA7AFtC2jw16Z7tO/04hGO+Vk5hkxWD+627xgoGGCw4NxGKTGvvmWRSpexowdeRSg0eJat25TNza0txRq1+0+GuYhxNpB2mShuMtiDhUptmX5+fW/3hUAcr7LEtE80iqIpufpKprmGMP54YJFhylXdOKd0dt0lAm6i4XpCxHkONzYP+jFeVlr6zT+ZMjHMqj/bSzbLWQgatjNo1vaFhOA9J9lhXbRscNWZzbhizVUElrvSxNFtvj9QT0qXFcXBDRjMlxcAWQj/CwpEoe5lq8DCQSSLg2e08oX0PFyPHUIrWp6MaVrOkOOBp7Exrv41iAf5mkem1osiX6XodjoR9O+I2Wf2Upz9UHUz9O+iA+JtStLphJ+KNPYzZa1mo8oN9NBCWwOQ4OaN/nT7ks5E5vFoz9jKNmde3rBG/oLOHEyarKnKNvL1BLBvMmhXgzrC1T1nP6bnlAElrlIA3KGbPWvkFbr+SdEw/z8pKAlqQzBZDAlgG+7hlHkQlBgenP2q9idpXr+07gW/1wVwmguQ7eu/6nanorS8MhyfUN+g5J7CszQ98fZd6vgyQiNkj64FZzi8olURC00JBDzXZ5bkAeylPIVivtT+qT3Zs35cxxBj3nhF+g60w2v52rg+DM84JaltfmIcx uo+SKTSH /O0RXg79qoWCepj6g3wPPmezj04CCv/w02hxOVgdnV6ipgBCEj9yjryqIIbgrfzCHm31OO+14sSua9xVtiW2eDTcI+JXxDVtn/R30U4p0o4H4v8wmTMlbvMZc9I13E4yZM49hWAs2m3tAkw/pqQur+/TodXm8V2J+1BVXTtUa3tfXvf4mlXPx9XKFuBvQ79f8ZRNka3gfz8bI7ih5gKnwQ2Do9oP4yjsgK6/WFtXaj0gADiTLWqCNO4OAtx50Xxu7mVdBNXv0NZdLSOg= 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: POR_EL0 is a register that can be modified by userspace directly, so it must be context switched. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/include/asm/cpufeature.h | 6 ++++++ arch/arm64/include/asm/processor.h | 1 + arch/arm64/include/asm/sysreg.h | 3 +++ arch/arm64/kernel/process.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+) diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index 8b904a757bd3..d46aab23e06e 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -832,6 +832,12 @@ static inline bool system_supports_lpa2(void) return cpus_have_final_cap(ARM64_HAS_LPA2); } +static inline bool system_supports_poe(void) +{ + return IS_ENABLED(CONFIG_ARM64_POE) && + alternative_has_cap_unlikely(ARM64_HAS_S1POE); +} + int do_emulate_mrs(struct pt_regs *regs, u32 sys_reg, u32 rt); bool try_emulate_mrs(struct pt_regs *regs, u32 isn); diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index f77371232d8c..e6376f979273 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -184,6 +184,7 @@ struct thread_struct { u64 sctlr_user; u64 svcr; u64 tpidr2_el0; + u64 por_el0; }; static inline unsigned int thread_get_vl(struct thread_struct *thread, diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 9e8999592f3a..62c399811dbf 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -1064,6 +1064,9 @@ #define POE_RXW UL(0x7) #define POE_MASK UL(0xf) +/* Initial value for Permission Overlay Extension for EL0 */ +#define POR_EL0_INIT POE_RXW + #define ARM64_FEATURE_FIELD_BITS 4 /* Defined for compatibility only, do not add new users. */ diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 4ae31b7af6c3..0ffaca98bed6 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -271,12 +271,23 @@ static void flush_tagged_addr_state(void) clear_thread_flag(TIF_TAGGED_ADDR); } +static void flush_poe(void) +{ + if (!system_supports_poe()) + return; + + write_sysreg_s(POR_EL0_INIT, SYS_POR_EL0); + /* ISB required for kernel uaccess routines when chaning POR_EL0 */ + isb(); +} + void flush_thread(void) { fpsimd_flush_thread(); tls_thread_flush(); flush_ptrace_hw_breakpoint(current); flush_tagged_addr_state(); + flush_poe(); } void arch_release_task_struct(struct task_struct *tsk) @@ -371,6 +382,9 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) if (system_supports_tpidr2()) p->thread.tpidr2_el0 = read_sysreg_s(SYS_TPIDR2_EL0); + if (system_supports_poe()) + p->thread.por_el0 = read_sysreg_s(SYS_POR_EL0); + if (stack_start) { if (is_compat_thread(task_thread_info(p))) childregs->compat_sp = stack_start; @@ -495,6 +509,19 @@ static void erratum_1418040_new_exec(void) preempt_enable(); } +static void permission_overlay_switch(struct task_struct *next) +{ + if (!system_supports_poe()) + return; + + current->thread.por_el0 = read_sysreg_s(SYS_POR_EL0); + if (current->thread.por_el0 != next->thread.por_el0) { + write_sysreg_s(next->thread.por_el0, SYS_POR_EL0); + /* ISB required for kernel uaccess routines when chaning POR_EL0 */ + isb(); + } +} + /* * __switch_to() checks current->thread.sctlr_user as an optimisation. Therefore * this function must be called with preemption disabled and the update to @@ -530,6 +557,7 @@ struct task_struct *__switch_to(struct task_struct *prev, ssbs_thread_switch(next); erratum_1418040_thread_switch(next); ptrauth_thread_switch_user(next); + permission_overlay_switch(next); /* * Complete any pending TLB or cache maintenance on this CPU in case -- 2.25.1