From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 80F1E1FF138 for ; Mon, 15 Jun 2026 12:29:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 03F9510A5A; Mon, 15 Jun 2026 12:29:06 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Subject: [PATCH zfsonlinux] update submodule to 2.4.3 and refresh patches Date: Mon, 15 Jun 2026 12:28:32 +0200 Message-ID: <20260615102852.184317-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1781519287339 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.042 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LOTSOFHASH 0.25 Emails with lots of hash-like gibberish KAM_SHORT 0.001 Use of a URL Shortener for very short URL SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [makefile.am,etc.com] Message-ID-Hash: BHVOPJKKOWAUMQEKSTOSPVGUZTB3C6DY X-Message-ID-Hash: BHVOPJKKOWAUMQEKSTOSPVGUZTB3C6DY X-MailFrom: s.ivanov@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- ...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 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 -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 -Signed-off-by: Rob Norris -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