X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Fautoconf%2Flustre-libcfs.m4;h=a3b61424aa9cec198ef94b96b99ca784d6450963;hp=c52a490f48317db735760e480bb2813e3bc08b30;hb=d1b9bfc290dfafb3f7aa1b4ac92a6c01cd1f92a7;hpb=1c69e4dd53307cbd17b05a24191280f431173c9f diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index c52a490..a3b6142 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -3,870 +3,360 @@ # # whether to enable various libcfs debugs (CDEBUG, ENTRY/EXIT, LASSERT, etc.) # -AC_DEFUN([LN_CONFIG_CDEBUG], -[ +AC_DEFUN([LN_CONFIG_CDEBUG], [ AC_MSG_CHECKING([whether to enable CDEBUG, CWARN]) AC_ARG_ENABLE([libcfs_cdebug], AC_HELP_STRING([--disable-libcfs-cdebug], - [disable libcfs CDEBUG, CWARN]), - [],[enable_libcfs_cdebug='yes']) + [disable libcfs CDEBUG, CWARN]), + [], [enable_libcfs_cdebug="yes"]) AC_MSG_RESULT([$enable_libcfs_cdebug]) -if test x$enable_libcfs_cdebug = xyes; then - AC_DEFINE(CDEBUG_ENABLED, 1, [enable libcfs CDEBUG, CWARN]) -else - AC_DEFINE(CDEBUG_ENABLED, 0, [disable libcfs CDEBUG, CWARN]) -fi +AS_IF([test "x$enable_libcfs_cdebug" = xyes], + [AC_DEFINE(CDEBUG_ENABLED, 1, [enable libcfs CDEBUG, CWARN])]) AC_MSG_CHECKING([whether to enable ENTRY/EXIT]) AC_ARG_ENABLE([libcfs_trace], AC_HELP_STRING([--disable-libcfs-trace], - [disable libcfs ENTRY/EXIT]), - [],[enable_libcfs_trace='yes']) + [disable libcfs ENTRY/EXIT]), + [], [enable_libcfs_trace="yes"]) AC_MSG_RESULT([$enable_libcfs_trace]) -if test x$enable_libcfs_trace = xyes; then - AC_DEFINE(CDEBUG_ENTRY_EXIT, 1, [enable libcfs ENTRY/EXIT]) -else - AC_DEFINE(CDEBUG_ENTRY_EXIT, 0, [disable libcfs ENTRY/EXIT]) -fi +AS_IF([test "x$enable_libcfs_trace" = xyes], + [AC_DEFINE(CDEBUG_ENTRY_EXIT, 1, [enable libcfs ENTRY/EXIT])]) AC_MSG_CHECKING([whether to enable LASSERT, LASSERTF]) AC_ARG_ENABLE([libcfs_assert], AC_HELP_STRING([--disable-libcfs-assert], - [disable libcfs LASSERT, LASSERTF]), - [],[enable_libcfs_assert='yes']) + [disable libcfs LASSERT, LASSERTF]), + [], [enable_libcfs_assert="yes"]) AC_MSG_RESULT([$enable_libcfs_assert]) -if test x$enable_libcfs_assert = xyes; then - AC_DEFINE(LIBCFS_DEBUG, 1, [enable libcfs LASSERT, LASSERTF]) -fi -]) +AS_IF([test x$enable_libcfs_assert = xyes], + [AC_DEFINE(LIBCFS_DEBUG, 1, [enable libcfs LASSERT, LASSERTF])]) +]) # LN_CONFIG_CDEBUG # # LIBCFS_CONFIG_PANIC_DUMPLOG # # check if tunable panic_dumplog is wanted # -AC_DEFUN([LIBCFS_CONFIG_PANIC_DUMPLOG], -[AC_MSG_CHECKING([for tunable panic_dumplog support]) +AC_DEFUN([LIBCFS_CONFIG_PANIC_DUMPLOG], [ +AC_MSG_CHECKING([whether to use tunable 'panic_dumplog' support]) AC_ARG_ENABLE([panic_dumplog], - AC_HELP_STRING([--enable-panic_dumplog], - [enable panic_dumplog]), - [],[enable_panic_dumplog='no']) -if test x$enable_panic_dumplog = xyes ; then - AC_DEFINE(LNET_DUMP_ON_PANIC, 1, [use dumplog on panic]) - AC_MSG_RESULT([yes (by request)]) -else - AC_MSG_RESULT([no]) -fi -]) - -# check kernel __u64 type -AC_DEFUN([LIBCFS_U64_LONG_LONG_LINUX], -[ -AC_MSG_CHECKING([kernel __u64 is long long type]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Werror" -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - unsigned long long *data; - - data = (__u64*)sizeof(data); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_KERN__U64_LONG_LONG, 1, - [kernel __u64 is long long type]) -],[ - AC_MSG_RESULT([no]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) + AC_HELP_STRING([--enable-panic_dumplog], + [enable panic_dumplog]), + [], [enable_panic_dumplog="no"]) +AC_MSG_RESULT([$enable_panic_dumplog]) +AS_IF([test "x$enable_panic_dumplog" = xyes], + [AC_DEFINE(LNET_DUMP_ON_PANIC, 1, [use dumplog on panic])]) +]) # LIBCFS_CONFIG_PANIC_DUMPLOG -# LIBCFS_TASKLIST_LOCK -# 2.6.18 remove tasklist_lock export -AC_DEFUN([LIBCFS_TASKLIST_LOCK], -[LB_CHECK_SYMBOL_EXPORT([tasklist_lock], -[kernel/fork.c],[ -AC_DEFINE(HAVE_TASKLIST_LOCK, 1, - [tasklist_lock exported]) -],[ -]) -]) - -# LIBCFS_DIGEST_SETKEY_FLAGS -# digest_alg.dia_setkey takes 4 args (2.6.18) # -AC_DEFUN([LIBCFS_DIGEST_SETKEY_FLAGS], -[AC_MSG_CHECKING([if kernel dia_setkey takes 4 args]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct digest_alg alg; - - alg.dia_setkey(NULL, NULL, 0, NULL); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_DIGEST_SETKEY_FLAGS, 1, [kernel dia_setkey takes 4 args]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.19 API changes -# kmem_cache_destroy(cachep) return void instead of -# int -AC_DEFUN([LIBCFS_KMEM_CACHE_DESTROY_INT], -[AC_MSG_CHECKING([kmem_cache_destroy(cachep) return int]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int i __attribute__ ((unused)); - i = kmem_cache_destroy(NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_KMEM_CACHE_DESTROY_INT, 1, - [kmem_cache_destroy(cachep) return int]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# check cpumask_size (2.6.28) -AC_DEFUN([LIBCFS_CPUMASK_SIZE], -[AC_MSG_CHECKING([whether have cpumask_size()]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int size = cpumask_size(); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_CPUMASK_SIZE, 1, [have cpumask_size()]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# check cpu topology functions +# LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK # -# topology_core_cpumask (2.6.29, not on all archs) -# topology_core_siblings (not on all archs) -# topology_thread_cpumask (2.6.29, not on all archs) -# topology_thread_siblings (not on all archs) -# cpumask_of_node/node_to_cpumask (not always exported) -AC_DEFUN([LIBCFS_CPU_TOPOLOGY], -[AC_MSG_CHECKING([whether have topology.h]) -LB_LINUX_TRY_COMPILE([ - #include -],[],[ - AC_DEFINE(HAVE_CPU_TOPOLOGY, 1, [have CPU topology]) - AC_MSG_RESULT(yes) - - AC_MSG_CHECKING([whether have topology_core_cpumask]) - LB_LINUX_TRY_COMPILE([ - #include - ],[ - cpumask_t *mask = topology_core_cpumask(0); - ],[ - AC_DEFINE(HAVE_TOPOLOGY_CORE_CPUMASK, 1, - [have topology_core_cpumask]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - ]) - - AC_MSG_CHECKING([whether have topology_core_siblings]) - LB_LINUX_TRY_COMPILE([ - #include - ],[ - cpumask_t mask = topology_core_siblings(0); - ],[ - AC_DEFINE(HAVE_TOPOLOGY_CORE_SIBLINGS, 1, - [have topology_core_siblings]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - ]) - - AC_MSG_CHECKING([whether have topology_thread_cpumask]) - LB_LINUX_TRY_COMPILE([ - #include - ],[ - cpumask_t *mask = topology_thread_cpumask(0); - ],[ - AC_DEFINE(HAVE_TOPOLOGY_THREAD_CPUMASK, 1, - [have topology_thread_cpumask]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - ]) - - AC_MSG_CHECKING([whether have topology_thread_siblings]) - LB_LINUX_TRY_COMPILE([ - #include - ],[ - cpumask_t mask = topology_thread_siblings(0); - ],[ - AC_DEFINE(HAVE_TOPOLOGY_THREAD_SIBLINGS, 1, - [have topology_thread_siblings]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - ]) - - AC_MSG_CHECKING([whether OFED backports have cpumask_of_node]) - # Some OFED has cpumask_of_node backports defined in - # its private include/linux/cpumask.h. However, it is - # defined conflictingly with kernel's cpumask_of_node. - if test -f $OFED_BACKPORT_PATH/linux/cpumask.h; then - grep -q cpumask_of_node $OFED_BACKPORT_PATH/linux/cpumask.h 2>/dev/null - rc=$? - if test $rc -eq 0; then - AC_DEFINE(HAVE_OFED_CPUMASK_OF_NODE, 1, [have cpumask_of_node]) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - fi - - AC_MSG_CHECKING([whether have cpumask_of_node]) - LB_LINUX_TRY_COMPILE([ - #include - ],[ - cpumask_t *mask = cpumask_of_node(0); - ],[ - AC_DEFINE(HAVE_CPUMASK_OF_NODE, 1, [have cpumask_of_node]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - ]) - - AC_MSG_CHECKING([whether have cpumask_copy]) - LB_LINUX_TRY_COMPILE([ - #include - ],[ - cpumask_copy(NULL, NULL); - ],[ - AC_DEFINE(HAVE_CPUMASK_COPY, 1, [have cpumask_copy]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - ]) - - AC_MSG_CHECKING([whether have node_to_cpumask]) - LB_LINUX_TRY_COMPILE([ - #include - ],[ - cpumask_t mask = node_to_cpumask(0); - ],[ - AC_DEFINE(HAVE_NODE_TO_CPUMASK, 1, [have node_to_cpumask]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - ]) -],[ - AC_MSG_RESULT(NO) -]) -]) - - -# 2.6.20 API change INIT_WORK use 2 args and not -# store data inside -AC_DEFUN([LIBCFS_3ARGS_INIT_WORK], -[AC_MSG_CHECKING([check INIT_WORK want 3 args]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct work_struct work __attribute__ ((unused)); - - INIT_WORK(&work, NULL, NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_3ARGS_INIT_WORK, 1, - [INIT_WORK use 3 args and store data inside]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# 2.6.21 api change. 'register_sysctl_table' use only one argument, -# instead of more old which need two. -AC_DEFUN([LIBCFS_2ARGS_REGISTER_SYSCTL], -[AC_MSG_CHECKING([check register_sysctl_table want 2 args]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - register_sysctl_table(NULL,0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_2ARGS_REGISTER_SYSCTL, 1, - [register_sysctl_table want 2 args]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# 2.6.23 lost dtor argument -AC_DEFUN([LIBCFS_KMEM_CACHE_CREATE_DTOR], -[AC_MSG_CHECKING([check kmem_cache_create has dtor argument]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - kmem_cache_create(NULL, 0, 0, 0, NULL, NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_KMEM_CACHE_CREATE_DTOR, 1, - [kmem_cache_create has dtor argument]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -#2.6.23 has new shrinker API -AC_DEFUN([LC_REGISTER_SHRINKER], -[AC_MSG_CHECKING([if kernel has register_shrinker]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - register_shrinker(NULL); -], [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_REGISTER_SHRINKER, 1, - [kernel has register_shrinker]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.24 request not use real numbers for ctl_name -AC_DEFUN([LIBCFS_SYSCTL_UNNUMBERED], -[AC_MSG_CHECKING([for CTL_UNNUMBERED]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - #ifndef CTL_UNNUMBERED - #error CTL_UNNUMBERED not exist in kernel - #endif -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SYSCTL_UNNUMBERED, 1, - [sysctl has CTL_UNNUMBERED]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# 2.6.24 lost scatterlist->page -AC_DEFUN([LIBCFS_SCATTERLIST_SETPAGE], -[AC_MSG_CHECKING([for exist sg_set_page]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - sg_set_page(NULL,NULL,0,0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SCATTERLIST_SETPAGE, 1, - [struct scatterlist has no page member]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# 2.6.24-rc1 sg_init_table -AC_DEFUN([LIBCFS_SCATTERLIST_INITTABLE], -[AC_MSG_CHECKING([for sg_init_table]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - sg_init_table(NULL,0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SCATTERLIST_INITTABLE, 1, - [scatterlist has sg_init_table]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# 2.6.24 -AC_DEFUN([LIBCFS_NETWORK_NAMESPACE], -[AC_MSG_CHECKING([for network stack has namespaces]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct net *net __attribute__ ((unused)); - net = &init_net; +# 2.6.32-30.el6 adds a new 'walk_stack' field in 'struct stacktrace_ops' +# +AC_DEFUN([LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK], [ +LB_CHECK_COMPILE([if 'struct stacktrace_ops' has 'walk_stack' field], +stacktrace_ops_walk_stack, [ + #include ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INIT_NET, 1, - [kernel is support network namespaces ]) + ((struct stacktrace_ops *)0)->walk_stack(NULL, NULL, 0, NULL, NULL, NULL, NULL); ],[ - AC_MSG_RESULT(NO) -]) + AC_DEFINE(STACKTRACE_OPS_HAVE_WALK_STACK, 1, + ['struct stacktrace_ops' has 'walk_stack' field]) ]) +]) # LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK # -# LIBCFS_FUNC_DUMP_TRACE +# LIBCFS_STACKTRACE_WARNING # -# 2.6.23 exports dump_trace() so we can dump_stack() on any task -# 2.6.24 has stacktrace_ops.address with "reliable" parameter +# 3.0 removes stacktrace_ops warning* functions # -AC_DEFUN([LIBCFS_FUNC_DUMP_TRACE], -[LB_CHECK_SYMBOL_EXPORT([dump_trace], -[kernel/ksyms.c arch/${LINUX_ARCH%_64}/kernel/traps_64.c arch/x86/kernel/dumpstack_32.c arch/x86/kernel/dumpstack_64.c],[ - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="-Werror" - AC_MSG_CHECKING([whether we can really use dump_trace]) - LB_LINUX_TRY_COMPILE([ - struct task_struct; - struct pt_regs; - #include - ],[ - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_DUMP_TRACE, 1, [dump_trace is exported]) - ],[ - AC_MSG_RESULT(no) - ],[ - ]) - AC_MSG_CHECKING([whether print_trace_address has reliable argument]) - LB_LINUX_TRY_COMPILE([ - struct task_struct; - struct pt_regs; - #include - ],[ - ((struct stacktrace_ops *)0)->address(NULL, 0, 0); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_TRACE_ADDRESS_RELIABLE, 1, - [print_trace_address has reliable argument]) - ],[ - AC_MSG_RESULT(no) - ],[ - ]) - AC_MSG_CHECKING([whether stacktrace_ops.warning is exist]) - LB_LINUX_TRY_COMPILE([ - struct task_struct; - struct pt_regs; - #include - ],[ - ((struct stacktrace_ops *)0)->warning(NULL, NULL); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_STACKTRACE_WARNING, 1, [stacktrace_ops.warning is exist]) - ],[ - AC_MSG_RESULT(no) - ],[ - ]) - AC_MSG_CHECKING([dump_trace want address]) - LB_LINUX_TRY_COMPILE([ - struct task_struct; - struct pt_regs; - #include - ],[ - dump_trace(NULL, NULL, NULL, 0, NULL, NULL); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_DUMP_TRACE_ADDRESS, 1, - [dump_trace want address argument]) - ],[ - AC_MSG_RESULT(no) - ],[ - ]) - -EXTRA_KCFLAGS="$tmp_flags" -]) -]) - - -# 2.6.26 use int instead of atomic for sem.count -AC_DEFUN([LIBCFS_SEM_COUNT], -[AC_MSG_CHECKING([atomic sem.count]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct semaphore s __attribute__ ((unused)); - - atomic_read(&s.count); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SEM_COUNT_ATOMIC, 1, - [semaphore counter is atomic]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# 2.6.27 have second argument to sock_map_fd -AC_DEFUN([LIBCFS_SOCK_MAP_FD_2ARG], -[AC_MSG_CHECKING([sock_map_fd have second argument]) -LB_LINUX_TRY_COMPILE([ - #include +AC_DEFUN([LIBCFS_STACKTRACE_WARNING], [ +LB_CHECK_COMPILE([if 'stacktrace_ops.warning' is exist], +stacktrace_ops_warning, [ + struct task_struct; + struct pt_regs; + #include ],[ - sock_map_fd(NULL, 0); + ((struct stacktrace_ops *)0)->warning(NULL, NULL); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SOCK_MAP_FD_2ARG, 1, - [sock_map_fd have second argument]) -],[ - AC_MSG_RESULT(NO) -]) + AC_DEFINE(HAVE_STACKTRACE_WARNING, 1, + [stacktrace_ops.warning is exist]) ]) +]) # LIBCFS_STACKTRACE_WARNING -# LIBCFS_CRED_WRAPPERS # -# wrappers for task's credentials are in sles11 +# LC_SHRINKER_WANT_SHRINK_PTR # -AC_DEFUN([LIBCFS_CRED_WRAPPERS], -[AC_MSG_CHECKING([if kernel has wrappers for task's credentials]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - uid_t uid; - - uid = current_uid() + sizeof(uid); +# RHEL6/2.6.32 want to have pointer to shrinker self pointer in handler function +# +AC_DEFUN([LC_SHRINKER_WANT_SHRINK_PTR], [ +LB_CHECK_COMPILE([if 'shrinker' want self pointer in handler], +shrink_self_pointer, [ + #include ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_CRED_WRAPPERS, 1, [task's cred wrappers found]) + struct shrinker *tmp = NULL; + tmp->shrink(tmp, 0, 0); ],[ - AC_MSG_RESULT([no]) -]) + AC_DEFINE(HAVE_SHRINKER_WANT_SHRINK_PTR, 1, + [shrinker want self pointer in handler]) ]) +]) # LC_SHRINKER_WANT_SHRINK_PTR # -# LN_STRUCT_CRED_IN_TASK +# LIBCFS_SYSCTL_CTLNAME # -# struct cred was introduced in 2.6.29 to streamline credentials in task struct +# 2.6.33 no longer has ctl_name & strategy field in struct ctl_table. # -AC_DEFUN([LIBCFS_STRUCT_CRED_IN_TASK], -[AC_MSG_CHECKING([if kernel has struct cred]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct task_struct *tsk = NULL; - tsk->real_cred = NULL; +AC_DEFUN([LIBCFS_SYSCTL_CTLNAME], [ +LB_CHECK_COMPILE([if 'ctl_table' has a 'ctl_name' field], +ctl_table_ctl_name, [ + #include ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_STRUCT_CRED, 1, [struct cred found]) + struct ctl_table ct; + ct.ctl_name = sizeof(ct); ],[ - AC_MSG_RESULT([no]) -]) + AC_DEFINE(HAVE_SYSCTL_CTLNAME, 1, + [ctl_table has ctl_name field]) ]) +]) # LIBCFS_SYSCTL_CTLNAME -# LIBCFS_STRUCT_SHASH_ALG -# struct shash_alg was introduced in 2.6.29 # -AC_DEFUN([LIBCFS_STRUCT_SHASH_ALG], -[AC_MSG_CHECKING([if kernel has struct shash_alg]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct shash_alg foo; +# 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 ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_STRUCT_SHASH_ALG, 1, [kernel has struct shash_alg]) + sk_sleep(NULL); ],[ - AC_MSG_RESULT([no]) -]) + AC_DEFINE(HAVE_SK_SLEEP, 1, + [kernel has sk_sleep]) ]) - +]) # LC_SK_SLEEP # -# LIBCFS_FUNC_UNSHARE_FS_STRUCT +# LIBCFS_KSTRTOUL # -# unshare_fs_struct was introduced in 2.6.30 to prevent others to directly -# mess with copy_fs_struct +# 2.6.38 kstrtoul is added # -AC_DEFUN([LIBCFS_FUNC_UNSHARE_FS_STRUCT], -[AC_MSG_CHECKING([if kernel defines unshare_fs_struct()]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - unshare_fs_struct(); +AC_DEFUN([LIBCFS_KSTRTOUL], [ +LB_CHECK_COMPILE([if Linux kernel has 'kstrtoul'], +kstrtoul, [ + #include ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_UNSHARE_FS_STRUCT, 1, [unshare_fs_struct found]) + unsigned long result; + return kstrtoul("12345", 0, &result); ],[ - AC_MSG_RESULT([no]) -]) -EXTRA_KCFLAGS="$tmp_flags" + AC_DEFINE(HAVE_KSTRTOUL, 1, + [kernel has kstrtoul]) ]) +]) # LIBCFS_KSTRTOUL # -# LIBCFS_HAVE_IS_COMPAT_TASK +# LIBCFS_DUMP_TRACE_ADDRESS # -# Added in 2.6.17, it wasn't until 2.6.29 that all -# Linux architectures have is_compat_task() +# 2.6.39 adds a base pointer address argument to dump_trace # -AC_DEFUN([LIBCFS_HAVE_IS_COMPAT_TASK], -[AC_MSG_CHECKING([if is_compat_task() is declared]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int i __attribute__ ((unused)); - i = is_compat_task(); +AC_DEFUN([LIBCFS_DUMP_TRACE_ADDRESS], [ +LB_CHECK_COMPILE([if 'dump_trace' want address], +dump_trace_address, [ + struct task_struct; + struct pt_regs; + #include ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_IS_COMPAT_TASK, 1, [is_compat_task() is available]) + dump_trace(NULL, NULL, NULL, 0, NULL, NULL); ],[ - AC_MSG_RESULT([no]) -]) + AC_DEFINE(HAVE_DUMP_TRACE_ADDRESS, 1, + [dump_trace want address argument]) ]) +]) # LIBCFS_DUMP_TRACE_ADDRESS # -# LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK +# LC_SHRINK_CONTROL # -# 2.6.32-30.el6 adds a new 'walk_stack' field in 'struct stacktrace_ops' +# FC15 2.6.40-5 backported the "shrink_control" parameter to the memory +# pressure shrinker from Linux 3.0 # -AC_DEFUN([LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK], -[AC_MSG_CHECKING([if 'struct stacktrace_ops' has 'walk_stack' field]) -LB_LINUX_TRY_COMPILE([ - #include +AC_DEFUN([LC_SHRINK_CONTROL], [ +LB_CHECK_COMPILE([if 'shrink_control' is present], +shrink_control, [ + #include + #include ],[ - ((struct stacktrace_ops *)0)->walk_stack(NULL, NULL, 0, NULL, NULL, NULL, NULL); + struct shrink_control tmp = {0}; + tmp.nr_to_scan = sizeof(tmp); ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(STACKTRACE_OPS_HAVE_WALK_STACK, 1, ['struct stacktrace_ops' has 'walk_stack' field]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -AC_DEFUN([LIBCFS_HAVE_OOM_H], -[LB_CHECK_FILE([$LINUX/include/linux/oom.h], [ - AC_DEFINE(HAVE_LINUX_OOM_H, 1, - [kernel has include/oom.h]) -],[ - AC_MSG_RESULT([no]) -]) + AC_DEFINE(HAVE_SHRINK_CONTROL, 1, + [shrink_control is present]) ]) +]) # LC_SHRINK_CONTROL # -# check set_mems_allowed -# 2.6.31 adds function set_mems_allowed in cpuset.h +# LIBCFS_PROCESS_NAMESPACE # -AC_DEFUN([LIBCFS_HAVE_SET_MEMS_ALLOWED], -[AC_MSG_CHECKING([whether have set_mems_allowed()]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - nodemask_t mask; - - set_mems_allowed(mask); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SET_MEMS_ALLOWED, 1, [have set_mems_allowed()]) -],[ - AC_MSG_RESULT(NO) -]) -]) - +# 3.5 introduced process namespace +AC_DEFUN([LIBCFS_PROCESS_NAMESPACE], [ +LB_CHECK_LINUX_HEADER([linux/uidgid.h], [ + AC_DEFINE(HAVE_UIDGID_HEADER, 1, + [uidgid.h is present])]) +]) # LIBCFS_PROCESS_NAMESPACE # -# RHEL6/2.6.32 want to have pointer to shrinker self pointer in handler function +# LIBCFS_I_UID_READ # -AC_DEFUN([LC_SHRINKER_WANT_SHRINK_PTR], -[AC_MSG_CHECKING([shrinker want self pointer in handler]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct shrinker *tmp = NULL; - tmp->shrink(tmp, 0, 0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SHRINKER_WANT_SHRINK_PTR, 1, - [shrinker want self pointer in handler]) -],[ - AC_MSG_RESULT(no) -]) -]) - -# 2.6.18 store oom parameters in task struct. -# 2.6.32 store oom parameters in signal struct -AC_DEFUN([LIBCFS_OOMADJ_IN_SIG], -[AC_MSG_CHECKING([kernel store oom parameters in task]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - ((struct signal_struct *)0)->oom_adj = 0; +# 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 ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_OOMADJ_IN_SIG, 1, - [kernel store a oom parameters in signal struct]) + i_uid_read(NULL); ],[ - AC_MSG_RESULT(no) -]) + AC_DEFINE(HAVE_I_UID_READ, 1, [i_uid_read is present]) ]) +]) # LIBCFS_I_UID_READ # -# 2.6.33 no longer has ctl_name & strategy field in struct ctl_table. +# LIBCFS_SOCK_ALLOC_FILE # -AC_DEFUN([LIBCFS_SYSCTL_CTLNAME], -[AC_MSG_CHECKING([if ctl_table has a ctl_name field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct ctl_table ct; - ct.ctl_name = sizeof(ct); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SYSCTL_CTLNAME, 1, - [ctl_table has ctl_name field]) -],[ - AC_MSG_RESULT(no) -]) +# 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_ADD_WAIT_QUEUE_EXCLUSIVE +# LIBCFS_HAVE_CRC32 +# +AC_DEFUN([LIBCFS_HAVE_CRC32], [ +LB_CHECK_CONFIG_IM([CRC32], + [have_crc32="yes"], [have_crc32="no"]) +AS_IF([test "x$have_crc32" = xyes], + [AC_DEFINE(HAVE_CRC32, 1, + [kernel compiled with CRC32 functions])]) +]) # LIBCFS_HAVE_CRC32 + # -# 2.6.34 adds __add_wait_queue_exclusive +# LIBCFS_ENABLE_CRC32_ACCEL # -AC_DEFUN([LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE], -[AC_MSG_CHECKING([if __add_wait_queue_exclusive exists]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - wait_queue_head_t queue; - wait_queue_t wait; +AC_DEFUN([LIBCFS_ENABLE_CRC32_ACCEL], [ +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([ - __add_wait_queue_exclusive(&queue, &wait); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE___ADD_WAIT_QUEUE_EXCLUSIVE, 1, - [__add_wait_queue_exclusive exists]) -],[ - AC_MSG_RESULT(no) -]) -]) +No crc32 pclmulqdq crypto api found, enable internal pclmulqdq based crc32 +])]) +]) # LIBCFS_ENABLE_CRC32_ACCEL # -# 2.6.35 kernel has sk_sleep function +# LIBCFS_ENABLE_CRC32C_ACCEL # -AC_DEFUN([LC_SK_SLEEP], -[AC_MSG_CHECKING([if kernel has sk_sleep]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - sk_sleep(NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SK_SLEEP, 1, [kernel has sk_sleep]) -],[ - AC_MSG_RESULT(no) -]) -]) +AC_DEFUN([LIBCFS_ENABLE_CRC32C_ACCEL], [ +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 +])]) +]) # LIBCFS_ENABLE_CRC32C_ACCEL # -# FC15 2.6.40-5 backported the "shrink_control" parameter to the memory -# pressure shrinker from Linux 3.0 +# FC19 3.12 kernel struct shrinker change # -AC_DEFUN([LC_SHRINK_CONTROL], -[AC_MSG_CHECKING([shrink_control is present]) -LB_LINUX_TRY_COMPILE([ - #include +AC_DEFUN([LIBCFS_SHRINKER_COUNT],[ +LB_CHECK_COMPILE([shrinker has 'count_objects'], +shrinker_count_objects, [ + #include + #include ],[ - struct shrink_control tmp = {0}; - tmp.nr_to_scan = sizeof(tmp); + ((struct shrinker*)0)->count_objects(NULL, NULL); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SHRINK_CONTROL, 1, - [shrink_control is present]) -],[ - AC_MSG_RESULT(no) + AC_DEFINE(HAVE_SHRINKER_COUNT, 1, + [shrinker has count_objects member]) ]) ]) # # LIBCFS_PROG_LINUX # -# LNet linux kernel checks +# LibCFS linux kernel checks # -AC_DEFUN([LIBCFS_PROG_LINUX], -[ +AC_DEFUN([LIBCFS_PROG_LINUX], [ +AC_MSG_NOTICE([LibCFS kernel checks +==============================================================================]) LIBCFS_CONFIG_PANIC_DUMPLOG -LIBCFS_U64_LONG_LONG_LINUX -# 2.6.18 -LIBCFS_TASKLIST_LOCK -LIBCFS_HAVE_IS_COMPAT_TASK -LIBCFS_DIGEST_SETKEY_FLAGS -# 2.6.19 -LIBCFS_KMEM_CACHE_DESTROY_INT -# 2.6.20 -LIBCFS_3ARGS_INIT_WORK -# 2.6.21 -LIBCFS_2ARGS_REGISTER_SYSCTL -# 2.6.23 -LIBCFS_KMEM_CACHE_CREATE_DTOR -LC_REGISTER_SHRINKER -# 2.6.24 -LIBCFS_SYSCTL_UNNUMBERED -LIBCFS_SCATTERLIST_SETPAGE -LIBCFS_SCATTERLIST_INITTABLE -LIBCFS_NETWORK_NAMESPACE -LIBCFS_FUNC_DUMP_TRACE -# 2.6.26 -LIBCFS_SEM_COUNT -# 2.6.27 -LIBCFS_CRED_WRAPPERS -# 2.6.28 -LIBCFS_CPUMASK_SIZE -# 2.6.29 -LIBCFS_STRUCT_CRED_IN_TASK -LIBCFS_CPU_TOPOLOGY -LIBCFS_STRUCT_SHASH_ALG -# 2.6.30 -LIBCFS_FUNC_UNSHARE_FS_STRUCT -LIBCFS_SOCK_MAP_FD_2ARG -# 2.6.31 -LIBCFS_HAVE_SET_MEMS_ALLOWED # 2.6.32 LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK LC_SHRINKER_WANT_SHRINK_PTR -LIBCFS_HAVE_OOM_H -LIBCFS_OOMADJ_IN_SIG # 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 -]) - -# -# LIBCFS_PROG_DARWIN -# -# Darwin checks -# -AC_DEFUN([LIBCFS_PROG_DARWIN], -[LB_DARWIN_CHECK_FUNCS([get_preemption_level]) -]) +# 3.0 +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.12 +LIBCFS_SHRINKER_COUNT +]) # LIBCFS_PROG_LINUX # # LIBCFS_PATH_DEFAULTS # # default paths for installed files # -AC_DEFUN([LIBCFS_PATH_DEFAULTS], -[ -]) +AC_DEFUN([LIBCFS_PATH_DEFAULTS], [ +]) # LIBCFS_PATH_DEFAULTS # # LIBCFS_CONFIGURE # # other configure checks # -AC_DEFUN([LIBCFS_CONFIGURE], -[# lnet/utils/portals.c +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 @@ -886,153 +376,77 @@ 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 ]) - -AC_CHECK_TYPE([__s8], - [AC_DEFINE(HAVE___S8, 1, [__s8 is defined])], - [], - [#include ]) - -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 -AC_MSG_CHECKING([userspace __u64 is long long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - #include - #include - int main(void) { - unsigned long long *data1; - __u64 *data2 = NULL; - - data1 = data2; - data2 = data1; - return 0; - } -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_USER__U64_LONG_LONG, 1, - [__u64 is long long type]) -],[ - AC_MSG_RESULT([no]) -]) -CFLAGS="$tmp_flags" - # -------- Check for required packages -------------- +AC_MSG_NOTICE([LibCFS required packages checks +==============================================================================]) -AC_MSG_CHECKING([if efence debugging support is requested]) +AC_MSG_CHECKING([whether to enable 'efence' debugging support]) AC_ARG_ENABLE(efence, AC_HELP_STRING([--enable-efence], - [use efence library]), - [],[enable_efence='no']) + [use efence library]), + [], [enable_efence="no"]) AC_MSG_RESULT([$enable_efence]) -if test "$enable_efence" = "yes" ; then +AS_IF([test "$enable_efence" = yes], [ LIBEFENCE="-lefence" AC_DEFINE(HAVE_LIBEFENCE, 1, [libefence support is requested]) -else +], [ LIBEFENCE="" -fi +]) AC_SUBST(LIBEFENCE) - # -------- check for -lpthread support ---- + AC_MSG_CHECKING([whether to use libpthread for libcfs library]) AC_ARG_ENABLE([libpthread], - AC_HELP_STRING([--disable-libpthread], - [disable libpthread]), - [],[enable_libpthread=yes]) -if test "$enable_libpthread" = "yes" ; then + AC_HELP_STRING([--disable-libpthread], + [disable libpthread]), + [], [enable_libpthread="yes"]) +AC_MSG_RESULT([$enable_libpthread]) +AS_IF([test "x$enable_libpthread" = xyes], [ AC_CHECK_LIB([pthread], [pthread_create], [ENABLE_LIBPTHREAD="yes"], [ENABLE_LIBPTHREAD="no"]) - if test "$ENABLE_LIBPTHREAD" = "yes" ; then - AC_MSG_RESULT([$ENABLE_LIBPTHREAD]) + AS_IF([test "$ENABLE_LIBPTHREAD" = yes], [ PTHREAD_LIBS="-lpthread" AC_DEFINE([HAVE_LIBPTHREAD], 1, [use libpthread]) - else + ], [ PTHREAD_LIBS="" - AC_MSG_RESULT([no libpthread is found]) - fi + ]) AC_SUBST(PTHREAD_LIBS) -else - AC_MSG_RESULT([no (disabled explicitly)]) +], [ + AC_MSG_WARN([Using libpthread for libcfs library is disabled explicitly]) ENABLE_LIBPTHREAD="no" -fi -AC_SUBST(ENABLE_LIBPTHREAD) - - ]) +AC_SUBST(ENABLE_LIBPTHREAD) +]) # LIBCFS_CONFIGURE # # LIBCFS_CONDITIONALS # -# AM_CONDITOINAL defines for lnet -# -AC_DEFUN([LIBCFS_CONDITIONALS], -[ -]) +AC_DEFUN([LIBCFS_CONDITIONALS], [ +AM_CONDITIONAL(HAVE_CRC32, [test "x$have_crc32" = xyes]) +AM_CONDITIONAL(NEED_PCLMULQDQ_CRC32, [test "x$have_crc32" = xyes -a "x$enable_crc32_crypto" = xyes]) +AM_CONDITIONAL(NEED_PCLMULQDQ_CRC32C, [test "x$enable_crc32c_crypto" = xyes]) +]) # LIBCFS_CONDITIONALS # # LIBCFS_CONFIG_FILES # # files that should be generated with AC_OUTPUT # -AC_DEFUN([LIBCFS_CONFIG_FILES], -[AC_CONFIG_FILES([ -libcfs/Kernelenv +AC_DEFUN([LIBCFS_CONFIG_FILES], [ +AC_CONFIG_FILES([ 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