* [PATCH] arm64: Move PSTATE.TCO setting to separate functions
@ 2021-01-04 12:47 Catalin Marinas
2021-01-04 14:06 ` Vincenzo Frascino
2021-01-07 11:37 ` Mark Rutland
0 siblings, 2 replies; 3+ messages in thread
From: Catalin Marinas @ 2021-01-04 12:47 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: Mark Rutland, Vincenzo Frascino, Will Deacon
For consistency with __uaccess_{disable,enable}_hw_pan(), move the
PSTATE.TCO setting into dedicated __uaccess_{disable,enable}_tco()
functions.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
---
arch/arm64/include/asm/uaccess.h | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
index 6f986e09a781..534a7d33b12f 100644
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@@ -159,6 +159,18 @@ static inline void __uaccess_enable_hw_pan(void)
CONFIG_ARM64_PAN));
}
+static inline void __uaccess_disable_tco(void)
+{
+ asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(0),
+ ARM64_MTE, CONFIG_KASAN_HW_TAGS));
+}
+
+static inline void __uaccess_enable_tco(void)
+{
+ asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(1),
+ ARM64_MTE, CONFIG_KASAN_HW_TAGS));
+}
+
/*
* The Tag Check Flag (TCF) mode for MTE is per EL, hence TCF0
* affects EL0 and TCF affects EL1 irrespective of which TTBR is
@@ -178,8 +190,7 @@ static inline void __uaccess_enable_hw_pan(void)
*/
static inline void uaccess_disable_privileged(void)
{
- asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(0),
- ARM64_MTE, CONFIG_KASAN_HW_TAGS));
+ __uaccess_disable_tco();
if (uaccess_ttbr0_disable())
return;
@@ -189,8 +200,7 @@ static inline void uaccess_disable_privileged(void)
static inline void uaccess_enable_privileged(void)
{
- asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(1),
- ARM64_MTE, CONFIG_KASAN_HW_TAGS));
+ __uaccess_enable_tco();
if (uaccess_ttbr0_enable())
return;
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: Move PSTATE.TCO setting to separate functions
2021-01-04 12:47 [PATCH] arm64: Move PSTATE.TCO setting to separate functions Catalin Marinas
@ 2021-01-04 14:06 ` Vincenzo Frascino
2021-01-07 11:37 ` Mark Rutland
1 sibling, 0 replies; 3+ messages in thread
From: Vincenzo Frascino @ 2021-01-04 14:06 UTC (permalink / raw)
To: Catalin Marinas, linux-arm-kernel; +Cc: Mark Rutland, Will Deacon
On 1/4/21 12:47 PM, Catalin Marinas wrote:
> For consistency with __uaccess_{disable,enable}_hw_pan(), move the
> PSTATE.TCO setting into dedicated __uaccess_{disable,enable}_tco()
> functions.
>
> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
> Cc: Mark Rutland <mark.rutland@arm.com>
Looks nicer like this! Thanks!
We should probably update the comment on top of uaccess_disable_privileged() to
reflect the introduction of the new API, otherwise:
Acked-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
> ---
> arch/arm64/include/asm/uaccess.h | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
> index 6f986e09a781..534a7d33b12f 100644
> --- a/arch/arm64/include/asm/uaccess.h
> +++ b/arch/arm64/include/asm/uaccess.h
> @@ -159,6 +159,18 @@ static inline void __uaccess_enable_hw_pan(void)
> CONFIG_ARM64_PAN));
> }
>
> +static inline void __uaccess_disable_tco(void)
> +{
> + asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(0),
> + ARM64_MTE, CONFIG_KASAN_HW_TAGS));
> +}
> +
> +static inline void __uaccess_enable_tco(void)
> +{
> + asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(1),
> + ARM64_MTE, CONFIG_KASAN_HW_TAGS));
> +}
> +
> /*
> * The Tag Check Flag (TCF) mode for MTE is per EL, hence TCF0
> * affects EL0 and TCF affects EL1 irrespective of which TTBR is
> @@ -178,8 +190,7 @@ static inline void __uaccess_enable_hw_pan(void)
> */
> static inline void uaccess_disable_privileged(void)
> {
> - asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(0),
> - ARM64_MTE, CONFIG_KASAN_HW_TAGS));
> + __uaccess_disable_tco();
>
> if (uaccess_ttbr0_disable())
> return;
> @@ -189,8 +200,7 @@ static inline void uaccess_disable_privileged(void)
>
> static inline void uaccess_enable_privileged(void)
> {
> - asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(1),
> - ARM64_MTE, CONFIG_KASAN_HW_TAGS));
> + __uaccess_enable_tco();
>
> if (uaccess_ttbr0_enable())
> return;
>
--
Regards,
Vincenzo
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: Move PSTATE.TCO setting to separate functions
2021-01-04 12:47 [PATCH] arm64: Move PSTATE.TCO setting to separate functions Catalin Marinas
2021-01-04 14:06 ` Vincenzo Frascino
@ 2021-01-07 11:37 ` Mark Rutland
1 sibling, 0 replies; 3+ messages in thread
From: Mark Rutland @ 2021-01-07 11:37 UTC (permalink / raw)
To: Catalin Marinas; +Cc: Vincenzo Frascino, Will Deacon, linux-arm-kernel
On Mon, Jan 04, 2021 at 12:47:15PM +0000, Catalin Marinas wrote:
> For consistency with __uaccess_{disable,enable}_hw_pan(), move the
> PSTATE.TCO setting into dedicated __uaccess_{disable,enable}_tco()
> functions.
>
> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
> Cc: Mark Rutland <mark.rutland@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Mark.
> ---
> arch/arm64/include/asm/uaccess.h | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
> index 6f986e09a781..534a7d33b12f 100644
> --- a/arch/arm64/include/asm/uaccess.h
> +++ b/arch/arm64/include/asm/uaccess.h
> @@ -159,6 +159,18 @@ static inline void __uaccess_enable_hw_pan(void)
> CONFIG_ARM64_PAN));
> }
>
> +static inline void __uaccess_disable_tco(void)
> +{
> + asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(0),
> + ARM64_MTE, CONFIG_KASAN_HW_TAGS));
> +}
> +
> +static inline void __uaccess_enable_tco(void)
> +{
> + asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(1),
> + ARM64_MTE, CONFIG_KASAN_HW_TAGS));
> +}
> +
> /*
> * The Tag Check Flag (TCF) mode for MTE is per EL, hence TCF0
> * affects EL0 and TCF affects EL1 irrespective of which TTBR is
> @@ -178,8 +190,7 @@ static inline void __uaccess_enable_hw_pan(void)
> */
> static inline void uaccess_disable_privileged(void)
> {
> - asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(0),
> - ARM64_MTE, CONFIG_KASAN_HW_TAGS));
> + __uaccess_disable_tco();
>
> if (uaccess_ttbr0_disable())
> return;
> @@ -189,8 +200,7 @@ static inline void uaccess_disable_privileged(void)
>
> static inline void uaccess_enable_privileged(void)
> {
> - asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(1),
> - ARM64_MTE, CONFIG_KASAN_HW_TAGS));
> + __uaccess_enable_tco();
>
> if (uaccess_ttbr0_enable())
> return;
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-07 11:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-04 12:47 [PATCH] arm64: Move PSTATE.TCO setting to separate functions Catalin Marinas
2021-01-04 14:06 ` Vincenzo Frascino
2021-01-07 11:37 ` Mark Rutland
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox