Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Linux 5.9 compat: make_request_fn replaced with submit_bio interface 

The make_request_fn and associated API was replaced recently in a
Linux 5.9 merge, to replace its functionality with a new submit_bio
member in struct block_device_operations.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes #10696
This commit is contained in:
Coleman Kane 2020-08-09 12:12:25 -04:00 committed by Brian Behlendorf
parent dcdc12e8ba
commit d817c17100
3 changed files with 74 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
config/kernel-make-request-fn.m4
View File

@ -26,57 +26,75 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_MAKE_REQUEST_FN], [
struct request_queue *q __attribute__ ((unused)); struct request_queue *q __attribute__ ((unused));
q = blk_alloc_queue(make_request, NUMA_NO_NODE); q = blk_alloc_queue(make_request, NUMA_NO_NODE);
]) ])
ZFS_LINUX_TEST_SRC([block_device_operations_submit_bio], [
#include <linux/blkdev.h>
],[
struct block_device_operations o;
o.submit_bio = NULL;
])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_MAKE_REQUEST_FN], [ AC_DEFUN([ZFS_AC_KERNEL_MAKE_REQUEST_FN], [
dnl # Checked as part of the blk_alloc_queue_request_fn test
dnl # dnl #
dnl # Linux 5.7 API Change dnl # Linux 5.9 API Change
dnl # blk_alloc_queue() expects request function. dnl # make_request_fn was moved into block_device_operations->submit_bio
dnl # dnl #
AC_MSG_CHECKING([whether blk_alloc_queue() expects request function]) AC_MSG_CHECKING([whether submit_bio is member of struct block_device_operations])
ZFS_LINUX_TEST_RESULT([blk_alloc_queue_request_fn], [ ZFS_LINUX_TEST_RESULT([block_device_operations_submit_bio], [
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
dnl # Checked as part of the blk_alloc_queue_request_fn test AC_DEFINE(HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS, 1,
AC_MSG_CHECKING([whether make_request_fn() returns blk_qc_t]) [submit_bio is member of struct block_device_operations])
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_BLK_ALLOC_QUEUE_REQUEST_FN, 1,
[blk_alloc_queue() expects request function])
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])
],[
dnl #
dnl # Linux 3.2 API Change
dnl # make_request_fn returns void.
dnl #
AC_MSG_CHECKING([whether make_request_fn() returns void])
ZFS_LINUX_TEST_RESULT([make_request_fn_void], [
AC_MSG_RESULT(yes)
AC_DEFINE(MAKE_REQUEST_FN_RET, void,
[make_request_fn() return type])
AC_DEFINE(HAVE_MAKE_REQUEST_FN_RET_VOID, 1,
[Noting that make_request_fn() returns void])
],[ ],[
AC_MSG_RESULT(no) dnl # Checked as part of the blk_alloc_queue_request_fn test
dnl #
dnl # Linux 5.7 API Change
dnl # blk_alloc_queue() expects request function.
dnl #
AC_MSG_CHECKING([whether blk_alloc_queue() expects request function])
ZFS_LINUX_TEST_RESULT([blk_alloc_queue_request_fn], [
AC_MSG_CHECKING([whether make_request_fn() returns blk_qc_t])
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_BLK_ALLOC_QUEUE_REQUEST_FN, 1,
[blk_alloc_queue() expects request function])
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])
],[
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 void])
[whether make_request_fn() returns blk_qc_t]) ZFS_LINUX_TEST_RESULT([make_request_fn_void], [
ZFS_LINUX_TEST_RESULT([make_request_fn_blk_qc_t], [
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])
])
]) ])
]) ])
]) ])

2
include/os/linux/kernel/linux/blkdev_compat.h
View File

@ -487,6 +487,7 @@ blk_generic_end_io_acct(struct request_queue *q, int rw,
#endif #endif
} }
#ifndef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS
static inline struct request_queue * static inline struct request_queue *
blk_generic_alloc_queue(make_request_fn make_request, int node_id) blk_generic_alloc_queue(make_request_fn make_request, int node_id)
{ {
@ -500,5 +501,6 @@ blk_generic_alloc_queue(make_request_fn make_request, int node_id)
return (q); return (q);
#endif #endif
} }
#endif /* !HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */
#endif /* _ZFS_BLKDEV_H */ #endif /* _ZFS_BLKDEV_H */

18
module/os/linux/zfs/zvol_os.c
View File

@ -295,9 +295,17 @@ zvol_read(void *arg)
kmem_free(zvr, sizeof (zv_request_t)); kmem_free(zvr, sizeof (zv_request_t));
} }
#ifdef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS
static blk_qc_t
zvol_submit_bio(struct bio *bio)
#else
static MAKE_REQUEST_FN_RET static MAKE_REQUEST_FN_RET
zvol_request(struct request_queue *q, struct bio *bio) zvol_request(struct request_queue *q, struct bio *bio)
#endif
{ {
#ifdef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS
struct request_queue *q = bio->bi_disk->queue;
#endif
zvol_state_t *zv = q->queuedata; zvol_state_t *zv = q->queuedata;
fstrans_cookie_t cookie = spl_fstrans_mark(); fstrans_cookie_t cookie = spl_fstrans_mark();
uint64_t offset = BIO_BI_SECTOR(bio) << 9; uint64_t offset = BIO_BI_SECTOR(bio) << 9;
@ -425,7 +433,8 @@ zvol_request(struct request_queue *q, struct bio *bio)
out: out:
spl_fstrans_unmark(cookie); spl_fstrans_unmark(cookie);
#if defined(HAVE_MAKE_REQUEST_FN_RET_QC) #if defined(HAVE_MAKE_REQUEST_FN_RET_QC) || \
defined(HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS)
return (BLK_QC_T_NONE); return (BLK_QC_T_NONE);
#endif #endif
} }
@ -737,6 +746,9 @@ static struct block_device_operations zvol_ops = {
.revalidate_disk = zvol_revalidate_disk, .revalidate_disk = zvol_revalidate_disk,
.getgeo = zvol_getgeo, .getgeo = zvol_getgeo,
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS
.submit_bio = zvol_submit_bio,
#endif
}; };
/* /*
@ -766,7 +778,11 @@ zvol_alloc(dev_t dev, const char *name)
list_link_init(&zv->zv_next); list_link_init(&zv->zv_next);
mutex_init(&zv->zv_state_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&zv->zv_state_lock, NULL, MUTEX_DEFAULT, NULL);
#ifdef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS
zso->zvo_queue = blk_alloc_queue(NUMA_NO_NODE);
#else
zso->zvo_queue = blk_generic_alloc_queue(zvol_request, NUMA_NO_NODE); zso->zvo_queue = blk_generic_alloc_queue(zvol_request, NUMA_NO_NODE);
#endif
if (zso->zvo_queue == NULL) if (zso->zvo_queue == NULL)
goto out_kmem; goto out_kmem;