diff options
| author | Richard Yao <[email protected]> | 2015-09-07 12:03:19 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-09-09 09:29:24 -0700 |
| commit | 8198d18ca7e05ec30139e10d658a8b06c0ec4c55 (patch) | |
| tree | 898e7d611c3a7b1575870c26a4b853cfcbed8e7e /config | |
| parent | 1e17e910ea315c0c3f732a7e8d31229dbd1e6069 (diff) | |
Reintroduce IO accounting on zvols on Linux 3.19+
zfsonlinux/zfs@e20cd6f7a8922709b1aa2ecefd783390102d79e0 caused us to
lose IO accounting on zvols. When I originally wrote that last year, the
symbols we needed to maintain IO accounting were GPL exported, but
torvalds/linux@394ffa503bc40e32d7f54a9b817264e81ce131b4 provided
suitable symbols for restoring this functionality 4 months later. We
can call them to restore the IO accounting on Linux 3.19 and later as
well as any older kernels where that patch is backported.
Signed-off-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3741
Diffstat (limited to 'config')
| -rw-r--r-- | config/kernel-generic_io_acct.m4 | 26 | ||||
| -rw-r--r-- | config/kernel.m4 | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/config/kernel-generic_io_acct.m4 b/config/kernel-generic_io_acct.m4 new file mode 100644 index 000000000..25bfa3848 --- /dev/null +++ b/config/kernel-generic_io_acct.m4 @@ -0,0 +1,26 @@ +dnl # +dnl # 3.19 API addition +dnl # +dnl # torvalds/linux@394ffa503bc40e32d7f54a9b817264e81ce131b4 allows us to +dnl # increment iostat counters without generic_make_request(). +dnl # +AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT], [ + AC_MSG_CHECKING([whether generic IO accounting symbols are avaliable]) + ZFS_LINUX_TRY_COMPILE_SYMBOL([ + #include <linux/bio.h> + + void (*generic_start_io_acct_f)(int, unsigned long, + struct hd_struct *) = &generic_start_io_acct; + void (*generic_end_io_acct_f)(int, struct hd_struct *, + unsigned long) = &generic_end_io_acct; + ], [ + generic_start_io_acct(0, 0, NULL); + generic_end_io_acct(0, NULL, 0); + ], [generic_start_io_acct], [block/bio.c], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_GENERIC_IO_ACCT, 1, + [generic_start_io_acct()/generic_end_io_acct() avaliable]) + ], [ + AC_MSG_RESULT(no) + ]) +]) diff --git a/config/kernel.m4 b/config/kernel.m4 index 975e42264..e088c4da3 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -94,6 +94,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_KMAP_ATOMIC_ARGS ZFS_AC_KERNEL_FOLLOW_DOWN_ONE ZFS_AC_KERNEL_MAKE_REQUEST_FN + ZFS_AC_KERNEL_GENERIC_IO_ACCT AS_IF([test "$LINUX_OBJ" != "$LINUX"], [ KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ" |