68be554e71
Use the current ZFS 2.2.4 staging tree [0] with commit deb7a8423 ("Fix
corruption caused by mmap flushing problems") on top.
Additionally, include an open, but ack'd, pull request [1] that avoids
a potential general protection fault due to touching a vbio after it
was handed off to the kernel.
[0]: https://github.com/openzfs/zfs/commits/zfs-2.2.4-staging/
[1]: https://github.com/openzfs/zfs/pull/16049
Both should mostly touch the module code.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
122 lines
4.0 KiB
Diff
122 lines
4.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Rob Norris <rob.norris@klarasystems.com>
|
|
Date: Mon, 13 Nov 2023 17:55:29 +1100
|
|
Subject: [PATCH] linux 5.4 compat: page_size()
|
|
|
|
Before 5.4 we have to do a little math.
|
|
|
|
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
|
|
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
|
|
Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
|
|
Sponsored-by: Klara, Inc.
|
|
Sponsored-by: Wasabi Technology, Inc.
|
|
Closes #15533
|
|
Closes #15588
|
|
(cherry picked from commit df04efe321a49c650f1fbaa6fd701fa2928cbe21)
|
|
---
|
|
config/kernel-mm-page-size.m4 | 17 +++++++++++
|
|
config/kernel.m4 | 2 ++
|
|
include/os/linux/Makefile.am | 1 +
|
|
include/os/linux/kernel/linux/mm_compat.h | 36 +++++++++++++++++++++++
|
|
4 files changed, 56 insertions(+)
|
|
create mode 100644 config/kernel-mm-page-size.m4
|
|
create mode 100644 include/os/linux/kernel/linux/mm_compat.h
|
|
|
|
diff --git a/config/kernel-mm-page-size.m4 b/config/kernel-mm-page-size.m4
|
|
new file mode 100644
|
|
index 000000000..d5ebd9269
|
|
--- /dev/null
|
|
+++ b/config/kernel-mm-page-size.m4
|
|
@@ -0,0 +1,17 @@
|
|
+AC_DEFUN([ZFS_AC_KERNEL_SRC_MM_PAGE_SIZE], [
|
|
+ ZFS_LINUX_TEST_SRC([page_size], [
|
|
+ #include <linux/mm.h>
|
|
+ ],[
|
|
+ unsigned long s;
|
|
+ s = page_size(NULL);
|
|
+ ])
|
|
+])
|
|
+AC_DEFUN([ZFS_AC_KERNEL_MM_PAGE_SIZE], [
|
|
+ AC_MSG_CHECKING([whether page_size() is available])
|
|
+ ZFS_LINUX_TEST_RESULT([page_size], [
|
|
+ AC_MSG_RESULT(yes)
|
|
+ AC_DEFINE(HAVE_MM_PAGE_SIZE, 1, [page_size() is available])
|
|
+ ],[
|
|
+ AC_MSG_RESULT(no)
|
|
+ ])
|
|
+])
|
|
diff --git a/config/kernel.m4 b/config/kernel.m4
|
|
index 1d0c5a27f..548905ccd 100644
|
|
--- a/config/kernel.m4
|
|
+++ b/config/kernel.m4
|
|
@@ -167,6 +167,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
|
|
ZFS_AC_KERNEL_SRC_REGISTER_SYSCTL_TABLE
|
|
ZFS_AC_KERNEL_SRC_COPY_SPLICE_READ
|
|
ZFS_AC_KERNEL_SRC_SYNC_BDEV
|
|
+ ZFS_AC_KERNEL_SRC_MM_PAGE_SIZE
|
|
case "$host_cpu" in
|
|
powerpc*)
|
|
ZFS_AC_KERNEL_SRC_CPU_HAS_FEATURE
|
|
@@ -316,6 +317,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
|
|
ZFS_AC_KERNEL_REGISTER_SYSCTL_TABLE
|
|
ZFS_AC_KERNEL_COPY_SPLICE_READ
|
|
ZFS_AC_KERNEL_SYNC_BDEV
|
|
+ ZFS_AC_KERNEL_MM_PAGE_SIZE
|
|
case "$host_cpu" in
|
|
powerpc*)
|
|
ZFS_AC_KERNEL_CPU_HAS_FEATURE
|
|
diff --git a/include/os/linux/Makefile.am b/include/os/linux/Makefile.am
|
|
index 3830d198d..51c27132b 100644
|
|
--- a/include/os/linux/Makefile.am
|
|
+++ b/include/os/linux/Makefile.am
|
|
@@ -5,6 +5,7 @@ kernel_linux_HEADERS = \
|
|
%D%/kernel/linux/compiler_compat.h \
|
|
%D%/kernel/linux/dcache_compat.h \
|
|
%D%/kernel/linux/kmap_compat.h \
|
|
+ %D%/kernel/linux/mm_compat.h \
|
|
%D%/kernel/linux/mod_compat.h \
|
|
%D%/kernel/linux/page_compat.h \
|
|
%D%/kernel/linux/percpu_compat.h \
|
|
diff --git a/include/os/linux/kernel/linux/mm_compat.h b/include/os/linux/kernel/linux/mm_compat.h
|
|
new file mode 100644
|
|
index 000000000..40056c68d
|
|
--- /dev/null
|
|
+++ b/include/os/linux/kernel/linux/mm_compat.h
|
|
@@ -0,0 +1,36 @@
|
|
+/*
|
|
+ * CDDL HEADER START
|
|
+ *
|
|
+ * The contents of this file are subject to the terms of the
|
|
+ * Common Development and Distribution License (the "License").
|
|
+ * You may not use this file except in compliance with the License.
|
|
+ *
|
|
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
+ * or https://opensource.org/licenses/CDDL-1.0.
|
|
+ * See the License for the specific language governing permissions
|
|
+ * and limitations under the License.
|
|
+ *
|
|
+ * When distributing Covered Code, include this CDDL HEADER in each
|
|
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
+ * If applicable, add the following below this CDDL HEADER, with the
|
|
+ * fields enclosed by brackets "[]" replaced with your own identifying
|
|
+ * information: Portions Copyright [yyyy] [name of copyright owner]
|
|
+ *
|
|
+ * CDDL HEADER END
|
|
+ */
|
|
+
|
|
+/*
|
|
+ * Copyright (c) 2023, 2024, Klara Inc.
|
|
+ */
|
|
+
|
|
+#ifndef _ZFS_MM_COMPAT_H
|
|
+#define _ZFS_MM_COMPAT_H
|
|
+
|
|
+#include <linux/mm.h>
|
|
+
|
|
+/* 5.4 introduced page_size(). Older kernels can use a trivial macro instead */
|
|
+#ifndef HAVE_MM_PAGE_SIZE
|
|
+#define page_size(p) ((unsigned long)(PAGE_SIZE << compound_order(p)))
|
|
+#endif
|
|
+
|
|
+#endif /* _ZFS_MM_COMPAT_H */
|