update ABI file for 5.4.203-1-pve

(generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
bump version to 5.4.203-1
2022-08-26 16:54:32 +02:00 · 2022-08-26 16:38:02 +02:00 · 2022-08-26 16:38:02 +02:00 · 2022-08-26 14:42:56 +02:00 · 2022-08-26 14:42:56 +02:00 · 2022-07-13 13:45:06 +02:00
48 changed files with 25146 additions and 31943 deletions
@@ -1,6 +1,6 @@
 [submodule "submodules/zfsonlinux"]
 	path = submodules/zfsonlinux
 	url = ../zfsonlinux
-[submodule "submodules/ubuntu-kernel"]
-	path = submodules/ubuntu-kernel
-	url = ../mirror_ubuntu-kernels
+[submodule "submodules/ubuntu-focal"]
+	path = submodules/ubuntu-focal
+	url = ../mirror_ubuntu-focal-kernel
@@ -1,133 +1,110 @@
-include /usr/share/dpkg/pkg-info.mk
-
-# also bump proxmox-kernel-meta if the default MAJ.MIN version changes!
-KERNEL_MAJ=6
-KERNEL_MIN=2
-KERNEL_PATCHLEVEL=16
-# increment KREL for every published package release!
+# also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
+KERNEL_MAJ=5
+KERNEL_MIN=4
+KERNEL_PATCHLEVEL=203
+# increment KREL if the ABI changes (abicheck target in debian/rules)
 # rebuild packages with new KREL and run 'make abiupdate'
-KREL=20
+KREL=1
+
+PKGREL=1

 KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
 KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)

-EXTRAVERSION=-$(KREL)-pve
-KVNAME=$(KERNEL_VER)$(EXTRAVERSION)
-PACKAGE=proxmox-kernel-$(KVNAME)
-HDRPACKAGE=proxmox-headers-$(KVNAME)
+EXTRAVERSION=-${KREL}-pve
+KVNAME=${KERNEL_VER}${EXTRAVERSION}
+PACKAGE=pve-kernel-${KVNAME}
+HDRPACKAGE=pve-headers-${KVNAME}

 ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)

 # amd64/x86_64/x86 share the arch subdirectory in the kernel, 'x86' so we need
 # a mapping
 KERNEL_ARCH=x86
-ifneq ($(ARCH), amd64)
-KERNEL_ARCH=$(ARCH)
+ifneq (${ARCH}, amd64)
+KERNEL_ARCH=${ARCH}
 endif

+GITVERSION:=$(shell git rev-parse HEAD)
+
 SKIPABI=0

-BUILD_DIR=proxmox-kernel-$(KERNEL_VER)
+BUILD_DIR=build

-KERNEL_SRC=ubuntu-kernel
+KERNEL_SRC=ubuntu-focal
 KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC)
-KERNEL_CFG_ORG=config-$(KERNEL_VER).org
+KERNEL_CFG_ORG=config-${KERNEL_VER}.org

 ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
 ZFSDIR=pkg-zfs

 MODULES=modules
-MODULE_DIRS=$(ZFSDIR)
+MODULE_DIRS=${ZFSDIR}

 # exported to debian/rules via debian/rules.d/dirs.mk
 DIRS=KERNEL_SRC ZFSDIR MODULES

-DSC=proxmox-kernel-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL).dsc
-DST_DEB=$(PACKAGE)_$(KERNEL_VER)-$(KREL)_$(ARCH).deb
-META_DEB=proxmox-kernel-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL)_all.deb
-HDR_DEB=$(HDRPACKAGE)_$(KERNEL_VER)-$(KREL)_$(ARCH).deb
-META_HDR_DEB=proxmox-headers-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL)_all.deb
-USR_HDR_DEB=proxmox-kernel-libc-dev_$(KERNEL_VER)-$(KREL)_$(ARCH).deb
-LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_$(KERNEL_VER)-$(KREL)_$(ARCH).deb
-LINUX_TOOLS_DBG_DEB=linux-tools-$(KERNEL_MAJMIN)-dbgsym_$(KERNEL_VER)-$(KREL)_$(ARCH).deb
+DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
+HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
+USR_HDR_DEB=pve-kernel-libc-dev_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
+LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
+LINUX_TOOLS_DBG_DEB=linux-tools-$(KERNEL_MAJMIN)-dbgsym_${KERNEL_VER}-${PKGREL}_${ARCH}.deb

-DEBS=$(DST_DEB) $(META_DEB) $(HDR_DEB) $(META_HDR_DEB) $(LINUX_TOOLS_DEB) $(LINUX_TOOLS_DBG_DEB) # $(USR_HDR_DEB)
+DEBS=${DST_DEB} ${HDR_DEB} ${USR_HDR_DEB} ${LINUX_TOOLS_DEB} ${LINUX_TOOLS_DBG_DEB}

 all: deb
-deb: $(DEBS)
+deb: ${DEBS}

-$(META_DEB) $(META_HDR_DEB) $(LINUX_TOOLS_DEB) $(HDR_DEB): $(DST_DEB)
-$(DST_DEB): $(BUILD_DIR).prepared
-	cd $(BUILD_DIR); dpkg-buildpackage --jobs=auto -b -uc -us
-	lintian $(DST_DEB)
-	#lintian $(HDR_DEB)
-	lintian $(LINUX_TOOLS_DEB)
+${LINUX_TOOLS_DEB} ${HDR_DEB}: ${DST_DEB}
+${DST_DEB}: ${BUILD_DIR}.prepared
+	cd ${BUILD_DIR}; dpkg-buildpackage --jobs=auto -b -uc -us
+	lintian ${DST_DEB}
+	#lintian ${HDR_DEB}
+	lintian ${LINUX_TOOLS_DEB}

-dsc:
-	$(MAKE) $(DSC)
-	lintian $(DSC)
-
-$(DSC): $(BUILD_DIR).prepared
-	cd $(BUILD_DIR); dpkg-buildpackage -S -uc -us -d
-
-sbuild: $(DSC)
-	sbuild $(DSC)
-
-$(BUILD_DIR).prepared: $(addsuffix .prepared,$(KERNEL_SRC) $(MODULES) debian)
-	cp -a fwlist-previous $(BUILD_DIR)/
-	cp -a abi-prev-* $(BUILD_DIR)/
-	cp -a abi-blacklist $(BUILD_DIR)/
+${BUILD_DIR}.prepared: $(addsuffix .prepared,${KERNEL_SRC} ${MODULES} debian)
+	cp -a fwlist-previous ${BUILD_DIR}/
+	cp -a abi-prev-* ${BUILD_DIR}/
+	cp -a abi-blacklist ${BUILD_DIR}/
 	touch $@

-.PHONY: build-dir-fresh
-build-dir-fresh:
-	$(MAKE) clean
-	$(MAKE) $(BUILD_DIR).prepared
-	echo "created build-directory: $(BUILD_DIR).prepared/"
-
 debian.prepared: debian
-	rm -rf $(BUILD_DIR)/debian
-	mkdir -p $(BUILD_DIR)
-	cp -a debian $(BUILD_DIR)/debian
-	echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout $(shell git rev-parse HEAD)" \
-	    >$(BUILD_DIR)/debian/SOURCE
-	@$(foreach dir, $(DIRS),echo "$(dir)=$($(dir))" >> $(BUILD_DIR)/debian/rules.d/env.mk;)
-	echo "KVNAME=$(KVNAME)" >> $(BUILD_DIR)/debian/rules.d/env.mk
-	echo "KERNEL_MAJMIN=$(KERNEL_MAJMIN)" >> $(BUILD_DIR)/debian/rules.d/env.mk
-	cd $(BUILD_DIR); debian/rules debian/control
+	rm -rf ${BUILD_DIR}/debian
+	mkdir -p ${BUILD_DIR}
+	cp -a debian ${BUILD_DIR}/debian
+	echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > ${BUILD_DIR}/debian/SOURCE
+	@$(foreach dir, ${DIRS},echo "${dir}=${${dir}}" >> ${BUILD_DIR}/debian/rules.d/env.mk;)
+	echo "KVNAME=${KVNAME}" >> ${BUILD_DIR}/debian/rules.d/env.mk
+	echo "KERNEL_MAJMIN=${KERNEL_MAJMIN}" >> ${BUILD_DIR}/debian/rules.d/env.mk
+	cd ${BUILD_DIR}; debian/rules debian/control
 	touch $@

-$(KERNEL_SRC).prepared: $(KERNEL_SRC_SUBMODULE) | submodule
-	rm -rf $(BUILD_DIR)/$(KERNEL_SRC) $@
-	mkdir -p $(BUILD_DIR)
-	cp -a $(KERNEL_SRC_SUBMODULE) $(BUILD_DIR)/$(KERNEL_SRC)
+${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE} | submodule
+	rm -rf ${BUILD_DIR}/${KERNEL_SRC} $@
+	mkdir -p ${BUILD_DIR}
+	cp -a ${KERNEL_SRC_SUBMODULE} ${BUILD_DIR}/${KERNEL_SRC}
 # TODO: split for archs, track and diff in our repository?
-	cd $(BUILD_DIR)/$(KERNEL_SRC); python3 debian/scripts/misc/annotations --arch amd64 --export >../../$(KERNEL_CFG_ORG)
-	cp $(KERNEL_CFG_ORG) $(BUILD_DIR)/$(KERNEL_SRC)/.config
-	sed -i $(BUILD_DIR)/$(KERNEL_SRC)/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=$(EXTRAVERSION)/'
-	rm -rf $(BUILD_DIR)/$(KERNEL_SRC)/debian $(BUILD_DIR)/$(KERNEL_SRC)/debian.master
-	set -e; cd $(BUILD_DIR)/$(KERNEL_SRC); \
-	  for patch in ../../patches/kernel/*.patch; do \
-	    echo "applying patch '$$patch'"; \
-	    patch --batch -p1 < "$${patch}"; \
-	  done
+	cat ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG}
+	cp ${KERNEL_CFG_ORG} ${BUILD_DIR}/${KERNEL_SRC}/.config
+	sed -i ${BUILD_DIR}/${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
+	rm -rf ${BUILD_DIR}/${KERNEL_SRC}/debian ${BUILD_DIR}/${KERNEL_SRC}/debian.master
+	set -e; cd ${BUILD_DIR}/${KERNEL_SRC}; for patch in ../../patches/kernel/*.patch; do echo "applying patch '$$patch'" && patch -p1 < $${patch}; done
 	touch $@

-$(MODULES).prepared: $(addsuffix .prepared,$(MODULE_DIRS))
+${MODULES}.prepared: $(addsuffix .prepared,${MODULE_DIRS})
 	touch $@

-$(ZFSDIR).prepared: $(ZFSONLINUX_SUBMODULE)
-	rm -rf $(BUILD_DIR)/$(MODULES)/$(ZFSDIR) $(BUILD_DIR)/$(MODULES)/tmp $@
-	mkdir -p $(BUILD_DIR)/$(MODULES)/tmp
-	cp -a $(ZFSONLINUX_SUBMODULE)/* $(BUILD_DIR)/$(MODULES)/tmp
-	cd $(BUILD_DIR)/$(MODULES)/tmp; make kernel
-	rm -rf $(BUILD_DIR)/$(MODULES)/tmp
-	touch $(ZFSDIR).prepared
+${ZFSDIR}.prepared: ${ZFSONLINUX_SUBMODULE}
+	rm -rf ${BUILD_DIR}/${MODULES}/${ZFSDIR} ${BUILD_DIR}/${MODULES}/tmp $@
+	mkdir -p ${BUILD_DIR}/${MODULES}/tmp
+	cp -a ${ZFSONLINUX_SUBMODULE}/* ${BUILD_DIR}/${MODULES}/tmp
+	cd ${BUILD_DIR}/${MODULES}/tmp; make kernel
+	rm -rf ${BUILD_DIR}/${MODULES}/tmp
+	touch ${ZFSDIR}.prepared

 .PHONY: upload
-upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
-upload: $(DEBS)
-	tar cf - $(DEBS)|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist $(UPLOAD_DIST) --arch $(ARCH)
+upload: ${DEBS}
+	tar cf - ${DEBS}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster --arch ${ARCH}

 .PHONY: distclean
 distclean: clean
@@ -137,18 +114,18 @@ distclean: clean
 .PHONY: update_modules
 update_modules: submodule
 	git submodule foreach 'git pull --ff-only origin master'
-	cd $(ZFSONLINUX_SUBMODULE); git pull --ff-only origin master
+	cd ${ZFSONLINUX_SUBMODULE}; git pull --ff-only origin master

 # make sure submodules were initialized
 .PHONY: submodule
 submodule:
-	test -f "$(KERNEL_SRC_SUBMODULE)/README" || git submodule update --init $(KERNEL_SRC_SUBMODULE)
-	test -f "$(ZFSONLINUX_SUBMODULE)/Makefile" || git submodule update --init --recursive $(ZFSONLINUX_SUBMODULE)
+	test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init ${KERNEL_SRC_SUBMODULE}
+	test -f "${ZFSONLINUX_SUBMODULE}/Makefile" || git submodule update --init --recursive ${ZFSONLINUX_SUBMODULE}

 # call after ABI bump with header deb in working directory
 .PHONY: abiupdate
-abiupdate: abi-prev-$(KVNAME)
-abi-prev-$(KVNAME): abi-tmp-$(KVNAME)
+abiupdate: abi-prev-${KVNAME}
+abi-prev-${KVNAME}: abi-tmp-${KVNAME}
 ifneq ($(strip $(shell git status --untracked-files=no --porcelain -z)),)
 	@echo "working directory unclean, aborting!"
 	@false
@@ -156,15 +133,15 @@ else
 	git rm "abi-prev-*"
 	mv $< $@
 	git add $@
-	git commit -s -m "update ABI file for $(KVNAME)" -m "(generated with debian/scripts/abi-generate)"
-	@echo "update abi-prev-$(KVNAME) committed!"
+	git commit -s -m "update ABI file for ${KVNAME}" -m "(generated with debian/scripts/abi-generate)"
+	@echo "update abi-prev-${KVNAME} committed!"
 endif

-abi-tmp-$(KVNAME):
-	@ test -e $(HDR_DEB) || (echo "need $(HDR_DEB) to extract ABI data!" && false)
-	debian/scripts/abi-generate $(HDR_DEB) $@ $(KVNAME) 1
+abi-tmp-${KVNAME}:
+	@ test -e ${HDR_DEB} || (echo "need ${HDR_DEB} to extract ABI data!" && false)
+	debian/scripts/abi-generate ${HDR_DEB} $@ ${KVNAME} 1

 .PHONY: clean
 clean:
-	rm -rf *~ proxmox-kernel-[0-9]*/ *.prepared $(KERNEL_CFG_ORG)
-	rm -f *.deb *.dsc *.changes *.buildinfo *.build proxmox-kernel*.tar.*
+	rm -rf *~ build *.prepared ${KERNEL_CFG_ORG}
+	rm -f *.deb *.changes *.buildinfo
@@ -1,17 +1,13 @@
 KERNEL SOURCE:
 ==============

-We currently use the Ubuntu kernel sources, available from our mirror:
+We currently use the Ubuntu kernel sources, available from:

- https://git.proxmox.com/?p=mirror_ubuntu-kernels.git;a=summary
+ http://kernel.ubuntu.com/git/ubuntu/ubuntu-focal.git/

 Ubuntu will maintain those kernels till:

 https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
- or
- https://pve.proxmox.com/pve-docs/chapter-pve-faq.html#faq-support-table
-
- whatever happens to be earlier.


 Additional/Updated Modules:
@@ -24,67 +20,6 @@ Additional/Updated Modules:
  For licensing questions, see: http://open-zfs.org/wiki/Talk:FAQ


-BUILD
-=====
-
-As this is packaging for the Linux kernel with some extra integrations, like
-ZFS, this repo cannot be handled like a plain Linux kernel git repository.
-
-The actual Linux kernel source lives in a git submodule.
-
-For a build you should init the submodules and then handle it like most our
-Debian packaging builds. If unsure you can follow this:
-
-Installing Build-Dependencies
-----------------------------
-
-You can either just check the package metadata template `debian/control.in`
-and install the packages listed in the `Build-Depends` section manually
-(replace `debhelper-compat` with just `debhelper`) or use a more automated way
-described below:
-
- # install base build-dependencies and helpers
- apt update
- apt install devscripts
-
- # create build-directory so that we got final packaging control files from the
- # .in templates generated
- make build-dir-fresh
-
- # install build-dependencies (replace BUILD-DIR with actual one)
- mk-build-deps -ir BUILD-DIR/debian/control
-
-
-Package Build
-------------
-
- # start the actual build
- make deb
-
-For simple KConfig modifications you can adapt the list in `debian/rules` file.
-For quick code changes to the actual kernel code you can do them directly in
-the submodule/ubuntu-kernels directory, then re-create the build-directory, e.g.:
-
- make clean
- # now build again, explicitly creating the build-dir isn't required anymore
- # after one has the build-dependencies already installed.
- make deb
-
-
-Modify-Build-Test Cycles
------------------------
-
-Ideally you avoid the need for doing a full package build and just directly
-build linux from the ubuntu-kernels or the mainline (stable) repo with copying
-over a build-config of a proxmox-kernel to that as .config and then using the
-`make olddefconfig` target.
-
-If you need full package builds you can try to make changes inside the
-BUILD-DIR directly and then continue build from there, e.g., using
-`dpkg-buildpackage -b -uc -us --no-pre-clean`. Depending on what stage you want
-to continue build you might need to touch, or remove some *.prepared files.
-Just check `debian/rules` for how kernel build progress is tracked by make.
-
 SUBMODULE
 =========

@@ -96,7 +31,7 @@ get applied with the `patch` tool. From a git point-of-view, the copied
 directory remains clean even with extra patches applied since it does not
 contain a .git directory, but a reference to the (still pristine) submodule:

-$ cat build/ubuntu-kernel/.git
+$ cat build/ubuntu-focal/.git

 If you mistakenly cloned the upstream repo as "normal" clone (not via the
 submodule mechanics) this means that you have a real .git directory with its
@@ -121,30 +56,18 @@ top level meta package, depends on current default kernel series meta package.

 git clone git://git.proxmox.com/git/proxmox-ve.git

-proxmox-default-kernel
----------------------
+pve-kernel-meta
+---------------

-Depends on default kernel and header meta package, e.g., proxmox-kernel-6.2 /
-proxmox-headers-6.2.
+depends on latest kernel and header package within a certain kernel series,
+e.g., pve-kernel-4.15 / pve-headers-4.15

 git clone git://git.proxmox.com/git/pve-kernel-meta.git

-proxmox-kernel-X.Y
------------------
-
-Depends on the latest kernel (or header, in case of proxmox-headers-X.Y)
-package within a certain series.
-
-e.g., proxmox-kernel-6.2 depends on proxmox-kernel-6.2.16-6-pve
-
-NOTE: Since Proxmox VE 8, based on Debian 12 Bookworm, the kernel ABI is bumped
-with every version bump due to module signing. Since then the meta package was
-pulled into the kernel repo, before that it lived in pve-kernel-meta.git.
-
 pve-firmware
 ------------

-Contains the firmware for all released PVE kernels.
+contains the firmware for all released PVE kernels.

 git clone git://git.proxmox.com/git/pve-firmware.git

@@ -172,21 +95,9 @@ Watchdog blacklist

 By default, all watchdog modules are black-listed because it is totally undefined
 which device is actually used for /dev/watchdog.
-We ship this list in /lib/modprobe.d/blacklist_proxmox-kernel-<VERSION>.conf
+We ship this list in /lib/modprobe.d/blacklist_pve-kernel-<VERSION>.conf
 The user typically edit /etc/modules to enable a specific watchdog device.

-Debug kernel and modules
------------------------
-
-In order to build a -dbgsym package containing an unstripped copy of the kernel
-image and modules, enable the 'pkg.proxmox-kernel.debug' build profile (e.g. by
-exporting DEB_BUILD_PROFILES='pkg.proxmox-kernel.debug'). The resulting package can
-be used together with 'crash'/'kdump-tools' to debug kernel crashes.
-
-Note: the -dbgsym package is only valid for the proxmox-kernel packages produced by
-the same build. A kernel/module from a different build will likely not match,
-even if both builds are of the same kernel and package version.
-
 Additional information
 ----------------------

@@ -210,39 +121,55 @@ NOTE: For the exact and current list see debian/rules (PVE_CONFIG_OPTS)
  	 CONFIG_BLK_DEV_SR=y
  	 CONFIG_BLK_DEV_DM=y

+- add workaround for Debian bug #807000 (see
+  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807000)
+
+  	 CONFIG_BLK_DEV_NVME=y
+
 - compile NBD and RBD modules
 	 CONFIG_BLK_DEV_NBD=m
 	 CONFIG_BLK_DEV_RBD=m

 - enable IBM JFS file system as module
-  requested by users (bug #64)
+
+  enable it as requested by users (bug #64)

 - enable apple HFS and HFSPLUS as module
-  requested by users
+
+  enable it as requested by users

 - enable CONFIG_BCACHE=m (requested by user)

 - enable CONFIG_BRIDGE=y
-  to avoid warnings on boot, e.g. that net.bridge.bridge-nf-call-iptables is an unknown key
+
+  Else we get warnings on boot, that
+  net.bridge.bridge-nf-call-iptables is an unknown key

 - enable CONFIG_DEFAULT_SECURITY_APPARMOR
+
  We need this for lxc

 - set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+
  because if not set, it can give some dynamic memory or cpu frequencies 
  change, and vms can crash (mainly windows guest).
+
  see http://forum.proxmox.com/threads/18238-Windows-7-x64-VMs-crashing-randomly-during-process-termination?p=93273#post93273

 - use 'deadline' as default scheduler
-  This is the suggested setting for KVM. We also measure bad fsync performance with ext4 and cfq.
+
+  This is the suggested setting for KVM. We also measure bad fsync
+  performance with ext4 and cfq.

 - disable CONFIG_INPUT_EVBUG
-  Module evbug is not blacklisted on debian, so we simply disable it to avoid
-  key-event logs (which is a big security problem)
+
+  Module evbug is not blacklisted on debian, so we simply disable it
+  to avoid key-event logs (which is a big security problem)

 - enable CONFIG_MODVERSIONS (needed for ABI tracking)

 - switch default UNWINDER to FRAME_POINTER
+
  the recently introduced ORC_UNWINDER is not 100% stable yet, especially in combination with ZFS

 - enable CONFIG_PAGE_TABLE_ISOLATION (Meltdown mitigation)
@@ -1,642 +1,208 @@
-proxmox-kernel-6.2 (6.2.16-20) bookworm; urgency=medium
+pve-kernel (5.4.203-1) buster; urgency=medium

-  * update sources to Ubuntu-6.2.0-39.40
+  * update sources to Ubuntu-5.4.0-126.142

-  * update ZFS to 2.1.14
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 26 Aug 2022 14:43:35 +0200

- -- Proxmox Support Team <support@proxmox.com>  Fri, 01 Dec 2023 14:17:27 +0100
+pve-kernel (5.4.195-1) buster; urgency=medium

-proxmox-kernel-6.2 (6.2.16-19) bookworm; urgency=medium
+  * update sources to Ubuntu-5.4.0-123.139

-  * backport exposing FLUSHBYASID when running nested VMs on AMD CPUs to fix
-    nesting of some hyper-visors like VMware Workstation.
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 13 Jul 2022 13:19:46 +0200

-  * backport constraining guest-supported xfeatures only at KVM_GET_XSAVE{2}
-    to further improve compatibility for guests w.r.t. live-migration, or live
-    snapshot rollback, to hosts with less (FPU) xfeatures supported.
+pve-kernel (5.4.192-1) buster; urgency=medium

- -- Proxmox Support Team <support@proxmox.com>  Tue, 24 Oct 2023 14:07:51 +0200
+  * update sources to Ubuntu-5.4.0-122.138

-proxmox-kernel-6.2 (6.2.16-18) bookworm; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 23 Jun 2022 11:56:26 +0200

-  * backport fix for AMD erratum #1485 on Zen4-based CPUs to avoid triggering
-    undefined instruction exceptions when disabling all, or certain security
-    mitigations, like using the "mitigations=off" kernel command line
-    parameter
+pve-kernel (5.4.189-2) buster; urgency=medium

-  * backport ZFS fix to avoid crashes and hangs if used on modern Intel HW
-    like the Xeon Scalable 4th Gen "Sapphire Rapids" CPUs due to a HW bug as
-    per Intel SPR erratum SPR4
+  * update sources to Ubuntu-5.4.0-117.132

- -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Oct 2023 17:05:18 +0200
+  * fixes: CVE-2022-1966, CVE-2022-21499, CVE-2022-28390, CVE-2022-29581,
+    CVE-2022-1116

-proxmox-kernel-6.2 (6.2.16-16) bookworm; urgency=medium
+  * bump ABI to 5.4.189-2

-  * update sources to Ubuntu-6.2.0-36.36
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 13 Jun 2022 09:39:53 +0200

- -- Proxmox Support Team <support@proxmox.com>  Tue, 03 Oct 2023 07:42:21 +0200
+pve-kernel (5.4.189-1) buster; urgency=medium

-proxmox-kernel-6.2 (6.2.16-15) bookworm; urgency=medium
+  * update sources to Ubuntu-5.4.0-112.126

-  * fix thunderbolt ring-interrupt not being masked on suspend
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 11 May 2022 07:10:20 +0200

-  * cherry-pick fix to avoid potentially offlining one CPU thread on some EPYC
-    CPUs with a new amd64-microcode package (still in unstable).
+pve-kernel (5.4.178-1) buster; urgency=medium

-  * update ZFS to 2.1.13
+  * update sources to Ubuntu-5.4.0-108.122

- -- Proxmox Support Team <support@proxmox.com>  Thu, 28 Sep 2023 15:53:58 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2022 15:16:31 +0200

-proxmox-kernel-6.2 (6.2.16-14) bookworm; urgency=medium
+pve-kernel (5.4.174-2) buster; urgency=medium

-  * cherry-pick fix for setting X86_FEATURE_OSXSAVE feature improving
-    performance of some code that tries to live-detect available CPU features,
-    like, e.g., ZFS.
+  * update sources to Ubuntu-5.4.0-105.119

- -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Sep 2023 10:17:16 +0200
+  * bump ABI to 5.4.174-2

-proxmox-kernel-6.2 (6.2.16-13) bookworm; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 10 Mar 2022 15:58:44 +0100

-  * fix #4707: add override parameter for RMRR relaxation
+pve-kernel (5.4.174-1) buster; urgency=medium

-  * backport thunderbolt-net fixes for IPv6 and connection re-establishment
-    after a node got rebooted
+  * update sources to Ubuntu-5.4.0-101.114

-  * update sources to Ubuntu-6.2.0-34.34
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Feb 2022 08:21:31 +0100

- -- Proxmox Support Team <support@proxmox.com>  Mon, 18 Sep 2023 15:31:57 +0200
+pve-kernel (5.4.166-1) buster; urgency=medium

-proxmox-kernel-6.2 (6.2.16-12) bookworm; urgency=medium
+  * update sources to Ubuntu-5.4.0-98.111

-  * cherry-pick fix for KVM vCPU page-fault loop.
-    Due to too small and signed type used for an memory related sequence
-    counter there was a chance that for long-lived VMs KVM would effectively
-    hang vCPUs due to always thinking page faults are stale, which results in
-    KVM refusing to "fix" faults.
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 02 Feb 2022 08:05:40 +0100

- -- Proxmox Support Team <support@proxmox.com>  Mon, 04 Sep 2023 15:21:22 +0200
-
-proxmox-kernel-6.2 (6.2.16-11) bookworm; urgency=medium
-
-  * cherry-pick fix to surpress faulty segfault logging. While harmless, such
-    logs can look scary and might let people follow them like a red herring.
-
-  * update sources to Ubuntu-6.2.0-32.32
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 31 Aug 2023 11:56:15 +0200
-
-proxmox-kernel-6.2 (6.2.16-10) bookworm; urgency=medium
-
-  * disable CONFIG_GDS_FORCE_MITIGATION again
-    when not having installed a new-enough intel-microcode, this disables AVX
-    instructions which breaks a lot of software
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 18 Aug 2023 13:42:38 +0200
-
-proxmox-kernel-6.2 (6.2.16-9) bookworm; urgency=medium
-
-  * add fixes for downfall
-
-  * enable mitigation config option CONFIG_GDS_FORCE_MITIGATION
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 16 Aug 2023 10:07:11 +0200
-
-proxmox-kernel-6.2 (6.2.16-8) bookworm; urgency=medium
-
-  * sign modules and set trust anchor/lockdown to allow manual secure boot
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 02 Aug 2023 14:17:00 +0200
-
-proxmox-kernel-6.2 (6.2.16-7) bookworm; urgency=medium
-
-  * change `pve-` prefix to `proxmox-`
-
-  * merge proxmox-kernel-meta packaging into main kernel repository
-
-  * bump ABI to 6.2.16-6
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 01 Aug 2023 13:23:46 +0200
-
-pve-kernel (6.2.16-6) bookworm; urgency=medium
-
-  * fix #4833: backport fix for recovering potential NX huge pages
-
-  * fix #4770: backport "nvme: don't reject probe due to duplicate IDs"
-
-  * backport Zenbleed stop-gap workaround for CVE-2023-20593, the actual fix
-    is the amd64-microcode update.
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 25 Jul 2023 17:33:45 +0200
-
-pve-kernel (6.2.16-5) bookworm; urgency=medium
-
-  * kvm: xsave set: mask-out PKRU bit in xfeatures if vCPU has no support to
-    improve live-migrations & snapshot-rollback of VMs running on modern Intel
-    CPUs (Skylake-Server or Tiger Lake Desktop), if configured with a
-    restricted vCPU type (e.g., qemu64) and if the migration source is from
-    our 5.15 based kernel (default in Proxmox VE 7.4) to the 6.2 (and future
-    newer) of Proxmox VE 8.0 as target.
-    This copes with the fallout of a fix, that while itself improved migration
-    compatibility for clusters with different host-CPU models, caused another
-    issue on the transition between the older "broken" and newer "fixed"
-    kernels for homogeneous clusters, i.e., those with the same PVE host-CPU
-    model.
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 14 Jul 2023 19:53:39 +0200
-
-pve-kernel (6.2.16-4) bookworm; urgency=medium
-
-  * backport fixes for StackRot (CVE-2023-3269)
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 07 Jul 2023 06:22:28 +0200
-
-pve-kernel (6.2.16-3) bookworm; urgency=medium
-
-  * update to Ubuntu-6.2.0-25.25
-
- -- Proxmox Support Team <support@proxmox.com>  Sat, 17 Jun 2023 07:58:57 +0200
-
-pve-kernel (6.2.16-2) bookworm; urgency=medium
-
-  * update ZFS to 2.1.12
-
-  * bump ABI to 6.2.16-2
-
-  * backport "net/sched: flower: fix possible OOB write in fl_set_geneve_opt()"
-
-  * backport re-adding mdev_set_iommu_device() kABI for support of SRIOV based
-    Nvidia vGPU
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 13 Jun 2023 15:30:53 +0200
-
-pve-kernel (6.2.16-1) bookworm; urgency=medium
-
-  * update to Ubuntu-6.2.0-23.23 and pull in stable fixes up to v6.2.16
-
-  * build for Debian 12 Bookworm based releases
-
- -- Proxmox Support Team <support@proxmox.com>  Sat, 20 May 2023 19:23:34 +0200
-
-pve-kernel (6.2.11-2) bullseye; urgency=medium
-
-  * backport "netfilter: nf_tables: deactivate anonymous set from preparation
-    phase"
-
-  * bump ABI to 6.2.11-2
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 10 May 2023 11:13:34 +0200
-
-pve-kernel (6.2.11-1) bullseye; urgency=medium
-
-  * update kernel to Proxmox-6.2.11-1
-
-  * update ZFS to 2.1.11
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 20 Apr 2023 11:59:36 +0200
-
-pve-kernel (6.2.9-1) bullseye; urgency=medium
-
-  * update to Ubuntu-6.2.0-19.19 and cherry-pick patches up to 6.2.9
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 31 Mar 2023 12:48:33 +0200
-
-pve-kernel (6.2.6-1) bullseye; urgency=medium
-
-  * update to Ubuntu-6.2.0-17.17 based on 6.2.6
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Mar 2023 18:08:23 +0100
-
-pve-kernel (6.2.2-1) bullseye; urgency=medium
-
-  * update to Ubuntu-6.2.0-1.1
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 13 Mar 2023 17:57:00 +0100
-
-pve-kernel (6.1.15-1) bullseye; urgency=medium
-
-  * update to Proxmox-6.1.15-1
-
-  * backport patch to fix issue with large IO requests
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 08 Mar 2023 09:53:18 +0100
-
-pve-kernel (6.1.14-1) bullseye; urgency=medium
-
-  * update to Proxmox-6.1.14-1
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 27 Feb 2023 18:09:47 +0100
-
-pve-kernel (6.1.10-1) bullseye; urgency=medium
-
-  * update to Proxmox-6.1.10-1
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 07 Feb 2023 14:10:10 +0100
-
-pve-kernel (6.1.6-1) bullseye; urgency=medium
-
-  * update ZFS to 2.1.9
-
-  * update to Ubuntu-6.1.0-14.14 based on upstream 6.1.6
-
- -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Jan 2023 15:05:09 +0100
-
-pve-kernel (6.1.2-1) bullseye; urgency=medium
-
-  * backport ZFS compat fixes for Linux 6.1 w.r.t. a OTMPFILE open syscall
-
-  * update to Ubuntu-6.1.0-12.12
-
-  * backport a few newer fixes-of-fixes from 6.1.4
-
-  * bump ABI to 6.1.2-1
-
- -- Proxmox Support Team <support@proxmox.com>  Sat, 07 Jan 2023 14:56:01 +0100
-
-pve-kernel (6.1.0-1) bullseye; urgency=medium
-
-  * update to Ubuntu-6.1.0-1.1 based on upstram v6.1
-
-  * update ZFS to 2.1.7
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 13 Dec 2022 15:08:53 +0100
-
-pve-kernel (5.19.17-1) bullseye; urgency=medium
-
-  * update to Ubuntu-5.19.0-24.25
-
-  * bump ABI to 5.19.17-1
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 14 Nov 2022 20:25:12 +0100
-
-pve-kernel (5.19.7-2) bullseye; urgency=medium
-
-  * update ZFS to 2.1.6
-
-  * update to Ubuntu-5.19.0-19.19
-
-  * bump ABI to 5.19.7-2
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 04 Oct 2022 17:18:40 +0200
-
-pve-kernel (5.19.7-1) bullseye; urgency=medium
-
-  * update to 5.19.7 based on Ubuntu-5.19.0-16.16
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 06 Sep 2022 07:54:58 +0200
-
-pve-kernel (5.19.0-1) bullseye; urgency=medium
-
-  * update to 5.19.0 based from Ubuntu-5.19.0-14.14
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 02 Aug 2022 09:18:39 +0200
-
-pve-kernel (5.19.0-1~rc8+2) bullseye; urgency=medium
-
-  * backport smm fixes
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 27 Jul 2022 11:27:10 +0200
-
-pve-kernel (5.19.0-1~rc8+1) bullseye; urgency=medium
-
-  * update to 5.19.0-rc8 based from Ubuntu-5.19.0-11.11
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 26 Jul 2022 11:47:30 +0200
-
-pve-kernel (5.15.53-1) bullseye; urgency=medium
-
-  * update to Ubuntu-5.15.0-48.54
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 26 Aug 2022 16:53:52 +0200
-
-pve-kernel (5.15.39-4) bullseye; urgency=medium
-
-  * update "SMM emulation and interrupt shadow fixes" to v3
-
-  * bump ABI to 5.15.35-4
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 08 Aug 2022 15:11:15 +0200
-
-pve-kernel (5.15.39-3) bullseye; urgency=medium
-
-  * backport "SMM emulation and interrupt shadow fixes"
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 27 Jul 2022 13:45:39 +0200
-
-pve-kernel (5.15.39-2) bullseye; urgency=medium
-
-  * update to Ubuntu-5.15.0-45.48
-
-  * update ZFS to 2.1.5
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 20 Jul 2022 17:22:19 +0200
-
-pve-kernel (5.15.39-1) bullseye; urgency=medium
-
-  * update to Ubuntu-5.15.0-41.44
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 22 Jun 2022 17:22:00 +0200
-
-pve-kernel (5.15.35-6) bullseye; urgency=medium
-
-  * update to Ubuntu-5.15.0-40.43
-
-  * bump ABI to 5.15.35-3
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 17 Jun 2022 13:42:35 +0200
-
-pve-kernel (5.15.35-5) bullseye; urgency=medium
-
-  * backport netfilter nf_table sanitiation fixes
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 08 Jun 2022 15:02:51 +0200
-
-pve-kernel (5.15.35-4) bullseye; urgency=medium
-
-  * update to Ubuntu-5.15.0-36.37
-
-  * fix #4083: backport "EDAC/amd64: Add PCI device IDs for family 19h
-    model 50h"
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 02 Jun 2022 13:48:41 +0200
-
-pve-kernel (5.15.35-3) bullseye; urgency=medium
-
-  * fix #4039: backport aquantia atlantic NIC fixes
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 11 May 2022 07:57:51 +0200
-
-pve-kernel (5.15.35-2) bullseye; urgency=medium
-
-  * cherry pick "NFSv4.1 provide mount option to toggle trunking discovery"
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 05 May 2022 13:54:35 +0200
-
-pve-kernel (5.15.35-1) bullseye; urgency=medium
-
-  * update to Ubuntu-5.15.0-29.30
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 04 May 2022 12:32:49 +0200
-
-pve-kernel (5.15.30-3) bullseye; urgency=medium
-
-  * backport "io_uring: fix race between timeout flush and removal"
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 22 Apr 2022 18:08:27 +0200
-
-pve-kernel (5.15.30-2) bullseye; urgency=medium
-
-  * update sources to Ubuntu-5.15.0-27.28
-
-  * bump ABI to 5.15.30-2
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 22 Apr 2022 11:15:56 +0200
-
-pve-kernel (5.15.30-1) bullseye; urgency=medium
-
-  * update sources to Ubuntu-5.15.0-24.24 based on 5.15.30
-
-  * update ZFS to 2.1.4
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 29 Mar 2022 10:36:02 +0200
-
-pve-kernel (5.15.27-1) bullseye; urgency=medium
-
-  * update sources to Ubuntu-5.15.0-23.23 based on 5.15.27
-
-  * update ZFS to 2.1.3
-
- -- Proxmox Support Team <support@proxmox.com>  Sat, 12 Mar 2022 15:16:17 +0100
-
-pve-kernel (5.15.19-3) bullseye; urgency=medium
-
-  * backport "lib/iov_iter: initialize "flags" in new pipe_buffer"
-    fixing CVE-2022-0847 "dirty pipe"
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 07 Mar 2022 16:23:02 +0100
-
-pve-kernel (5.15.19-2) bullseye; urgency=medium
-
-  * backport fbdev memory region release improvements
-
-  * ensure 'simpledrm' module gets build, allowing it to take over any system
-    VGA/VBE/EFI framebuffer directly
-
-  * bump ABI to 5.15.19-2
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 08 Feb 2022 11:19:02 +0100
-
-pve-kernel (5.15.19-1) bullseye; urgency=medium
-
-  * update sources to Ubuntu-5.15.0-20.20 based on 5.15.19
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 04 Feb 2022 06:09:14 +0100
-
-pve-kernel (5.15.17-1) bullseye; urgency=medium
-
-  * update sources to Ubuntu-5.15.0-19.19 based on 5.15.17
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 31 Jan 2022 09:41:30 +0100
-
-pve-kernel (5.15.12-3) bullseye; urgency=medium
+pve-kernel (5.4.162-2) buster; urgency=medium

  * backport "vfs: fs_context: fix up param length parsing in
    legacy_parse_param"

- -- Proxmox Support Team <support@proxmox.com>  Thu, 20 Jan 2022 16:36:44 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 20 Jan 2022 16:38:53 +0100

-pve-kernel (5.15.12-2) bullseye; urgency=medium
+pve-kernel (5.4.162-1) buster; urgency=medium

-  * update sources to Ubuntu-5.15.0-16.16 based on 5.15.12
+  * update sources to Ubuntu-5.4.0-95.107

-  * update ZFS to 2.1.2
+  * bump ABI to 5.4.162-1

-  * ZFS: cherry-pick lock-inversion patch for zvol_open
+  * update ZFS to 2.0.7

-  * cherry-pick "blk-cgroup: always terminate io.stat lines"
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Jan 2022 18:49:53 +0100

- -- Proxmox Support Team <support@proxmox.com>  Tue, 11 Jan 2022 16:43:18 +0100
+pve-kernel (5.4.157-1) buster; urgency=medium

-pve-kernel (5.15.7-1) bullseye; urgency=medium
+  * update sources to Ubuntu-5.4.0-92.103

-  * update to Ubuntu-5.15.0-14.14
+  * bump ABI to 5.4.157-1

-  * bump ABI to 5.15.7-1
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Nov 2021 12:01:44 +0100

- -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Dec 2021 16:42:34 +0100
+pve-kernel (5.4.151-1) buster; urgency=medium

-pve-kernel (5.15.5-1) bullseye; urgency=medium
+  * update sources to Ubuntu-5.4.0-91.102

-  * update to upcomming Ubuntu 22.04, Jammy Jellyfish kernel
+  * bump ABI to 5.4.151-1

-  * bump ABI to 5.15.5-1
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 06 Nov 2021 16:10:09 +0100

- -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Nov 2021 18:49:57 +0100
+pve-kernel (5.4.148-1) buster; urgency=medium

-pve-kernel (5.13.19-4) bullseye; urgency=medium
+  * update sources to Ubuntu-5.4.0-90.101

-  * update sources to Ubuntu-5.13.0-23.23
+  * bump ABI to 5.4.148-1

-  * bump ABI to 5.13.19-2
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 18 Oct 2021 15:24:06 +0200

- -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Nov 2021 12:10:09 +0100
+pve-kernel (5.4.143-1) buster; urgency=medium

-pve-kernel (5.13.19-3) bullseye; urgency=medium
+  * update Sources to Ubuntu-5.4.0-89.100

-  * backport two io-wq fixes relevant for io_uring
+  * bump ABI to 5.4.143-1

- -- Proxmox Support Team <support@proxmox.com>  Tue, 23 Nov 2021 13:31:19 +0100
+  * update ZFS to 2.0.6

-pve-kernel (5.13.19-2) bullseye; urgency=medium
+  * fix #3558: backport "bnx2x: Fix enabling network interfaces without VFs"

-  * re-enable retrying to get a blockdev on ERESTARTSYS to work around
-    ZFS still depending on that
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 09:10:37 +0200

- -- Proxmox Support Team <support@proxmox.com>  Tue, 09 Nov 2021 12:59:38 +0100
+pve-kernel (5.4.140-1) buster; urgency=medium

-pve-kernel (5.13.19-1) bullseye; urgency=medium
+  * update sources to 5.4.140 stable release based on Ubuntu-5.4.0-85.95

-  * update sources to Ubuntu-5.13.0-22.22
+  * ZFS: cherry-pick revert of "Consolidate arc_buf allocation checks" (ZFS GH
+    issue #11531)

- -- Proxmox Support Team <support@proxmox.com>  Sat, 06 Nov 2021 13:08:30 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 08 Sep 2021 16:21:59 +0200

-pve-kernel (5.13.18-1) bullseye; urgency=medium
-
-  * update sources to Ubuntu-5.13.0-21.21
-
-  * bump ABI to 5.13.18-1
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Oct 2021 13:42:26 +0200
-
-pve-kernel (5.13.14-1) bullseye; urgency=medium
-
-  * update kernel-base to Ubuntu 21.10 Impish kernel
-
-  * update ZFS to 2.1.1
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 06:16:44 +0200
-
-pve-kernel (5.11.22-9) bullseye; urgency=medium
-
-  * backport "blk-mq: fix kernel panic during iterating over flush
-    request"
-
-  * d/rules: kconfig: enable SQUASHFS_DECOMP_MULTI_PERCPU to speed up
-    decompression of mounted squashfs images
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 22 Sep 2021 10:11:11 +0200
-
-pve-kernel (5.11.22-8) bullseye; urgency=medium
-
-  * update to Ubuntu-5.11.0-34.36
-
-  * fix #3552: cherry-pick PCI probe fixes
-
-  * build nvme as a module again to satisfy some inflexible (mellanox) modules
-    insisting in being able to load the nvme-core module as dependency
-
-  * bump ABI to 5.11.22-4
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 27 Aug 2021 11:51:34 +0200
-
-pve-kernel (5.11.22-7) bullseye; urgency=medium
+pve-kernel (5.4.128-2) buster; urgency=medium

  * cherry-pick fixes for CVE-2021-3656 and CVE-2021-3653

- -- Proxmox Support Team <support@proxmox.com>  Wed, 18 Aug 2021 15:06:12 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 18 Aug 2021 16:20:02 +0200

-pve-kernel (5.11.22-6) bullseye; urgency=medium
+pve-kernel (5.4.128-1) buster; urgency=medium

-  * io_uring: don't block level reissue off completion path
+  * update sources to 5.4.128 stable release based on Ubuntu-5.4.0-81.91

- -- Proxmox Support Team <support@proxmox.com>  Wed, 28 Jul 2021 10:51:12 +0200
+  * update ZFS to 2.0.5

-pve-kernel (5.11.22-5) bullseye; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Jul 2021 18:32:02 +0200

-  * import Ubuntu-5.11.0-26.28
-
-  * pull in upstream stable releases from v5.10.44, v5.12.11
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Jul 2021 18:25:44 +0200
-
-pve-kernel (5.11.22-4) bullseye; urgency=medium
+pve-kernel (5.4.124-2) buster; urgency=medium

  * fix CVE-2021-33909: seq_file: disallow extremely large seq buffer
    allocations

- -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Jul 2021 21:40:02 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Jul 2021 21:43:44 +0200

-pve-kernel (5.11.22-3) bullseye; urgency=medium
+pve-kernel (5.4.124-1) buster; urgency=medium

-  * update ZFS to 2.0.5
-
-  * pull in upstream stable releases from v5.10.43, v5.12.10
-
-  * ensure 'performance' is the default frequency CPU governor again, as
-    schedutil seems to cause still some issues in with a few VM workloads
-
- -- Proxmox Support Team <support@proxmox.com>  Sun, 11 Jul 2021 13:45:15 +0200
-
-pve-kernel (5.11.22-2) bullseye; urgency=medium
-
-  * net: bridge: sync fdb to new unicast-filtering ports
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 02 Jul 2021 16:22:45 +0200
-
-pve-kernel (5.11.22-1) bullseye; urgency=medium
-
-  * update sources to stable release 5.11.22 with Ubuntu-5.11.0-23.24
+  * update sources to 5.4.124 stable release based on Ubuntu-5.4.0-78.87

  * pve-kernel-libc-dev: add version to Provides dependency field for
    linux-libc-dev to satisfy versioned dependencies from other packages

-  * build perf with python3
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 23 Jun 2021 13:47:09 +0200

-  * fixes #3465: keep unstripped kernel and module files, allowing one to use
-    kdump-tools
+pve-kernel (5.4.119-1) buster; urgency=medium

- -- Proxmox Support Team <support@proxmox.com>  Wed, 23 Jun 2021 08:53:17 +0200
+  * update sources to 5.4.119 stable release based on Ubuntu-5.4.0-75.84

-pve-kernel (5.11.21-1) bullseye; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 01 Jun 2021 15:32:00 +0200

-  * update sources to stable release 5.11.21 with Ubuntu-5.11.0-19.20
+pve-kernel (5.4.114-1) buster; urgency=medium

- -- Proxmox Support Team <support@proxmox.com>  Tue, 01 Jun 2021 16:38:57 +0200
+  * update sources to 5.4.114 stable release based on Ubuntu-5.4.0-74.83

-pve-kernel (5.11.17-1) bullseye; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 09 May 2021 17:13:05 +0200

-  * update sources to stable release 5.11.17 with Ubuntu-5.11.0-18.19
+pve-kernel (5.4.106-1) pve pmg; urgency=medium

- -- Proxmox Support Team <support@proxmox.com>  Wed, 12 May 2021 12:45:37 +0200
-
-pve-kernel (5.11.12-1) bullseye; urgency=medium
-
-  * update sources to Ubuntu-5.11.0-14.15
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Apr 2021 10:31:19 +0200
-
-pve-kernel (5.11.7-1) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.11.0-12.13
+  * update sources to 5.4.106 stable release

  * update ZFS to 2.0.4

- -- Proxmox Support Team <support@proxmox.com>  Thu, 18 Mar 2021 14:07:05 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 19 Mar 2021 11:08:47 +0100

-pve-kernel (5.11.0-1) pve pmg; urgency=medium
+pve-kernel (5.4.103-1) pve pmg; urgency=medium

-  * update sources to Ubuntu-5.11.0-11.12
+  * update sources to 5.4.103 stable release
+
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 07 Mar 2021 15:55:09 +0100
+
+pve-kernel (5.4.101-1) pve pmg; urgency=medium
+
+  * update sources to 5.4.101 stable release
+
+  * fix #3320: backport "kvm: x86: replace kvm_spec_ctrl_test_value with
+    runtime test on the host"
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 26 Feb 2021 13:13:09 +0100
+
+pve-kernel (5.4.98-1) pve pmg; urgency=medium
+
+  * update sources to 5.4.98 stable release

  * update ZFS to 2.0.3

- -- Proxmox Support Team <support@proxmox.com>  Tue, 02 Mar 2021 13:36:01 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 15 Feb 2021 16:33:27 +0100

-pve-kernel (5.10.6-1) pve pmg; urgency=medium
+pve-kernel (5.4.86-1) pve pmg; urgency=medium

-  * update sources to Ubuntu-5.10.0-12.13
+  * update sources to Ubuntu-5.4.0-66.74
+
+  * bump ABI to 5.4.86-1

  * update ZFS to 2.0.1

- -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2021 14:27:01 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 28 Jan 2021 14:56:38 +0100

 pve-kernel (5.4.78-2) pve pmg; urgency=medium

@@ -0,0 +1 @@
+10
@@ -1,4 +1,4 @@
-Source: proxmox-kernel-@KVMAJMIN@
+Source: pve-kernel
 Section: devel
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
@@ -7,9 +7,9 @@ Build-Depends: asciidoc-base,
               bc,
               bison,
               cpio,
-               debhelper-compat (= 13),
+               debhelper (>= 10~),
               dh-python,
-               dwarves,
+               dwarves (>= 1.13~),
               file,
               flex,
               gcc (>= 8.3.0-6),
@@ -25,14 +25,15 @@ Build-Depends: asciidoc-base,
               libtool,
               lintian,
               lz4,
-               python3-minimal,
+               perl-modules,
+               python2-minimal,
               rsync,
+               sed,
               sphinx-common,
+               tar,
               xmlto,
               zlib1g-dev,
-               zstd,
-Build-Conflicts: proxmox-headers-@KVNAME@,
-Standards-Version: 4.6.2
+Build-Conflicts: pve-headers-@KVNAME@,
 Vcs-Git: git://git.proxmox.com/git/pve-kernel
 Vcs-Browser: https://git.proxmox.com/?p=pve-kernel.git

@@ -40,77 +41,44 @@ Package: linux-tools-@KVMAJMIN@
 Architecture: any
 Section: devel
 Priority: optional
-Depends: linux-base, ${misc:Depends}, ${shlibs:Depends},
+Depends: linux-base,
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: Linux kernel version specific tools for version @KVMAJMIN@
 This package provides the architecture dependent parts for kernel
 version locked tools (such as perf and x86_energy_perf_policy)

-Package: proxmox-headers-@KVNAME@
+Package: pve-headers-@KVNAME@
 Section: devel
 Priority: optional
 Architecture: any
-Provides: linux-headers-@KVNAME@-amd64, pve-headers-@KVNAME@
-Depends: ${misc:Depends},
-Description: Proxmox Kernel Headers
+Provides: linux-headers,
+          linux-headers-2.6,
+Depends: coreutils | fileutils (>= 4.0),
+Description: The Proxmox PVE Kernel Headers
 This package contains the linux kernel headers

-Package: proxmox-kernel-@KVNAME@
+Package: pve-kernel-@KVNAME@
 Section: admin
 Priority: optional
 Architecture: any
-Provides: linux-image-@KVNAME@-amd64, pve-kernel-@KVNAME@
+Provides: linux-image,
+          linux-image-2.6,
 Suggests: pve-firmware,
-Depends: busybox, initramfs-tools | linux-initramfs-tool, ${misc:Depends},
+Depends: busybox,
+         initramfs-tools,
 Recommends: grub-pc | grub-efi-amd64 | grub-efi-ia32 | grub-efi-arm64,
-Description: Proxmox Kernel Image
+Description: The Proxmox PVE Kernel Image
 This package contains the linux kernel and initial ramdisk used for booting

-Package: proxmox-kernel-@KVNAME@-dbgsym
-Architecture: any
-Provides: linux-debug, pve-kernel-@KVNAME@-dbgsym
-Section: devel
-Priority: optional
-Build-Profiles: <pkg.proxmox-kernel.debug>
-Depends: ${misc:Depends},
-Description: Proxmox Kernel debug image
- This package provides the kernel debug image for version @KVNAME@. The debug
- kernel image contained in this package is NOT meant to boot from - it is
- uncompressed, and unstripped, and suitable for use with crash/kdump-tools/..
- to analyze kernel crashes. This package also contains the proxmox-kernel modules
- in their unstripped version.
-
-Package: proxmox-kernel-libc-dev
+Package: pve-kernel-libc-dev
 Section: devel
 Priority: optional
 Architecture: any
-Provides: linux-libc-dev (=${binary:Version}), pve-kernel-libc-dev
+Provides: linux-libc-dev (=${binary:Version}),
 Conflicts: linux-libc-dev,
-Replaces: linux-libc-dev, pve-kernel-libc-dev
-Breaks: pve-kernel-libc-dev
-Depends: ${misc:Depends},
+Replaces: linux-libc-dev,
+Depends: ${misc:Depends}
 Description: Linux support headers for userspace development
 This package provides userspaces headers from the Linux kernel.  These headers
 are used by the installed headers for GNU libc and other system libraries.
-
-Package: proxmox-headers-@KVMAJMIN@
-Architecture: all
-Section: admin
-Provides: linux-headers-amd64, linux-headers-generic, pve-headers-@KVMAJMIN@
-Replaces: pve-headers-@KVMAJMIN@
-Priority: optional
-Depends: proxmox-headers-@KVNAME@, ${misc:Depends},
-Description: Latest Proxmox Kernel Headers
- This is a metapackage which will install the kernel headers
- for the latest available proxmox kernel from the @KVMAJMIN@
- series.
-
-Package: proxmox-kernel-@KVMAJMIN@
-Architecture: all
-Section: admin
-Provides: linux-image-amd64, linux-image-generic, wireguard-modules (=1.0.0), pve-kernel-@KVMAJMIN@
-Replaces: pve-kernel-@KVMAJMIN@
-Priority: optional
-Depends: pve-firmware, proxmox-kernel-@KVNAME@, ${misc:Depends},
-Description: Latest Proxmox Kernel Image
- This is a metapackage which will install the latest available
- proxmox kernel from the @KVMAJMIN@ series.
@@ -1,8 +1,11 @@
 This is a prepackaged version of the Linux kernel binary image.

-For the packaging and all files in the debian/ folder consider:
- Copyright (C) 2007-2022 Proxmox Server Solutions GmbH
- Licensed under the AGPL-3.0-or-later
+This package was put together by Proxmox Server
+Solutions GmbH <support@proxmox.com>.
+
+We use the RHEL7 kernel sources, available from:
+
+ftp://ftp.redhat.com/redhat/rhel/

 Linux is copyrighted by Linus Torvalds and others.

@@ -1,17 +0,0 @@
-#! /bin/sh
-
-# Abort if any command returns an error value 
-set -e
-
-case "$1" in
-  configure)
-    # setup kernel links for installation CD (rescue boot)
-    mkdir -p /boot/pve
-    ln -sf /boot/vmlinuz-@@KVNAME@@ /boot/pve/vmlinuz-@@KVMAJMIN@@
-    ln -sf /boot/initrd.img-@@KVNAME@@ /boot/pve/initrd.img-@@KVMAJMIN@@
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
@@ -1,19 +0,0 @@
-#! /bin/sh
-
-# Abort if any command returns an error value
-set -e
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-        # remove kernel symlinks
-        rm -f /boot/pve/vmlinuz-@@KVNAME@@
-        rm -f /boot/pve/initrd.img-@@KVNAME@@
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
@@ -1,46 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-# Ignore all 'upgrade' invocations .
-exit 0 if $ARGV[0] =~ /upgrade/;
-
-my $imagedir = "/boot";
-
-my $version = "@@KVNAME@@";
-
-if (-d "/etc/kernel/postrm.d") {
-  print STDERR "Examining /etc/kernel/postrm.d.\n";
-  system (
-      "run-parts --verbose --exit-on-error --arg=$version --arg=$imagedir/vmlinuz-$version /etc/kernel/postrm.d"
-  ) && die "Failed to process /etc/kernel/postrm.d";
-}
-
-unlink "$imagedir/initrd.img-$version";
-unlink "$imagedir/initrd.img-$version.bak";
-unlink "/var/lib/initramfs-tools/$version";
-
-# Ignore all invocations except when called on to purge.
-exit 0 unless $ARGV[0] =~ /purge/;
-
-my @files_to_remove = qw{
-    modules.dep modules.isapnpmap modules.pcimap
-    modules.usbmap modules.parportmap
-    modules.generic_string modules.ieee1394map
-    modules.ieee1394map modules.pnpbiosmap
-    modules.alias modules.ccwmap modules.inputmap
-    modules.symbols modules.ofmap
-    modules.seriomap modules.*.bin
-    modules.softdep modules.devname
-};
-
-foreach my $extra_file (@files_to_remove) {
-    for (glob("/lib/modules/$version/$extra_file")) {
-	unlink;
-    }
-}
-
-system ("rmdir", "/lib/modules/$version") if -d "/lib/modules/$version";
-
-exit 0
@@ -1,7 +1,6 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w

 use strict;
-use warnings;

 # Ignore all invocations except when called on to configure.
 exit 0 unless $ARGV[0] =~ /configure/;
@@ -17,9 +16,10 @@ system("depmod $version");

 if (-d "/etc/kernel/postinst.d") {
  print STDERR "Examining /etc/kernel/postinst.d.\n";
-  system(
-      "run-parts --verbose --exit-on-error --arg=$version --arg=$imagedir/vmlinuz-$version /etc/kernel/postinst.d"
-  ) && die "Failed to process /etc/kernel/postinst.d";
+  system ("run-parts --verbose --exit-on-error --arg=$version " .
+          "--arg=$imagedir/vmlinuz-$version " .
+          "/etc/kernel/postinst.d") &&
+            die "Failed to process /etc/kernel/postinst.d";
 }

 exit 0
@@ -0,0 +1,46 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+# Ignore all 'upgrade' invocations .
+exit 0 if $ARGV[0] =~ /upgrade/;
+
+my $imagedir = "/boot";
+
+my $version = "@@KVNAME@@";
+
+if (-d "/etc/kernel/postrm.d") {
+  print STDERR "Examining /etc/kernel/postrm.d.\n";
+  system ("run-parts --verbose --exit-on-error --arg=$version " .
+          "--arg=$imagedir/vmlinuz-$version " .
+          "/etc/kernel/postrm.d") &&
+            die "Failed to process /etc/kernel/postrm.d";
+}
+
+unlink "$imagedir/initrd.img-$version";
+unlink "$imagedir/initrd.img-$version.bak";
+unlink "/var/lib/initramfs-tools/$version";
+
+# Ignore all invocations except when called on to purge.
+exit 0 unless $ARGV[0] =~ /purge/;
+
+my @files_to_remove = qw{
+                         modules.dep modules.isapnpmap modules.pcimap
+                         modules.usbmap modules.parportmap
+                         modules.generic_string modules.ieee1394map
+                         modules.ieee1394map modules.pnpbiosmap
+                         modules.alias modules.ccwmap modules.inputmap
+                         modules.symbols modules.ofmap
+                         modules.seriomap modules.*.bin
+			 modules.softdep modules.devname
+                       };
+
+foreach my $extra_file (@files_to_remove) {
+    for (glob("/lib/modules/$version/$extra_file")) {
+	unlink;
+    }
+}
+
+system ("rmdir", "/lib/modules/$version") if -d "/lib/modules/$version";
+
+exit 0
@@ -1,7 +1,6 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w

 use strict;
-use warnings;

 # Ignore all invocations uxcept when called on to remove
 exit 0 unless ($ARGV[0] && $ARGV[0] =~ /remove/) ;
@@ -15,9 +14,10 @@ my $version = "@@KVNAME@@";

 if (-d "/etc/kernel/prerm.d") {
  print STDERR "Examining /etc/kernel/prerm.d.\n";
-  system(
-      "run-parts --verbose --exit-on-error --arg=$version --arg=$imagedir/vmlinuz-$version /etc/kernel/prerm.d"
-  ) && die "Failed to process /etc/kernel/prerm.d";
+  system ("run-parts --verbose --exit-on-error --arg=$version " . 
+          "--arg=$imagedir/vmlinuz-$version " .
+          "/etc/kernel/prerm.d") &&
+	  die "Failed to process /etc/kernel/prerm.d";
 }

 exit 0
@@ -9,23 +9,18 @@ BUILD_DIR=$(shell pwd)

 include /usr/share/dpkg/default.mk
 include debian/rules.d/env.mk
-include debian/rules.d/$(DEB_BUILD_ARCH).mk
-
-MAKEFLAGS += $(subst parallel=,-j,$(filter parallel=%,${DEB_BUILD_OPTIONS}))
+include debian/rules.d/${DEB_BUILD_ARCH}.mk

 CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate)
-CHANGELOG_DATE_UTC_ISO := $(shell date -u -d '$(CHANGELOG_DATE)' +%Y-%m-%dT%H:%MZ)

-PMX_KERNEL_PKG=proxmox-kernel-$(KVNAME)
-PMX_KERNEL_SERIES_PKG=proxmox-kernel-$(KERNEL_MAJMIN)
-PMX_DEBUG_KERNEL_PKG=proxmox-kernel-$(KVNAME)-dbgsym
-PMX_HEADER_PKG=proxmox-headers-$(KVNAME)
-PMX_USR_HEADER_PKG=proxmox-kernel-libc-dev
-LINUX_TOOLS_PKG=linux-tools-$(KERNEL_MAJMIN)
-KERNEL_SRC_COPY=$(KERNEL_SRC)_tmp
+PVE_KERNEL_PKG=pve-kernel-${KVNAME}
+PVE_HEADER_PKG=pve-headers-${KVNAME}
+PVE_USR_HEADER_PKG=pve-kernel-libc-dev
+LINUX_TOOLS_PKG=linux-tools-${KERNEL_MAJMIN}
+KERNEL_SRC_COPY=${KERNEL_SRC}_tmp

 # TODO: split for archs, move to files?
-PMX_CONFIG_OPTS= \
+PVE_CONFIG_OPTS= \
 -m INTEL_MEI_WDT \
 -d CONFIG_SND_PCM_OSS \
 -e CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \
@@ -33,34 +28,23 @@ PMX_CONFIG_OPTS= \
 -m CONFIG_CEPH_FS \
 -m CONFIG_BLK_DEV_NBD \
 -m CONFIG_BLK_DEV_RBD \
-m CONFIG_BLK_DEV_UBLK \
 -d CONFIG_SND_PCSP \
 -m CONFIG_BCACHE \
 -m CONFIG_JFS_FS \
 -m CONFIG_HFS_FS \
 -m CONFIG_HFSPLUS_FS \
 -e CIFS_SMB_DIRECT \
-e CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU \
 -e CONFIG_BRIDGE \
 -e CONFIG_BRIDGE_NETFILTER \
 -e CONFIG_BLK_DEV_SD \
 -e CONFIG_BLK_DEV_SR \
 -e CONFIG_BLK_DEV_DM \
-m CONFIG_BLK_DEV_NVME \
+-e CONFIG_BLK_DEV_NVME \
 -e CONFIG_NLS_ISO8859_1 \
 -d CONFIG_INPUT_EVBUG \
 -d CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND \
-d CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL \
 -e CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE \
-e CONFIG_SYSFB_SIMPLEFB \
-e CONFIG_DRM_SIMPLEDRM \
-e CONFIG_MODULE_SIG \
-e CONFIG_MODULE_SIG_ALL \
-e CONFIG_MODULE_SIG_FORMAT \
--set-str CONFIG_MODULE_SIG_HASH sha512 \
--set-str CONFIG_MODULE_SIG_KEY certs/signing_key.pem \
-e CONFIG_MODULE_SIG_KEY_TYPE_RSA \
-e CONFIG_MODULE_SIG_SHA512 \
+-d CONFIG_MODULE_SIG \
 -d CONFIG_MEMCG_DISABLED \
 -e CONFIG_MEMCG_SWAP_ENABLED \
 -e CONFIG_HYPERV \
@@ -83,37 +67,29 @@ PMX_CONFIG_OPTS= \
 -d CONFIG_DEFAULT_CFQ \
 -e CONFIG_DEFAULT_DEADLINE \
 -e CONFIG_MODVERSIONS \
-e CONFIG_ZSTD_COMPRESS \
 -d CONFIG_DEFAULT_SECURITY_DAC \
 -e CONFIG_DEFAULT_SECURITY_APPARMOR \
 --set-str CONFIG_DEFAULT_SECURITY apparmor \
-e CONFIG_MODULE_ALLOW_BTF_MISMATCH \
 -d CONFIG_UNWINDER_ORC \
 -d CONFIG_UNWINDER_GUESS \
 -e CONFIG_UNWINDER_FRAME_POINTER \
 --set-str CONFIG_SYSTEM_TRUSTED_KEYS ""\
 --set-str CONFIG_SYSTEM_REVOCATION_KEYS ""\
-e CONFIG_SECURITY_LOCKDOWN_LSM \
-e CONFIG_SECURITY_LOCKDOWN_LSM_EARLY \
--set-str CONFIG_LSM lockdown,yama,integrity,apparmor \
-e CONFIG_PAGE_TABLE_ISOLATION \
-e CONFIG_ARCH_HAS_CPU_FINALIZE_INIT \
-d CONFIG_GDS_FORCE_MITIGATION
+-d CONFIG_SECURITY_LOCKDOWN_LSM \
+-d CONFIG_SECURITY_LOCKDOWN_LSM_EARLY \
+--set-str CONFIG_LSM yama,integrity,apparmor \
+-e CONFIG_PAGE_TABLE_ISOLATION

 debian/control: $(wildcard debian/*.in)
-	sed -e 's/@@KVNAME@@/$(KVNAME)/g' < debian/proxmox-kernel.prerm.in > debian/$(PMX_KERNEL_PKG).prerm
-	sed -e 's/@@KVNAME@@/$(KVNAME)/g' < debian/proxmox-kernel.postrm.in > debian/$(PMX_KERNEL_PKG).postrm
-	sed -e 's/@@KVNAME@@/$(KVNAME)/g' < debian/proxmox-kernel.postinst.in > debian/$(PMX_KERNEL_PKG).postinst
-	sed -e 's/@@KVNAME@@/$(KVNAME)/g' < debian/proxmox-headers.postinst.in > debian/$(PMX_HEADER_PKG).postinst
-	sed -e 's/@@KVMAJMIN@@/$(KERNEL_MAJMIN)/g' -e 's/@@KVNAME@@/$(KVNAME)/g' < debian/proxmox-kernel-meta.postrm.in > debian/$(PMX_KERNEL_SERIES_PKG).postrm
-	sed -e 's/@@KVMAJMIN@@/$(KERNEL_MAJMIN)/g' -e 's/@@KVNAME@@/$(KVNAME)/g' < debian/proxmox-kernel-meta.postinst.in > debian/$(PMX_KERNEL_SERIES_PKG).postinst
-	chmod +x debian/$(PMX_KERNEL_PKG).prerm
-	chmod +x debian/$(PMX_KERNEL_PKG).postrm
-	chmod +x debian/$(PMX_KERNEL_PKG).postinst
-	chmod +x debian/$(PMX_KERNEL_SERIES_PKG).postrm
-	chmod +x debian/$(PMX_KERNEL_SERIES_PKG).postinst
-	chmod +x debian/$(PMX_HEADER_PKG).postinst
-	sed -e 's/@KVNAME@/$(KVNAME)/g' -e 's/@KVMAJMIN@/$(KERNEL_MAJMIN)/g' < debian/control.in > debian/control
+	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/pve-kernel.prerm.in > debian/${PVE_KERNEL_PKG}.prerm
+	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/pve-kernel.postrm.in > debian/${PVE_KERNEL_PKG}.postrm
+	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/pve-kernel.postinst.in > debian/${PVE_KERNEL_PKG}.postinst
+	sed -e 's/@@KVNAME@@/${KVNAME}/g' < debian/pve-headers.postinst.in > debian/${PVE_HEADER_PKG}.postinst
+	chmod +x debian/${PVE_KERNEL_PKG}.prerm
+	chmod +x debian/${PVE_KERNEL_PKG}.postrm
+	chmod +x debian/${PVE_KERNEL_PKG}.postinst
+	chmod +x debian/${PVE_HEADER_PKG}.postinst
+	sed -e 's/@KVNAME@/${KVNAME}/g' -e 's/@KVMAJMIN@/${KERNEL_MAJMIN}/g' < debian/control.in > debian/control

 build: .compile_mark .tools_compile_mark .modules_compile_mark

@@ -127,7 +103,7 @@ install: .install_mark .tools_install_mark .headers_install_mark .usr_headers_in

 binary: install
 	debian/rules fwcheck abicheck
-	dh_strip -N$(PMX_HEADER_PKG) -N$(PMX_USR_HEADER_PKG)
+	dh_strip -N${PVE_HEADER_PKG} -N${PVE_USR_HEADER_PKG}
 	dh_makeshlibs
 	dh_shlibdeps
 	dh_installdeb
@@ -136,90 +112,68 @@ binary: install
 	dh_builddeb

 .config_mark:
-	cd $(KERNEL_SRC); scripts/config $(PMX_CONFIG_OPTS)
-	$(MAKE) -C $(KERNEL_SRC) oldconfig
-	# copy to allow building in parallel to kernel/module compilation without interference
-	rm -rf $(KERNEL_SRC_COPY)
-	cp -ar $(KERNEL_SRC) $(KERNEL_SRC_COPY)
+	cd ${KERNEL_SRC}; scripts/config ${PVE_CONFIG_OPTS}
+	${MAKE} -C ${KERNEL_SRC} oldconfig
 	touch $@

 .compile_mark: .config_mark
-	$(MAKE) -C $(KERNEL_SRC) KBUILD_BUILD_VERSION_TIMESTAMP="PMX $(DEB_VERSION) ($(CHANGELOG_DATE_UTC_ISO))"
+	${MAKE} -C ${KERNEL_SRC} KBUILD_BUILD_VERSION_TIMESTAMP="PVE ${DEB_VERSION} (${CHANGELOG_DATE})"
 	touch $@

 .install_mark: .compile_mark .modules_compile_mark
-	rm -rf debian/$(PMX_KERNEL_PKG)
-	mkdir -p debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)
-	mkdir debian/$(PMX_KERNEL_PKG)/boot
-	install -m 644 $(KERNEL_SRC)/.config debian/$(PMX_KERNEL_PKG)/boot/config-$(KVNAME)
-	install -m 644 $(KERNEL_SRC)/System.map debian/$(PMX_KERNEL_PKG)/boot/System.map-$(KVNAME)
-	install -m 644 $(KERNEL_SRC)/$(KERNEL_IMAGE_PATH) debian/$(PMX_KERNEL_PKG)/boot/$(KERNEL_INSTALL_FILE)-$(KVNAME)
-	$(MAKE) -C $(KERNEL_SRC) INSTALL_MOD_PATH=$(BUILD_DIR)/debian/$(PMX_KERNEL_PKG)/ modules_install
+	rm -rf debian/${PVE_KERNEL_PKG}
+	mkdir -p debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}
+	mkdir debian/${PVE_KERNEL_PKG}/boot
+	install -m 644 ${KERNEL_SRC}/.config debian/${PVE_KERNEL_PKG}/boot/config-${KVNAME}
+	install -m 644 ${KERNEL_SRC}/System.map debian/${PVE_KERNEL_PKG}/boot/System.map-${KVNAME}
+	install -m 644 ${KERNEL_SRC}/${KERNEL_IMAGE_PATH} debian/${PVE_KERNEL_PKG}/boot/${KERNEL_INSTALL_FILE}-${KVNAME}
+	${MAKE} -C ${KERNEL_SRC} INSTALL_MOD_PATH=${BUILD_DIR}/debian/${PVE_KERNEL_PKG}/ modules_install
 	# install zfs drivers
-	install -d -m 0755 debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/zfs
-	install -m 644 $(addprefix $(MODULES)/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko zzstd.ko) debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/zfs
+	install -d -m 0755 debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
+	install -m 644 $(addprefix ${MODULES}/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko zzstd.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
 	# remove firmware
-	rm -rf debian/$(PMX_KERNEL_PKG)/lib/firmware
-
-ifeq ($(filter pkg.proxmox-kernel.debug,$(DEB_BUILD_PROFILES)),)
-	echo "'pkg.proxmox-kernel.debug' build profile disabled, skipping -dbgsym creation"
-else
-	echo "'pkg.proxmox-kernel.debug' build profile enabled, creating -dbgsym contents"
-	mkdir -p debian/$(PMX_DEBUG_KERNEL_PKG)/usr/lib/debug/lib/modules/$(KVNAME)
-	mkdir debian/$(PMX_DEBUG_KERNEL_PKG)/usr/lib/debug/boot
-	install -m 644 $(KERNEL_SRC)/vmlinux debian/$(PMX_DEBUG_KERNEL_PKG)/usr/lib/debug/boot/vmlinux-$(KVNAME)
-	cp -r debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME) debian/$(PMX_DEBUG_KERNEL_PKG)/usr/lib/debug/lib/modules/
-	rm -f debian/$(PMX_DEBUG_KERNEL_PKG)/usr/lib/debug/lib/modules/$(KVNAME)/source
-	rm -f debian/$(PMX_DEBUG_KERNEL_PKG)/usr/lib/debug/lib/modules/$(KVNAME)/build
-	rm -f debian/$(PMX_DEBUG_KERNEL_PKG)/usr/lib/debug/lib/modules/$(KVNAME)/modules.*
-endif
-
+	rm -rf debian/${PVE_KERNEL_PKG}/lib/firmware
 	# strip debug info
-	find debian/$(PMX_KERNEL_PKG)/lib/modules -name \*.ko -print | while read f ; do strip --strip-debug "$$f"; done
-
-	# sign modules using ephemeral, embedded key
-	if grep -q CONFIG_MODULE_SIG=y ubuntu-kernel/.config ; then \
-		find debian/$(PMX_KERNEL_PKG)/lib/modules -name \*.ko -print | while read f ; do \
-			./ubuntu-kernel/scripts/sign-file sha512 ./ubuntu-kernel/certs/signing_key.pem ubuntu-kernel/certs/signing_key.x509 "$$f" ; \
-		done; \
-		rm ./ubuntu-kernel/certs/signing_key.pem ; \
-	fi
+	find debian/${PVE_KERNEL_PKG}/lib/modules -name \*.ko -print | while read f ; do strip --strip-debug "$$f"; done
 	# finalize
-	/sbin/depmod -b debian/$(PMX_KERNEL_PKG)/ $(KVNAME)
+	/sbin/depmod -b debian/${PVE_KERNEL_PKG}/ ${KVNAME}
 	# Autogenerate blacklist for watchdog devices (see README)
-	install -m 0755 -d debian/$(PMX_KERNEL_PKG)/lib/modprobe.d
-	ls debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/kernel/drivers/watchdog/ > watchdog-blacklist.tmp
+	install -m 0755 -d debian/${PVE_KERNEL_PKG}/lib/modprobe.d
+	ls debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/watchdog/ > watchdog-blacklist.tmp
 	echo ipmi_watchdog.ko >> watchdog-blacklist.tmp
-	cat watchdog-blacklist.tmp|sed -e 's/^/blacklist /' -e 's/.ko$$//'|sort -u > debian/$(PMX_KERNEL_PKG)/lib/modprobe.d/blacklist_$(PMX_KERNEL_PKG).conf
-	rm -f debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/source
-	rm -f debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/build
+	cat watchdog-blacklist.tmp|sed -e 's/^/blacklist /' -e 's/.ko$$//'|sort -u > debian/${PVE_KERNEL_PKG}/lib/modprobe.d/blacklist_${PVE_KERNEL_PKG}.conf
+	rm -f debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/source
+	rm -f debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/build
 	touch $@

 .tools_compile_mark: .compile_mark
-	$(MAKE) -C $(KERNEL_SRC)/tools/perf prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 NO_LIBPYTHON=1 NO_LIBPERL=1 NO_LIBCRYPTO=1 PYTHON=python3
+	${MAKE} -C ${KERNEL_SRC}/tools/perf prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 NO_LIBPYTHON=1 NO_LIBPERL=1 NO_LIBCRYPTO=1 PYTHON=python2.7
 	echo "checking GPL-2 only perf binary for library linkage with incompatible licenses.."
-	! ldd $(KERNEL_SRC)/tools/perf/perf | grep -q -E '\blibbfd'
-	! ldd $(KERNEL_SRC)/tools/perf/perf | grep -q -E '\blibcrypto'
-	$(MAKE) -C $(KERNEL_SRC)/tools/perf man
+	! ldd ${KERNEL_SRC}/tools/perf/perf | grep -q -E '\blibbfd'
+	! ldd ${KERNEL_SRC}/tools/perf/perf | grep -q -E '\blibcrypto'
+	${MAKE} -C ${KERNEL_SRC}/tools/perf man
 	touch $@

 .tools_install_mark: .tools_compile_mark
-	rm -rf debian/$(LINUX_TOOLS_PKG)
-	mkdir -p debian/$(LINUX_TOOLS_PKG)/usr/bin
-	mkdir -p debian/$(LINUX_TOOLS_PKG)/usr/share/man/man1
-	install -m 755 $(BUILD_DIR)/$(KERNEL_SRC)/tools/perf/perf debian/$(LINUX_TOOLS_PKG)/usr/bin/perf_$(KERNEL_MAJMIN)
-	for i in $(BUILD_DIR)/$(KERNEL_SRC)/tools/perf/Documentation/*.1; do \
+	rm -rf debian/${LINUX_TOOLS_PKG}
+	mkdir -p debian/${LINUX_TOOLS_PKG}/usr/bin
+	mkdir -p debian/${LINUX_TOOLS_PKG}/usr/share/man/man1
+	install -m 755 ${BUILD_DIR}/${KERNEL_SRC}/tools/perf/perf debian/${LINUX_TOOLS_PKG}/usr/bin/perf_$(KERNEL_MAJMIN)
+	for i in ${BUILD_DIR}/${KERNEL_SRC}/tools/perf/Documentation/*.1; do \
 	    fname="$${i##*/}"; manname="$${fname%.1}"; \
-	    install -m644 "$$i" "debian/$(LINUX_TOOLS_PKG)/usr/share/man/man1/$${manname}_$(KERNEL_MAJMIN).1"; \
+	    install -m644 "$$i" "debian/${LINUX_TOOLS_PKG}/usr/share/man/man1/$${manname}_$(KERNEL_MAJMIN).1"; \
 	done
 	touch $@

 .headers_prepare_mark: .config_mark
-	rm -rf debian/$(PMX_HEADER_PKG)
-	mkdir -p debian/$(PMX_HEADER_PKG)/usr/src/linux-headers-$(KVNAME)
-	install -m 0644 $(KERNEL_SRC)/.config debian/$(PMX_HEADER_PKG)/usr/src/linux-headers-$(KVNAME)
-	make -C $(KERNEL_SRC_COPY) mrproper
-	cd $(KERNEL_SRC_COPY); find . -path './debian/*' -prune \
+	rm -rf debian/${PVE_HEADER_PKG}
+	mkdir -p debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
+	install -m 0644 ${KERNEL_SRC}/.config debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
+	# copy to allow building in parallel to kernel/module compilation without interference
+	rm -rf ${KERNEL_SRC_COPY}
+	cp -ar ${KERNEL_SRC} ${KERNEL_SRC_COPY}
+	make -C ${KERNEL_SRC_COPY} mrproper
+	cd ${KERNEL_SRC_COPY}; find . -path './debian/*' -prune \
 	    -o -path './include/*' -prune \
 	    -o -path './Documentation' -prune \
 	    -o -path './scripts' -prune \
@@ -231,40 +185,41 @@ endif
 	        -o -name '*.sh' \
 	        -o -name '*.pl' \
 	    \) \
-	    -print | cpio -pd --preserve-modification-time $(BUILD_DIR)/debian/$(PMX_HEADER_PKG)/usr/src/linux-headers-$(KVNAME)
-	cd $(KERNEL_SRC_COPY); \
+	    -print | cpio -pd --preserve-modification-time ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
+	cd ${KERNEL_SRC_COPY}; cp -a include scripts ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
+	cd ${KERNEL_SRC_COPY}; \
 	    ( \
-	        find arch/$(KERNEL_HEADER_ARCH) -name include -type d -print | \
+	        find arch/${KERNEL_HEADER_ARCH} -name include -type d -print | \
 	        xargs -n1 -i: find : -type f \
 	    ) | \
-	    cpio -pd --preserve-modification-time $(BUILD_DIR)/debian/$(PMX_HEADER_PKG)/usr/src/linux-headers-$(KVNAME)
+	    cpio -pd --preserve-modification-time ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
 	touch $@

 .headers_compile_mark: .headers_prepare_mark
 	# set output to subdir of source to reduce number of hardcoded paths in output files
-	rm -rf $(BUILD_DIR)/$(KERNEL_SRC_COPY)/$(PMX_HEADER_PKG)
-	mkdir -p $(BUILD_DIR)/$(KERNEL_SRC_COPY)/$(PMX_HEADER_PKG)
-	cp $(KERNEL_SRC)/.config $(BUILD_DIR)/$(KERNEL_SRC_COPY)/$(PMX_HEADER_PKG)/.config
-	$(MAKE) -C $(KERNEL_SRC_COPY) O=$(BUILD_DIR)/$(KERNEL_SRC_COPY)/$(PMX_HEADER_PKG) -j1 syncconfig modules_prepare prepare scripts
-	cd $(KERNEL_SRC_COPY); cp -a include scripts $(BUILD_DIR)/debian/$(PMX_HEADER_PKG)/usr/src/linux-headers-$(KVNAME)
-	find $(BUILD_DIR)/$(KERNEL_SRC_COPY)/$(PMX_HEADER_PKG) -name \*.o.ur-\* -o -name '*.cmd' | xargs rm -f
-	rsync --ignore-existing -r -v -a $(addprefix $(BUILD_DIR)/$(KERNEL_SRC_COPY)/$(PMX_HEADER_PKG)/,arch include kernel scripts tools) $(BUILD_DIR)/debian/$(PMX_HEADER_PKG)/usr/src/linux-headers-$(KVNAME)/
-	rm -rf $(BUILD_DIR)/$(KERNEL_SRC_COPY)
+	rm -rf ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}
+	mkdir -p ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}
+	cp ${KERNEL_SRC}/.config ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}/.config
+	${MAKE} -C ${KERNEL_SRC_COPY} O=${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG} -j1 syncconfig prepare scripts
+	find ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG} -name \*.o.ur-\* | xargs rm -f
+	rsync --ignore-existing -r -v -a $(addprefix ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}/,arch include kernel scripts tools) ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/
+	rm -rf ${BUILD_DIR}/${KERNEL_SRC_COPY}
 	touch $@

 .headers_install_mark: .compile_mark .modules_compile_mark .headers_compile_mark
-	cp $(KERNEL_SRC)/include/generated/compile.h debian/$(PMX_HEADER_PKG)/usr/src/linux-headers-$(KVNAME)/include/generated/compile.h
-	install -m 0644 $(KERNEL_SRC)/Module.symvers debian/$(PMX_HEADER_PKG)/usr/src/linux-headers-$(KVNAME)
-	mkdir -p debian/$(PMX_HEADER_PKG)/lib/modules/$(KVNAME)
-	ln -sf /usr/src/linux-headers-$(KVNAME) debian/$(PMX_HEADER_PKG)/lib/modules/$(KVNAME)/build
+	cp ${KERNEL_SRC}/include/generated/compile.h debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/include/generated/compile.h
+	install -m 0644 ${KERNEL_SRC}/Module.symvers debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
+	mkdir -p debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}
+	ln -sf /usr/src/linux-headers-${KVNAME} debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}/build
 	touch $@

-.usr_headers_install_mark: PKG_DIR = debian/$(PMX_USR_HEADER_PKG)
-.usr_headers_install_mark: OUT_DIR = $(PKG_DIR)/usr
+.usr_headers_install_mark: PKG_DIR = debian/${PVE_USR_HEADER_PKG}
+.usr_headers_install_mark: OUT_DIR = ${PKG_DIR}/usr
 .usr_headers_install_mark: .config_mark
