X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Fautoconf%2Flustre-libcfs.m4;h=0aaf7d36664cd7cd9b5ebc5b32a116ac9fd36251;hp=2a199fabd8ca3decd6546059636e0a34564c830d;hb=d750891e478804bc495ffa075d771d1816369958;hpb=62ef9c949753efb9535fa5b1eb2eb38ec663917f;ds=sidebyside diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index 2a199fa..0aaf7d3 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -60,46 +60,6 @@ fi ]) # -# LIBCFS_STRUCT_PAGE_LIST -# -# 2.6.4 no longer has page->list -# -AC_DEFUN([LIBCFS_STRUCT_PAGE_LIST], -[AC_MSG_CHECKING([if struct page has a list field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct page page; - &page.list; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_PAGE_LIST, 1, [struct page has a list field]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LIBCFS_STRUCT_SIGHAND -# -# red hat 2.4 adds sighand to struct task_struct -# -AC_DEFUN([LIBCFS_STRUCT_SIGHAND], -[AC_MSG_CHECKING([if task_struct has a sighand field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct task_struct p; - p.sighand = NULL; -],[ - AC_DEFINE(CONFIG_RH_2_4_20, 1, [this kernel contains Red Hat 2.4.20 patches]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# # LIBCFS_FUNC_CPU_ONLINE # # cpu_online is different in rh 2.4, vanilla 2.4, and 2.6 @@ -107,14 +67,14 @@ LB_LINUX_TRY_COMPILE([ AC_DEFUN([LIBCFS_FUNC_CPU_ONLINE], [AC_MSG_CHECKING([if kernel defines cpu_online()]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - cpu_online(0); + cpu_online(0); ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_CPU_ONLINE, 1, [cpu_online found]) + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_CPU_ONLINE, 1, [cpu_online found]) ],[ - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) ]) ]) @@ -138,25 +98,6 @@ LB_LINUX_TRY_COMPILE([ ]) # -# LIBCFS_TYPE_CPUMASK_T -# -# same goes for cpumask_t -# -AC_DEFUN([LIBCFS_TYPE_CPUMASK_T], -[AC_MSG_CHECKING([if kernel defines cpumask_t]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - return sizeof (cpumask_t); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_CPUMASK_T, 1, [cpumask_t found]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# # LIBCFS_FUNC_SHOW_TASK # # we export show_task(), but not all kernels have it (yet) @@ -166,32 +107,16 @@ AC_DEFUN([LIBCFS_FUNC_SHOW_TASK], [kernel/ksyms.c kernel/sched.c],[ AC_DEFINE(HAVE_SHOW_TASK, 1, [show_task is exported]) ],[ + LB_CHECK_SYMBOL_EXPORT([sched_show_task], + [kernel/ksyms.c kernel/sched.c],[ + AC_DEFINE(HAVE_SCHED_SHOW_TASK, 1, [sched_show_task is exported]) + ],[]) ]) ]) -# check userland & kernel __u64 type -AC_DEFUN([LIBCFS_U64_LONG_LONG], -[AC_MSG_CHECKING([u64 is long long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - #include - int main(void) { - unsigned long long *data1; - __u64 *data2 = NULL; - - data1 = data2; - 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 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" @@ -213,56 +138,6 @@ LB_LINUX_TRY_COMPILE([ EXTRA_KCFLAGS="$tmp_flags" ]) -# check userland size_t type -AC_DEFUN([LIBCFS_SIZE_T_LONG], -[AC_MSG_CHECKING([size_t is unsigned long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - #include - int main(void) { - unsigned long *data1; - size_t *data2 = NULL; - - data1 = data2; - return 0; - } -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SIZE_T_LONG, 1, - [size_t is long type]) -],[ - AC_MSG_RESULT([no]) -]) -CFLAGS="$tmp_flags" -]) - -AC_DEFUN([LIBCFS_SSIZE_T_LONG], -[AC_MSG_CHECKING([ssize_t is signed long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - #include - int main(void) { - long *data1; - ssize_t *data2 = NULL; - - data1 = data2; - return 0; - } -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SSIZE_T_LONG, 1, - [ssize_t is long type]) -],[ - AC_MSG_RESULT([no]) -]) -CFLAGS="$tmp_flags" -]) - - # check if task_struct with rcu memeber AC_DEFUN([LIBCFS_TASK_RCU], [AC_MSG_CHECKING([if task_struct has a rcu field]) @@ -489,6 +364,7 @@ LB_LINUX_TRY_COMPILE([ 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); @@ -507,7 +383,7 @@ AC_DEFUN([LIBCFS_NETWORK_NAMESPACE], LB_LINUX_TRY_COMPILE([ #include ],[ - struct net *net = &init_ns; + struct net *net = &init_net; ],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_INIT_NET, 1, @@ -570,10 +446,10 @@ LB_LINUX_TRY_COMPILE([ # AC_DEFUN([LIBCFS_FUNC_DUMP_TRACE], [LB_CHECK_SYMBOL_EXPORT([dump_trace], -[kernel/ksyms.c arch/${LINUX_ARCH%_64}/kernel/traps_64.c],[ +[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_stack]) + AC_MSG_CHECKING([whether we can really use dump_trace]) LB_LINUX_TRY_COMPILE([ struct task_struct; struct pt_regs; @@ -643,6 +519,118 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# LIBCFS_CRED_WRAPPERS +# +# wrappers for task's credentials are in sles11 +# +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(); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_CRED_WRAPPERS, 1, [task's cred wrappers found]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# LN_STRUCT_CRED_IN_TASK +# +# struct cred was introduced in 2.6.29 to streamline credentials in task struct +# +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_MSG_RESULT([yes]) + AC_DEFINE(HAVE_STRUCT_CRED, 1, [struct cred found]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# LIBCFS_FUNC_UNSHARE_FS_STRUCT +# +# unshare_fs_struct was introduced in 2.6.30 to prevent others to directly +# mess with copy_fs_struct +# +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_MSG_RESULT([yes]) + AC_DEFINE(HAVE_UNSHARE_FS_STRUCT, 1, [unshare_fs_struct found]) +],[ + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# +# LIBCFS_HAVE_IS_COMPAT_TASK +# +# Added in 2.6.17, it wasn't until 2.6.29 that all +# Linux architectures have is_compat_task() +# +AC_DEFUN([LIBCFS_HAVE_IS_COMPAT_TASK], +[AC_MSG_CHECKING([if is_compat_task() is declared]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + int i = is_compat_task(); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_IS_COMPAT_TASK, 1, [is_compat_task() is available]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK +# +# 2.6.32-30.el6 adds a new 'walk_stack' field in 'struct stacktrace_ops' +# +AC_DEFUN([LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK], +[AC_MSG_CHECKING([if 'struct stacktrace_ops' has 'walk_stack' field]) +LB_LINUX_TRY_COMPILE([ + #include + unsigned long walkstack(struct thread_info *tinfo, + unsigned long *stack, + unsigned long bp, + const struct stacktrace_ops *ops, + void *data, + unsigned long *end, + int *graph); +],[ + struct stacktrace_ops ops; + + ops.walk_stack = walkstack; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(STACKTRACE_OPS_HAVE_WALK_STACK, 1, ['struct stacktrace_ops' has 'walk_stack' field]) +],[ + AC_MSG_RESULT([no]) +]) +]) + # # LIBCFS_PROG_LINUX # @@ -652,18 +640,14 @@ AC_DEFUN([LIBCFS_PROG_LINUX], [ LIBCFS_FUNC_CPU_ONLINE LIBCFS_TYPE_GFP_T -LIBCFS_TYPE_CPUMASK_T LIBCFS_CONFIG_PANIC_DUMPLOG -LIBCFS_STRUCT_PAGE_LIST -LIBCFS_STRUCT_SIGHAND LIBCFS_FUNC_SHOW_TASK -LIBCFS_U64_LONG_LONG -LIBCFS_SSIZE_T_LONG -LIBCFS_SIZE_T_LONG +LIBCFS_U64_LONG_LONG_LINUX LIBCFS_TASK_RCU # 2.6.18 LIBCFS_TASKLIST_LOCK +LIBCFS_HAVE_IS_COMPAT_TASK # 2.6.19 LIBCFS_NETLINK LIBCFS_NLMSG_MULTICAST @@ -686,7 +670,15 @@ LIBCFS_NETLINK_NETNS LIBCFS_FUNC_DUMP_TRACE # 2.6.26 LIBCFS_SEM_COUNT +# 2.6.27 +LIBCFS_CRED_WRAPPERS +# 2.6.29 +LIBCFS_STRUCT_CRED_IN_TASK +# 2.6.30 +LIBCFS_FUNC_UNSHARE_FS_STRUCT LIBCFS_SOCK_MAP_FD_2ARG +# 2.6.32 +LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK ]) # @@ -732,6 +724,36 @@ AC_CHECK_TYPE([umode_t], [], [#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])], [], @@ -742,6 +764,30 @@ AC_CHECK_TYPE([__s64], [], [#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; + 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 -------------- @@ -816,16 +862,9 @@ libcfs/include/libcfs/util/Makefile libcfs/libcfs/Makefile libcfs/libcfs/autoMakefile libcfs/libcfs/linux/Makefile -libcfs/libcfs/ulinux/Makefile libcfs/libcfs/posix/Makefile libcfs/libcfs/util/Makefile -]) -case $lb_target_os in - darwin) - AC_CONFIG_FILES([ libcfs/include/libcfs/darwin/Makefile libcfs/libcfs/darwin/Makefile ]) - ;; -esac ])