Commit 9aa030ce authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

arm64: cpufeatures: Fix FEAT_NV check when checking for FEAT_NV1 



Using this_cpu_has_cap() has the potential to go wrong when
used system-wide on a preemptible kernel. Instead, use the
__system_matches_cap() helper when checking for FEAT_NV in the
FEAT_NV1 probing helper.

Fixes: 3673d01a ("arm64: cpufeatures: Only check for NV1 if NV is present")
Reported-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/kvmarm/86bk8k5ts3.wl-maz@kernel.org/


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 3673d01a

arch/arm64/kernel/cpufeature.c

+1 −1
Original line number Diff line number Diff line
@@ -1812,7 +1812,7 @@ static bool has_nv1(const struct arm64_cpu_capabilities *entry, int scope) 
		{}

	};



	return (this_cpu_has_cap(ARM64_HAS_NESTED_VIRT) &&

	return (__system_matches_cap(ARM64_HAS_NESTED_VIRT) &&

		!(has_cpuid_feature(entry, scope) ||

		  is_midr_in_range_list(read_cpuid_id(), nv1_ni_list)));

}