aboutsummaryrefslogtreecommitdiffstats
path: root/config/kernel-timer.m4
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2019-10-01 12:50:34 -0700
committerGitHub <[email protected]>2019-10-01 12:50:34 -0700
commit608f8749a1055e6769899788e11bd51fd396f9e5 (patch)
tree91f45b006e07d030881c058d29874438ed46a26f /config/kernel-timer.m4
parent99573cc05339ee04e80eb49c68f62d310da92ec7 (diff)
Perform KABI checks in parallel
Reduce the time required for ./configure to perform the needed KABI checks by allowing kbuild to compile multiple test cases in parallel. This was accomplished by splitting each test's source code from the logic handling whether that code could be compiled or not. By introducing this split it's possible to minimize the number of times kbuild needs to be invoked. As importantly, it means all of the tests can be built in parallel. This does require a little extra care since we expect some tests to fail, so the --keep-going (-k) option must be provided otherwise some tests may not get compiled. Furthermore, since a failure during the kbuild modpost phase will result in an early exit; the final linking phase is limited to tests which passed the initial compilation and produced an object file. Once everything has been built the configure script proceeds as previously. The only significant difference is that it now merely needs to test for the existence of a .ko file to determine the result of a given test. This vastly speeds up the entire process. New test cases should use ZFS_LINUX_TEST_SRC to declare their test source code and ZFS_LINUX_TEST_RESULT to check the result. All of the existing kernel-*.m4 files have been updated accordingly, see config/kernel-current-time.m4 for a basic example. The legacy ZFS_LINUX_TRY_COMPILE macro has been kept to handle special cases but it's use is not encouraged. master (secs) patched (secs) ------------- ---------------- autogen.sh 61 68 configure 137 24 (~17% of current run time) make -j $(nproc) 44 44 make rpms 287 150 Reviewed-by: Tony Hutter <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #8547 Closes #9132 Closes #9341
Diffstat (limited to 'config/kernel-timer.m4')
-rw-r--r--config/kernel-timer.m452
1 files changed, 27 insertions, 25 deletions
diff --git a/config/kernel-timer.m4 b/config/kernel-timer.m4
index d90642043..403cff3f4 100644
--- a/config/kernel-timer.m4
+++ b/config/kernel-timer.m4
@@ -8,13 +8,9 @@ dnl # kernels that support the new timer_list.func signature.
dnl #
dnl # Also check for the existence of flags in struct timer_list, they were
dnl # added in 4.1-rc8 via 0eeda71bc30d.
-
-AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [
- AC_MSG_CHECKING([whether timer_setup() is available])
- tmp_flags="$EXTRA_KCFLAGS"
- EXTRA_KCFLAGS="-Werror"
-
- ZFS_LINUX_TRY_COMPILE([
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_TIMER_SETUP], [
+ ZFS_LINUX_TEST_SRC([timer_setup], [
#include <linux/timer.h>
struct my_task_timer {
@@ -24,13 +20,34 @@ AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [
void task_expire(struct timer_list *tl)
{
- struct my_task_timer *task_timer = from_timer(task_timer, tl, timer);
+ struct my_task_timer *task_timer =
+ from_timer(task_timer, tl, timer);
task_timer->data = 42;
}
],[
struct my_task_timer task_timer;
timer_setup(&task_timer.timer, task_expire, 0);
+ ])
+
+ ZFS_LINUX_TEST_SRC([timer_list_function], [
+ #include <linux/timer.h>
+ void task_expire(struct timer_list *tl) {}
],[
+ struct timer_list tl;
+ tl.function = task_expire;
+ ])
+
+ ZFS_LINUX_TEST_SRC([timer_list_flags], [
+ #include <linux/timer.h>
+ ],[
+ struct timer_list tl;
+ tl.flags = 2;
+ ])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [
+ AC_MSG_CHECKING([whether timer_setup() is available])
+ ZFS_LINUX_TEST_RESULT([timer_setup], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_KERNEL_TIMER_SETUP, 1,
[timer_setup() is available])
@@ -39,14 +56,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [
])
AC_MSG_CHECKING([whether timer function expects timer_list])
-
- ZFS_LINUX_TRY_COMPILE([
- #include <linux/timer.h>
- void task_expire(struct timer_list *tl) {}
- ],[
- struct timer_list tl;
- tl.function = task_expire;
- ],[
+ ZFS_LINUX_TEST_RESULT([timer_list_function], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST, 1,
[timer_list.function gets a timer_list])
@@ -55,19 +65,11 @@ AC_DEFUN([ZFS_AC_KERNEL_TIMER_SETUP], [
])
AC_MSG_CHECKING([whether struct timer_list has flags])
-
- ZFS_LINUX_TRY_COMPILE([
- #include <linux/timer.h>
- ],[
- struct timer_list tl;
- tl.flags = 2;
- ],[
+ ZFS_LINUX_TEST_RESULT([timer_list_flags], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_KERNEL_TIMER_LIST_FLAGS, 1,
[struct timer_list has a flags member])
],[
AC_MSG_RESULT(no)
])
-
- EXTRA_KCFLAGS="$tmp_flags"
])