* [PATCH zfsonlinux] update submodule to 2.4.3 and refresh patches
@ 2026-06-15 10:28 Stoiko Ivanov
0 siblings, 0 replies; only message in thread
From: Stoiko Ivanov @ 2026-06-15 10:28 UTC (permalink / raw)
To: pve-devel
drop patch 11 which is included in 2.4.3
The changeset between 2.4.2 and 2.4.3 is not too large - notable
commits (from quickly looking through `git log`):
* 1821ca2db ("ZVOL: Add encryption key check for block cloning") could
affect users who enabled both blockcloning and encryption manually
* 50697dc93 ("Fix log vdev removal issues")
* 97117686d ("Remove parent ZIO from dbuf_prefetch()") - performance
improvment with recordsize 4k of 5-10%
* 3a897c4e8 ("Avoid flushing unrelated NFS exports on snapshot unmount")
fixes flushing all exports on each snapshot umount, which looks like
it causes quite some performance degradation on NFS-servers using
ZFS)
* 63a0ff6cd ("nvpair: Check for un-terminated strings in packed nvlist")
a few commits are general defensive clean-ups and robustness
improvments (fixing lock-order reversals, preventing overflows in
integer conversion, properly initiallizing variables)
I minimally tested the changes with 2 virtual PVE-nodes with storage
replication and container guests.
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
...md-unit-for-importing-specific-pools.patch | 4 +-
...ove-__GFP_COMP-before-calling-vmallo.patch | 38 -------------------
debian/patches/series | 1 -
upstream | 2 +-
4 files changed, 3 insertions(+), 42 deletions(-)
delete mode 100644 debian/patches/0011-spl_kvmalloc-remove-__GFP_COMP-before-calling-vmallo.patch
diff --git a/debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch b/debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch
index 3313dd5d4..6f2242c40 100644
--- a/debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch
+++ b/debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch
@@ -23,10 +23,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
create mode 100644 etc/systemd/system/zfs-import@.service.in
diff --git a/etc/Makefile.am b/etc/Makefile.am
-index 58b3cf563b624c716f1a3f82b15283758a19bc0c..2e539ae4623441db09a8baa166fca4deceed7930 100644
+index a795bec160d91d49f90f46f1995c267d16e39643..4e0e8fe5883e4b26e0708107a06034fd69ec89ff 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
-@@ -55,6 +55,7 @@ dist_systemdpreset_DATA = \
+@@ -49,6 +49,7 @@ dist_systemdpreset_DATA = \
systemdunit_DATA = \
%D%/systemd/system/zfs-import-cache.service \
%D%/systemd/system/zfs-import-scan.service \
diff --git a/debian/patches/0011-spl_kvmalloc-remove-__GFP_COMP-before-calling-vmallo.patch b/debian/patches/0011-spl_kvmalloc-remove-__GFP_COMP-before-calling-vmallo.patch
deleted file mode 100644
index ebc6704cb..000000000
--- a/debian/patches/0011-spl_kvmalloc-remove-__GFP_COMP-before-calling-vmallo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e5473afe18a013ec76070e8ef10597f7cda153f2 Mon Sep 17 00:00:00 2001
-From: Rob Norris <rob.norris@truenas.com>
-Date: Wed, 20 May 2026 02:11:31 +1000
-Subject: [PATCH] spl_kvmalloc: remove __GFP_COMP before calling vmalloc()
-
-In cb1833023 we stopped using it for KM_VMEM allocations, since its not
-a valid flag for vmalloc(). However, there's a fallback path for
-non-KM_VMEM allocations to use vmalloc(), and we need to remove
-__GFP_COMP there too to avoid a warning.
-
-Sponsored-by: TrueNAS
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Signed-off-by: Rob Norris <rob.norris@truenas.com>
-Closes #18558
----
- module/os/linux/spl/spl-kmem.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/module/os/linux/spl/spl-kmem.c b/module/os/linux/spl/spl-kmem.c
-index 9fe4042b50..6e34026198 100644
---- a/module/os/linux/spl/spl-kmem.c
-+++ b/module/os/linux/spl/spl-kmem.c
-@@ -188,6 +188,12 @@ spl_kvmalloc(size_t size, gfp_t lflags)
- return (ptr);
- }
-
-+ /*
-+ * vmalloc fallback. KM_VMEM may not have been requested originally if
-+ * we've come through spl_kmem_alloc_impl(), so we need to remove
-+ * __GFP_COMP, which is not a valid flag for vmalloc.
-+ */
-+ lflags &= ~__GFP_COMP;
- return (spl_vmalloc(size, lflags));
- }
-
---
-2.47.3
-
diff --git a/debian/patches/series b/debian/patches/series
index b73cc4284..0ef82e7bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@
0008-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch
0009-libzfs-scrub-only-include-start-and-end-nv-pairs-if-.patch
0010-Add-no-preserve-encryption-flag.patch
-0011-spl_kvmalloc-remove-__GFP_COMP-before-calling-vmallo.patch
diff --git a/upstream b/upstream
index 6330a45b0..83020cf82 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit 6330a45b06d20125de679aae5f63ba14082671ef
+Subproject commit 83020cf8259d057d4cc9102010c05f07ffdfc136
--
2.47.3
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-15 10:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-06-15 10:28 [PATCH zfsonlinux] update submodule to 2.4.3 and refresh patches Stoiko Ivanov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox