update kernel to 6.5.11 and ZFS to 2.2.1, refresh patches

* for the kernel-patch this includes a rename from 0003+0004 to
  0001+0002
* for ZFS there was a change in upstream's autotools-setup - I
  referenced the commit in the actual patch-file

minimally tested with a VM with a zfs-pool and an ext4 disk
* restore of a directory on ext4 containing 160MB of debian packages
  as tar.zstd
* restore of a small folder (/root in a debian container) on zfs
both worked

restoring files from a Windows guest - worked, however there is an
independent issue with tpmstate not being found:
`given image 'drive-tpmstate0-backup.img.fidx' not found (400)`

directories with 10 million files also still cause the restore-shim to
run into OOM (but this is independent of the restore-image)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2023-11-28 16:07:30 +01:00 committed by Thomas Lamprecht
parent 0512062108
commit 95e95f36a5
5 changed files with 17 additions and 24 deletions

View File

@ -1,4 +1,4 @@
From a437d428733881f408b5d42eb75812600083cb75 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Stefan Reiter <s.reiter@proxmox.com>
Date: Mon, 26 Apr 2021 14:08:36 +0200
Subject: [PATCH] vsock: reduce packet size
@ -19,10 +19,10 @@ Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
index dc636b727179..18c09ff72929 100644
index c58453699ee9..62a609444e12 100644
--- a/include/linux/virtio_vsock.h
+++ b/include/linux/virtio_vsock.h
@@ -9,7 +9,7 @@
@@ -112,7 +112,7 @@ static inline size_t virtio_vsock_skb_len(struct sk_buff *skb)
#define VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE (1024 * 4)
#define VIRTIO_VSOCK_MAX_BUF_SIZE 0xFFFFFFFFUL
@ -31,6 +31,3 @@ index dc636b727179..18c09ff72929 100644
enum {
VSOCK_VQ_RX = 0, /* for host to guest data */
--
2.20.1

View File

@ -1,4 +1,4 @@
From 7222e7424aab957f63b98853ea9fb30eec83666e Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Stefan Reiter <s.reiter@proxmox.com>
Date: Mon, 3 May 2021 11:13:10 +0200
Subject: [PATCH] PBS-restore: halt machine on kernel panic
@ -14,10 +14,10 @@ Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
1 file changed, 3 insertions(+)
diff --git a/kernel/panic.c b/kernel/panic.c
index 332736a72a58..56339ae5165c 100644
index ea1c5fcb2d19..c317ca992a26 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -325,6 +325,9 @@ void panic(const char *fmt, ...)
@@ -417,6 +417,9 @@ void panic(const char *fmt, ...)
}
}
if (panic_timeout != 0) {
@ -27,6 +27,3 @@ index 332736a72a58..56339ae5165c 100644
/*
* This will not be a clean reboot, with everything
* shutting down. But if there is a chance of
--
2.20.1

View File

@ -6,6 +6,8 @@ Subject: [PATCH] remove reference to libudev
since there's no command line flag I can see...
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
[ SI adapt to aebd94cc8541e0ec3b1de57edbd57c4280213089 ]
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
config/user-libudev.m4 | 17 -----------------
config/user.m4 | 1 -
@ -36,17 +38,14 @@ index 8c3c1d7e0..000000000
- ])
-])
diff --git a/config/user.m4 b/config/user.m4
index c22067551..1b6d3a24e 100644
index 6ec27a5b2..46244f19b 100644
--- a/config/user.m4
+++ b/config/user.m4
@@ -18,7 +18,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
@@ -14,7 +14,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
AM_COND_IF([BUILD_LINUX], [
ZFS_AC_CONFIG_USER_UDEV
ZFS_AC_CONFIG_USER_SYSTEMD
- ZFS_AC_CONFIG_USER_LIBUDEV
ZFS_AC_CONFIG_USER_LIBUUID
ZFS_AC_CONFIG_USER_LIBBLKID
])
ZFS_AC_CONFIG_USER_LIBTIRPC
- ZFS_AC_CONFIG_USER_LIBUDEV
ZFS_AC_CONFIG_USER_LIBCRYPTO
ZFS_AC_CONFIG_USER_LIBAIO
ZFS_AC_CONFIG_USER_CLOCK_GETTIME
--
2.30.2

@ -1 +1 @@
Subproject commit 1978bab71596981268838efebf801f03fdce9d3a
Subproject commit 9f8b45f5f8dbd6093b7ff71750bc6eb762fc8b20

@ -1 +1 @@
Subproject commit e25f9131d679692704c11dc0c1df6d4585b70c35
Subproject commit 55dd24c4ccee2da61d5396289ef560f9b7bc6a68