mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-11-18 02:20:59 +03:00
305510fd33
The generic IO accounting functions have been removed in favor of the bio_start_io_acct() and bio_end_io_acct() functions which provide a better interface. These new functions were introduced in the 5.8 kernels but it wasn't until the 5.11 kernel that the previous generic IO accounting interfaces were removed. This commit updates the blk_generic_*_io_acct() wrappers to provide and interface similar to the updated kernel interface. It's slightly different because for older kernels we need to pass the request queue as well as the bio. Reviewed-by: Rafael Kitover <rkitover@gmail.com> Reviewed-by: Coleman Kane <ckane@colemankane.org> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #11387 Closes #11390
88 lines
2.4 KiB
Plaintext
88 lines
2.4 KiB
Plaintext
dnl #
|
|
dnl # Check for generic io accounting interface.
|
|
dnl #
|
|
AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_IO_ACCT], [
|
|
ZFS_LINUX_TEST_SRC([bio_io_acct], [
|
|
#include <linux/blkdev.h>
|
|
], [
|
|
struct bio *bio = NULL;
|
|
unsigned long start_time;
|
|
|
|
start_time = bio_start_io_acct(bio);
|
|
bio_end_io_acct(bio, start_time);
|
|
])
|
|
|
|
ZFS_LINUX_TEST_SRC([generic_acct_3args], [
|
|
#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);
|
|
])
|
|
|
|
ZFS_LINUX_TEST_SRC([generic_acct_4args], [
|
|
#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);
|
|
])
|
|
])
|
|
|
|
AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT], [
|
|
dnl #
|
|
dnl # 5.7 API,
|
|
dnl #
|
|
dnl # Added bio_start_io_acct() and bio_end_io_acct() helpers.
|
|
dnl #
|
|
AC_MSG_CHECKING([whether generic bio_*_io_acct() are available])
|
|
ZFS_LINUX_TEST_RESULT([bio_io_acct], [
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(HAVE_BIO_IO_ACCT, 1, [bio_*_io_acct() available])
|
|
], [
|
|
AC_MSG_RESULT(no)
|
|
|
|
dnl #
|
|
dnl # 4.14 API,
|
|
dnl #
|
|
dnl # generic_start_io_acct/generic_end_io_acct now require
|
|
dnl # request_queue to be provided. No functional changes,
|
|
dnl # but preparation for inflight accounting.
|
|
dnl #
|
|
AC_MSG_CHECKING([whether generic_*_io_acct wants 4 args])
|
|
ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_4args],
|
|
[generic_start_io_acct], [block/bio.c], [
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(HAVE_GENERIC_IO_ACCT_4ARG, 1,
|
|
[generic_*_io_acct() 4 arg available])
|
|
], [
|
|
AC_MSG_RESULT(no)
|
|
|
|
dnl #
|
|
dnl # 3.19 API addition
|
|
dnl #
|
|
dnl # torvalds/linux@394ffa50 allows us to increment
|
|
dnl # iostat counters without generic_make_request().
|
|
dnl #
|
|
AC_MSG_CHECKING(
|
|
[whether generic_*_io_acct wants 3 args])
|
|
ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_3args],
|
|
[generic_start_io_acct], [block/bio.c], [
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(HAVE_GENERIC_IO_ACCT_3ARG, 1,
|
|
[generic_*_io_acct() 3 arg available])
|
|
], [
|
|
AC_MSG_RESULT(no)
|
|
])
|
|
])
|
|
])
|
|
])
|