Commit 52f73c38 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Will Deacon
Browse files

arm64: nofpsmid: Handle TIF_FOREIGN_FPSTATE flag cleanly 



We detect the absence of FP/SIMD after an incapable CPU is brought up,
and by then we have kernel threads running already with TIF_FOREIGN_FPSTATE set
which could be set for early userspace applications (e.g, modprobe triggered
from initramfs) and init. This could cause the applications to loop forever in
do_nofity_resume() as we never clear the TIF flag, once we now know that
we don't support FP.

Fix this by making sure that we clear the TIF_FOREIGN_FPSTATE flag
for tasks which may have them set, as we would have done in the normal
case, but avoiding touching the hardware state (since we don't support any).

Also to make sure we handle the cases seemlessly we categorise the
helper functions to two :
 1) Helpers for common core code, which calls into take appropriate
    actions without knowing the current FPSIMD state of the CPU/task.

    e.g fpsimd_restore_current_state(), fpsimd_flush_task_state(),
        fpsimd_save_and_flush_cpu_state().

    We bail out early for these functions, taking any appropriate actions
    (e.g, clearing the TIF flag) where necessary to hide the handling
    from core code.

 2) Helpers used when the presence of FP/SIMD is apparent.
    i.e, save/restore the FP/SIMD register state, modify the CPU/task
    FP/SIMD state.
    e.g,

    fpsimd_save(), task_fpsimd_load() - save/restore task FP/SIMD registers

    fpsimd_bind_task_to_cpu()  \
                                - Update the "state" metadata for CPU/task.
    fpsimd_bind_state_to_cpu() /

    fpsimd_update_current_state() - Update the fp/simd state for the current
                                    task from memory.

    These must not be called in the absence of FP/SIMD. Put in a WARNING
    to make sure they are not invoked in the absence of FP/SIMD.

KVM also uses the TIF_FOREIGN_FPSTATE flag to manage the FP/SIMD state
on the CPU. However, without FP/SIMD support we trap all accesses and
inject undefined instruction. Thus we should never "load" guest state.
Add a sanity check to make sure this is valid.

Fixes: 82e0191a ("arm64: Support systems without FP/ASIMD")
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 6d502b6b

arch/arm64/kernel/fpsimd.c

+27 −3
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ static void sve_free(struct task_struct *task) 
 */

static void task_fpsimd_load(void)

{

	WARN_ON(!system_supports_fpsimd());

	WARN_ON(!have_cpu_fpsimd_context());



	if (system_supports_sve() && test_thread_flag(TIF_SVE))
@@ -289,6 +290,7 @@ static void fpsimd_save(void) 
		this_cpu_ptr(&fpsimd_last_state);

	/* set by fpsimd_bind_task_to_cpu() or fpsimd_bind_state_to_cpu() */



	WARN_ON(!system_supports_fpsimd());

	WARN_ON(!have_cpu_fpsimd_context());



	if (!test_thread_flag(TIF_FOREIGN_FPSTATE)) {
@@ -1092,6 +1094,7 @@ void fpsimd_bind_task_to_cpu(void) 
	struct fpsimd_last_state_struct *last =

		this_cpu_ptr(&fpsimd_last_state);



	WARN_ON(!system_supports_fpsimd());

	last->st = &current->thread.uw.fpsimd_state;

	last->sve_state = current->thread.sve_state;

	last->sve_vl = current->thread.sve_vl;
@@ -1114,6 +1117,7 @@ void fpsimd_bind_state_to_cpu(struct user_fpsimd_state *st, void *sve_state, 
	struct fpsimd_last_state_struct *last =

		this_cpu_ptr(&fpsimd_last_state);



	WARN_ON(!system_supports_fpsimd());

	WARN_ON(!in_softirq() && !irqs_disabled());



	last->st = st;
@@ -1128,8 +1132,19 @@ void fpsimd_bind_state_to_cpu(struct user_fpsimd_state *st, void *sve_state, 
 */

void fpsimd_restore_current_state(void)

{

	if (!system_supports_fpsimd())

	/*

	 * For the tasks that were created before we detected the absence of

	 * FP/SIMD, the TIF_FOREIGN_FPSTATE could be set via fpsimd_thread_switch(),

	 * e.g, init. This could be then inherited by the children processes.

	 * If we later detect that the system doesn't support FP/SIMD,

	 * we must clear the flag for  all the tasks to indicate that the

	 * FPSTATE is clean (as we can't have one) to avoid looping for ever in

	 * do_notify_resume().

	 */

	if (!system_supports_fpsimd()) {

		clear_thread_flag(TIF_FOREIGN_FPSTATE);

		return;

	}



	get_cpu_fpsimd_context();
@@ -1148,7 +1163,7 @@ void fpsimd_restore_current_state(void) 
 */

void fpsimd_update_current_state(struct user_fpsimd_state const *state)

{

	if (!system_supports_fpsimd())

	if (WARN_ON(!system_supports_fpsimd()))

		return;



	get_cpu_fpsimd_context();
@@ -1179,7 +1194,13 @@ void fpsimd_update_current_state(struct user_fpsimd_state const *state) 
void fpsimd_flush_task_state(struct task_struct *t)

{

	t->thread.fpsimd_cpu = NR_CPUS;



	/*

	 * If we don't support fpsimd, bail out after we have

	 * reset the fpsimd_cpu for this task and clear the

	 * FPSTATE.

	 */

	if (!system_supports_fpsimd())

		return;

	barrier();

	set_tsk_thread_flag(t, TIF_FOREIGN_FPSTATE);
@@ -1193,6 +1214,7 @@ void fpsimd_flush_task_state(struct task_struct *t) 
 */

static void fpsimd_flush_cpu_state(void)

{

	WARN_ON(!system_supports_fpsimd());

	__this_cpu_write(fpsimd_last_state.st, NULL);

	set_thread_flag(TIF_FOREIGN_FPSTATE);

}
@@ -1203,6 +1225,8 @@ static void fpsimd_flush_cpu_state(void) 
 */

void fpsimd_save_and_flush_cpu_state(void)

{

	if (!system_supports_fpsimd())

		return;

	WARN_ON(preemptible());

	__get_cpu_fpsimd_context();

	fpsimd_save();

arch/arm64/kvm/hyp/switch.c

+9 −1
Original line number Diff line number Diff line
@@ -28,7 +28,15 @@ 
/* Check whether the FP regs were dirtied while in the host-side run loop: */

static bool __hyp_text update_fp_enabled(struct kvm_vcpu *vcpu)

{

	if (vcpu->arch.host_thread_info->flags & _TIF_FOREIGN_FPSTATE)

	/*

	 * When the system doesn't support FP/SIMD, we cannot rely on

	 * the _TIF_FOREIGN_FPSTATE flag. However, we always inject an

	 * abort on the very first access to FP and thus we should never

	 * see KVM_ARM64_FP_ENABLED. For added safety, make sure we always

	 * trap the accesses.

	 */

	if (!system_supports_fpsimd() ||

	    vcpu->arch.host_thread_info->flags & _TIF_FOREIGN_FPSTATE)

		vcpu->arch.flags &= ~(KVM_ARM64_FP_ENABLED |

				      KVM_ARM64_FP_HOST);

CRA Git | Maintained and supported by SUSTech CRA and CCSE