X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Fautoconf%2Flustre-libcfs.m4;h=4774cac789354f6a84f702cc9edf7cef4d106826;hb=e37335b2d8c2dc74badea8978ab3f46a63621265;hp=f81b92a8269394db23ac178d6fe00866380fd3f1;hpb=eca949bf83dfec5be33dc6230f55823376aef65a;p=fs%2Flustre-release.git diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index f81b92a..4774cac 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -137,6 +137,24 @@ ctl_table_ctl_name, [ ]) # LIBCFS_SYSCTL_CTLNAME # +# LIBCFS_MODULE_LOCKING +# +# 2.6.36 introduced locking to module params. RHEL6 lacks this support +# +AC_DEFUN([LIBCFS_MODULE_LOCKING],[ +LB_CHECK_COMPILE([does the kernel support module param locking], +module_param_locking, [ + #include +],[ + __kernel_param_lock(NULL); + __kernel_param_unlock(NULL); +],[ + AC_DEFINE(HAVE_MODULE_PARAM_LOCKING, 1, + [locking module param is supported]) +]) +]) # LIBCFS_MODULE_LOCKING + +# # LIBCFS_KSTRTOUL # # 2.6.38 kstrtoul is added @@ -221,30 +239,6 @@ i_uid_read, [ ]) # LIBCFS_I_UID_READ # -# LIBCFS_SOCK_ALLOC_FILE -# -# FC18 3.7.2-201 unexport sock_map_fd() change to -# use sock_alloc_file(). -# upstream commit 56b31d1c9f1e6a3ad92e7bfe252721e05d92b285 -# -AC_DEFUN([LIBCFS_SOCK_ALLOC_FILE], [ -LB_CHECK_EXPORT([sock_alloc_file], [net/socket.c], [ - LB_CHECK_COMPILE([if 'sock_alloc_file' takes 3 arguments], - sock_alloc_file_3args, [ - #include - ],[ - sock_alloc_file(NULL, 0, NULL); - ],[ - AC_DEFINE(HAVE_SOCK_ALLOC_FILE_3ARGS, 1, - [sock_alloc_file takes 3 arguments]) - ],[ - AC_DEFINE(HAVE_SOCK_ALLOC_FILE, 1, - [sock_alloc_file is exported]) - ]) -]) -]) # LIBCFS_SOCK_ALLOC_FILE - -# # LIBCFS_HAVE_CRC32 # AC_DEFUN([LIBCFS_HAVE_CRC32], [ @@ -283,6 +277,7 @@ AS_IF([test "x$enable_crc32c_crypto" = xyes], [ AC_DEFUN([LIBCFS_KTIME_GET_TS64],[ LB_CHECK_COMPILE([does function 'ktime_get_ts64' exist], ktime_get_ts64, [ + #include #include ],[ struct timespec64 *ts = NULL; @@ -295,11 +290,31 @@ ktime_get_ts64, [ ]) # LIBCFS_KTIME_GET_TS64 # +# Linux kernel 3.12 introduced struct kernel_param_ops +# This has been backported to all lustre supported +# clients except RHEL6. We have to handle the differences. +# +AC_DEFUN([LIBCFS_KERNEL_PARAM_OPS],[ +LB_CHECK_COMPILE([does 'struct kernel_param_ops' exist], +kernel_param_ops, [ + #include +],[ + struct kernel_param_ops ops; + + ops.set = NULL; +],[ + AC_DEFINE(HAVE_KERNEL_PARAM_OPS, 1, + ['struct kernel_param_ops' is available]) +]) +]) # LIBCFS_KERNEL_PARAM_OPS + +# # Kernel version 3.12 introduced ktime_add # AC_DEFUN([LIBCFS_KTIME_ADD],[ LB_CHECK_COMPILE([does function 'ktime_add' exist], ktime_add, [ + #include #include ],[ ktime_t start = ktime_set(0, 0); @@ -319,6 +334,7 @@ ktime_add, [ AC_DEFUN([LIBCFS_KTIME_AFTER],[ LB_CHECK_COMPILE([does function 'ktime_after' exist], ktime_after, [ + #include #include ],[ ktime_t start = ktime_set(0, 0); @@ -332,6 +348,45 @@ ktime_after, [ ]) # LIBCFS_KTIME_AFTER # +# Kernel version 3.12 introduced ktime_before +# See linux commit 67cb9366ff5f99868100198efba5ca88aaa6ad25 +# +AC_DEFUN([LIBCFS_KTIME_BEFORE],[ +LB_CHECK_COMPILE([does function 'ktime_before' exist], +ktime_before, [ + #include + #include +],[ + ktime_t start = ktime_set(0, 0); + ktime_t end = start; + + ktime_before(start, end); +],[ + AC_DEFINE(HAVE_KTIME_BEFORE, 1, + [ktime_before is available]) +]) +]) # LIBCFS_KTIME_BEFORE + +# +# Kernel version 3.12 introduced ktime_compare +# +AC_DEFUN([LIBCFS_KTIME_COMPARE],[ +LB_CHECK_COMPILE([does function 'ktime_compare' exist], +ktime_compare, [ + #include + #include +],[ + ktime_t start = ktime_set(0, 0); + ktime_t end = start; + + ktime_compare(start, end); +],[ + AC_DEFINE(HAVE_KTIME_COMPARE, 1, + [ktime_compare is available]) +]) +]) # LIBCFS_KTIME_COMPARE + +# # FC19 3.12 kernel struct shrinker change # AC_DEFUN([LIBCFS_SHRINKER_COUNT],[ @@ -340,7 +395,9 @@ shrinker_count_objects, [ #include #include ],[ - ((struct shrinker*)0)->count_objects(NULL, NULL); + struct shrinker shrinker; + + shrinker.count_objects = NULL; ],[ AC_DEFINE(HAVE_SHRINKER_COUNT, 1, [shrinker has count_objects member]) @@ -404,6 +461,7 @@ ktime_get_real_ts64, [ AC_DEFUN([LIBCFS_KTIME_GET_REAL_SECONDS],[ LB_CHECK_COMPILE([does function 'ktime_get_real_seconds' exist], ktime_get_real_seconds, [ + #include #include ],[ time64_t now; @@ -416,11 +474,30 @@ ktime_get_real_seconds, [ ]) # LIBCFS_KTIME_GET_REAL_SECONDS # +# Kernel version 3.17 created ktime_get_ns wrapper +# +AC_DEFUN([LIBCFS_KTIME_GET_NS],[ +LB_CHECK_COMPILE([does function 'ktime_get_ns' exist], +ktime_get_ns, [ + #include + #include +],[ + u64 nanoseconds; + + nanoseconds = ktime_get_ns(); +],[],[ + AC_DEFINE(NEED_KTIME_GET_NS, 1, + ['ktime_get_ns' is not available]) +]) +]) # LIBCFS_KTIME_GET_NS + +# # Kernel version 3.17 created ktime_get_real_ns wrapper # AC_DEFUN([LIBCFS_KTIME_GET_REAL_NS],[ LB_CHECK_COMPILE([does function 'ktime_get_real_ns' exist], ktime_get_real_ns, [ + #include #include ],[ u64 nanoseconds; @@ -438,10 +515,11 @@ ktime_get_real_ns, [ AC_DEFUN([LIBCFS_KTIME_TO_TIMESPEC64],[ LB_CHECK_COMPILE([does function 'ktime_to_timespec64' exist], ktime_to_timespec64, [ + #include #include ],[ + ktime_t now = ktime_set(0, 0); struct timespec64 ts; - ktime_t now; ts = ktime_to_timespec64(now); ],[ @@ -458,7 +536,7 @@ LB_CHECK_COMPILE([does function 'timespec64_sub' exist], timespec64_sub, [ #include ],[ - struct timespec64 later,earlier,diff; + struct timespec64 later = { }, earlier = { }, diff; diff = timespec64_sub(later, earlier); ],[ @@ -524,6 +602,44 @@ cpumap_print_to_pagebuf, [ ]) # LIBCFS_HAVE_CPUMASK_PRINT_TO_PAGEBUF # +# Kernel version 4.0 commit 41fbf3b39d5eca01527338b4d0ee15ee1ae1023c +# introduced the helper function ktime_ms_delta. +# +AC_DEFUN([LIBCFS_KTIME_MS_DELTA],[ +LB_CHECK_COMPILE([does function 'ktime_ms_delta' exist], +ktime_ms_delta, [ + #include +],[ + ktime_t start = ktime_set(0, 0); + ktime_t end = start; + + ktime_ms_delta(start, end); +],[ + AC_DEFINE(HAVE_KTIME_MS_DELTA, 1, + ['ktime_ms_delta' is available]) +]) +]) # LIBCFS_KTIME_MS_DELTA + +# +# Kernel version 4.1 commit b51d23e4e9fea6f264d39535c2a62d1f51e7ccc3 +# create per module locks which added kernel_param_[un]lock(). Older +# kernels you have to use __kernel_param_[un]lock(). In that case its +# a global lock for all modules but that is okay since its a rare event. +# +AC_DEFUN([LIBCFS_KERNEL_PARAM_LOCK],[ +LB_CHECK_COMPILE([does function 'kernel_param_[un]lock' exist], +kernel_param_lock, [ + #include +],[ + kernel_param_lock(NULL); + kernel_param_unlock(NULL); +],[ + AC_DEFINE(HAVE_KERNEL_PARAM_LOCK, 1, + ['kernel_param_[un]lock' is available]) +]) +]) # LIBCFS_KERNEL_PARAM_LOCK + +# # Kernel version 4.2 changed topology_thread_cpumask # to topology_sibling_cpumask # @@ -552,6 +668,23 @@ LB_CHECK_LINUX_HEADER([asm/fpu/api.h], [ ]) # LIBCFS_FPU_API # +# Kernel version 4.4 commit ef951599074ba4fad2d0efa0a977129b41e6d203 +# introduced kstrtobool and kstrtobool_from_user. +# +AC_DEFUN([LIBCFS_KSTRTOBOOL_FROM_USER], [ +LB_CHECK_COMPILE([if Linux kernel has 'kstrtobool_from_user'], +kstrtobool_from_user, [ + #include +],[ + bool result; + return kstrtobool_from_user(NULL, 0, &result); +],[ + AC_DEFINE(HAVE_KSTRTOBOOL_FROM_USER, 1, + [kernel has kstrtobool_from_user]) +]) +]) # LIBCFS_KSTRTOBOOL_FROM_USER + +# # Kernel version 4.5-rc1 commit d12481bc58fba89427565f8592e88446ec084a24 # added crypto hash helpers # @@ -569,6 +702,16 @@ crypto_hash_helpers, [ ]) # LIBCFS_CRYPTO_HASH_HELPERS # +# Kernerl version 4.5-rc3 commit 2fe829aca9d7bed5fd6b49c6a1452e5e486b6cc3dd +# made kset_find_obj() exportable to modules +# +AC_DEFUN([LIBCFS_EXPORT_KSET_FIND_OBJ], [ +LB_CHECK_EXPORT([kset_find_obj], [lib/kobject.c], + [AC_DEFINE(HAVE_KSET_FIND_OBJ, 1, + [kset_find_obj is exported by the kernel])]) +]) # LIBCFS_EXPORT_KSET_FIND_OBJ + +# # LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT # # linux 4.6 kernel changed stacktrace_ops address to return an int @@ -644,6 +787,96 @@ get_user_pages_gup_flags, [ ]) # LIBCFS_GET_USER_PAGES_GUP_FLAGS # +# Kernel version 4.10 commit 7b737965b33188bd3dbb44e938535c4006d97fbb +# libcfs: Convert to hotplug state machine +# +AC_DEFUN([LIBCFS_HOTPLUG_STATE_MACHINE], [ +LB_CHECK_COMPILE([if libcfs supports CPU hotplug state machine], +cpu_hotplug_state_machine, [ + #include +],[ + cpuhp_remove_state(CPUHP_LUSTRE_CFS_DEAD); +],[ + AC_DEFINE(HAVE_HOTPLUG_STATE_MACHINE, 1, + [hotplug state machine is supported]) +]) +]) # LIBCFS_HOTPLUG_STATE_MACHINE + +# +# LIBCFS_SCHED_HEADERS +# +# 4.11 has broken up sched.h into more headers. +# +AC_DEFUN([LIBCFS_SCHED_HEADERS], [ +LB_CHECK_LINUX_HEADER([linux/sched/signal.h], [ + AC_DEFINE(HAVE_SCHED_HEADERS, 1, + [linux/sched header directory exist])]) +]) # LIBCFS_SCHED_HEADERS + +# +# LIBCFS_WAIT_QUEUE_ENTRY +# +# Kernel version 4.13 ac6424b981bce1c4bc55675c6ce11bfe1bbfa64f +# Rename wait_queue_t => wait_queue_entry_t +# +AC_DEFUN([LIBCFS_WAIT_QUEUE_ENTRY], [ +LB_CHECK_COMPILE([if 'wait_queue_entry_t' exists], +wait_queue_entry, [ + #include +],[ + wait_queue_entry_t e; + + e.flags = 0; +],[ + AC_DEFINE(HAVE_WAIT_QUEUE_ENTRY, 1, + ['wait_queue_entry_t' is available]) +]) +]) # LIBCFS_WAIT_QUEUE_ENTRY + +# +# LIBCFS_NEW_KERNEL_WRITE +# +# Kernel version 4.14 e13ec939e96b13e664bb6cee361cc976a0ee621a +# changed kernel_write prototype to make is plug compatible +# with the unexported vfs_write() +# +AC_DEFUN([LIBCFS_NEW_KERNEL_WRITE], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if 'kernel_write' matches other read/write helpers], +kernel_write_match, [ + #include +],[ + const void *buf = NULL; + loff_t pos = 0; + return kernel_write(NULL, buf, 0, &pos); +],[ + AC_DEFINE(HAVE_NEW_KERNEL_WRITE, 1, + ['kernel_write' aligns with read/write helpers]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LIBCFS_NEW_KERNEL_WRITE + +# +# LIBCFS_TIMER_SETUP +# +# Kernel version 4.15 commit e99e88a9d2b067465adaa9c111ada99a041bef9a +# setup_timer() was replaced by timer_setup(), where the callback +# argument is the structure already holding the struct timer_list. +# +AC_DEFUN([LIBCFS_TIMER_SETUP], [ +LB_CHECK_COMPILE([if setup_timer has been replaced with timer_setup], +timer_setup, [ + #include +],[ + timer_setup(NULL, NULL, 0); +],[ + AC_DEFINE(HAVE_TIMER_SETUP, 1, + [timer_setup has replaced setup_timer]) +]) +]) # LIBCFS_TIMER_SETUP + +# # LIBCFS_PROG_LINUX # # LibCFS linux kernel checks @@ -658,6 +891,8 @@ LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK LC_SHRINKER_WANT_SHRINK_PTR # 2.6.33 LIBCFS_SYSCTL_CTLNAME +# 2.6.36 +LIBCFS_MODULE_LOCKING # 2.6.38 LIBCFS_KSTRTOUL # 2.6.39 @@ -670,8 +905,6 @@ LIBCFS_REINIT_COMPLETION # 3.5 LIBCFS_PROCESS_NAMESPACE LIBCFS_I_UID_READ -# 3.7 -LIBCFS_SOCK_ALLOC_FILE # 3.8 LIBCFS_HAVE_CRC32 LIBCFS_ENABLE_CRC32_ACCEL @@ -680,12 +913,16 @@ LIBCFS_ENABLE_CRC32C_ACCEL # 3.11 LIBCFS_KTIME_GET_TS64 # 3.12 +LIBCFS_KERNEL_PARAM_OPS LIBCFS_KTIME_ADD LIBCFS_KTIME_AFTER +LIBCFS_KTIME_BEFORE +LIBCFS_KTIME_COMPARE LIBCFS_SHRINKER_COUNT # 3.17 LIBCFS_HLIST_ADD_AFTER LIBCFS_TIMESPEC64 +LIBCFS_KTIME_GET_NS LIBCFS_KTIME_GET_REAL_TS64 LIBCFS_KTIME_GET_REAL_SECONDS LIBCFS_KTIME_GET_REAL_NS @@ -695,11 +932,18 @@ LIBCFS_TIMESPEC64_TO_KTIME # 3.19 LIBCFS_KTIME_GET_SECONDS LIBCFS_HAVE_CPUMASK_PRINT_TO_PAGEBUF +# 4.0 +LIBCFS_KTIME_MS_DELTA +# 4.1 +LIBCFS_KERNEL_PARAM_LOCK # 4.2 LIBCFS_HAVE_TOPOLOGY_SIBLING_CPUMASK LIBCFS_FPU_API +# 4.4 +LIBCFS_KSTRTOBOOL_FROM_USER # 4.5 LIBCFS_CRYPTO_HASH_HELPERS +LIBCFS_EXPORT_KSET_FIND_OBJ # 4.6 LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT LIBCFS_GET_USER_PAGES_6ARG @@ -707,6 +951,16 @@ LIBCFS_GET_USER_PAGES_6ARG LIBCFS_STACKTRACE_OPS # 4.9 LIBCFS_GET_USER_PAGES_GUP_FLAGS +# 4.10 +LIBCFS_HOTPLUG_STATE_MACHINE +# 4.11 +LIBCFS_SCHED_HEADERS +# 4.13 +LIBCFS_WAIT_QUEUE_ENTRY +# 4.14 +LIBCFS_NEW_KERNEL_WRITE +# 4.15 +LIBCFS_TIMER_SETUP ]) # LIBCFS_PROG_LINUX # @@ -726,38 +980,6 @@ AC_DEFUN([LIBCFS_CONFIGURE], [ AC_MSG_NOTICE([LibCFS core checks ==============================================================================]) -# lnet/utils/portals.c -AC_CHECK_HEADERS([asm/types.h endian.h sys/ioctl.h]) - -# lnet/utils/debug.c -AC_CHECK_HEADERS([linux/version.h]) - -AC_CHECK_TYPE([spinlock_t], - [AC_DEFINE(HAVE_SPINLOCK_T, 1, [spinlock_t is defined])], - [], - [#include ]) - -# lnet/utils/wirecheck.c -AC_CHECK_FUNCS([strnlen]) - -# lnet/libcfs/user-prim.c, missing for RHEL5 and earlier userspace -AC_CHECK_FUNCS([strlcpy]) - -# libcfs/libcfs/user-prim.c, missing for RHEL5 and earlier userspace -AC_CHECK_FUNCS([strlcat]) - -# libcfs/include/libcfs/linux/linux-prim.h, ... -AC_CHECK_HEADERS([linux/types.h sys/types.h linux/unistd.h unistd.h]) - -# libcfs/include/libcfs/linux/linux-prim.h -AC_CHECK_HEADERS([linux/random.h], [], [], - [#ifdef HAVE_LINUX_TYPES_H - #include - #endif - ]) - -# libcfs/include/libcfs/linux/libcfs.h -# libcfs/include/libcfs/byteorder.h # libcfs/libcfs/util/nidstrings.c AC_CHECK_HEADERS([netdb.h asm/types.h endian.h]) AC_CHECK_FUNCS([gethostbyname])