diff options
| author | Giuseppe Di Natale <[email protected]> | 2017-09-16 11:00:19 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-09-16 11:00:19 -0700 |
| commit | 787acae0b5cd139ea0f9fa60558cca28d4673b23 (patch) | |
| tree | 08561030aefd7cab9e4bf07abdcf23be83078ef5 /config/kernel-generic_io_acct.m4 | |
| parent | 90cdf2833d163dd4db31aded1e6940cc9edb67f6 (diff) | |
Linux 3.14 compat: IO acct, global_page_state, etc
generic_start_io_acct/generic_end_io_acct in the master
branch of the linux kernel requires that the request_queue
be provided.
Move the logic from freemem in the spl to arc_free_memory
in arc.c. Do this so we can take advantage of global_page_state
interface checks in zfs.
Upstream kernel replaced struct block_device with
struct gendisk in struct bio. Determine if the
function bio_set_dev exists during configure
and have zfs use that if it exists.
bio_set_dev https://github.com/torvalds/linux/commit/74d4699
global_node_page_state https://github.com/torvalds/linux/commit/75ef718
io acct https://github.com/torvalds/linux/commit/d62e26b
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Giuseppe Di Natale <[email protected]>
Closes #6635
Diffstat (limited to 'config/kernel-generic_io_acct.m4')
| -rw-r--r-- | config/kernel-generic_io_acct.m4 | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/config/kernel-generic_io_acct.m4 b/config/kernel-generic_io_acct.m4 index 25bfa3848..0aa762162 100644 --- a/config/kernel-generic_io_acct.m4 +++ b/config/kernel-generic_io_acct.m4 @@ -4,8 +4,8 @@ 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]) +AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT_3ARG], [ + AC_MSG_CHECKING([whether 3 arg generic IO accounting symbols are available]) ZFS_LINUX_TRY_COMPILE_SYMBOL([ #include <linux/bio.h> @@ -18,8 +18,35 @@ AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT], [ 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_DEFINE(HAVE_GENERIC_IO_ACCT_3ARG, 1, + [generic_start_io_acct()/generic_end_io_acct() available]) + ], [ + AC_MSG_RESULT(no) + ]) +]) + +dnl # +dnl # Linux 4.14 API, +dnl # +dnl # generic_start_io_acct/generic_end_io_acct now require request_queue to be +dnl # provided. No functional changes, but preparation for inflight accounting +dnl # +AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT_4ARG], [ + AC_MSG_CHECKING([whether 4 arg generic IO accounting symbols are available]) + ZFS_LINUX_TRY_COMPILE_SYMBOL([ + #include <linux/bio.h> + + void (*generic_start_io_acct_f)(struct request_queue *, int, + unsigned long, struct hd_struct *) = &generic_start_io_acct; + void (*generic_end_io_acct_f)(struct request_queue *, int, + struct hd_struct *, unsigned long) = &generic_end_io_acct; + ], [ + generic_start_io_acct(NULL, 0, 0, NULL); + generic_end_io_acct(NULL, 0, NULL, 0); + ], [generic_start_io_acct], [block/bio.c], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_GENERIC_IO_ACCT_4ARG, 1, + [generic_start_io_acct()/generic_end_io_acct() 4 arg available]) ], [ AC_MSG_RESULT(no) ]) |