From 4d14a285b341b7031c0d23b7dd6b5ad63de8f0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20F=C3=BCl=C3=B6p?= Date: Thu, 24 Feb 2022 18:23:41 +0100 Subject: [PATCH] Linux 5.11 compat: x86 SIMD: fix kernel_fpu_{begin,end}() detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Linux 5.11 changed kernel_fpu_begin() to an inlined function and moved the functionality to kernel_fpu_begin_mask(). This breaks the existing detection mechanism since it checks if kernel_fpu_begin is an exported kernel symbol, which isn't the case for an inlined function. To avoid assumptions about internal implementation, replace ZFS_LINUX_TEST_RESULT_SYMBOL in favor of ZFS_LINUX_TEST_RESULT which already makes sure kernel_fpu_{begin,end}() is usable by us. Reviewed-by: Tony Hutter Reviewed-by: Brian Behlendorf Signed-off-by: Attila Fülöp Closes #13147 --- config/kernel-fpu.m4 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/kernel-fpu.m4 b/config/kernel-fpu.m4 index 06280239d..7f8b028d0 100644 --- a/config/kernel-fpu.m4 +++ b/config/kernel-fpu.m4 @@ -8,6 +8,9 @@ dnl # dnl # XSTATE_XSAVE and XSTATE_XRESTORE aren't accessible any more dnl # HAVE_KERNEL_FPU_XSAVE_INTERNAL dnl # +dnl # 5.11: kernel_fpu_begin() is an inlined function now, so don't check +dnl # for it inside the kernel symbols. +dnl # dnl # 5.0: Wrappers have been introduced to save/restore the FPU state. dnl # This change was made to the 4.19.38 and 4.14.120 LTS kernels. dnl # HAVE_KERNEL_FPU_INTERNAL @@ -147,8 +150,7 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU], [ dnl # Legacy kernel dnl # AC_MSG_CHECKING([whether kernel fpu is available]) - ZFS_LINUX_TEST_RESULT_SYMBOL([kernel_fpu_license], - [kernel_fpu_begin], [arch/x86/kernel/fpu/core.c], [ + ZFS_LINUX_TEST_RESULT([kernel_fpu_license], [ AC_MSG_RESULT(kernel_fpu_*) AC_DEFINE(HAVE_KERNEL_FPU, 1, [kernel has kernel_fpu_* functions])