Linux 4.18.0-257.el8 compat: blk_alloc_queue()
The CentOS stream 4.18.0-257 kernel appears to have backported the Linux 5.9 change to make_request_fn and the associated API. To maintain weak modules compatibility the original symbol was retained and the new interface blk_alloc_queue_rh() was added. Unfortunately, blk_alloc_queue() was replaced in the blkdev.h header by blk_alloc_queue_bh() so there doesn't seem to be a way to build new kmods against the old interfces. Even though they appear to still be available for weak module binding. To accommodate this a configure check is added for the new _rh() variant of the function and used if available. If compatibility code gets added to the kernel for the original blk_alloc_queue() interface this should be fine. OpenZFS will simply continue to prefer the new interface and only fallback to blk_alloc_queue() when blk_alloc_queue_rh() isn't available. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #11374
This commit is contained in:
parent
8947fa4495
commit
6152014d1a
|
@ -27,6 +27,15 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_MAKE_REQUEST_FN], [
|
||||||
q = blk_alloc_queue(make_request, NUMA_NO_NODE);
|
q = blk_alloc_queue(make_request, NUMA_NO_NODE);
|
||||||
])
|
])
|
||||||
|
|
||||||
|
ZFS_LINUX_TEST_SRC([blk_alloc_queue_request_fn_rh], [
|
||||||
|
#include <linux/blkdev.h>
|
||||||
|
blk_qc_t make_request(struct request_queue *q,
|
||||||
|
struct bio *bio) { return (BLK_QC_T_NONE); }
|
||||||
|
],[
|
||||||
|
struct request_queue *q __attribute__ ((unused));
|
||||||
|
q = blk_alloc_queue_rh(make_request, NUMA_NO_NODE);
|
||||||
|
])
|
||||||
|
|
||||||
ZFS_LINUX_TEST_SRC([block_device_operations_submit_bio], [
|
ZFS_LINUX_TEST_SRC([block_device_operations_submit_bio], [
|
||||||
#include <linux/blkdev.h>
|
#include <linux/blkdev.h>
|
||||||
],[
|
],[
|
||||||
|
@ -47,7 +56,9 @@ AC_DEFUN([ZFS_AC_KERNEL_MAKE_REQUEST_FN], [
|
||||||
|
|
||||||
AC_DEFINE(HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS, 1,
|
AC_DEFINE(HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS, 1,
|
||||||
[submit_bio is member of struct block_device_operations])
|
[submit_bio is member of struct block_device_operations])
|
||||||
],[
|
],[
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
|
||||||
dnl # Checked as part of the blk_alloc_queue_request_fn test
|
dnl # Checked as part of the blk_alloc_queue_request_fn test
|
||||||
dnl #
|
dnl #
|
||||||
dnl # Linux 5.7 API Change
|
dnl # Linux 5.7 API Change
|
||||||
|
@ -55,6 +66,9 @@ AC_DEFUN([ZFS_AC_KERNEL_MAKE_REQUEST_FN], [
|
||||||
dnl #
|
dnl #
|
||||||
AC_MSG_CHECKING([whether blk_alloc_queue() expects request function])
|
AC_MSG_CHECKING([whether blk_alloc_queue() expects request function])
|
||||||
ZFS_LINUX_TEST_RESULT([blk_alloc_queue_request_fn], [
|
ZFS_LINUX_TEST_RESULT([blk_alloc_queue_request_fn], [
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
|
||||||
|
dnl # This is currently always the case.
|
||||||
AC_MSG_CHECKING([whether make_request_fn() returns blk_qc_t])
|
AC_MSG_CHECKING([whether make_request_fn() returns blk_qc_t])
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
|
|
||||||
|
@ -66,34 +80,59 @@ AC_DEFUN([ZFS_AC_KERNEL_MAKE_REQUEST_FN], [
|
||||||
[Noting that make_request_fn() returns blk_qc_t])
|
[Noting that make_request_fn() returns blk_qc_t])
|
||||||
],[
|
],[
|
||||||
dnl #
|
dnl #
|
||||||
dnl # Linux 3.2 API Change
|
dnl # CentOS Stream 4.18.0-257 API Change
|
||||||
dnl # make_request_fn returns void.
|
dnl # The Linux 5.7 blk_alloc_queue() change was back-
|
||||||
|
dnl # ported and the symbol renamed blk_alloc_queue_rh().
|
||||||
|
dnl # As of this kernel version they're not providing
|
||||||
|
dnl # any compatibility code in the kernel for this.
|
||||||
dnl #
|
dnl #
|
||||||
AC_MSG_CHECKING([whether make_request_fn() returns void])
|
ZFS_LINUX_TEST_RESULT([blk_alloc_queue_request_fn_rh], [
|
||||||
ZFS_LINUX_TEST_RESULT([make_request_fn_void], [
|
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
AC_DEFINE(MAKE_REQUEST_FN_RET, void,
|
|
||||||
|
dnl # This is currently always the case.
|
||||||
|
AC_MSG_CHECKING([whether make_request_fn_rh() returns blk_qc_t])
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
|
||||||
|
AC_DEFINE(HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH, 1,
|
||||||
|
[blk_alloc_queue_rh() expects request function])
|
||||||
|
AC_DEFINE(MAKE_REQUEST_FN_RET, blk_qc_t,
|
||||||
[make_request_fn() return type])
|
[make_request_fn() return type])
|
||||||
AC_DEFINE(HAVE_MAKE_REQUEST_FN_RET_VOID, 1,
|
AC_DEFINE(HAVE_MAKE_REQUEST_FN_RET_QC, 1,
|
||||||
[Noting that make_request_fn() returns void])
|
[Noting that make_request_fn() returns blk_qc_t])
|
||||||
],[
|
],[
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
|
|
||||||
dnl #
|
dnl #
|
||||||
dnl # Linux 4.4 API Change
|
dnl # Linux 3.2 API Change
|
||||||
dnl # make_request_fn returns blk_qc_t.
|
dnl # make_request_fn returns void.
|
||||||
dnl #
|
dnl #
|
||||||
AC_MSG_CHECKING(
|
AC_MSG_CHECKING(
|
||||||
[whether make_request_fn() returns blk_qc_t])
|
[whether make_request_fn() returns void])
|
||||||
ZFS_LINUX_TEST_RESULT([make_request_fn_blk_qc_t], [
|
ZFS_LINUX_TEST_RESULT([make_request_fn_void], [
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
AC_DEFINE(MAKE_REQUEST_FN_RET, blk_qc_t,
|
AC_DEFINE(MAKE_REQUEST_FN_RET, void,
|
||||||
[make_request_fn() return type])
|
[make_request_fn() return type])
|
||||||
AC_DEFINE(HAVE_MAKE_REQUEST_FN_RET_QC, 1,
|
AC_DEFINE(HAVE_MAKE_REQUEST_FN_RET_VOID, 1,
|
||||||
[Noting that make_request_fn() ]
|
[Noting that make_request_fn() returns void])
|
||||||
[returns blk_qc_t])
|
|
||||||
],[
|
],[
|
||||||
ZFS_LINUX_TEST_ERROR([make_request_fn])
|
AC_MSG_RESULT(no)
|
||||||
|
|
||||||
|
dnl #
|
||||||
|
dnl # Linux 4.4 API Change
|
||||||
|
dnl # make_request_fn returns blk_qc_t.
|
||||||
|
dnl #
|
||||||
|
AC_MSG_CHECKING(
|
||||||
|
[whether make_request_fn() returns blk_qc_t])
|
||||||
|
ZFS_LINUX_TEST_RESULT([make_request_fn_blk_qc_t], [
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
AC_DEFINE(MAKE_REQUEST_FN_RET, blk_qc_t,
|
||||||
|
[make_request_fn() return type])
|
||||||
|
AC_DEFINE(HAVE_MAKE_REQUEST_FN_RET_QC, 1,
|
||||||
|
[Noting that make_request_fn() ]
|
||||||
|
[returns blk_qc_t])
|
||||||
|
],[
|
||||||
|
ZFS_LINUX_TEST_ERROR([make_request_fn])
|
||||||
|
])
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
|
|
|
@ -529,6 +529,8 @@ blk_generic_alloc_queue(make_request_fn make_request, int node_id)
|
||||||
{
|
{
|
||||||
#if defined(HAVE_BLK_ALLOC_QUEUE_REQUEST_FN)
|
#if defined(HAVE_BLK_ALLOC_QUEUE_REQUEST_FN)
|
||||||
return (blk_alloc_queue(make_request, node_id));
|
return (blk_alloc_queue(make_request, node_id));
|
||||||
|
#elif defined(HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH)
|
||||||
|
return (blk_alloc_queue_rh(make_request, node_id));
|
||||||
#else
|
#else
|
||||||
struct request_queue *q = blk_alloc_queue(GFP_KERNEL);
|
struct request_queue *q = blk_alloc_queue(GFP_KERNEL);
|
||||||
if (q != NULL)
|
if (q != NULL)
|
||||||
|
|
Loading…
Reference in New Issue