X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Fautoconf%2Flustre-libcfs.m4;h=82a4ebc791e853f86d4457a353e7a377a7d327d2;hb=604c266a175b72500ef99793652b64ed4f842b2c;hp=b55979865d1abd8122260c580e00b645c3e861e3;hpb=fb436c078ddb95f2371d93a37e4f67a31701add2;p=fs%2Flustre-release.git diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index b559798..82a4ebc 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -121,6 +121,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 @@ -205,30 +223,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], [ @@ -262,6 +256,121 @@ AS_IF([test "x$enable_crc32c_crypto" = xyes], [ ]) # LIBCFS_ENABLE_CRC32C_ACCEL # +# Kernel version 3.11 introduced ktime_get_ts64 +# +AC_DEFUN([LIBCFS_KTIME_GET_TS64],[ +LB_CHECK_COMPILE([does function 'ktime_get_ts64' exist], +ktime_get_ts64, [ + #include + #include +],[ + struct timespec64 *ts = NULL; + + ktime_get_ts64(ts); +],[ + AC_DEFINE(HAVE_KTIME_GET_TS64, 1, + ['ktime_get_ts64' is available]) +]) +]) # 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); + ktime_t end = start; + ktime_t total; + + total = ktime_add(start, end); +],[ + AC_DEFINE(HAVE_KTIME_ADD, 1, + [ktime_add is available]) +]) +]) # LIBCFS_KTIME_ADD + +# +# Kernel version 3.12 introduced ktime_after +# +AC_DEFUN([LIBCFS_KTIME_AFTER],[ +LB_CHECK_COMPILE([does function 'ktime_after' exist], +ktime_after, [ + #include + #include +],[ + ktime_t start = ktime_set(0, 0); + ktime_t end = start; + + ktime_after(start, end); +],[ + AC_DEFINE(HAVE_KTIME_AFTER, 1, + [ktime_after is available]) +]) +]) # 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],[ @@ -270,7 +379,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]) @@ -294,6 +405,204 @@ hlist_add_after, [ ]) # LIBCFS_HLIST_ADD_AFTER # +# Kernel version 3.17 introduced struct timespec64 +# +AC_DEFUN([LIBCFS_TIMESPEC64],[ +LB_CHECK_COMPILE([does 'struct timespec64' exist], +timespec64, [ + #include +],[ + struct timespec64 ts; + + ts.tv_sec = 0; + ts.tv_nsec = 0; +],[ + AC_DEFINE(HAVE_TIMESPEC64, 1, + ['struct timespec64' is available]) +]) +]) # LIBCFS_TIMESPEC64 + +# +# Kernel version 3.17 introduced ktime_get_real_ts64 +# +AC_DEFUN([LIBCFS_KTIME_GET_REAL_TS64],[ +LB_CHECK_COMPILE([does function 'ktime_get_real_ts64' exist], +ktime_get_real_ts64, [ + #include +],[ + struct timespec64 *ts = NULL; + + ktime_get_real_ts64(ts); +],[ + AC_DEFINE(HAVE_KTIME_GET_REAL_TS64, 1, + ['ktime_get_real_ts64' is available]) +]) +]) # LIBCFS_KTIME_GET_REAL_TS64 + +# +# Kernel version 3.17 introduced ktime_get_real_seconds +# +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; + + now = ktime_get_real_seconds(); +],[ + AC_DEFINE(HAVE_KTIME_GET_REAL_SECONDS, 1, + ['ktime_get_real_seconds' is available]) +]) +]) # 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; + + nanoseconds = ktime_get_real_ns(); +],[],[ + AC_DEFINE(NEED_KTIME_GET_REAL_NS, 1, + ['ktime_get_real_ns' is not available]) +]) +]) # LIBCFS_KTIME_GET_REAL_NS + +# +# Kernel version 3.17 introduced ktime_to_timespec64 +# +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; + + ts = ktime_to_timespec64(now); +],[ + AC_DEFINE(HAVE_KTIME_TO_TIMESPEC64, 1, + ['ktime_to_timespec64' is available]) +]) +]) # LIBCFS_KTIME_TO_TIMESPEC64 + +# +# Kernel version 3.17 introduced timespec64_sub +# +AC_DEFUN([LIBCFS_TIMESPEC64_SUB],[ +LB_CHECK_COMPILE([does function 'timespec64_sub' exist], +timespec64_sub, [ + #include +],[ + struct timespec64 later = { }, earlier = { }, diff; + + diff = timespec64_sub(later, earlier); +],[ + AC_DEFINE(HAVE_TIMESPEC64_SUB, 1, + ['timespec64_sub' is available]) +]) +]) # LIBCFS_TIMESPEC64_SUB + +# +# Kernel version 3.17 introduced timespec64_to_ktime +# +AC_DEFUN([LIBCFS_TIMESPEC64_TO_KTIME],[ +LB_CHECK_COMPILE([does function 'timespec64_to_ktime' exist], +timespec64_to_ktime, [ + #include +],[ + struct timespec64 ts; + ktime_t now; + + now = timespec64_to_ktime(ts); +],[ + AC_DEFINE(HAVE_TIMESPEC64_TO_KTIME, 1, + ['timespec64_to_ktime' is available]) +]) +]) # LIBCFS_TIMESPEC64_TO_KTIME + +# +# Kernel version 3.19 introduced ktime_get_seconds +# +AC_DEFUN([LIBCFS_KTIME_GET_SECONDS],[ +LB_CHECK_COMPILE([does function 'ktime_get_seconds' exist], +ktime_get_seconds, [ + #include +],[ + time64_t now; + + now = ktime_get_seconds(); +],[ + AC_DEFINE(HAVE_KTIME_GET_SECONDS, 1, + ['ktime_get_seconds' is available]) +]) +]) # LIBCFS_KTIME_GET_SECONDS + +# +# 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 # @@ -322,6 +631,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 # @@ -339,6 +665,32 @@ 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 + +# +# Kernel version 4.6+ commit ef703f49a6c5b909a85149bb6625c4ed0d697186 +# fixed the brokenness of hash_64(). The fix removed GOLDEN_RATIO_PRIME_64 +# since it was a poor prime value. +# +AC_DEFUN([LIBCFS_BROKEN_HASH_64], [ +LB_CHECK_COMPILE([kernel has fixed hash_64()], +broken_hash_64, [ + #include +],[ + int tmp = GOLDEN_RATIO_PRIME_64; +],[ + AC_DEFINE(HAVE_BROKEN_HASH_64, 1, [kernel hash_64() is broken]) +]) +]) # LIBCFS_BROKEN_HASH_64 + +# # LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT # # linux 4.6 kernel changed stacktrace_ops address to return an int @@ -358,6 +710,283 @@ stacktrace_ops_address_return_int, [ ]) # LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT # +# Kernel version 4.6 removed both struct task_struct and struct mm_struct +# arguments to get_user_pages +# +AC_DEFUN([LIBCFS_GET_USER_PAGES_6ARG], [ +LB_CHECK_COMPILE([if 'get_user_pages()' takes 6 arguments], +get_user_pages_6arg, [ + #include +],[ + int rc; + + rc = get_user_pages(0, 0, 0, 0, NULL, NULL); +],[ + AC_DEFINE(HAVE_GET_USER_PAGES_6ARG, 1, + [get_user_pages takes 6 arguments]) +]) +]) # LIBCFS_GET_USER_PAGES_6ARG + +# +# LIBCFS_STRINGHASH +# +# 4.6 kernel created stringhash.h which moved stuff out of dcache.h +# commit f4bcbe792b8f434e32487cff9d9e30ab45a3ce02 +# +AC_DEFUN([LIBCFS_STRINGHASH], [ +LB_CHECK_LINUX_HEADER([linux/stringhash.h], [ + AC_DEFINE(HAVE_STRINGHASH, 1, + [stringhash.h is present])]) +]) # LIBCFS_STRINGHASH + +# +# LIBCFS_RHASHTABLE_INSERT_FAST +# +# 4.7+ kernel commit 5ca8cc5bf11faed257c762018aea9106d529232f +# changed __rhashtable_insert_fast to support the new function +# rhashtable_lookup_get_insert_key(). +# +AC_DEFUN([LIBCFS_RHASHTABLE_INSERT_FAST], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if internal '__rhashtable_insert_fast()' returns int], +rhashtable_insert_fast, [ + #include +],[ + const struct rhashtable_params params = { 0 }; + int rc; + + rc = __rhashtable_insert_fast(NULL, NULL, NULL, params); +],[ + AC_DEFINE(HAVE_HASHTABLE_INSERT_FAST_RETURN_INT, 1, + ['__rhashtable_insert_fast()' returns int]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LIBCFS_RHASHTABLE_INSERT_FAST + +# +# Kernel version 4.8-rc6 commit ca26893f05e86497a86732768ec53cd38c0819ca +# introduced rhashtable_lookup +# +AC_DEFUN([LIBCFS_RHASHTABLE_LOOKUP], [ +LB_CHECK_COMPILE([if 'rhashtable_lookup' exist], +rhashtable_lookup, [ + #include +],[ + const struct rhashtable_params params = { 0 }; + void *ret; + + ret = rhashtable_lookup(NULL, NULL, params); +],[ + AC_DEFINE(HAVE_RHASHTABLE_LOOKUP, 1, + [rhashtable_lookup() is available]) +]) +]) # LIBCFS_RHASHTABLE_LOOKUP + +# +# LIBCFS_RHLTABLE +# Kernel version 4.8-rc6 commit ca26893f05e86497a86732768ec53cd38c0819ca +# created the rhlist interface to allow inserting duplicate objects +# into the same table. +# +AC_DEFUN([LIBCFS_RHLTABLE], [ +LB_CHECK_COMPILE([does 'struct rhltable' exist], +rhtable, [ + #include +],[ + struct rhltable *hlt; + + rhltable_destroy(hlt); +],[ + AC_DEFINE(HAVE_RHLTABLE, 1, + [struct rhltable exist]) +]) +]) # LIBCFS_RHLTABLE + +# +# LIBCFS_STACKTRACE_OPS +# +# Kernel version 4.8 commit c8fe4609827aedc9c4b45de80e7cdc8ccfa8541b +# removed both struct stacktrace_ops and dump_trace() function +# +AC_DEFUN([LIBCFS_STACKTRACE_OPS], [ +LB_CHECK_COMPILE([if 'struct stacktrace_ops' exists], +stacktrace_ops, [ + struct task_struct; + struct pt_regs; + #include +],[ + struct stacktrace_ops ops; + ops.stack = NULL; +],[ + AC_DEFINE(HAVE_STACKTRACE_OPS, 1, + [struct stacktrace_ops exists]) +]) +]) # LIBCFS_STACKTRACE_OPS + +# +# Kernel version 4.9 commit 768ae309a96103ed02eb1e111e838c87854d8b51 +# mm: replace get_user_pages() write/force parameters with gup_flags +# +AC_DEFUN([LIBCFS_GET_USER_PAGES_GUP_FLAGS], [ +LB_CHECK_COMPILE([if 'get_user_pages()' takes gup_flags in arguments], +get_user_pages_gup_flags, [ + #include +],[ + int rc; + rc = get_user_pages(0, 0, FOLL_WRITE, NULL, NULL); +],[ + AC_DEFINE(HAVE_GET_USER_PAGES_GUP_FLAGS, 1, + [get_user_pages takes gup_flags in arguments]) +]) +]) # 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 + +# +# Kernel version 4.11 commit f9fe1c12d126f9887441fa5bb165046f30ddd4b5 +# introduced rhashtable_lookup_get_insert_fast +# +AC_DEFUN([LIBCFS_RHASHTABLE_LOOKUP_GET_INSERT_FAST], [ +LB_CHECK_COMPILE([if 'rhashtable_lookup_get_insert_fast' exist], +rhashtable_lookup_get_insert_fast, [ + #include +],[ + const struct rhashtable_params params = { 0 }; + void *ret; + + ret = rhashtable_lookup_get_insert_fast(NULL, NULL, params); +],[ + AC_DEFINE(HAVE_RHASHTABLE_LOOKUP_GET_INSERT_FAST, 1, + [rhashtable_lookup_get_insert_fast() is available]) +]) +]) # LIBCFS_RHASHTABLE_LOOKUP_GET_INSERT_FAST + +# +# Kernel version 4.12-rc3 f9727a17db9bab71ddae91f74f11a8a2f9a0ece6 +# renamed uuid_be to uuid_t +# +AC_DEFUN([LIBCFS_UUID_T], [ +LB_CHECK_COMPILE([if 'uuid_t' exist], +uuid_t, [ + #include +],[ + uuid_t uuid; + + memset(uuid.b, 0, 16); +],[ + AC_DEFINE(HAVE_UUID_T, 1, ['uuid_t' exist]) +]) +]) # LIBCFS_UUID_T + +# +# 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_DEFINE_TIMER +# +# Kernel version 4.14 commit 1d27e3e2252ba9d949ca82fbdb73cde102cb2067 +# remove expires and data arguments from DEFINE_TIMER. Also the callback +# when from using unsigned long argument to using struct timer_list pointer. +# +AC_DEFUN([LIBCFS_DEFINE_TIMER], [ +LB_CHECK_COMPILE([if DEFINE_TIMER takes only 2 arguments], +define_timer, [ + #include +],[ + static DEFINE_TIMER(my_timer, NULL); +],[ + AC_DEFINE(HAVE_NEW_DEFINE_TIMER, 1, + [DEFINE_TIMER uses only 2 arguements]) +]) +]) # LIBCFS_DEFINE_TIMER + +# +# 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 @@ -372,6 +1001,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 @@ -383,24 +1014,71 @@ LIBCFS_STACKTRACE_WARNING # 3.5 LIBCFS_PROCESS_NAMESPACE LIBCFS_I_UID_READ -# 3.7 -LIBCFS_SOCK_ALLOC_FILE # 3.8 LIBCFS_HAVE_CRC32 LIBCFS_ENABLE_CRC32_ACCEL # 3.10 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 +LIBCFS_KTIME_TO_TIMESPEC64 +LIBCFS_TIMESPEC64_SUB +LIBCFS_TIMESPEC64_TO_KTIME +# 3.19 +LIBCFS_KTIME_GET_SECONDS +# 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_BROKEN_HASH_64 LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT +LIBCFS_GET_USER_PAGES_6ARG +LIBCFS_STRINGHASH +# 4.7 +LIBCFS_RHASHTABLE_INSERT_FAST +# 4.8 +LIBCFS_RHASHTABLE_LOOKUP +LIBCFS_RHLTABLE +LIBCFS_STACKTRACE_OPS +# 4.9 +LIBCFS_GET_USER_PAGES_GUP_FLAGS +# 4.10 +LIBCFS_HOTPLUG_STATE_MACHINE +# 4.11 +LIBCFS_RHASHTABLE_LOOKUP_GET_INSERT_FAST +LIBCFS_SCHED_HEADERS +# 4.12 +LIBCFS_UUID_T +# 4.13 +LIBCFS_WAIT_QUEUE_ENTRY +# 4.14 +LIBCFS_DEFINE_TIMER +LIBCFS_NEW_KERNEL_WRITE +# 4.15 +LIBCFS_TIMER_SETUP ]) # LIBCFS_PROG_LINUX # @@ -420,38 +1098,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])