-	rm -rf '$(PKG_DIR)'
-	mkdir -p  '$(PKG_DIR)'
-	$(MAKE) -C $(KERNEL_SRC) headers_install ARCH=$(KERNEL_HEADER_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
+	rm -rf '${PKG_DIR}'
+	mkdir -p  '${PKG_DIR}'
+	$(MAKE) -C ${KERNEL_SRC} headers_check ARCH=$(KERNEL_HEADER_ARCH)
+	$(MAKE) -C ${KERNEL_SRC} headers_install ARCH=$(KERNEL_HEADER_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
 	rm -rf $(OUT_DIR)/include/drm $(OUT_DIR)/include/scsi
 	find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +

@@ -275,43 +230,43 @@ endif
 		mv $(OUT_DIR)/include/arch $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
 	touch $@

-.modules_compile_mark: $(MODULES)/zfs.ko
+.modules_compile_mark: ${MODULES}/zfs.ko
 	touch $@

-$(MODULES)/zfs.ko: .compile_mark
-	cd $(MODULES)/$(ZFSDIR); ./autogen.sh
-	cd $(MODULES)/$(ZFSDIR); ./configure --with-config=kernel --with-linux=$(BUILD_DIR)/$(KERNEL_SRC) --with-linux-obj=$(BUILD_DIR)/$(KERNEL_SRC)
-	$(MAKE) -C $(MODULES)/$(ZFSDIR)
-	cp $(MODULES)/$(ZFSDIR)/module/avl/zavl.ko $(MODULES)/
-	cp $(MODULES)/$(ZFSDIR)/module/nvpair/znvpair.ko $(MODULES)/
-	cp $(MODULES)/$(ZFSDIR)/module/unicode/zunicode.ko $(MODULES)/
-	cp $(MODULES)/$(ZFSDIR)/module/zcommon/zcommon.ko $(MODULES)/
-	cp $(MODULES)/$(ZFSDIR)/module/icp/icp.ko $(MODULES)/
-	cp $(MODULES)/$(ZFSDIR)/module/zfs/zfs.ko $(MODULES)/
-	cp $(MODULES)/$(ZFSDIR)/module/lua/zlua.ko $(MODULES)/
-	cp $(MODULES)/$(ZFSDIR)/module/spl/spl.ko $(MODULES)/
-	cp $(MODULES)/$(ZFSDIR)/module/zstd/zzstd.ko $(MODULES)/
+${MODULES}/zfs.ko: .compile_mark
+	cd ${MODULES}/${ZFSDIR}; ./autogen.sh
+	cd ${MODULES}/${ZFSDIR}; ./configure --with-config=kernel --with-linux=${BUILD_DIR}/${KERNEL_SRC} --with-linux-obj=${BUILD_DIR}/${KERNEL_SRC}
+	${MAKE} -C ${MODULES}/${ZFSDIR}
+	cp ${MODULES}/${ZFSDIR}/module/avl/zavl.ko ${MODULES}/
+	cp ${MODULES}/${ZFSDIR}/module/nvpair/znvpair.ko ${MODULES}/
+	cp ${MODULES}/${ZFSDIR}/module/unicode/zunicode.ko ${MODULES}/
+	cp ${MODULES}/${ZFSDIR}/module/zcommon/zcommon.ko ${MODULES}/
+	cp ${MODULES}/${ZFSDIR}/module/icp/icp.ko ${MODULES}/
+	cp ${MODULES}/${ZFSDIR}/module/zfs/zfs.ko ${MODULES}/
+	cp ${MODULES}/${ZFSDIR}/module/lua/zlua.ko ${MODULES}/
+	cp ${MODULES}/${ZFSDIR}/module/spl/spl.ko ${MODULES}/
+	cp ${MODULES}/${ZFSDIR}/module/zstd/zzstd.ko ${MODULES}/

-fwlist-$(KVNAME): .compile_mark .modules_compile_mark
-	debian/scripts/find-firmware.pl debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME) >fwlist.tmp
+fwlist-${KVNAME}: .compile_mark .modules_compile_mark
+	debian/scripts/find-firmware.pl debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME} >fwlist.tmp
 	mv fwlist.tmp $@

 .PHONY: fwcheck
-fwcheck: fwlist-$(KVNAME) fwlist-previous
+fwcheck: fwlist-${KVNAME} fwlist-previous
 	@echo "checking fwlist for changes since last built firmware package.."
-	@echo "if this check fails, add fwlist-$(KVNAME) to the pve-firmware repository and upload a new firmware package together with the $(KVNAME) kernel"
+	@echo "if this check fails, add fwlist-${KVNAME} to the pve-firmware repository and upload a new firmware package together with the ${KVNAME} kernel"
 	sort fwlist-previous | uniq > fwlist-previous.sorted
-	sort fwlist-$(KVNAME) | uniq > fwlist-$(KVNAME).sorted
-	diff -up -N fwlist-previous.sorted fwlist-$(KVNAME).sorted > fwlist.diff
-	rm fwlist.diff fwlist-previous.sorted fwlist-$(KVNAME).sorted
+	sort fwlist-${KVNAME} | uniq > fwlist-${KVNAME}.sorted
+	diff -up -N fwlist-previous.sorted fwlist-${KVNAME}.sorted > fwlist.diff
+	rm fwlist.diff fwlist-previous.sorted fwlist-${KVNAME}.sorted
 	@echo "done, no need to rebuild pve-firmware"


-abi-$(KVNAME): .compile_mark
-	debian/scripts/abi-generate debian/$(PMX_HEADER_PKG)/usr/src/linux-headers-$(KVNAME)/Module.symvers abi-$(KVNAME) $(KVNAME)
+abi-${KVNAME}: .compile_mark
+	debian/scripts/abi-generate debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/Module.symvers abi-${KVNAME} ${KVNAME}

 .PHONY: abicheck
-abicheck: debian/scripts/abi-check abi-$(KVNAME) abi-prev-* abi-blacklist
-	debian/scripts/abi-check abi-$(KVNAME) abi-prev-* $(SKIPABI)
+abicheck: debian/scripts/abi-check abi-${KVNAME} abi-prev-* abi-blacklist
+	debian/scripts/abi-check abi-${KVNAME} abi-prev-* ${SKIPABI}

 .PHONY: clean
@@ -1,14 +1,12 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
+#!/usr/bin/perl -w

 my $abinew = shift;
 my $abiold = shift;
 my $skipabi = shift;

 # to catch multiple abi-prev-* files being passed in
-die "invalid value '$skipabi' for skipabi parameter\n" if defined($skipabi) && $skipabi !~ /^[01]$/;
+die "invalid value for skipabi parameter\n"
+	if (defined($skipabi) && $skipabi !~ /^[01]$/);

 $abinew =~ /abi-(.*)/;
 my $abistr = $1;
@@ -25,30 +23,30 @@ my $count;
 print "II: Checking ABI...\n";

 if ($skipabi) {
-    print "WW: Explicitly asked to ignore ABI, running in no-fail mode\n";
-    $fail_exit = 0;
-    $abiskip = 1;
-    $EE = "WW:";
+	print "WW: Explicitly asked to ignore ABI, running in no-fail mode\n";
+	$fail_exit = 0;
+	$abiskip = 1;
+	$EE = "WW:";
 }

 if ($prev_abistr ne $abistr) {
-    print "II: Different ABI's, running in no-fail mode\n";
-    $fail_exit = 0;
-    $EE = "WW:";
+	print "II: Different ABI's, running in no-fail mode\n";
+	$fail_exit = 0;
+	$EE = "WW:";
 }

 if (not -f "$abinew" or not -f "$abiold") {
-    print "EE: Previous or current ABI file missing!\n";
-    print "    $abinew\n" if not -f "$abinew";
-    print "    $abiold\n" if not -f "$abiold";
+	print "EE: Previous or current ABI file missing!\n";
+	print "    $abinew\n" if not -f "$abinew";
+	print "    $abiold\n" if not -f "$abiold";

-    # Exit if the ABI files are missing, but return status based on whether
-    # skip ABI was indicated.
-    if ("$abiskip" eq "1") {
-	exit(0);
-    } else {
-	exit(1);
-    }
+	# Exit if the ABI files are missing, but return status based on whether
+	# skip ABI was indicated.
+	if ("$abiskip" eq "1") {
+		exit(0);
+	} else {
+		exit(1);
+	}
 }

 my %symbols;
@@ -60,97 +58,101 @@ my %module_syms;
 my $ignore = 0;
 print "    Reading symbols/modules to ignore...";

-for my $file ("abi-blacklist") {
-    next if !-f $file;
-    open(my $IGNORE_FH, '<', $file) or die "Could not open $file - $!";
-
-    while (<$IGNORE_FH>) {
-	chomp;
-	if ($_ =~ m/M: (.*)/) {
-	    $modules_ignore{$1} = 1;
-	} else {
-	    $symbols_ignore{$_} = 1;
+for $file ("abi-blacklist") {
+	if (-f $file) {
+		open(IGNORE, "< $file") or
+			die "Could not open $file";
+		while (<IGNORE>) {
+			chomp;
+			if ($_ =~ m/M: (.*)/) {
+				$modules_ignore{$1} = 1;
+			} else {
+				$symbols_ignore{$_} = 1;
+			}
+			$ignore++;
+		}
+		close(IGNORE);
 	}
-	$ignore++;
-    }
-    close($IGNORE_FH);
 }
 print "read $ignore symbols/modules.\n";

 sub is_ignored($$) {
-    my ($mod, $sym) = @_;
+	my ($mod, $sym) = @_;

-    die "Missing module name in is_ignored()" if not defined($mod);
-    die "Missing symbol name in is_ignored()" if not defined($sym);
+	die "Missing module name in is_ignored()" if not defined($mod);
+	die "Missing symbol name in is_ignored()" if not defined($sym);

-    if (defined($symbols_ignore{$sym}) or defined($modules_ignore{$mod})) {
-	return 1;
-    }
-    return 0;
+	if (defined($symbols_ignore{$sym}) or defined($modules_ignore{$mod})) {
+		return 1;
+	}
+	return 0;
 }

 # Read new syms first
 print "    Reading new symbols ($abistr)...";
 $count = 0;
-open(my $NEW_FH, '<', $abinew) or die "Could not open $abinew - $!";
-while (<$NEW_FH>) {
-    chomp;
-    m/^(\S+)\s(.+)\s(0x[0-9a-f]+)\s(.+)$/;
-    $symbols{$4}{'type'} = $1;
-    $symbols{$4}{'loc'} = $2;
-    $symbols{$4}{'hash'} = $3;
-    $module_syms{$2} = 0;
-    $count++;
+open(NEW, "< $abinew") or
+	die "Could not open $abinew";
+while (<NEW>) {
+	chomp;
+	m/^(\S+)\s(.+)\s(0x[0-9a-f]+)\s(.+)$/;
+	$symbols{$4}{'type'} = $1;
+	$symbols{$4}{'loc'} = $2;
+	$symbols{$4}{'hash'} = $3;
+	$module_syms{$2} = 0;
+	$count++;
 }
-close($NEW_FH);
+close(NEW);
 print "read $count symbols.\n";

 # Now the old symbols, checking for missing ones
 print "    Reading old symbols...";
 $count = 0;
-open(my $OLD_FH, '<', $abiold) or die "Could not open $abiold - $!";
-while (<$OLD_FH>) {
-    chomp;
-    m/^(\S+)\s(.+)\s(0x[0-9a-f]+)\s(.+)$/;
-    $symbols{$4}{'old_type'} = $1;
-    $symbols{$4}{'old_loc'} = $2;
-    $symbols{$4}{'old_hash'} = $3;
-    $count++;
+open(OLD, "< $abiold") or
+	die "Could not open $abiold";
+while (<OLD>) {
+	chomp;
+	m/^(\S+)\s(.+)\s(0x[0-9a-f]+)\s(.+)$/;
+	$symbols{$4}{'old_type'} = $1;
+	$symbols{$4}{'old_loc'} = $2;
+	$symbols{$4}{'old_hash'} = $3;
+	$count++;
 }
-close($OLD_FH);
+close(OLD);

 print "read $count symbols.\n";

 print "II: Checking for missing symbols in new ABI...";
 $count = 0;
-for my $sym (keys(%symbols)) {
-    if (!defined($symbols{$sym}{'type'})) {
-	print "\n" if not $count;
-	printf("    MISS : %s%s\n", $sym, is_ignored($symbols{$sym}{'old_loc'}, $sym) ? " (ignored)" : "");
-	$count++ if !is_ignored($symbols{$sym}{'old_loc'}, $sym);
-    }
+foreach $sym (keys(%symbols)) {
+	if (!defined($symbols{$sym}{'type'})) {
+		print "\n" if not $count;
+		printf("    MISS : %s%s\n", $sym,
+			is_ignored($symbols{$sym}{'old_loc'}, $sym) ? " (ignored)" : "");
+		$count++ if !is_ignored($symbols{$sym}{'old_loc'}, $sym);
+	}
 }
 print "    " if $count;
 print "found $count missing symbols\n";
 if ($count) {
-    print "$EE Symbols gone missing (what did you do!?!)\n";
-    $errors++;
+	print "$EE Symbols gone missing (what did you do!?!)\n";
+	$errors++;
 }


 print "II: Checking for new symbols in new ABI...";
 $count = 0;
-for my $sym (keys(%symbols)) {
-    if (!defined($symbols{$sym}{'old_type'})) {
-	print "\n" if not $count;
-	print "    NEW : $sym\n";
-	$count++;
-    }
+foreach $sym (keys(%symbols)) {
+	if (!defined($symbols{$sym}{'old_type'})) {
+		print "\n" if not $count;
+		print "    NEW : $sym\n";
+		$count++;
+	}
 }
 print "    " if $count;
 print "found $count new symbols\n";
 if ($count) {
-    print "WW: Found new symbols. Not recommended unless ABI was bumped\n";
+	print "WW: Found new symbols. Not recommended unless ABI was bumped\n";
 }

 print "II: Checking for changes to ABI...\n";
@@ -158,34 +160,37 @@ $count = 0;
 my $moved = 0;
 my $changed_type = 0;
 my $changed_hash = 0;
-for my $sym (keys(%symbols)) {
-    if (!defined($symbols{$sym}{'old_type'}) or !defined($symbols{$sym}{'type'})) {
-	next;
-    }
+foreach $sym (keys(%symbols)) {
+	if (!defined($symbols{$sym}{'old_type'}) or
+	    !defined($symbols{$sym}{'type'})) {
+		next;
+	}

-    # Changes in location don't hurt us, but log it anyway
-    if ($symbols{$sym}{'loc'} ne $symbols{$sym}{'old_loc'}) {
-	printf("    MOVE : %-40s : %s => %s\n", $sym, $symbols{$sym}{'old_loc'}, $symbols{$sym}{'loc'});
-	$moved++;
-    }
+	# Changes in location don't hurt us, but log it anyway
+	if ($symbols{$sym}{'loc'} ne $symbols{$sym}{'old_loc'}) {
+		printf("    MOVE : %-40s : %s => %s\n", $sym, $symbols{$sym}{'old_loc'},
+			$symbols{$sym}{'loc'});
+		$moved++;
+	}

-    # Changes to export type are only bad if new type isn't
-    # EXPORT_SYMBOL. Changing things to GPL are bad.
-    if ($symbols{$sym}{'type'} ne $symbols{$sym}{'old_type'}) {
-	printf("    TYPE : %-40s : %s => %s%s\n", $sym, $symbols{$sym}{'old_type'}.
-	    $symbols{$sym}{'type'}, is_ignored($symbols{$sym}{'loc'}, $sym)
-	    ? " (ignored)" : "");
-	$changed_type++ if $symbols{$sym}{'type'} ne "EXPORT_SYMBOL" and !is_ignored($symbols{$sym}{'loc'}, $sym);
-    }
+	# Changes to export type are only bad if new type isn't
+	# EXPORT_SYMBOL. Changing things to GPL are bad.
+	if ($symbols{$sym}{'type'} ne $symbols{$sym}{'old_type'}) {
+		printf("    TYPE : %-40s : %s => %s%s\n", $sym, $symbols{$sym}{'old_type'}.
+			$symbols{$sym}{'type'}, is_ignored($symbols{$sym}{'loc'}, $sym)
+			? " (ignored)" : "");
+		$changed_type++ if $symbols{$sym}{'type'} ne "EXPORT_SYMBOL"
+			and !is_ignored($symbols{$sym}{'loc'}, $sym);
+	}

-    # Changes to the hash are always bad
-    if ($symbols{$sym}{'hash'} ne $symbols{$sym}{'old_hash'}) {
-	printf("    HASH : %-40s : %s => %s%s\n", $sym, $symbols{$sym}{'old_hash'},
-	    $symbols{$sym}{'hash'}, is_ignored($symbols{$sym}{'loc'}, $sym)
-	    ? " (ignored)" : "");
-	$changed_hash++ if !is_ignored($symbols{$sym}{'loc'}, $sym);
-	$module_syms{$symbols{$sym}{'loc'}}++;
-    }
+	# Changes to the hash are always bad
+	if ($symbols{$sym}{'hash'} ne $symbols{$sym}{'old_hash'}) {
+		printf("    HASH : %-40s : %s => %s%s\n", $sym, $symbols{$sym}{'old_hash'},
+			$symbols{$sym}{'hash'}, is_ignored($symbols{$sym}{'loc'}, $sym)
+			? " (ignored)" : "");
+		$changed_hash++ if !is_ignored($symbols{$sym}{'loc'}, $sym);
+		$module_syms{$symbols{$sym}{'loc'}}++;
+	}
 }

 print "WW: $moved symbols changed location\n" if $moved;
@@ -194,17 +199,17 @@ print "$EE $changed_hash symbols changed hash and weren't ignored\n" if $changed

 $errors++ if $changed_hash or $changed_type;
 if ($changed_hash) {
-    print "II: Module hash change summary...\n";
-    for my $mod (sort { $module_syms{$b} <=> $module_syms{$a} } keys %module_syms) {
-	next if ! $module_syms{$mod};
-	printf("    %-40s: %d\n", $mod, $module_syms{$mod});
-    }
+	print "II: Module hash change summary...\n";
+	foreach $mod (sort { $module_syms{$b} <=> $module_syms{$a} } keys %module_syms) {
+		next if ! $module_syms{$mod};
+		printf("    %-40s: %d\n", $mod, $module_syms{$mod});
+	}
 }

 print "II: Done\n";

 if ($errors) {
-    exit($fail_exit);
+	exit($fail_exit);
 } else {
-    exit(0);
+	exit(0);
 }
@@ -1,11 +1,8 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w

-use strict;
-use warnings;
+use PVE::Tools;

-use PVE::Tools ();
-
-use IO::File ();
+use IO::File;

 sub usage {
    die "USAGE: $0 INFILE OUTFILE [ABI INFILE-IS-DEB]\n";
@@ -1,7 +1,6 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w

 use strict;
-use warnings;

 my $dir = shift;

@@ -9,25 +8,25 @@ die "no directory to scan" if !$dir;

 die "no such directory" if ! -d $dir;

-warn "\n\nNOTE: strange directory name: $dir\n\n" if $dir !~ m|^(.*/)?(\d+.\d+.\d+\-\d+\-pve)(/+)?$|;
+die "strange directory name: $dir" if $dir !~ m|^(.*/)?(5.\d.\d+\-\d+\-pve)(/+)?$|;

 my $apiver = $2;

-open(my $FIND_KO_FH, "find '$dir' -name '*.ko'|");
-while (defined(my $fn = <$FIND_KO_FH>)) {
+open(TMP, "find '$dir' -name '*.ko'|");
+while (defined(my $fn = <TMP>)) {
    chomp $fn;
    my $relfn = $fn;
    $relfn =~ s|^$dir/*||;

    my $cmd = "/sbin/modinfo -F firmware '$fn'";
-    open(my $MOD_FH, "$cmd|");
-    while (defined(my $fw = <$MOD_FH>)) {
+    open(MOD, "$cmd|");
+    while (defined(my $fw = <MOD>)) {
 	chomp $fw;
 	print "$fw $relfn\n";
    }
-    close($MOD_FH);
+    close(MOD);

 }
-close($FIND_KO_FH);
+close TMP;

 exit 0;
@@ -1,2 +0,0 @@
-proxmox-kernel-6.2 source: debian-control-has-dbgsym-package (in section for proxmox-kernel-*-pve-dbgsym) Package [debian/control:*]
-proxmox-kernel-6.2 source: license-problem-gfdl-invariants invariant part is: with the :ref:`invariant sections <fdl-invariant>` being list their titles, with the :ref:`front-cover texts <fdl-cover-texts>` being list, and with the :ref:`back-cover texts <fdl-cover-texts>` being list [ubuntu-kernel/Documentation/userspace-api/media/fdl-appendix.rst]
@@ -17,19 +17,28 @@ $KBUILD_BUILD_TIMESTAMP.
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- init/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ scripts/mkcompile_h | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)

-diff --git a/init/Makefile b/init/Makefile
-index ec557ada3c12..72095034f338 100644
--- a/init/Makefile
-+++ b/init/Makefile
-@@ -29,7 +29,7 @@ preempt-flag-$(CONFIG_PREEMPT_DYNAMIC)	:= PREEMPT_DYNAMIC
- preempt-flag-$(CONFIG_PREEMPT_RT)	:= PREEMPT_RT
+diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
+index 06c1e9e3bc38..6e7012175600 100755
+--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
+@@ -34,10 +34,14 @@ else
+ 	VERSION=$KBUILD_BUILD_VERSION
+ fi
 
- build-version = $(or $(KBUILD_BUILD_VERSION), $(build-version-auto))
-build-timestamp = $(or $(KBUILD_BUILD_TIMESTAMP), $(build-timestamp-auto))
-+build-timestamp = $(or $(KBUILD_BUILD_VERSION_TIMESTAMP), $(KBUILD_BUILD_TIMESTAMP), $(build-timestamp-auto))
- 
- # Maximum length of UTS_VERSION is 64 chars
- filechk_uts_version = \
+-if [ -z "$KBUILD_BUILD_TIMESTAMP" ]; then
+-	TIMESTAMP=`date`
+if [ -z "$KBUILD_BUILD_VERSION_TIMESTAMP" ]; then
+	if [ -z "$KBUILD_BUILD_TIMESTAMP" ]; then
+		TIMESTAMP=`date`
+	else
+		TIMESTAMP=$KBUILD_BUILD_TIMESTAMP
+	fi
+ else
+-	TIMESTAMP=$KBUILD_BUILD_TIMESTAMP
+	TIMESTAMP=$KBUILD_BUILD_VERSION_TIMESTAMP
+ fi
+ if test -z "$KBUILD_BUILD_USER"; then
+ 	LINUX_COMPILE_BY=$(whoami | sed 's/\\/\\\\/')
@@ -19,10 +19,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 1 insertion(+), 4 deletions(-)

 diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
-index 75204d36d7f9..1fb5ff73ec1e 100644
+index d174d3a566aa..885e18c72c87 100644
 --- a/net/bridge/br_stp_if.c
 +++ b/net/bridge/br_stp_if.c
-@@ -265,10 +265,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
+@@ -256,10 +256,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
 		return false;
 
 	list_for_each_entry(p, &br->port_list, list) {
@@ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2 files changed, 111 insertions(+)

 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 5d47f23514d0..f06df077504b 100644
+index 1520dc3ad4d2..d3db42dface6 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -4210,6 +4210,15 @@
+@@ -3489,6 +3489,15 @@
 				Also, it enforces the PCI Local Bus spec
 				rule that those bits should be 0 in system reset
 				events (useful for kexec/kdump cases).
@@ -75,10 +75,10 @@ index 5d47f23514d0..f06df077504b 100644
 				Safety option to keep boot IRQs enabled. This
 				should never be necessary.
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 592e1c4ae697..aebf6f412203 100644
+index ff07d35046b0..81f720abe39e 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void)
+@@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void)
 }
 fs_initcall_sync(pci_apply_final_quirks);
 
@@ -185,7 +185,7 @@ index 592e1c4ae697..aebf6f412203 100644
 /*
  * Decoding should be disabled for a PCI device during BAR sizing to avoid
  * conflict. But doing so may cause problems on host bridge and perhaps other
-@@ -4974,6 +5074,8 @@ static const struct pci_dev_acs_enabled {
+@@ -4948,6 +5048,8 @@ static const struct pci_dev_acs_enabled {
 	{ PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs },
 	/* APM X-Gene */
 	{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },
@@ -13,10 +13,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 73fad57408f7..99ae3e468ce6 100644
+index 98edde13ec17..8344711583bc 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
-@@ -79,7 +79,7 @@ module_param(halt_poll_ns, uint, 0644);
+@@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644);
 EXPORT_SYMBOL_GPL(halt_poll_ns);
 
 /* Default doubles per-vcpu halt_poll_ns. */
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Fri, 7 Jun 2019 21:16:42 +0200
+Subject: [PATCH] Revert "KVM: VMX: enable nested virtualization by default"
+
+This reverts commit 1e58e5e59148916fa43444a406335a990783fb78
+
+As we're not yet there, and this effectively breaks live migration
+for all VMs using host or +vmx which did not manually enabled nesting
+
+Those which already enabled nesting manually have already breakage,
+but that was something to expect. The situation will get better in
+the future (probably post qemu 4.1).
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ arch/x86/kvm/vmx/vmx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
+index 435dfebf5867..82c2afe46ebf 100644
+--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
+@@ -103,7 +103,7 @@ module_param(enable_apicv, bool, S_IRUGO);
+  * VMX and be a hypervisor for its own guests. If nested=0, guests may not
+  * use VMX instructions.
+  */
+-static bool __read_mostly nested = 1;
+static bool __read_mostly nested = 0;
+ module_param(nested, bool, S_IRUGO);
+ 
+ static u64 __read_mostly host_xss;
@@ -3,26 +3,22 @@ From: Thomas Lamprecht <t.lamprecht@proxmox.com>
 Date: Wed, 7 Oct 2020 17:18:28 +0200
 Subject: [PATCH] net: core: downgrade unregister_netdevice refcount leak from
 emergency to error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit

 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 net/core/dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/net/core/dev.c b/net/core/dev.c
-index 555bbe774734..de2e0d0185fc 100644
+index f2c6fc836f9d..8940c12333b0 100644
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -10262,7 +10262,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list)
- 		if (time_after(jiffies, warning_time +
- 			       READ_ONCE(netdev_unregister_timeout_secs) * HZ)) {
- 			list_for_each_entry(dev, list, todo_list) {
-				pr_emerg("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",
-+				pr_err("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",
- 					 dev->name, netdev_refcnt_read(dev));
- 				ref_tracker_dir_print(&dev->refcnt_tracker, 10);
- 			}
+@@ -9368,7 +9368,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
+ 		refcnt = netdev_refcnt_read(dev);
+ 
+ 		if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) {
+-			pr_emerg("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",
+			pr_err("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",
+ 				 dev->name, refcnt);
+ 			warning_time = jiffies;
+ 		}
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Tue, 10 Jan 2023 08:52:40 +0100
-Subject: [PATCH] Revert "fortify: Do not cast to "unsigned char""
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 106b7a61c488d2022f44e3531ce33461c7c0685f.
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- include/linux/fortify-string.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/linux/fortify-string.h b/include/linux/fortify-string.h
-index 7cad8bb031e9..acc24887db3e 100644
--- a/include/linux/fortify-string.h
-+++ b/include/linux/fortify-string.h
-@@ -18,7 +18,7 @@ void __write_overflow_field(size_t avail, size_t wanted) __compiletime_warning("
- 
- #define __compiletime_strlen(p)					\
- ({								\
-	char *__p = (char *)(p);				\
-+	unsigned char *__p = (unsigned char *)(p);		\
- 	size_t __ret = SIZE_MAX;				\
- 	size_t __p_size = __member_size(p);			\
- 	if (__p_size != SIZE_MAX &&				\
@@ -0,0 +1,122 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Miklos Szeredi <mszeredi@redhat.com>
+Date: Thu, 14 May 2020 16:44:23 +0200
+Subject: [PATCH] vfs: allow unprivileged whiteout creation
+
+Whiteouts, unlike real device node should not require privileges to create.
+
+The general concern with device nodes is that opening them can have side
+effects.  The kernel already avoids zero major (see
+Documentation/admin-guide/devices.txt).  To be on the safe side the patch
+explicitly forbids registering a char device with 0/0 number (see
+cdev_add()).
+
+This guarantees that a non-O_PATH open on a whiteout will fail with ENODEV;
+i.e. it won't have any side effect.
+
+Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
+(cherry picked from commit a3c751a50fe6bbe50eb7622a14b18b361804ee0c)
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ fs/char_dev.c                 |  3 +++
+ fs/namei.c                    | 21 +++------------------
+ include/linux/device_cgroup.h |  3 +++
+ include/linux/fs.h            |  6 +++++-
+ 4 files changed, 14 insertions(+), 19 deletions(-)
+
+diff --git a/fs/char_dev.c b/fs/char_dev.c
+index c5e6eff5a381..ba0ded7842a7 100644
+--- a/fs/char_dev.c
+++ b/fs/char_dev.c
+@@ -483,6 +483,9 @@ int cdev_add(struct cdev *p, dev_t dev, unsigned count)
+ 	p->dev = dev;
+ 	p->count = count;
+ 
+	if (WARN_ON(dev == WHITEOUT_DEV))
+		return -EBUSY;
+
+ 	error = kobj_map(cdev_map, dev, count, NULL,
+ 			 exact_match, exact_lock, p);
+ 	if (error)
+diff --git a/fs/namei.c b/fs/namei.c
+index f9c46c7abd80..a5e907558b88 100644
+--- a/fs/namei.c
+++ b/fs/namei.c
+@@ -3690,12 +3690,14 @@ EXPORT_SYMBOL(user_path_create);
+ 
+ int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
+ {
+	bool is_whiteout = S_ISCHR(mode) && dev == WHITEOUT_DEV;
+ 	int error = may_create(dir, dentry);
+ 
+ 	if (error)
+ 		return error;
+ 
+-	if ((S_ISCHR(mode) || S_ISBLK(mode)) && !capable(CAP_MKNOD))
+	if ((S_ISCHR(mode) || S_ISBLK(mode)) && !is_whiteout &&
+	    !capable(CAP_MKNOD))
+ 		return -EPERM;
+ 
+ 	if (!dir->i_op->mknod)
+@@ -4530,9 +4532,6 @@ static int do_renameat2(int olddfd, const char __user *oldname, int newdfd,
+ 	    (flags & RENAME_EXCHANGE))
+ 		return -EINVAL;
+ 
+-	if ((flags & RENAME_WHITEOUT) && !capable(CAP_MKNOD))
+-		return -EPERM;
+-
+ 	if (flags & RENAME_EXCHANGE)
+ 		target_flags = 0;
+ 
+@@ -4668,20 +4667,6 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
+ 	return do_renameat2(AT_FDCWD, oldname, AT_FDCWD, newname, 0);
+ }
+ 
+-int vfs_whiteout(struct inode *dir, struct dentry *dentry)
+-{
+-	int error = may_create(dir, dentry);
+-	if (error)
+-		return error;
+-
+-	if (!dir->i_op->mknod)
+-		return -EPERM;
+-
+-	return dir->i_op->mknod(dir, dentry,
+-				S_IFCHR | WHITEOUT_MODE, WHITEOUT_DEV);
+-}
+-EXPORT_SYMBOL(vfs_whiteout);
+-
+ int readlink_copy(char __user *buffer, int buflen, const char *link)
+ {
+ 	int len = PTR_ERR(link);
+diff --git a/include/linux/device_cgroup.h b/include/linux/device_cgroup.h
+index 8557efe096dc..fc989487c273 100644
+--- a/include/linux/device_cgroup.h
+++ b/include/linux/device_cgroup.h
+@@ -62,6 +62,9 @@ static inline int devcgroup_inode_mknod(int mode, dev_t dev)
+ 	if (!S_ISBLK(mode) && !S_ISCHR(mode))
+ 		return 0;
+ 
+	if (S_ISCHR(mode) && dev == WHITEOUT_DEV)
+		return 0;
+
+ 	if (S_ISBLK(mode))
+ 		type = DEVCG_DEV_BLOCK;
+ 	else
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 2bd06577c02a..fc22bade5b21 100644
+--- a/include/linux/fs.h
+++ b/include/linux/fs.h
+@@ -1719,7 +1719,11 @@ extern int vfs_link(struct dentry *, struct inode *, struct dentry *, struct ino
+ extern int vfs_rmdir(struct inode *, struct dentry *);
+ extern int vfs_unlink(struct inode *, struct dentry *, struct inode **);
+ extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *, struct inode **, unsigned int);
+-extern int vfs_whiteout(struct inode *, struct dentry *);
+
+static inline int vfs_whiteout(struct inode *dir, struct dentry *dentry)
+{
+	return vfs_mknod(dir, dentry, S_IFCHR | WHITEOUT_MODE, WHITEOUT_DEV);
+}
+ 
+ extern struct dentry *vfs_tmpfile(struct dentry *dentry, umode_t mode,
+ 				  int open_flag);
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Chuck Lever <chuck.lever@oracle.com>
+Date: Thu, 30 Jun 2022 16:48:18 -0400
+Subject: [PATCH] SUNRPC: Fix READ_PLUS crasher
+
+commit a23dd544debcda4ee4a549ec7de59e85c3c8345c upstream.
+
+Looks like there are still cases when "space_left - frag1bytes" can
+legitimately exceed PAGE_SIZE. Ensure that xdr->end always remains
+within the current encode buffer.
+
+Reported-by: Bruce Fields <bfields@fieldses.org>
+Reported-by: Zorro Lang <zlang@redhat.com>
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=216151
+Fixes: 6c254bf3b637 ("SUNRPC: Fix the calculation of xdr->end in xdr_get_next_encode_buffer()")
+Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ net/sunrpc/xdr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
+index cb8740d15633..daa4165f1179 100644
+--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
+@@ -608,7 +608,7 @@ static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
+ 	 */
+ 	xdr->p = (void *)p + frag2bytes;
+ 	space_left = xdr->buf->buflen - xdr->buf->len;
+-	if (space_left - nbytes >= PAGE_SIZE)
+	if (space_left - frag1bytes >= PAGE_SIZE)
+ 		xdr->end = (void *)p + PAGE_SIZE;
+ 	else
+ 		xdr->end = (void *)p + space_left - frag1bytes;
@@ -1,133 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Fri, 14 Jul 2023 18:10:32 +0200
-Subject: [PATCH] kvm: xsave set: mask-out PKRU bit in xfeatures if vCPU has no
- support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes live-migrations & snapshot-rollback of VMs with a restricted
-CPU type (e.g., qemu64) from our 5.15 based kernel (default Proxmox
-VE 7.4) to the 6.2 (and future newer) of Proxmox VE 8.0.
-
-Previous to ad856280ddea ("x86/kvm/fpu: Limit guest user_xfeatures to
-supported bits of XCR0") the PKRU bit of the host could leak into the
-state from the guest, which caused trouble when migrating between
-hosts with different CPUs, i.e., where the source supported it but
-the target did not, causing a general protection fault when the guest
-tried to use a pkru related instruction after the migration.
-
-But the fix, while welcome, caused a temporary out-of-sync state when
-migrating such a VM from a kernel without the fix to a kernel with
-the fix, as it threw of KVM when the CPUID of the guest and most of
-the state doesn't report XSAVE and thus any xfeatures, but PKRU and
-the related state is set as enabled, causing the vCPU to spin at 100%
-without any progress forever.
-
-The fix could be at two sites, either in QEMU or in the kernel, I
-choose the kernel as we have all the info there for a targeted
-heuristic so that we don't have to adapt QEMU and qemu-server, the
-latter even on both sides.
-
-Still, a short summary of the possible fixes and short drawbacks:
-* on QEMU-side either
-  - clear the PKRU state in the migration saved state would be rather
-    complicated to implement as the vCPU is initialised way before we
-    have the saved xfeature state available to check what we'd need
-    to do, plus the user-space only gets a memory blob from ioctl
-    KVM_GET_XSAVE2 that it passes to KVM_SET_XSAVE ioctl, there are
-    no ABI guarantees, and while the struct seem stable for 5.15 to
-    6.5-rc1, that doesn't has to be for future kernels, so off the
-    table.
-  - enforce that the CPUID reports PKU support even if it normally
-    wouldn't. While this works (tested by hard-coding it as POC) it
-    is a) not really nice and b) needs some interaction from
-    qemu-server to enable this flag as otherwise we have no good info
-    to decide when it's OK to do this, which means we need to adapt
-    both PVE 7 and 8's qemu-server and also pve-qemu, workable but
-    not optimal
-
-* on Kernel/KVM-side we can hook into the set XSAVE ioctl specific to
-  the KVM subsystem, which already reduces chance of regression for
-  all other places. There we have access to the union/struct
-  definitions of the saved state and thus can savely cast to that.
-  We also got access to the vCPU's CPUID capabilities, meaning we can
-  check if the XCR0 (first XSAVE Control Register) reports
-  that it support the PKRU feature, and if it does *NOT* but the
-  saved xfeatures register from XSAVE *DOES* report it, we can safely
-  assume that this combination is due to an migration from an older,
-  leaky kernel – and clear the bit in the xfeature register before
-  restoring it to the guest vCPU KVM state, avoiding the confusing
-  situation that made the vCPU spin at 100%.
-  This should be safe to do, as the guest vCPU CPUID never reported
-  support for the PKRU feature, and it's also a relatively niche and
-  newish feature.
-
-If it gains us something we can drop this patch a bit in the future
-Proxmox VE 9 major release, but we should ensure that VMs that where
-started before PVE 8 cannot be directly live-migrated to the release
-that includes that change; so we should rather only drop it if the
-maintenance burden is high.
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- arch/x86/kvm/cpuid.c |  6 ++++++
- arch/x86/kvm/cpuid.h |  2 ++
- arch/x86/kvm/x86.c   | 13 +++++++++++++
- 3 files changed, 21 insertions(+)
-
-diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
-index 7ccdf991d18e..61aefeb3fdbc 100644
--- a/arch/x86/kvm/cpuid.c
-+++ b/arch/x86/kvm/cpuid.c
-@@ -251,6 +251,12 @@ static u64 cpuid_get_supported_xcr0(struct kvm_cpuid_entry2 *entries, int nent)
- 	return (best->eax | ((u64)best->edx << 32)) & kvm_caps.supported_xcr0;
- }
- 
-+bool vcpu_supports_xsave_pkru(struct kvm_vcpu *vcpu) {
-+	u64 guest_supported_xcr0 = cpuid_get_supported_xcr0(
-+	    vcpu->arch.cpuid_entries, vcpu->arch.cpuid_nent);
-+	return (guest_supported_xcr0 & XFEATURE_MASK_PKRU) != 0;
-+}
-+
- static void __kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *entries,
- 				       int nent)
- {
-diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h
-index b1658c0de847..12a02851ff57 100644
--- a/arch/x86/kvm/cpuid.h
-+++ b/arch/x86/kvm/cpuid.h
-@@ -32,6 +32,8 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
- bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx,
- 	       u32 *ecx, u32 *edx, bool exact_only);
- 
-+bool vcpu_supports_xsave_pkru(struct kvm_vcpu *vcpu);
-+
- u32 xstate_required_size(u64 xstate_bv, bool compacted);
- 
- int cpuid_query_maxphyaddr(struct kvm_vcpu *vcpu);
-diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index ee603f4edce1..ff92ff41d5ce 100644
--- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -5342,6 +5342,19 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu,
- 	if (fpstate_is_confidential(&vcpu->arch.guest_fpu))
- 		return 0;
- 
-+	if (!vcpu_supports_xsave_pkru(vcpu)) {
-+		void *buf = guest_xsave->region;
-+		union fpregs_state *ustate = buf;
-+		if (ustate->xsave.header.xfeatures & XFEATURE_MASK_PKRU) {
-+			printk(
-+				KERN_NOTICE "clearing PKRU xfeature bit as vCPU from PID %d"
-+				" reports no PKRU support - migration from fpu-leaky kernel?",
-+				current->pid
-+			);
-+			ustate->xsave.header.xfeatures &= ~XFEATURE_MASK_PKRU;
-+		}
-+	}
-+
- 	return fpu_copy_uabi_to_guest_fpstate(&vcpu->arch.guest_fpu,
- 					      guest_xsave->region,
- 					      kvm_caps.supported_xcr0,
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Trond Myklebust <trond.myklebust@hammerspace.com>
+Date: Tue, 2 Aug 2022 15:48:50 -0400
+Subject: [PATCH] NFSv4/pnfs: Fix a use-after-free bug in open
+
+commit 2135e5d56278ffdb1c2e6d325dc6b87f669b9dac upstream.
+
+If someone cancels the open RPC call, then we must not try to free
+either the open slot or the layoutget operation arguments, since they
+are likely still in use by the hung RPC call.
+
+Fixes: 6949493884fe ("NFSv4: Don't hold the layoutget locks across multiple RPC calls")
+Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ fs/nfs/nfs4proc.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
+index eee2d67d3ac9..831a16fec616 100644
+--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
+@@ -3041,12 +3041,13 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
+ 	}
+ 
+ out:
+-	if (opendata->lgp) {
+-		nfs4_lgopen_release(opendata->lgp);
+-		opendata->lgp = NULL;
+-	}
+-	if (!opendata->cancelled)
+	if (!opendata->cancelled) {
+		if (opendata->lgp) {
+			nfs4_lgopen_release(opendata->lgp);
+			opendata->lgp = NULL;
+		}
+ 		nfs4_sequence_free_slot(&opendata->o_res.seq_res);
+	}
+ 	return ret;
+ }
+ 
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kiler129 <grzegorz@noflash.pl>
-Date: Mon, 18 Sep 2023 15:19:26 +0200
-Subject: [PATCH] allow opt-in to allow pass-through on broken hardware..
-
-adapted from https://github.com/kiler129/relax-intel-rmrr , licensed under MIT or GPL 2.0+
---
- drivers/iommu/intel/iommu.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index 1c5ba4dbfe78..887667218e3b 100644
--- a/drivers/iommu/intel/iommu.c
-+++ b/drivers/iommu/intel/iommu.c
-@@ -297,6 +297,7 @@ static int dmar_map_gfx = 1;
- static int dmar_map_ipu = 1;
- static int intel_iommu_superpage = 1;
- static int iommu_identity_mapping;
-+static int intel_relaxable_rmrr = 0;
- static int iommu_skip_te_disable;
- 
- #define IDENTMAP_GFX		2
-@@ -358,6 +359,9 @@ static int __init intel_iommu_setup(char *str)
- 		} else if (!strncmp(str, "tboot_noforce", 13)) {
- 			pr_info("Intel-IOMMU: not forcing on after tboot. This could expose security risk for tboot\n");
- 			intel_iommu_tboot_noforce = 1;
-+		} else if (!strncmp(str, "relax_rmrr", 10)) {
-+			pr_info("Intel-IOMMU: assuming all RMRRs are relaxable. This can lead to instability or data loss\n");
-+			intel_relaxable_rmrr = 1;
- 		} else {
- 			pr_notice("Unknown option - '%s'\n", str);
- 		}
-@@ -2538,7 +2542,7 @@ static bool device_rmrr_is_relaxable(struct device *dev)
- 		return false;
- 
- 	pdev = to_pci_dev(dev);
-	if (IS_USB_DEVICE(pdev) || IS_GFX_DEVICE(pdev))
-+	if (intel_relaxable_rmrr || IS_USB_DEVICE(pdev) || IS_GFX_DEVICE(pdev))
- 		return true;
- 	else
- 		return false;
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mika Westerberg <mika.westerberg@linux.intel.com>
-Date: Wed, 13 Sep 2023 08:26:47 +0300
-Subject: [PATCH] net: thunderbolt: Fix TCPv6 GSO checksum calculation
-
-Alex reported that running ssh over IPv6 does not work with
-Thunderbolt/USB4 networking driver. The reason for that is that driver
-should call skb_is_gso() before calling skb_is_gso_v6(), and it should
-not return false after calculates the checksum successfully. This probably
-was a copy paste error from the original driver where it was done properly.
-
-Reported-by: Alex Balcanquall <alex@alexbal.com>
-Fixes: e69b6c02b4c3 ("net: Add support for networking over Thunderbolt cable")
-Cc: stable@vger.kernel.org
-Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
-Reviewed-by: Eric Dumazet <edumazet@google.com>
-Reviewed-by: Jiri Pirko <jiri@nvidia.com>
-Reviewed-by: Jiri Pirko <jiri@nvidia.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- drivers/net/thunderbolt.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c
-index 990484776f2d..0c554a7a5ce4 100644
--- a/drivers/net/thunderbolt.c
-+++ b/drivers/net/thunderbolt.c
-@@ -1005,12 +1005,11 @@ static bool tbnet_xmit_csum_and_map(struct tbnet *net, struct sk_buff *skb,
- 		*tucso = ~csum_tcpudp_magic(ip_hdr(skb)->saddr,
- 					    ip_hdr(skb)->daddr, 0,
- 					    ip_hdr(skb)->protocol, 0);
-	} else if (skb_is_gso_v6(skb)) {
-+	} else if (skb_is_gso(skb) && skb_is_gso_v6(skb)) {
- 		tucso = dest + ((void *)&(tcp_hdr(skb)->check) - data);
- 		*tucso = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
- 					  &ipv6_hdr(skb)->daddr, 0,
- 					  IPPROTO_TCP, 0);
-		return false;
- 	} else if (protocol == htons(ETH_P_IPV6)) {
- 		tucso = dest + skb_checksum_start_offset(skb) + skb->csum_offset;
- 		*tucso = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
@@ -0,0 +1,70 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nilesh Javali <njavali@marvell.com>
+Date: Tue, 12 Jul 2022 22:20:36 -0700
+Subject: [PATCH] scsi: Revert "scsi: qla2xxx: Fix disk failure to rediscover"
+
+commit 5bc7b01c513a4a9b4cfe306e8d1720cfcfd3b8a3 upstream.
+
+This fixes the regression of NVMe discovery failure during driver load
+time.
+
+This reverts commit 6a45c8e137d4e2c72eecf1ac7cf64f2fdfcead99.
+
+Link: https://lore.kernel.org/r/20220713052045.10683-2-njavali@marvell.com
+Cc: stable@vger.kernel.org
+Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
+Signed-off-by: Nilesh Javali <njavali@marvell.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ drivers/scsi/qla2xxx/qla_init.c | 5 ++---
+ drivers/scsi/qla2xxx/qla_nvme.c | 5 -----
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
+index 1800eb0aad1c..c662c8af6cc1 100644
+--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
+@@ -5422,8 +5422,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)
+ 	if (atomic_read(&fcport->state) == FCS_ONLINE)
+ 		return;
+ 
+-	qla2x00_set_fcport_state(fcport, FCS_ONLINE);
+-
+ 	rport_ids.node_name = wwn_to_u64(fcport->node_name);
+ 	rport_ids.port_name = wwn_to_u64(fcport->port_name);
+ 	rport_ids.port_id = fcport->d_id.b.domain << 16 |
+@@ -5519,7 +5517,6 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
+ 		qla2x00_reg_remote_port(vha, fcport);
+ 		break;
+ 	case MODE_TARGET:
+-		qla2x00_set_fcport_state(fcport, FCS_ONLINE);
+ 		if (!vha->vha_tgt.qla_tgt->tgt_stop &&
+ 			!vha->vha_tgt.qla_tgt->tgt_stopped)
+ 			qlt_fc_port_added(vha, fcport);
+@@ -5534,6 +5531,8 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
+ 		break;
+ 	}
+ 
+	qla2x00_set_fcport_state(fcport, FCS_ONLINE);
+
+ 	if (IS_IIDMA_CAPABLE(vha->hw) && vha->hw->flags.gpsc_supported) {
+ 		if (fcport->id_changed) {
+ 			fcport->id_changed = 0;
+diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
+index a15af048cd82..f0de7089e9ae 100644
+--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
+@@ -36,11 +36,6 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport)
+ 		(fcport->nvme_flag & NVME_FLAG_REGISTERED))
+ 		return 0;
+ 
+-	if (atomic_read(&fcport->state) == FCS_ONLINE)
+-		return 0;
+-
+-	qla2x00_set_fcport_state(fcport, FCS_ONLINE);
+-
+ 	fcport->nvme_flag &= ~NVME_FLAG_RESETTING;
+ 
+ 	memset(&req, 0, sizeof(struct nvme_fc_port_info));
@@ -0,0 +1,73 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Li Lingfeng <lilingfeng3@huawei.com>
+Date: Fri, 17 Jun 2022 14:25:15 +0800
+Subject: [PATCH] ext4: recover csum seed of tmp_inode after migrating to
+ extents
+
+[ Upstream commit 07ea7a617d6b278fb7acedb5cbe1a81ce2de7d0c ]
+
+When migrating to extents, the checksum seed of temporary inode
+need to be replaced by inode's, otherwise the inode checksums
+will be incorrect when swapping the inodes data.
+
+However, the temporary inode can not match it's checksum to
+itself since it has lost it's own checksum seed.
+
+mkfs.ext4 -F /dev/sdc
+mount /dev/sdc /mnt/sdc
+xfs_io -fc "pwrite 4k 4k" -c "fsync" /mnt/sdc/testfile
+chattr -e /mnt/sdc/testfile
+chattr +e /mnt/sdc/testfile
+umount /dev/sdc
+fsck -fn /dev/sdc
+
+========
+...
+Pass 1: Checking inodes, blocks, and sizes
+Inode 13 passes checks, but checksum does not match inode.  Fix? no
+...
+========
+
+The fix is simple, save the checksum seed of temporary inode, and
+recover it after migrating to extents.
+
+Fixes: e81c9302a6c3 ("ext4: set csum seed in tmp inode while migrating to extents")
+Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
+Reviewed-by: Jan Kara <jack@suse.cz>
+Link: https://lore.kernel.org/r/20220617062515.2113438-1-lilingfeng3@huawei.com
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ fs/ext4/migrate.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c
+index c5b2ea1a9372..1faa8e4ffb9d 100644
+--- a/fs/ext4/migrate.c
+++ b/fs/ext4/migrate.c
+@@ -435,7 +435,7 @@ int ext4_ext_migrate(struct inode *inode)
+ 	struct inode *tmp_inode = NULL;
+ 	struct migrate_struct lb;
+ 	unsigned long max_entries;
+-	__u32 goal;
+	__u32 goal, tmp_csum_seed;
+ 	uid_t owner[2];
+ 
+ 	/*
+@@ -483,6 +483,7 @@ int ext4_ext_migrate(struct inode *inode)
+ 	 * the migration.
+ 	 */
+ 	ei = EXT4_I(inode);
+	tmp_csum_seed = EXT4_I(tmp_inode)->i_csum_seed;
+ 	EXT4_I(tmp_inode)->i_csum_seed = ei->i_csum_seed;
+ 	i_size_write(tmp_inode, i_size_read(inode));
+ 	/*
+@@ -593,6 +594,7 @@ int ext4_ext_migrate(struct inode *inode)
+ 	 * the inode is not visible to user space.
+ 	 */
+ 	tmp_inode->i_blocks = 0;
+	EXT4_I(tmp_inode)->i_csum_seed = tmp_csum_seed;
+ 
+ 	/* Reset the extent details */
+ 	ext4_ext_tree_init(handle, tmp_inode);
@@ -1,134 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mika Westerberg <mika.westerberg@linux.intel.com>
-Date: Thu, 7 Sep 2023 16:02:30 +0300
-Subject: [PATCH] thunderbolt: Restart XDomain discovery handshake after
- failure
-
-Alex reported that after rebooting the other host the peer-to-peer link
-does not come up anymore. The reason for this is that the host that was
-not rebooted tries to send the UUID request only 10 times according to
-the USB4 Inter-Domain spec and gives up if it does not get reply. Then
-when the other side is actually ready it cannot get the link established
-anymore. The USB4 Inter-Domain spec requires that the discovery protocol
-is restarted in that case so implement this now.
-
-Reported-by: Alex Balcanquall <alex@alexbal.com>
-Fixes: 8e1de7042596 ("thunderbolt: Add support for XDomain lane bonding")
-Cc: stable@vger.kernel.org
-Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- drivers/thunderbolt/xdomain.c | 58 +++++++++++++++++++++++++----------
- 1 file changed, 41 insertions(+), 17 deletions(-)
-
-diff --git a/drivers/thunderbolt/xdomain.c b/drivers/thunderbolt/xdomain.c
-index 3c51e47dd86b..0b17a4d4e9b9 100644
--- a/drivers/thunderbolt/xdomain.c
-+++ b/drivers/thunderbolt/xdomain.c
-@@ -704,6 +704,27 @@ static void update_property_block(struct tb_xdomain *xd)
- 	mutex_unlock(&xdomain_lock);
- }
- 
-+static void start_handshake(struct tb_xdomain *xd)
-+{
-+	xd->state = XDOMAIN_STATE_INIT;
-+	queue_delayed_work(xd->tb->wq, &xd->state_work,
-+			   msecs_to_jiffies(XDOMAIN_SHORT_TIMEOUT));
-+}
-+
-+/* Can be called from state_work */
-+static void __stop_handshake(struct tb_xdomain *xd)
-+{
-+	cancel_delayed_work_sync(&xd->properties_changed_work);
-+	xd->properties_changed_retries = 0;
-+	xd->state_retries = 0;
-+}
-+
-+static void stop_handshake(struct tb_xdomain *xd)
-+{
-+	cancel_delayed_work_sync(&xd->state_work);
-+	__stop_handshake(xd);
-+}
-+
- static void tb_xdp_handle_request(struct work_struct *work)
- {
- 	struct xdomain_request_work *xw = container_of(work, typeof(*xw), work);
-@@ -766,6 +787,15 @@ static void tb_xdp_handle_request(struct work_struct *work)
- 	case UUID_REQUEST:
- 		tb_dbg(tb, "%llx: received XDomain UUID request\n", route);
- 		ret = tb_xdp_uuid_response(ctl, route, sequence, uuid);
-+		/*
-+		 * If we've stopped the discovery with an error such as
-+		 * timing out, we will restart the handshake now that we
-+		 * received UUID request from the remote host.
-+		 */
-+		if (!ret && xd && xd->state == XDOMAIN_STATE_ERROR) {
-+			dev_dbg(&xd->dev, "restarting handshake\n");
-+			start_handshake(xd);
-+		}
- 		break;
- 
- 	case LINK_STATE_STATUS_REQUEST:
-@@ -1522,6 +1552,13 @@ static void tb_xdomain_queue_properties_changed(struct tb_xdomain *xd)
- 			   msecs_to_jiffies(XDOMAIN_SHORT_TIMEOUT));
- }
- 
-+static void tb_xdomain_failed(struct tb_xdomain *xd)
-+{
-+	xd->state = XDOMAIN_STATE_ERROR;
-+	queue_delayed_work(xd->tb->wq, &xd->state_work,
-+			   msecs_to_jiffies(XDOMAIN_DEFAULT_TIMEOUT));
-+}
-+
- static void tb_xdomain_state_work(struct work_struct *work)
- {
- 	struct tb_xdomain *xd = container_of(work, typeof(*xd), state_work.work);
-@@ -1548,7 +1585,7 @@ static void tb_xdomain_state_work(struct work_struct *work)
- 		if (ret) {
- 			if (ret == -EAGAIN)
- 				goto retry_state;
-			xd->state = XDOMAIN_STATE_ERROR;
-+			tb_xdomain_failed(xd);
- 		} else {
- 			tb_xdomain_queue_properties_changed(xd);
- 			if (xd->bonding_possible)
-@@ -1613,7 +1650,7 @@ static void tb_xdomain_state_work(struct work_struct *work)
- 		if (ret) {
- 			if (ret == -EAGAIN)
- 				goto retry_state;
-			xd->state = XDOMAIN_STATE_ERROR;
-+			tb_xdomain_failed(xd);
- 		} else {
- 			xd->state = XDOMAIN_STATE_ENUMERATED;
- 		}
-@@ -1624,6 +1661,8 @@ static void tb_xdomain_state_work(struct work_struct *work)
- 		break;
- 
- 	case XDOMAIN_STATE_ERROR:
-+		dev_dbg(&xd->dev, "discovery failed, stopping handshake\n");
-+		__stop_handshake(xd);
- 		break;
- 
- 	default:
-@@ -1793,21 +1832,6 @@ static void tb_xdomain_release(struct device *dev)
- 	kfree(xd);
- }
- 
-static void start_handshake(struct tb_xdomain *xd)
-{
-	xd->state = XDOMAIN_STATE_INIT;
-	queue_delayed_work(xd->tb->wq, &xd->state_work,
-			   msecs_to_jiffies(XDOMAIN_SHORT_TIMEOUT));
-}
-
-static void stop_handshake(struct tb_xdomain *xd)
-{
-	cancel_delayed_work_sync(&xd->properties_changed_work);
-	cancel_delayed_work_sync(&xd->state_work);
-	xd->properties_changed_retries = 0;
-	xd->state_retries = 0;
-}
-
- static int __maybe_unused tb_xdomain_suspend(struct device *dev)
- {
- 	stop_handshake(tb_to_xdomain(dev));
@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris.p.wilson@intel.com>
+Date: Tue, 12 Jul 2022 16:21:33 +0100
+Subject: [PATCH] drm/i915/gt: Serialize TLB invalidates with GT resets
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[ Upstream commit a1c5a7bf79c1faa5633b918b5c0666545e84c4d1 ]
+
+Avoid trying to invalidate the TLB in the middle of performing an
+engine reset, as this may result in the reset timing out. Currently,
+the TLB invalidate is only serialised by its own mutex, forgoing the
+uncore lock, but we can take the uncore->lock as well to serialise
+the mmio access, thereby serialising with the GDRST.
+
+Tested on a NUC5i7RYB, BIOS RYBDWi35.86A.0380.2019.0517.1530 with
+i915 selftest/hangcheck.
+
+Cc: stable@vger.kernel.org  # v4.4 and upper
+Fixes: 7938d61591d3 ("drm/i915: Flush TLBs before releasing backing store")
+Reported-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Tested-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Signed-off-by: Chris Wilson <chris.p.wilson@intel.com>
+Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
+Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
+Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/1e59a7c45dd919a530256b9ac721ac6ea86c0677.1657639152.git.mchehab@kernel.org
+(cherry picked from commit 33da97894758737895e90c909f16786052680ef4)
+Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ drivers/gpu/drm/i915/gt/intel_gt.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
+index c8c070375d29..f6d7f5d307d7 100644
+--- a/drivers/gpu/drm/i915/gt/intel_gt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
+@@ -339,6 +339,20 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt)
+ 	mutex_lock(&gt->tlb_invalidate_lock);
+ 	intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
+ 
+	spin_lock_irq(&uncore->lock); /* serialise invalidate with GT reset */
+
+	for_each_engine(engine, gt, id) {
+		struct reg_and_bit rb;
+
+		rb = get_reg_and_bit(engine, regs == gen8_regs, regs, num);
+		if (!i915_mmio_reg_offset(rb.reg))
+			continue;
+
+		intel_uncore_write_fw(uncore, rb.reg, rb.bit);
+	}
+
+	spin_unlock_irq(&uncore->lock);
+
+ 	for_each_engine(engine, gt, id) {
+ 		/*
+ 		 * HW architecture suggest typical invalidation time at 40us,
+@@ -353,7 +367,6 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt)
+ 		if (!i915_mmio_reg_offset(rb.reg))
+ 			continue;
+ 
+-		intel_uncore_write_fw(uncore, rb.reg, rb.bit);
+ 		if (__intel_wait_for_register_fw(uncore,
+ 						 rb.reg, rb.bit, 0,
+ 						 timeout_us, timeout_ms,
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Borislav Petkov (AMD)" <bp@alien8.de>
-Date: Sat, 7 Oct 2023 12:57:02 +0200
-Subject: [PATCH] x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix erratum #1485 on Zen4 parts where running with STIBP disabled can
-cause an #UD exception. The performance impact of the fix is negligible.
-
-Reported-by: René Rebe <rene@exactcode.de>
-Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
-Tested-by: René Rebe <rene@exactcode.de>
-Cc: <stable@kernel.org>
-Link: https://lore.kernel.org/r/D99589F4-BC5D-430B-87B2-72C20370CF57@exactcode.com
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- arch/x86/include/asm/msr-index.h | 9 +++++++--
- arch/x86/kernel/cpu/amd.c        | 8 ++++++++
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
-index ebbf80d8b8bd..a79b10e57757 100644
--- a/arch/x86/include/asm/msr-index.h
-+++ b/arch/x86/include/asm/msr-index.h
-@@ -630,12 +630,17 @@
- /* AMD Last Branch Record MSRs */
- #define MSR_AMD64_LBR_SELECT			0xc000010e
- 
-/* Fam 17h MSRs */
-#define MSR_F17H_IRPERF			0xc00000e9
-+/* Zen4 */
-+#define MSR_ZEN4_BP_CFG			0xc001102e
-+#define MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT 5
- 
-+/* Zen 2 */
- #define MSR_ZEN2_SPECTRAL_CHICKEN	0xc00110e3
- #define MSR_ZEN2_SPECTRAL_CHICKEN_BIT	BIT_ULL(1)
- 
-+/* Fam 17h MSRs */
-+#define MSR_F17H_IRPERF			0xc00000e9
-+
- /* Fam 16h MSRs */
- #define MSR_F16H_L2I_PERF_CTL		0xc0010230
- #define MSR_F16H_L2I_PERF_CTR		0xc0010231
-diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
-index a608a2b78073..154e9c0c16bd 100644
--- a/arch/x86/kernel/cpu/amd.c
-+++ b/arch/x86/kernel/cpu/amd.c
-@@ -80,6 +80,10 @@ static const int amd_div0[] =
- 	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x00, 0x0, 0x2f, 0xf),
- 			   AMD_MODEL_RANGE(0x17, 0x50, 0x0, 0x5f, 0xf));
- 
-+static const int amd_erratum_1485[] =
-+	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x19, 0x10, 0x0, 0x1f, 0xf),
-+			   AMD_MODEL_RANGE(0x19, 0x60, 0x0, 0xaf, 0xf));
-+
- static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum)
- {
- 	int osvw_id = *erratum++;
-@@ -1125,6 +1129,10 @@ static void init_amd(struct cpuinfo_x86 *c)
- 		pr_notice_once("AMD Zen1 DIV0 bug detected. Disable SMT for full protection.\n");
- 		setup_force_cpu_bug(X86_BUG_DIV0);
- 	}
-+
-+	if (!cpu_has(c, X86_FEATURE_HYPERVISOR) &&
-+	     cpu_has_amd_erratum(c, amd_erratum_1485))
-+		msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT);
- }
- 
- #ifdef CONFIG_X86_32
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Stefan Sterz <s.sterz@proxmox.com>
-Date: Wed, 18 Oct 2023 10:45:45 +0200
-Subject: [PATCH] Revert "nSVM: Check for reserved encodings of TLB_CONTROL in
- nested VMCB"
-
-This reverts commit 174a921b6975ef959dd82ee9e8844067a62e3ec1.
-
-Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
---
- arch/x86/kvm/svm/nested.c | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
-index add65dd59756..61a6c0235519 100644
--- a/arch/x86/kvm/svm/nested.c
-+++ b/arch/x86/kvm/svm/nested.c
-@@ -242,18 +242,6 @@ static bool nested_svm_check_bitmap_pa(struct kvm_vcpu *vcpu, u64 pa, u32 size)
- 	    kvm_vcpu_is_legal_gpa(vcpu, addr + size - 1);
- }
- 
-static bool nested_svm_check_tlb_ctl(struct kvm_vcpu *vcpu, u8 tlb_ctl)
-{
-	/* Nested FLUSHBYASID is not supported yet.  */
-	switch(tlb_ctl) {
-		case TLB_CONTROL_DO_NOTHING:
-		case TLB_CONTROL_FLUSH_ALL_ASID:
-			return true;
-		default:
-			return false;
-	}
-}
-
- static bool __nested_vmcb_check_controls(struct kvm_vcpu *vcpu,
- 					 struct vmcb_ctrl_area_cached *control)
- {
-@@ -273,9 +261,6 @@ static bool __nested_vmcb_check_controls(struct kvm_vcpu *vcpu,
- 					   IOPM_SIZE)))
- 		return false;
- 
-	if (CC(!nested_svm_check_tlb_ctl(vcpu, control->tlb_ctl)))
-		return false;
-
- 	return true;
- }
- 
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sean Christopherson <seanjc@google.com>
-Date: Wed, 18 Oct 2023 12:41:04 -0700
-Subject: [PATCH] KVM: nSVM: Advertise support for flush-by-ASID
-
-Advertise support for FLUSHBYASID when nested SVM is enabled, as KVM can
-always emulate flushing TLB entries for a vmcb12 ASID, e.g. by running L2
-with a new, fresh ASID in vmcb02.  Some modern hypervisors, e.g. VMWare
-Workstation 17, require FLUSHBYASID support and will refuse to run if it's
-not present.
-
-Punt on proper support, as "Honor L1's request to flush an ASID on nested
-VMRUN" is one of the TODO items in the (incomplete) list of issues that
-need to be addressed in order for KVM to NOT do a full TLB flush on every
-nested SVM transition (see nested_svm_transition_tlb_flush()).
-
-Reported-by: Stefan Sterz <s.sterz@proxmox.com>
-Closes: https://lkml.kernel.org/r/b9915c9c-4cf6-051a-2d91-44cc6380f455%40proxmox.com
-Signed-off-by: Sean Christopherson <seanjc@google.com>
-Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
---
- arch/x86/kvm/svm/svm.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
-index cf31babfbbb9..99a7e93b2edf 100644
--- a/arch/x86/kvm/svm/svm.c
-+++ b/arch/x86/kvm/svm/svm.c
-@@ -4920,6 +4920,7 @@ static __init void svm_set_cpu_caps(void)
- 	if (nested) {
- 		kvm_cpu_cap_set(X86_FEATURE_SVM);
- 		kvm_cpu_cap_set(X86_FEATURE_VMCBCLEAN);
-+		kvm_cpu_cap_set(X86_FEATURE_FLUSHBYASID);
- 
- 		if (nrips)
- 			kvm_cpu_cap_set(X86_FEATURE_NRIPS);
@@ -1,164 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sean Christopherson <seanjc@google.com>
-Date: Wed, 27 Sep 2023 17:19:52 -0700
-Subject: [PATCH] x86/fpu: Allow caller to constrain xfeatures when copying to
- uabi buffer
-
-Plumb an xfeatures mask into __copy_xstate_to_uabi_buf() so that KVM can
-constrain which xfeatures are saved into the userspace buffer without
-having to modify the user_xfeatures field in KVM's guest_fpu state.
-
-KVM's ABI for KVM_GET_XSAVE{2} is that features that are not exposed to
-guest must not show up in the effective xstate_bv field of the buffer.
-Saving only the guest-supported xfeatures allows userspace to load the
-saved state on a different host with a fewer xfeatures, so long as the
-target host supports the xfeatures that are exposed to the guest.
-
-KVM currently sets user_xfeatures directly to restrict KVM_GET_XSAVE{2} to
-the set of guest-supported xfeatures, but doing so broke KVM's historical
-ABI for KVM_SET_XSAVE, which allows userspace to load any xfeatures that
-are supported by the *host*.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Sean Christopherson <seanjc@google.com>
-Message-Id: <20230928001956.924301-2-seanjc@google.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit 18164f66e6c59fda15c198b371fa008431efdb22)
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- arch/x86/include/asm/fpu/api.h |  3 ++-
- arch/x86/kernel/fpu/core.c     |  5 +++--
- arch/x86/kernel/fpu/xstate.c   |  7 +++++--
- arch/x86/kernel/fpu/xstate.h   |  3 ++-
- arch/x86/kvm/x86.c             | 21 +++++++++------------
- 5 files changed, 21 insertions(+), 18 deletions(-)
-
-diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h
-index b475d9a582b8..e829fa4c6788 100644
--- a/arch/x86/include/asm/fpu/api.h
-+++ b/arch/x86/include/asm/fpu/api.h
-@@ -148,7 +148,8 @@ static inline void fpu_update_guest_xfd(struct fpu_guest *guest_fpu, u64 xfd) {
- static inline void fpu_sync_guest_vmexit_xfd_state(void) { }
- #endif
- 
-extern void fpu_copy_guest_fpstate_to_uabi(struct fpu_guest *gfpu, void *buf, unsigned int size, u32 pkru);
-+extern void fpu_copy_guest_fpstate_to_uabi(struct fpu_guest *gfpu, void *buf,
-+					   unsigned int size, u64 xfeatures, u32 pkru);
- extern int fpu_copy_uabi_to_guest_fpstate(struct fpu_guest *gfpu, const void *buf, u64 xcr0, u32 *vpkru);
- 
- static inline void fpstate_set_confidential(struct fpu_guest *gfpu)
-diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
-index a083f9ac9e4f..1d190761d00f 100644
--- a/arch/x86/kernel/fpu/core.c
-+++ b/arch/x86/kernel/fpu/core.c
-@@ -369,14 +369,15 @@ int fpu_swap_kvm_fpstate(struct fpu_guest *guest_fpu, bool enter_guest)
- EXPORT_SYMBOL_GPL(fpu_swap_kvm_fpstate);
- 
- void fpu_copy_guest_fpstate_to_uabi(struct fpu_guest *gfpu, void *buf,
-				    unsigned int size, u32 pkru)
-+				    unsigned int size, u64 xfeatures, u32 pkru)
- {
- 	struct fpstate *kstate = gfpu->fpstate;
- 	union fpregs_state *ustate = buf;
- 	struct membuf mb = { .p = buf, .left = size };
- 
- 	if (cpu_feature_enabled(X86_FEATURE_XSAVE)) {
-		__copy_xstate_to_uabi_buf(mb, kstate, pkru, XSTATE_COPY_XSAVE);
-+		__copy_xstate_to_uabi_buf(mb, kstate, xfeatures, pkru,
-+					  XSTATE_COPY_XSAVE);
- 	} else {
- 		memcpy(&ustate->fxsave, &kstate->regs.fxsave,
- 		       sizeof(ustate->fxsave));
-diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
-index 1afbc4866b10..463ec0cd0dab 100644
--- a/arch/x86/kernel/fpu/xstate.c
-+++ b/arch/x86/kernel/fpu/xstate.c
-@@ -1053,6 +1053,7 @@ static void copy_feature(bool from_xstate, struct membuf *to, void *xstate,
-  * __copy_xstate_to_uabi_buf - Copy kernel saved xstate to a UABI buffer
-  * @to:		membuf descriptor
-  * @fpstate:	The fpstate buffer from which to copy
-+ * @xfeatures:	The mask of xfeatures to save (XSAVE mode only)
-  * @pkru_val:	The PKRU value to store in the PKRU component
-  * @copy_mode:	The requested copy mode
-  *
-@@ -1063,7 +1064,8 @@ static void copy_feature(bool from_xstate, struct membuf *to, void *xstate,
-  * It supports partial copy but @to.pos always starts from zero.
-  */
- void __copy_xstate_to_uabi_buf(struct membuf to, struct fpstate *fpstate,
-			       u32 pkru_val, enum xstate_copy_mode copy_mode)
-+			       u64 xfeatures, u32 pkru_val,
-+			       enum xstate_copy_mode copy_mode)
- {
- 	const unsigned int off_mxcsr = offsetof(struct fxregs_state, mxcsr);
- 	struct xregs_state *xinit = &init_fpstate.regs.xsave;
-@@ -1087,7 +1089,7 @@ void __copy_xstate_to_uabi_buf(struct membuf to, struct fpstate *fpstate,
- 		break;
- 
- 	case XSTATE_COPY_XSAVE:
-		header.xfeatures &= fpstate->user_xfeatures;
-+		header.xfeatures &= fpstate->user_xfeatures & xfeatures;
- 		break;
- 	}
- 
-@@ -1189,6 +1191,7 @@ void copy_xstate_to_uabi_buf(struct membuf to, struct task_struct *tsk,
- 			     enum xstate_copy_mode copy_mode)
- {
- 	__copy_xstate_to_uabi_buf(to, tsk->thread.fpu.fpstate,
-+				  tsk->thread.fpu.fpstate->user_xfeatures,
- 				  tsk->thread.pkru, copy_mode);
- }
- 
-diff --git a/arch/x86/kernel/fpu/xstate.h b/arch/x86/kernel/fpu/xstate.h
-index a4ecb04d8d64..3518fb26d06b 100644
--- a/arch/x86/kernel/fpu/xstate.h
-+++ b/arch/x86/kernel/fpu/xstate.h
-@@ -43,7 +43,8 @@ enum xstate_copy_mode {
- 
- struct membuf;
- extern void __copy_xstate_to_uabi_buf(struct membuf to, struct fpstate *fpstate,
-				      u32 pkru_val, enum xstate_copy_mode copy_mode);
-+				      u64 xfeatures, u32 pkru_val,
-+				      enum xstate_copy_mode copy_mode);
- extern void copy_xstate_to_uabi_buf(struct membuf to, struct task_struct *tsk,
- 				    enum xstate_copy_mode mode);
- extern int copy_uabi_from_kernel_to_xstate(struct fpstate *fpstate, const void *kbuf, u32 *pkru);
-diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index ff92ff41d5ce..a43a950d04cb 100644
--- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -5314,26 +5314,23 @@ static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu,
- 	return 0;
- }
- 
-static void kvm_vcpu_ioctl_x86_get_xsave(struct kvm_vcpu *vcpu,
-					 struct kvm_xsave *guest_xsave)
-+
-+static void kvm_vcpu_ioctl_x86_get_xsave2(struct kvm_vcpu *vcpu,
-+					  u8 *state, unsigned int size)
- {
- 	if (fpstate_is_confidential(&vcpu->arch.guest_fpu))
- 		return;
- 
-	fpu_copy_guest_fpstate_to_uabi(&vcpu->arch.guest_fpu,
-				       guest_xsave->region,
-				       sizeof(guest_xsave->region),
-+	fpu_copy_guest_fpstate_to_uabi(&vcpu->arch.guest_fpu, state, size,
-+				       vcpu->arch.guest_fpu.fpstate->user_xfeatures,
- 				       vcpu->arch.pkru);
- }
- 
-static void kvm_vcpu_ioctl_x86_get_xsave2(struct kvm_vcpu *vcpu,
-					  u8 *state, unsigned int size)
-+static void kvm_vcpu_ioctl_x86_get_xsave(struct kvm_vcpu *vcpu,
-+					 struct kvm_xsave *guest_xsave)
- {
-	if (fpstate_is_confidential(&vcpu->arch.guest_fpu))
-		return;
-
-	fpu_copy_guest_fpstate_to_uabi(&vcpu->arch.guest_fpu,
-				       state, size, vcpu->arch.pkru);
-+	return kvm_vcpu_ioctl_x86_get_xsave2(vcpu, (void *)guest_xsave->region,
-+					     sizeof(guest_xsave->region));
- }
- 
- static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu,
@@ -1,119 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sean Christopherson <seanjc@google.com>
-Date: Wed, 27 Sep 2023 17:19:53 -0700
-Subject: [PATCH] KVM: x86: Constrain guest-supported xfeatures only at
- KVM_GET_XSAVE{2}
-
-Mask off xfeatures that aren't exposed to the guest only when saving guest
-state via KVM_GET_XSAVE{2} instead of modifying user_xfeatures directly.
-Preserving the maximal set of xfeatures in user_xfeatures restores KVM's
-ABI for KVM_SET_XSAVE, which prior to commit ad856280ddea ("x86/kvm/fpu:
-Limit guest user_xfeatures to supported bits of XCR0") allowed userspace
-to load xfeatures that are supported by the host, irrespective of what
-xfeatures are exposed to the guest.
-
-There is no known use case where userspace *intentionally* loads xfeatures
-that aren't exposed to the guest, but the bug fixed by commit ad856280ddea
-was specifically that KVM_GET_SAVE{2} would save xfeatures that weren't
-exposed to the guest, e.g. would lead to userspace unintentionally loading
-guest-unsupported xfeatures when live migrating a VM.
-
-Restricting KVM_SET_XSAVE to guest-supported xfeatures is especially
-problematic for QEMU-based setups, as QEMU has a bug where instead of
-terminating the VM if KVM_SET_XSAVE fails, QEMU instead simply stops
-loading guest state, i.e. resumes the guest after live migration with
-incomplete guest state, and ultimately results in guest data corruption.
-
-Note, letting userspace restore all host-supported xfeatures does not fix
-setups where a VM is migrated from a host *without* commit ad856280ddea,
-to a target with a subset of host-supported xfeatures.  However there is
-no way to safely address that scenario, e.g. KVM could silently drop the
-unsupported features, but that would be a clear violation of KVM's ABI and
-so would require userspace to opt-in, at which point userspace could
-simply be updated to sanitize the to-be-loaded XSAVE state.
-
-Reported-by: Tyler Stachecki <stachecki.tyler@gmail.com>
-Closes: https://lore.kernel.org/all/20230914010003.358162-1-tstachecki@bloomberg.net
-Fixes: ad856280ddea ("x86/kvm/fpu: Limit guest user_xfeatures to supported bits of XCR0")
-Cc: stable@vger.kernel.org
-Cc: Leonardo Bras <leobras@redhat.com>
-Signed-off-by: Sean Christopherson <seanjc@google.com>
-Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
-Message-Id: <20230928001956.924301-3-seanjc@google.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit 8647c52e9504c99752a39f1d44f6268f82c40a5c)
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- arch/x86/kernel/fpu/xstate.c |  5 +----
- arch/x86/kvm/cpuid.c         |  8 --------
- arch/x86/kvm/x86.c           | 18 ++++++++++++++++--
- 3 files changed, 17 insertions(+), 14 deletions(-)
-
-diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
-index 463ec0cd0dab..ebe698f8af73 100644
--- a/arch/x86/kernel/fpu/xstate.c
-+++ b/arch/x86/kernel/fpu/xstate.c
-@@ -1543,10 +1543,7 @@ static int fpstate_realloc(u64 xfeatures, unsigned int ksize,
- 		fpregs_restore_userregs();
- 
- 	newfps->xfeatures = curfps->xfeatures | xfeatures;
-
-	if (!guest_fpu)
-		newfps->user_xfeatures = curfps->user_xfeatures | xfeatures;
-
-+	newfps->user_xfeatures = curfps->user_xfeatures | xfeatures;
- 	newfps->xfd = curfps->xfd & ~xfeatures;
- 
- 	/* Do the final updates within the locked region */
-diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
-index 61aefeb3fdbc..e5393ee652ba 100644
--- a/arch/x86/kvm/cpuid.c
-+++ b/arch/x86/kvm/cpuid.c
-@@ -350,14 +350,6 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)
- 	vcpu->arch.guest_supported_xcr0 =
- 		cpuid_get_supported_xcr0(vcpu->arch.cpuid_entries, vcpu->arch.cpuid_nent);
- 
-	/*
-	 * FP+SSE can always be saved/restored via KVM_{G,S}ET_XSAVE, even if
-	 * XSAVE/XCRO are not exposed to the guest, and even if XSAVE isn't
-	 * supported by the host.
-	 */
-	vcpu->arch.guest_fpu.fpstate->user_xfeatures = vcpu->arch.guest_supported_xcr0 |
-						       XFEATURE_MASK_FPSSE;
-
- 	kvm_update_pv_runtime(vcpu);
- 
- 	vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);
-diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index a43a950d04cb..a4a44adf7c72 100644
--- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -5318,12 +5318,26 @@ static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu,
- static void kvm_vcpu_ioctl_x86_get_xsave2(struct kvm_vcpu *vcpu,
- 					  u8 *state, unsigned int size)
- {
-+	/*
-+	 * Only copy state for features that are enabled for the guest.  The
-+	 * state itself isn't problematic, but setting bits in the header for
-+	 * features that are supported in *this* host but not exposed to the
-+	 * guest can result in KVM_SET_XSAVE failing when live migrating to a
-+	 * compatible host without the features that are NOT exposed to the
-+	 * guest.
-+	 *
-+	 * FP+SSE can always be saved/restored via KVM_{G,S}ET_XSAVE, even if
-+	 * XSAVE/XCRO are not exposed to the guest, and even if XSAVE isn't
-+	 * supported by the host.
-+	 */
-+	u64 supported_xcr0 = vcpu->arch.guest_supported_xcr0 |
-+			     XFEATURE_MASK_FPSSE;
-+
- 	if (fpstate_is_confidential(&vcpu->arch.guest_fpu))
- 		return;
- 
- 	fpu_copy_guest_fpstate_to_uabi(&vcpu->arch.guest_fpu, state, size,
-				       vcpu->arch.guest_fpu.fpstate->user_xfeatures,
-				       vcpu->arch.pkru);
-+				       supported_xcr0, vcpu->arch.pkru);
- }
- 
- static void kvm_vcpu_ioctl_x86_get_xsave(struct kvm_vcpu *vcpu,