Skip to content
Commit d5757901 authored by Eric Biggers's avatar Eric Biggers Committed by Yang Yingliang
Browse files

x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ

mainline inclusion
from mainline-v6.9-rc5
commit 9543f6e26634537997b6e909c20911b7bf4876de
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9NZ3E

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9543f6e26634537997b6e909c20911b7bf4876de



--------------------------------

Fix cpuid_deps[] to list the correct dependencies for GFNI, VAES, and
VPCLMULQDQ.  These features don't depend on AVX512, and there exist CPUs
that support these features but not AVX512.  GFNI actually doesn't even
depend on AVX.

This prevents GFNI from being unnecessarily disabled if AVX is disabled
to mitigate the GDS vulnerability.

This also prevents all three features from being unnecessarily disabled
if AVX512VL (or its dependency AVX512F) were to be disabled, but it
looks like there isn't any case where this happens anyway.

Fixes: c128dbfa ("x86/cpufeatures: Enable new SSE/AVX/AVX512 CPU features")
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Acked-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/r/20240417060434.47101-1-ebiggers@kernel.org


Conflicts:
	arch/x86/kernel/cpu/cpuid-deps.c
[yyl: adjust context]
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent c6c0f64f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment