diff options
| -rw-r--r-- | config/kernel-cpu_has_feature.m4 | 29 | ||||
| -rw-r--r-- | config/kernel-flush_dcache_page.m4 | 26 | ||||
| -rw-r--r-- | config/kernel.m4 | 12 | ||||
| -rw-r--r-- | include/os/linux/kernel/linux/dcache_compat.h | 15 | ||||
| -rw-r--r-- | include/os/linux/kernel/linux/simd_powerpc.h | 11 |
5 files changed, 93 insertions, 0 deletions
diff --git a/config/kernel-cpu_has_feature.m4 b/config/kernel-cpu_has_feature.m4 new file mode 100644 index 000000000..608faf0f8 --- /dev/null +++ b/config/kernel-cpu_has_feature.m4 @@ -0,0 +1,29 @@ +dnl # +dnl # cpu_has_feature() may referencing GPL-only cpu_feature_keys on powerpc +dnl # + +dnl # +dnl # Checking if cpu_has_feature is exported GPL-only +dnl # +AC_DEFUN([ZFS_AC_KERNEL_SRC_CPU_HAS_FEATURE], [ + ZFS_LINUX_TEST_SRC([cpu_has_feature], [ + #include <linux/version.h> + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) + #include <asm/cpu_has_feature.h> + #else + #include <asm/cputable.h> + #endif + ], [ + return cpu_has_feature(CPU_FTR_ALTIVEC) ? 0 : 1; + ], [], [ZFS_META_LICENSE]) +]) +AC_DEFUN([ZFS_AC_KERNEL_CPU_HAS_FEATURE], [ + AC_MSG_CHECKING([whether cpu_has_feature() is GPL-only]) + ZFS_LINUX_TEST_RESULT([cpu_has_feature_license], [ + AC_MSG_RESULT(no) + ], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_CPU_HAS_FEATURE_GPL_ONLY, 1, + [cpu_has_feature() is GPL-only]) + ]) +]) diff --git a/config/kernel-flush_dcache_page.m4 b/config/kernel-flush_dcache_page.m4 new file mode 100644 index 000000000..2340c386e --- /dev/null +++ b/config/kernel-flush_dcache_page.m4 @@ -0,0 +1,26 @@ +dnl # +dnl # Starting from Linux 5.13, flush_dcache_page() becomes an inline +dnl # function and may indirectly referencing GPL-only cpu_feature_keys on +dnl # powerpc +dnl # + +dnl # +dnl # Checking if flush_dcache_page is exported GPL-only +dnl # +AC_DEFUN([ZFS_AC_KERNEL_SRC_FLUSH_DCACHE_PAGE], [ + ZFS_LINUX_TEST_SRC([flush_dcache_page], [ + #include <asm/cacheflush.h> + ], [ + flush_dcache_page(0); + ], [], [ZFS_META_LICENSE]) +]) +AC_DEFUN([ZFS_AC_KERNEL_FLUSH_DCACHE_PAGE], [ + AC_MSG_CHECKING([whether flush_dcache_page() is GPL-only]) + ZFS_LINUX_TEST_RESULT([flush_dcache_page_license], [ + AC_MSG_RESULT(no) + ], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY, 1, + [flush_dcache_page() is GPL-only]) + ]) +]) diff --git a/config/kernel.m4 b/config/kernel.m4 index 121d73ef6..4c7569841 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -151,6 +151,12 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ ZFS_AC_KERNEL_SRC_IDMAP_MNT_API ZFS_AC_KERNEL_SRC_IATTR_VFSID ZFS_AC_KERNEL_SRC_FILEMAP + case "$host_cpu" in + powerpc*) + ZFS_AC_KERNEL_SRC_CPU_HAS_FEATURE + ZFS_AC_KERNEL_SRC_FLUSH_DCACHE_PAGE + ;; + esac AC_MSG_CHECKING([for available kernel interfaces]) ZFS_LINUX_TEST_COMPILE_ALL([kabi]) @@ -275,6 +281,12 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ ZFS_AC_KERNEL_IDMAP_MNT_API ZFS_AC_KERNEL_IATTR_VFSID ZFS_AC_KERNEL_FILEMAP + case "$host_cpu" in + powerpc*) + ZFS_AC_KERNEL_CPU_HAS_FEATURE + ZFS_AC_KERNEL_FLUSH_DCACHE_PAGE + ;; + esac ]) dnl # diff --git a/include/os/linux/kernel/linux/dcache_compat.h b/include/os/linux/kernel/linux/dcache_compat.h index c43e5b142..1e3520493 100644 --- a/include/os/linux/kernel/linux/dcache_compat.h +++ b/include/os/linux/kernel/linux/dcache_compat.h @@ -40,6 +40,21 @@ #endif /* + * Starting from Linux 5.13, flush_dcache_page() becomes an inline function + * and under some configurations, may indirectly referencing GPL-only + * cpu_feature_keys on powerpc. Override this function when it is detected + * being GPL-only. + */ +#if defined __powerpc__ && defined HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY +#include <linux/simd_powerpc.h> +#define flush_dcache_page(page) do { \ + if (!cpu_has_feature(CPU_FTR_COHERENT_ICACHE) && \ + test_bit(PG_dcache_clean, &(page)->flags)) \ + clear_bit(PG_dcache_clean, &(page)->flags); \ + } while (0) +#endif + +/* * 2.6.30 API change, * The const keyword was added to the 'struct dentry_operations' in * the dentry structure. To handle this we define an appropriate diff --git a/include/os/linux/kernel/linux/simd_powerpc.h b/include/os/linux/kernel/linux/simd_powerpc.h index 104fa6963..bd7328d7d 100644 --- a/include/os/linux/kernel/linux/simd_powerpc.h +++ b/include/os/linux/kernel/linux/simd_powerpc.h @@ -119,6 +119,17 @@ #define kfpu_fini() ((void) 0) /* + * Linux 4.7 makes cpu_has_feature to use jump labels on powerpc if + * CONFIG_JUMP_LABEL_FEATURE_CHECKS is enabled, in this case however it + * references GPL-only symbol cpu_feature_keys. Therefore we overrides this + * interface when it is detected being GPL-only. + */ +#if defined(CONFIG_JUMP_LABEL_FEATURE_CHECKS) && \ + defined(HAVE_CPU_HAS_FEATURE_GPL_ONLY) +#define cpu_has_feature(feature) early_cpu_has_feature(feature) +#endif + +/* * Check if AltiVec instruction set is available */ static inline boolean_t |