[packages/zfs] - blkdev fixes for kernel 6.2.8+, rel 2
baggins
baggins at pld-linux.org
Fri Apr 7 21:37:55 CEST 2023
commit 0f2c1c8cebef80080b005b7198b019d6fdf53c48
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Apr 7 21:37:34 2023 +0200
- blkdev fixes for kernel 6.2.8+, rel 2
blkdev.patch | 222 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
zfs.spec | 4 +-
2 files changed, 225 insertions(+), 1 deletion(-)
---
diff --git a/zfs.spec b/zfs.spec
index 571df62..1e73fd5 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -24,7 +24,7 @@ exit 1
%define _duplicate_files_terminate_build 0
-%define rel 1
+%define rel 2
%define pname zfs
Summary: Native Linux port of the ZFS filesystem
Summary(pl.UTF-8): Natywny linuksowy port systemu plików ZFS
@@ -38,6 +38,7 @@ Source0: https://github.com/openzfs/zfs/releases/download/zfs-%{version}/%{pname
Patch0: initdir.patch
Patch1: am.patch
Patch2: no-Werror.patch
+Patch3: blkdev.patch
URL: https://zfsonlinux.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -287,6 +288,7 @@ p=`pwd`\
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' \
cmd/arc_summary/arc_summary2
diff --git a/blkdev.patch b/blkdev.patch
new file mode 100644
index 0000000..e8a00db
--- /dev/null
+++ b/blkdev.patch
@@ -0,0 +1,222 @@
+From ae0b1f66c707cff09bfde54aade784a016559a34 Mon Sep 17 00:00:00 2001
+From: Rich Ercolani <214141+rincebrain at users.noreply.github.com>
+Date: Mon, 27 Mar 2023 14:29:19 -0400
+Subject: [PATCH] linux 6.3 compat: add another bdev_io_acct case
+
+Linux 6.3+, and backports from it (6.2.8+), changed the
+signatures on bdev_io_{start,end}_acct. Add a case for it.
+
+Reviewed-by: Brian Behlendorf <behlendorf1 at llnl.gov>
+Signed-off-by: Rich Ercolani <rincebrain at gmail.com>
+Closes #14658
+Closes #14668
+---
+ config/kernel-generic_io_acct.m4 | 98 ++++++++++++-------
+ include/os/linux/kernel/linux/blkdev_compat.h | 10 +-
+ 2 files changed, 69 insertions(+), 39 deletions(-)
+
+diff --git a/config/kernel-generic_io_acct.m4 b/config/kernel-generic_io_acct.m4
+index a8a448c6fe9..a6a10900429 100644
+--- a/config/kernel-generic_io_acct.m4
++++ b/config/kernel-generic_io_acct.m4
+@@ -2,7 +2,20 @@ dnl #
+ dnl # Check for generic io accounting interface.
+ dnl #
+ AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_IO_ACCT], [
+- ZFS_LINUX_TEST_SRC([bdev_io_acct], [
++ ZFS_LINUX_TEST_SRC([bdev_io_acct_63], [
++ #include <linux/blkdev.h>
++ ], [
++ struct block_device *bdev = NULL;
++ struct bio *bio = NULL;
++ unsigned long passed_time = 0;
++ unsigned long start_time;
++
++ start_time = bdev_start_io_acct(bdev, bio_op(bio),
++ passed_time);
++ bdev_end_io_acct(bdev, bio_op(bio), bio_sectors(bio), start_time);
++ ])
++
++ ZFS_LINUX_TEST_SRC([bdev_io_acct_old], [
+ #include <linux/blkdev.h>
+ ], [
+ struct block_device *bdev = NULL;
+@@ -63,74 +76,85 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_IO_ACCT], [
+
+ AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT], [
+ dnl #
+- dnl # 5.19 API,
++ dnl # Linux 6.3, and then backports thereof, changed
++ dnl # the signatures on bdev_start_io_acct/bdev_end_io_acct
+ dnl #
+- dnl # disk_start_io_acct() and disk_end_io_acct() have been replaced by
+- dnl # bdev_start_io_acct() and bdev_end_io_acct().
+- dnl #
+- AC_MSG_CHECKING([whether generic bdev_*_io_acct() are available])
+- ZFS_LINUX_TEST_RESULT([bdev_io_acct], [
++ AC_MSG_CHECKING([whether 6.3+ bdev_*_io_acct() are available])
++ ZFS_LINUX_TEST_RESULT([bdev_io_acct_63], [
+ AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_BDEV_IO_ACCT, 1, [bdev_*_io_acct() available])
++ AC_DEFINE(HAVE_BDEV_IO_ACCT_63, 1, [bdev_*_io_acct() available])
+ ], [
+ AC_MSG_RESULT(no)
+
+ dnl #
+- dnl # 5.12 API,
++ dnl # 5.19 API,
+ dnl #
+- dnl # bio_start_io_acct() and bio_end_io_acct() became GPL-exported
+- dnl # so use disk_start_io_acct() and disk_end_io_acct() instead
++ dnl # disk_start_io_acct() and disk_end_io_acct() have been replaced by
++ dnl # bdev_start_io_acct() and bdev_end_io_acct().
+ dnl #
+- AC_MSG_CHECKING([whether generic disk_*_io_acct() are available])
+- ZFS_LINUX_TEST_RESULT([disk_io_acct], [
++ AC_MSG_CHECKING([whether pre-6.3 bdev_*_io_acct() are available])
++ ZFS_LINUX_TEST_RESULT([bdev_io_acct_old], [
+ AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_DISK_IO_ACCT, 1, [disk_*_io_acct() available])
++ AC_DEFINE(HAVE_BDEV_IO_ACCT_OLD, 1, [bdev_*_io_acct() available])
+ ], [
+ AC_MSG_RESULT(no)
+-
+ dnl #
+- dnl # 5.7 API,
++ dnl # 5.12 API,
+ dnl #
+- dnl # Added bio_start_io_acct() and bio_end_io_acct() helpers.
++ dnl # bio_start_io_acct() and bio_end_io_acct() became GPL-exported
++ dnl # so use disk_start_io_acct() and disk_end_io_acct() instead
+ dnl #
+- AC_MSG_CHECKING([whether generic bio_*_io_acct() are available])
+- ZFS_LINUX_TEST_RESULT([bio_io_acct], [
++ AC_MSG_CHECKING([whether generic disk_*_io_acct() are available])
++ ZFS_LINUX_TEST_RESULT([disk_io_acct], [
+ AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_BIO_IO_ACCT, 1, [bio_*_io_acct() available])
++ AC_DEFINE(HAVE_DISK_IO_ACCT, 1, [disk_*_io_acct() available])
+ ], [
+ AC_MSG_RESULT(no)
+
+ dnl #
+- dnl # 4.14 API,
++ dnl # 5.7 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 # Added bio_start_io_acct() and bio_end_io_acct() helpers.
+ 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_CHECKING([whether generic bio_*_io_acct() are available])
++ ZFS_LINUX_TEST_RESULT([bio_io_acct], [
+ AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_GENERIC_IO_ACCT_4ARG, 1,
+- [generic_*_io_acct() 4 arg available])
++ AC_DEFINE(HAVE_BIO_IO_ACCT, 1, [bio_*_io_acct() available])
+ ], [
+ AC_MSG_RESULT(no)
+
+ dnl #
+- dnl # 3.19 API addition
++ dnl # 4.14 API,
+ dnl #
+- dnl # torvalds/linux at 394ffa50 allows us to increment
+- dnl # iostat counters without generic_make_request().
++ 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 3 args])
+- ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_3args],
++ 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_3ARG, 1,
+- [generic_*_io_acct() 3 arg available])
++ 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 at 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)
++ ])
+ ])
+ ])
+ ])
+diff --git a/include/os/linux/kernel/linux/blkdev_compat.h b/include/os/linux/kernel/linux/blkdev_compat.h
+index f04eb5b2593..c7405ffab8b 100644
+--- a/include/os/linux/kernel/linux/blkdev_compat.h
++++ b/include/os/linux/kernel/linux/blkdev_compat.h
+@@ -592,7 +592,10 @@ blk_generic_start_io_acct(struct request_queue *q __attribute__((unused)),
+ struct gendisk *disk __attribute__((unused)),
+ int rw __attribute__((unused)), struct bio *bio)
+ {
+-#if defined(HAVE_BDEV_IO_ACCT)
++#if defined(HAVE_BDEV_IO_ACCT_63)
++ return (bdev_start_io_acct(bio->bi_bdev, bio_op(bio),
++ jiffies));
++#elif defined(HAVE_BDEV_IO_ACCT_OLD)
+ return (bdev_start_io_acct(bio->bi_bdev, bio_sectors(bio),
+ bio_op(bio), jiffies));
+ #elif defined(HAVE_DISK_IO_ACCT)
+@@ -618,7 +621,10 @@ blk_generic_end_io_acct(struct request_queue *q __attribute__((unused)),
+ struct gendisk *disk __attribute__((unused)),
+ int rw __attribute__((unused)), struct bio *bio, unsigned long start_time)
+ {
+-#if defined(HAVE_BDEV_IO_ACCT)
++#if defined(HAVE_BDEV_IO_ACCT_63)
++ bdev_end_io_acct(bio->bi_bdev, bio_op(bio), bio_sectors(bio),
++ start_time);
++#elif defined(HAVE_BDEV_IO_ACCT_OLD)
+ bdev_end_io_acct(bio->bi_bdev, bio_op(bio), start_time);
+ #elif defined(HAVE_DISK_IO_ACCT)
+ disk_end_io_acct(disk, bio_op(bio), start_time);
+From c5431f14655ce05d1ea99cb012806f0e5873d257 Mon Sep 17 00:00:00 2001
+From: youzhongyang <youzhong at gmail.com>
+Date: Fri, 31 Mar 2023 12:46:22 -0400
+Subject: [PATCH] linux 6.3 compat: needs REQ_PREFLUSH | REQ_OP_WRITE
+
+Modify bio_set_flush() so if kernel version is >= 4.10, flags
+REQ_PREFLUSH and REQ_OP_WRITE are set together.
+
+Reviewed-by: Tony Hutter <hutter2 at llnl.gov>
+Reviewed-by: Brian Behlendorf <behlendorf1 at llnl.gov>
+Signed-off-by: Youzhong Yang <yyang at mathworks.com>
+Closes #14695
+---
+ include/os/linux/kernel/linux/blkdev_compat.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/os/linux/kernel/linux/blkdev_compat.h b/include/os/linux/kernel/linux/blkdev_compat.h
+index c7405ffab8b..c5c6385be6f 100644
+--- a/include/os/linux/kernel/linux/blkdev_compat.h
++++ b/include/os/linux/kernel/linux/blkdev_compat.h
+@@ -426,7 +426,7 @@ static inline void
+ bio_set_flush(struct bio *bio)
+ {
+ #if defined(HAVE_REQ_PREFLUSH) /* >= 4.10 */
+- bio_set_op_attrs(bio, 0, REQ_PREFLUSH);
++ bio_set_op_attrs(bio, 0, REQ_PREFLUSH | REQ_OP_WRITE);
+ #elif defined(WRITE_FLUSH_FUA) /* >= 2.6.37 and <= 4.9 */
+ bio_set_op_attrs(bio, 0, WRITE_FLUSH_FUA);
+ #else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/0f2c1c8cebef80080b005b7198b019d6fdf53c48
More information about the pld-cvs-commit
mailing list