Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian@packages.debian.org
Usertags: pu
X-Debbugs-CC: pkg-zfsonlinux-de...@alioth-lists.debian.net
Dear release team,
I would like to apply a few patches to address some stability issues in the
zfs-linux package in bullseye. All the patches are cherry-picked from upstream
2.0.x and 2.1.x stable branches.
* 0002-Initialize-ZIL-buffers.patch
zio_crypt.c |1 +
1 file changed, 1 insertion(+)
* 0003-Fix-crash-in-zio_done-error-reporting.patch
zio.c |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
* 0004-Fix-AVX512BW-Fletcher-code-on-AVX512-but-not-BW-mach.patch
zfs_fletcher_avx512.c |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
* 0005-Fix-zfs_get_data-access-to-files-with-wrong-generati.patch
cmd/ztest/ztest.c |4 ++--
include/sys/zil.h |3 ++-
include/sys/zvol_impl.h|4 ++--
module/os/linux/zfs/zfs_vnops_os.c | 14 +-
module/zfs/zfs_log.c |5 +
module/zfs/zil.c |3 ++-
module/zfs/zvol.c |3 ++-
7 files changed, 28 insertions(+), 8 deletions(-)
* 0006-Linux-always-check-or-verify-return-of-igrab.patch
include/os/linux/zfs/sys/zfs_znode_impl.h |8 +++-
module/os/linux/zfs/zfs_ctldir.c |3 ++-
module/os/linux/zfs/zfs_vfsops.c |6 +-
module/os/linux/zfs/zpl_inode.c |3 ++-
4 files changed, 16 insertions(+), 4 deletions(-)
* 0007-Avoid-deadlock-when-removing-L2ARC-devices-under-I-O.patch
arc.c | 17 ++---
zio.c |3 ---
2 files changed, 6 insertions(+), 14 deletions(-)
* 0008-file-reference-counts-can-get-corrupted.patch
include/sys/fm/util.h |5 +++--
include/sys/zfs_file.h |6 --
include/sys/zfs_ioctl.h |2 +-
include/sys/zfs_onexit.h|4 ++--
lib/libzpool/kernel.c | 20 +---
module/os/freebsd/zfs/zfs_file_os.c | 19 ++-
module/os/linux/zfs/zfs_file_os.c | 28 +++-
module/zfs/fm.c | 20
module/zfs/zfs_ioctl.c | 71
++-
module/zfs/zfs_onexit.c | 23 +--
10 files changed, 91 insertions(+), 107 deletions(-)
* 0009-libshare-nfs-don-t-leak-nfs_lock_fd-when-lock-fails.patch
freebsd/nfs.c | 13 +
linux/nfs.c | 13 +
2 files changed, 18 insertions(+), 8 deletions(-)
Regards,
Aron
diff -Nru zfs-linux-2.0.3/debian/changelog zfs-linux-2.0.3/debian/changelog
--- zfs-linux-2.0.3/debian/changelog2021-07-01 13:44:20.0 +0800
+++ zfs-linux-2.0.3/debian/changelog2023-03-02 00:15:02.0 +0800
@@ -1,3 +1,9 @@
+zfs-linux (2.0.3-9+deb11u1) bullseye; urgency=medium
+
+ * cherry-pick upstream fixes for stability issues
+
+ -- Aron Xu Thu, 02 Mar 2023 00:15:02 +0800
+
zfs-linux (2.0.3-9) unstable; urgency=medium
* Cherry-pick "Remove iov_iter_advance() for iter_write" (Closes: #989373)
diff -Nru zfs-linux-2.0.3/debian/patches/0002-Initialize-ZIL-buffers.patch
zfs-linux-2.0.3/debian/patches/0002-Initialize-ZIL-buffers.patch
--- zfs-linux-2.0.3/debian/patches/0002-Initialize-ZIL-buffers.patch
1970-01-01 08:00:00.0 +0800
+++ zfs-linux-2.0.3/debian/patches/0002-Initialize-ZIL-buffers.patch
2023-02-27 15:29:01.0 +0800
@@ -0,0 +1,31 @@
+From e219935f10f6f604a3dafb4727715c3741480fd4 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf
+Date: Fri, 5 Mar 2021 14:45:13 -0800
+Subject: [PATCH] Initialize ZIL buffers
+
+When populating a ZIL destination buffer ensure it is always
+zeroed before its contents are constructed.
+
+Reviewed-by: Matthew Ahrens
+Reviewed-by: Tom Caputi
+Signed-off-by: Brian Behlendorf
+Closes #11687
+---
+ module/os/linux/zfs/zio_crypt.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/module/os/linux/zfs/zio_crypt.c b/module/os/linux/zfs/zio_crypt.c
+index 96dabe55a..e2abc0ae2 100644
+--- a/module/os/linux/zfs/zio_crypt.c
b/module/os/linux/zfs/zio_crypt.c
+@@ -1399,6 +1399,7 @@ zio_crypt_init_uios_zil(boolean_t encrypt, uint8_t
*plainbuf,
+ nr_src = 1;
+ nr_dst = 0;
+ }
++ bzero(dst, datalen);
+
+ /* find the start and end record of the log block */
+ zilc = (zil_chain_t *)src;
+--
+2.30.2
+
diff -Nru
zfs-linux-2.0.3/debian/patches/0003-Fix-crash-in-zio_done-error-reporting.patch
zfs-linux-2.0.3/debian/patches/0003-Fix-crash-in-zio_done-error-reporting.patch
---
zfs-linux-2.0.3/debian/patches/0003-Fix-crash-in-zio_done-error-reporting.patch
1970-01-01 08:00:00.0 +0800
+++
zfs-linux-2.0.3/debian/patches/0003-Fix-crash-in-zio_done-error-reporting.patch
2023-02-27 15:33:33.0 +0800
@@ -0,0 +1,49 @@
+From b996523d54c4650
