]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm64/fpsimd: signal: Simplify preserve_tpidr2_context()
authorMark Rutland <mark.rutland@arm.com>
Wed, 9 Apr 2025 16:40:10 +0000 (17:40 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 9 Apr 2025 17:06:31 +0000 (18:06 +0100)
During a context-switch, tls_thread_switch() reads and writes a task's
thread_struct::tpidr2_el0 field. Other code shouldn't access this field
for an active task, as such accesses would form a data-race with a
concurrent context-switch.

The usage in preserve_tpidr2_context() is suspicious, but benign as any
race with a context switch will write the same value back to
current->thread.tpidr2_el0.

Make this clearer and match restore_tpidr2_context() by using a
temporary variable instead, avoiding the (benign) data-race.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Will Deacon <will@kernel.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20250409164010.3480271-14-mark.rutland@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/kernel/signal.c

index 0de9c452c6c0e3fa71544a4700370b5e595d6dec..73f1ab56d81b2c1547e5e31a64650a4589d94495 100644 (file)
@@ -478,13 +478,12 @@ extern int preserve_sve_context(void __user *ctx);
 
 static int preserve_tpidr2_context(struct tpidr2_context __user *ctx)
 {
+       u64 tpidr2_el0 = read_sysreg_s(SYS_TPIDR2_EL0);
        int err = 0;
 
-       current->thread.tpidr2_el0 = read_sysreg_s(SYS_TPIDR2_EL0);
-
        __put_user_error(TPIDR2_MAGIC, &ctx->head.magic, err);
        __put_user_error(sizeof(*ctx), &ctx->head.size, err);
-       __put_user_error(current->thread.tpidr2_el0, &ctx->tpidr2, err);
+       __put_user_error(tpidr2_el0, &ctx->tpidr2, err);
 
        return err;
 }