X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Fautoconf%2Flustre-libcfs.m4;h=979b815910f1b6c81545dfb3cca88f5188e12f50;hp=dba971d9c8024d53da19949b8bc840b969ddf8bd;hb=f548d1a00eaf705607b0c1eac254c95e3905f5b2;hpb=cf5b4ff87e7494fbc551ebd2c05d8ee5137dbcd9 diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index dba971d..979b815 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -1,9 +1,9 @@ # -# LN_CONFIG_CDEBUG +# LIBCFS_CONFIG_CDEBUG # # whether to enable various libcfs debugs (CDEBUG, ENTRY/EXIT, LASSERT, etc.) # -AC_DEFUN([LN_CONFIG_CDEBUG], [ +AC_DEFUN([LIBCFS_CONFIG_CDEBUG], [ AC_MSG_CHECKING([whether to enable CDEBUG, CWARN]) AC_ARG_ENABLE([libcfs_cdebug], AC_HELP_STRING([--disable-libcfs-cdebug], @@ -30,7 +30,7 @@ AC_ARG_ENABLE([libcfs_assert], AC_MSG_RESULT([$enable_libcfs_assert]) AS_IF([test x$enable_libcfs_assert = xyes], [AC_DEFINE(LIBCFS_DEBUG, 1, [enable libcfs LASSERT, LASSERTF])]) -]) # LN_CONFIG_CDEBUG +]) # LIBCFS_CONFIG_CDEBUG # # LIBCFS_CONFIG_PANIC_DUMPLOG @@ -49,28 +49,6 @@ AS_IF([test "x$enable_panic_dumplog" = xyes], ]) # LIBCFS_CONFIG_PANIC_DUMPLOG # -# LIBCFS_U64_LONG_LONG_LINUX -# -# check kernel __u64 type -# -AC_DEFUN([LIBCFS_U64_LONG_LONG_LINUX], [ -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Werror" -LB_CHECK_COMPILE([if Linux kernel '__u64' is 'long long' type], -kernel_u64_long_long, [ - #include - #include -],[ - unsigned long long *data; - data = (__u64*)sizeof(data); -],[ - AC_DEFINE(HAVE_KERN__U64_LONG_LONG, 1, - [Linux kernel __u64 is long long type]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) # LIBCFS_U64_LONG_LONG_LINUX - -# # LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK # # 2.6.32-30.el6 adds a new 'walk_stack' field in 'struct stacktrace_ops' @@ -143,40 +121,22 @@ ctl_table_ctl_name, [ ]) # LIBCFS_SYSCTL_CTLNAME # -# LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE +# LIBCFS_KSTRTOUL # -# 2.6.34 adds __add_wait_queue_exclusive +# 2.6.38 kstrtoul is added # -AC_DEFUN([LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE], [ -LB_CHECK_COMPILE([if '__add_wait_queue_exclusive' exists], -__add_wait_queue_exclusive, [ - #include +AC_DEFUN([LIBCFS_KSTRTOUL], [ +LB_CHECK_COMPILE([if Linux kernel has 'kstrtoul'], +kstrtoul, [ + #include ],[ - wait_queue_head_t queue; - wait_queue_t wait; - __add_wait_queue_exclusive(&queue, &wait); + unsigned long result; + return kstrtoul("12345", 0, &result); ],[ - AC_DEFINE(HAVE___ADD_WAIT_QUEUE_EXCLUSIVE, 1, - [__add_wait_queue_exclusive exists]) + AC_DEFINE(HAVE_KSTRTOUL, 1, + [kernel has kstrtoul]) ]) -]) # LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE - -# -# LC_SK_SLEEP -# -# 2.6.35 kernel has sk_sleep function -# -AC_DEFUN([LC_SK_SLEEP], [ -LB_CHECK_COMPILE([if Linux kernel has 'sk_sleep'], -sk_sleep, [ - #include -],[ - sk_sleep(NULL); -],[ - AC_DEFINE(HAVE_SK_SLEEP, 1, - [kernel has sk_sleep]) -]) -]) # LC_SK_SLEEP +]) # LIBCFS_KSTRTOUL # # LIBCFS_DUMP_TRACE_ADDRESS @@ -206,6 +166,7 @@ dump_trace_address, [ AC_DEFUN([LC_SHRINK_CONTROL], [ LB_CHECK_COMPILE([if 'shrink_control' is present], shrink_control, [ + #include #include ],[ struct shrink_control tmp = {0}; @@ -219,7 +180,7 @@ shrink_control, [ # # LIBCFS_PROCESS_NAMESPACE # -# 3.4 introduced process namespace +# 3.5 introduced process namespace AC_DEFUN([LIBCFS_PROCESS_NAMESPACE], [ LB_CHECK_LINUX_HEADER([linux/uidgid.h], [ AC_DEFINE(HAVE_UIDGID_HEADER, 1, @@ -227,6 +188,23 @@ LB_CHECK_LINUX_HEADER([linux/uidgid.h], [ ]) # LIBCFS_PROCESS_NAMESPACE # +# LIBCFS_I_UID_READ +# +# 3.5 added helpers to read the new uid/gid types from VFS structures +# SLE11 SP3 has uidgid.h but not the helpers +# +AC_DEFUN([LIBCFS_I_UID_READ], [ +LB_CHECK_COMPILE([if 'i_uid_read' is present], +i_uid_read, [ + #include +],[ + i_uid_read(NULL); +],[ + AC_DEFINE(HAVE_I_UID_READ, 1, [i_uid_read is present]) +]) +]) # LIBCFS_I_UID_READ + +# # LIBCFS_SOCK_ALLOC_FILE # # FC18 3.7.2-201 unexport sock_map_fd() change to @@ -269,10 +247,7 @@ LB_CHECK_CONFIG_IM([CRYPTO_CRC32_PCLMUL], [enable_crc32_crypto="no"], [enable_crc32_crypto="yes"]) AS_IF([test "x$have_crc32" = xyes -a "x$enable_crc32_crypto" = xyes], [ AC_DEFINE(NEED_CRC32_ACCEL, 1, [need pclmulqdq based crc32]) - AC_MSG_WARN([ - -No crc32 pclmulqdq crypto api found, enable internal pclmulqdq based crc32 -])]) + AC_MSG_WARN([No crc32 pclmulqdq crypto api found, enable internal pclmulqdq based crc32])]) ]) # LIBCFS_ENABLE_CRC32_ACCEL # @@ -283,13 +258,229 @@ LB_CHECK_CONFIG_IM([CRYPTO_CRC32C_INTEL], [enable_crc32c_crypto="no"], [enable_crc32c_crypto="yes"]) AS_IF([test "x$enable_crc32c_crypto" = xyes], [ AC_DEFINE(NEED_CRC32C_ACCEL, 1, [need pclmulqdq based crc32c]) - AC_MSG_WARN([ - -No crc32c pclmulqdq crypto api found, enable internal pclmulqdq based crc32c -])]) + AC_MSG_WARN([No crc32c pclmulqdq crypto api found, enable internal pclmulqdq based crc32c])]) ]) # 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 +],[ + struct timespec64 *ts = NULL; + + ktime_get_ts64(ts); +],[ + AC_DEFINE(HAVE_KTIME_GET_TS64, 1, + ['ktime_get_ts64' is available]) +]) +]) # LIBCFS_KTIME_GET_TS64 + +# + +# +# FC19 3.12 kernel struct shrinker change +# +AC_DEFUN([LIBCFS_SHRINKER_COUNT],[ +LB_CHECK_COMPILE([shrinker has 'count_objects'], +shrinker_count_objects, [ + #include + #include +],[ + ((struct shrinker*)0)->count_objects(NULL, NULL); +],[ + AC_DEFINE(HAVE_SHRINKER_COUNT, 1, + [shrinker has count_objects member]) +]) +]) # LIBCFS_SHRINKER_COUNT + +# +# Kernel version 3.17 changed hlist_add_after to +# hlist_add_behind +# +AC_DEFUN([LIBCFS_HLIST_ADD_AFTER],[ +LB_CHECK_COMPILE([does function 'hlist_add_after' exist], +hlist_add_after, [ + #include +],[ + hlist_add_after(NULL, NULL); +],[ + AC_DEFINE(HAVE_HLIST_ADD_AFTER, 1, + [hlist_add_after is available]) +]) +]) # 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 +],[ + 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_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 +],[ + 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.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.2 changed topology_thread_cpumask +# to topology_sibling_cpumask +# +AC_DEFUN([LIBCFS_HAVE_TOPOLOGY_SIBLING_CPUMASK],[ +LB_CHECK_COMPILE([does function 'topology_sibling_cpumask' exist], +topology_sibling_cpumask, [ + #include +],[ + const struct cpumask *mask; + + mask = topology_sibling_cpumask(0); +],[ + AC_DEFINE(HAVE_TOPOLOGY_SIBLING_CPUMASK, 1, + [topology_sibling_cpumask is available]) +]) +]) # LIBCFS_HAVE_TOPOLOGY_SIBLING_CPUMASK + +# +# Kernel version 4.2 commit df6b35f409af0a8ff1ef62f552b8402f3fef8665 +# header file i387.h was renamed to fpu/api.h +# +AC_DEFUN([LIBCFS_FPU_API], [ +LB_CHECK_LINUX_HEADER([asm/fpu/api.h], [ + AC_DEFINE(HAVE_FPU_API_HEADER, 1, + [fpu/api.h is present])]) +]) # LIBCFS_FPU_API + +# +# Kernel version 4.5-rc1 commit d12481bc58fba89427565f8592e88446ec084a24 +# added crypto hash helpers +# +AC_DEFUN([LIBCFS_CRYPTO_HASH_HELPERS], [ +LB_CHECK_COMPILE([does crypto hash helper functions exist], +crypto_hash_helpers, [ + #include +],[ + crypto_ahash_alg_name(NULL); + crypto_ahash_driver_name(NULL); +],[ + AC_DEFINE(HAVE_CRYPTO_HASH_HELPERS, 1, + [crypto hash helper functions are available]) +]) +]) # LIBCFS_CRYPTO_HASH_HELPERS + +# +# LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT +# +# linux 4.6 kernel changed stacktrace_ops address to return an int +# +AC_DEFUN([LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT], [ +LB_CHECK_COMPILE([if 'struct stacktrace_ops' address function returns an int], +stacktrace_ops_address_return_int, [ + #include +],[ + int rc; + + rc = ((struct stacktrace_ops *)0)->address(NULL, 0, 0); +],[ + AC_DEFINE(STACKTRACE_OPS_ADDRESS_RETURN_INT, 1, + ['struct stacktrace_ops' address function returns an 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_PROG_LINUX # # LibCFS linux kernel checks @@ -299,24 +490,22 @@ AC_MSG_NOTICE([LibCFS kernel checks ==============================================================================]) LIBCFS_CONFIG_PANIC_DUMPLOG -LIBCFS_U64_LONG_LONG_LINUX # 2.6.32 LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK LC_SHRINKER_WANT_SHRINK_PTR # 2.6.33 LIBCFS_SYSCTL_CTLNAME -# 2.6.34 -LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE -# 2.6.35 -LC_SK_SLEEP +# 2.6.38 +LIBCFS_KSTRTOUL # 2.6.39 LIBCFS_DUMP_TRACE_ADDRESS # 2.6.40 fc15 LC_SHRINK_CONTROL # 3.0 LIBCFS_STACKTRACE_WARNING -# 3.4 +# 3.5 LIBCFS_PROCESS_NAMESPACE +LIBCFS_I_UID_READ # 3.7 LIBCFS_SOCK_ALLOC_FILE # 3.8 @@ -324,18 +513,29 @@ LIBCFS_HAVE_CRC32 LIBCFS_ENABLE_CRC32_ACCEL # 3.10 LIBCFS_ENABLE_CRC32C_ACCEL +# 3.11 +LIBCFS_KTIME_GET_TS64 +# 3.12 +LIBCFS_SHRINKER_COUNT +# 3.17 +LIBCFS_HLIST_ADD_AFTER +LIBCFS_TIMESPEC64 +LIBCFS_KTIME_GET_REAL_TS64 +LIBCFS_KTIME_GET_REAL_SECONDS +LIBCFS_KTIME_GET_REAL_NS +# 3.19 +LIBCFS_KTIME_GET_SECONDS +# 4.2 +LIBCFS_HAVE_TOPOLOGY_SIBLING_CPUMASK +LIBCFS_FPU_API +# 4.5 +LIBCFS_CRYPTO_HASH_HELPERS +# 4.6 +LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT +LIBCFS_GET_USER_PAGES_6ARG ]) # LIBCFS_PROG_LINUX # -# LIBCFS_PROG_DARWIN -# -# Darwin checks -# -AC_DEFUN([LIBCFS_PROG_DARWIN], [ -LB_DARWIN_CHECK_FUNCS([get_preemption_level]) -]) # LIBCFS_PROG_DARWIN - -# # LIBCFS_PATH_DEFAULTS # # default paths for installed files @@ -372,96 +572,43 @@ AC_CHECK_FUNCS([strlcpy]) # libcfs/libcfs/user-prim.c, missing for RHEL5 and earlier userspace AC_CHECK_FUNCS([strlcat]) -AC_CHECK_TYPE([umode_t], - [AC_DEFINE(HAVE_UMODE_T, 1, [umode_t is defined])], - [], - [#include ]) +# libcfs/include/libcfs/linux/linux-prim.h, ... +AC_CHECK_HEADERS([linux/types.h sys/types.h linux/unistd.h unistd.h]) -AC_CHECK_TYPE([__s8], - [AC_DEFINE(HAVE___S8, 1, [__s8 is defined])], - [], - [#include ]) +# libcfs/include/libcfs/linux/linux-prim.h +AC_CHECK_HEADERS([linux/random.h], [], [], + [#ifdef HAVE_LINUX_TYPES_H + #include + #endif + ]) -AC_CHECK_TYPE([__u8], - [AC_DEFINE(HAVE___U8, 1, [__u8 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__s16], - [AC_DEFINE(HAVE___S16, 1, [__s16 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__u16], - [AC_DEFINE(HAVE___U16, 1, [__u16 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__s32], - [AC_DEFINE(HAVE___S32, 1, [__s32 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__u32], - [AC_DEFINE(HAVE___U32, 1, [__u32 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__u64], - [AC_DEFINE(HAVE___U64, 1, [__u64 is defined])], - [], - [#include ]) - -AC_CHECK_TYPE([__s64], - [AC_DEFINE(HAVE___S64, 1, [__s64 is defined])], - [], - [#include ]) - -# check userland __u64 type -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_CACHE_CHECK([if userspace '__u64' is 'long long' type], -lb_cv_compile_userspace_u64_long_long, [ -AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #include - #include - #include - int main(void) { - unsigned long long *data1; - __u64 *data2 = NULL; - data1 = data2; - data2 = data1; - return 0; - } -])], - [lb_cv_compile_userspace_u64_long_long="yes"], - [lb_cv_compile_userspace_u64_long_long="no"]) -]) -CFLAGS="$tmp_flags" -AS_IF([test "x$lb_cv_compile_userspace_u64_long_long" = xyes], - [AC_DEFINE(HAVE_USER__U64_LONG_LONG, 1, - [__u64 is long long type])]) +# 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]) # -------- Check for required packages -------------- AC_MSG_NOTICE([LibCFS required packages checks ==============================================================================]) -AC_MSG_CHECKING([whether to enable 'efence' debugging support]) -AC_ARG_ENABLE(efence, - AC_HELP_STRING([--enable-efence], - [use efence library]), - [], [enable_efence="no"]) -AC_MSG_RESULT([$enable_efence]) -AS_IF([test "$enable_efence" = yes], [ - LIBEFENCE="-lefence" - AC_DEFINE(HAVE_LIBEFENCE, 1, [libefence support is requested]) -], [ - LIBEFENCE="" +AC_MSG_CHECKING([whether to enable readline support]) +AC_ARG_ENABLE(readline, + AC_HELP_STRING([--disable-readline], + [disable readline support]), + [], [enable_readline="yes"]) +AC_MSG_RESULT([$enable_readline]) + +LIBREADLINE="" +AS_IF([test "x$enable_readline" = xyes], [ + AC_CHECK_LIB([readline], [readline], [ + LIBREADLINE="-lreadline" + AC_DEFINE(HAVE_LIBREADLINE, 1, + [readline library is available]) + ]) ]) -AC_SUBST(LIBEFENCE) - -# -------- check for -lpthread support ---- +AC_SUBST(LIBREADLINE) AC_MSG_CHECKING([whether to use libpthread for libcfs library]) AC_ARG_ENABLE([libpthread], @@ -469,22 +616,18 @@ AC_ARG_ENABLE([libpthread], [disable libpthread]), [], [enable_libpthread="yes"]) AC_MSG_RESULT([$enable_libpthread]) + +PTHREAD_LIBS="" AS_IF([test "x$enable_libpthread" = xyes], [ - AC_CHECK_LIB([pthread], [pthread_create], - [ENABLE_LIBPTHREAD="yes"], - [ENABLE_LIBPTHREAD="no"]) - AS_IF([test "$ENABLE_LIBPTHREAD" = yes], [ + AC_CHECK_LIB([pthread], [pthread_create], [ PTHREAD_LIBS="-lpthread" - AC_DEFINE([HAVE_LIBPTHREAD], 1, [use libpthread]) - ], [ - PTHREAD_LIBS="" + AC_DEFINE([HAVE_LIBPTHREAD], 1, + [use libpthread for libcfs library]) ]) - AC_SUBST(PTHREAD_LIBS) ], [ AC_MSG_WARN([Using libpthread for libcfs library is disabled explicitly]) - ENABLE_LIBPTHREAD="no" ]) -AC_SUBST(ENABLE_LIBPTHREAD) +AC_SUBST(PTHREAD_LIBS) ]) # LIBCFS_CONFIGURE # @@ -503,21 +646,16 @@ AM_CONDITIONAL(NEED_PCLMULQDQ_CRC32C, [test "x$enable_crc32c_crypto" = xyes]) # AC_DEFUN([LIBCFS_CONFIG_FILES], [ AC_CONFIG_FILES([ -libcfs/Kernelenv libcfs/Makefile libcfs/autoMakefile libcfs/autoconf/Makefile libcfs/include/Makefile libcfs/include/libcfs/Makefile libcfs/include/libcfs/linux/Makefile -libcfs/include/libcfs/posix/Makefile libcfs/include/libcfs/util/Makefile libcfs/libcfs/Makefile libcfs/libcfs/autoMakefile libcfs/libcfs/linux/Makefile -libcfs/libcfs/posix/Makefile libcfs/libcfs/util/Makefile -libcfs/include/libcfs/darwin/Makefile -libcfs/libcfs/darwin/Makefile ]) ]) # LIBCFS_CONFIG_FILES