update ABI file for 4.15.18-30-pve

(generated with debian/scripts/abi-generate) Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
bump version to 4.15.18-58
2020-06-16 16:07:50 +02:00 · 2020-06-12 14:21:52 +02:00 · 2020-06-12 13:50:05 +02:00 · 2020-05-18 15:48:05 +02:00 · 2020-05-18 14:35:07 +02:00 · 2020-05-18 14:04:32 +02:00
35 changed files with 24048 additions and 27038 deletions
@@ -1,6 +1,6 @@
 [submodule "submodules/zfsonlinux"]
 	path = submodules/zfsonlinux
 	url = ../zfsonlinux
-[submodule "submodules/ubuntu-hirsute"]
-	path = submodules/ubuntu-hirsute
-	url = ../mirror_ubuntu-hirsute-kernel
+[submodule "submodules/ubuntu-bionic"]
+	path = submodules/ubuntu-bionic
+	url = ../mirror_ubuntu-bionic-kernel
@@ -1,12 +1,12 @@
 # also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
-KERNEL_MAJ=5
-KERNEL_MIN=11
-KERNEL_PATCHLEVEL=22
+KERNEL_MAJ=4
+KERNEL_MIN=15
+KERNEL_PATCHLEVEL=18
 # increment KREL if the ABI changes (abicheck target in debian/rules)
 # rebuild packages with new KREL and run 'make abiupdate'
-KREL=7
+KREL=30

-PKGREL=12
+PKGREL=58

 KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
 KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)
@@ -29,32 +29,51 @@ GITVERSION:=$(shell git rev-parse HEAD)

 SKIPABI=0

+ifeq    ($(CC), cc)
+GCC=gcc
+else
+GCC=$(CC)
+endif
+
 BUILD_DIR=build

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

+E1000EDIR=e1000e-3.4.1.1
+E1000ESRC=${E1000EDIR}.tar.gz
+
+IGBDIR=igb-5.3.5.18
+IGBSRC=${IGBDIR}.tar.gz
+
 ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
+SPLDIR=pkg-spl
 ZFSDIR=pkg-zfs

 MODULES=modules
-MODULE_DIRS=${ZFSDIR}
+MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${SPLDIR} ${ZFSDIR}

 # exported to debian/rules via debian/rules.d/dirs.mk
-DIRS=KERNEL_SRC ZFSDIR MODULES
+DIRS=KERNEL_SRC E1000EDIR IGBDIR SPLDIR ZFSDIR MODULES

 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} ${HDR_DEB} ${USR_HDR_DEB} ${LINUX_TOOLS_DEB} ${LINUX_TOOLS_DBG_DEB}
+DEBS=${DST_DEB} ${HDR_DEB} ${LINUX_TOOLS_DEB}

-all: deb
+all: check_gcc deb
 deb: ${DEBS}

+check_gcc:
+	$(GCC) --version|grep "6\.3" || false
+	@$(GCC) -Werror -mindirect-branch=thunk-extern -mindirect-branch-register -c -x c /dev/null -o check_gcc.o \
+		|| ( rm -f check_gcc.o; \
+		     echo "Please install gcc-6 packages with indirect thunk / RETPOLINE support"; \
+		     false)
+	@rm -f check_gcc.o
+
 ${LINUX_TOOLS_DEB} ${HDR_DEB}: ${DST_DEB}
 ${DST_DEB}: ${BUILD_DIR}.prepared
 	cd ${BUILD_DIR}; dpkg-buildpackage --jobs=auto -b -uc -us
@@ -94,17 +113,34 @@ ${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE} | submodule
 ${MODULES}.prepared: $(addsuffix .prepared,${MODULE_DIRS})
 	touch $@

+${E1000EDIR}.prepared: ${E1000ESRC}
+	rm -rf ${BUILD_DIR}/${MODULES}/${E1000EDIR} $@
+	mkdir -p ${BUILD_DIR}/${MODULES}/${E1000EDIR}
+	tar --strip-components=1 -C ${BUILD_DIR}/${MODULES}/${E1000EDIR} -xf ${E1000ESRC}
+	cd ${BUILD_DIR}/${MODULES}/${E1000EDIR}; patch -p1 < ../../../patches/intel/intel-module-gcc6-compat.patch
+	cd ${BUILD_DIR}/${MODULES}/${E1000EDIR}; patch -p1 < ../../../patches/intel/e1000e/e1000e_4.10_max-mtu.patch
+	cd ${BUILD_DIR}/${MODULES}/${E1000EDIR}; patch -p1 < ../../../patches/intel/e1000e/e1000e_4.15-new-timer.patch
+	touch $@
+
+${IGBDIR}.prepared: ${IGBSRC}
+	rm -rf ${BUILD_DIR}/${MODULES}/${IGBDIR} $@
+	mkdir -p ${BUILD_DIR}/${MODULES}/${IGBDIR}
+	tar --strip-components=1 -C ${BUILD_DIR}/${MODULES}/${IGBDIR} -xf ${IGBSRC}
+	cd ${BUILD_DIR}/${MODULES}/${IGBDIR}; patch -p1 < ../../../patches/intel/igb/igb_4.15_mtu.patch
+	touch $@
+
+${SPLDIR}.prepared: ${ZFSDIR}.prepared
 ${ZFSDIR}.prepared: ${ZFSONLINUX_SUBMODULE}
-	rm -rf ${BUILD_DIR}/${MODULES}/${ZFSDIR} ${BUILD_DIR}/${MODULES}/tmp $@
+	rm -rf ${BUILD_DIR}/${MODULES}/${SPLDIR} ${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
+	touch ${ZFSDIR}.prepared ${SPLDIR}.prepared

 .PHONY: upload
 upload: ${DEBS}
-	tar cf - ${DEBS}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye --arch ${ARCH}
+	tar cf - ${DEBS}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch ${ARCH}

 .PHONY: distclean
 distclean: clean
@@ -120,7 +156,8 @@ update_modules: submodule
 .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 "${ZFSONLINUX_SUBMODULE}/Makefile" || git submodule update --init ${ZFSONLINUX_SUBMODULE}
+	(test -f "${ZFSONLINUX_SUBMODULE}/zfs/upstream/README.markdown" && test -f "${ZFSONLINUX_SUBMODULE}/spl/upstream/README.markdown") || (cd ${ZFSONLINUX_SUBMODULE}; git submodule update --init)

 # call after ABI bump with header deb in working directory
 .PHONY: abiupdate
@@ -3,7 +3,7 @@ KERNEL SOURCE:

 We currently use the Ubuntu kernel sources, available from:

- http://kernel.ubuntu.com/git/ubuntu/ubuntu-hirsute.git/
+ http://kernel.ubuntu.com/git/ubuntu/ubuntu-bionic.git/

 Ubuntu will maintain those kernels till:

@@ -13,6 +13,10 @@ Ubuntu will maintain those kernels till:
 Additional/Updated Modules:
 ---------------------------

+- include latest e1000e driver from intel/sourceforge
+
+- include latest igb driver from intel/sourceforge
+
 - include native OpenZFS filesystem kernel modules for Linux

  * https://github.com/zfsonlinux/
@@ -31,7 +35,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-hirsute/.git
+$ cat build/ubuntu-bionic/.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
@@ -98,18 +102,6 @@ which device is actually used for /dev/watchdog.
 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.pve-kernel.debug' build profile (e.g. by
-exporting DEB_BUILD_PROFILES='pkg.pve-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 pve-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
 ----------------------

@@ -133,6 +125,11 @@ 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
@@ -1,465 +1,150 @@
-pve-kernel (5.11.22-12) bullseye; urgency=medium
+pve-kernel (4.15.18-58) pve pmg; urgency=medium

-  * update sources to Ubuntu-5.11.0-41.45
+  * update to Ubuntu-4.15.0-107.108

-  * bump ABI to 5.11.22-7
+  * bump ABI to 4.15.18-30

- -- Proxmox Support Team <support@proxmox.com>  Sun, 07 Nov 2021 21:46:36 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 12 Jun 2020 13:53:01 +0200

-pve-kernel (5.11.22-11) bullseye; urgency=medium
+pve-kernel (4.15.18-57) pve pmg; urgency=medium

-  * update sources to Ubuntu-5.11.0-39.43
+  * update to Ubuntu-4.15.0-102.103

-  * bump ABI to 5.11.22-6
+  * bump ABI to 4.15.18-29

-  * back port proposed fix for "ocfs2: mount fails with buffer overflow in strlen"
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 18 May 2020 14:34:54 +0200

- -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Oct 2021 12:43:14 +0200
+pve-kernel (4.15.18-56) pve pmg; urgency=medium

-pve-kernel (5.11.22-10) bullseye; urgency=medium
+  * update to Ubuntu-4.15.0-97.98

-  * update sources to Ubuntu-5.11.0-38.42
+  * bump ABI to 4.15.18-28

-  * update ZFS to 2.0.6
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 08 Apr 2020 20:06:11 +0200

-  * bump ABI to 5.11.22-5
+pve-kernel (4.15.18-55) pve pmg; urgency=medium

-  * fix #3558: backport "bnx2x: Fix enabling network interfaces without VFs"
+  * update to Ubuntu-4.15.0-92.93

- -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 08:15:41 +0200
+  * bump ABI to 4.15.18-27

-pve-kernel (5.11.22-9) bullseye; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 17 Mar 2020 15:32:02 +0100

-  * backport "blk-mq: fix kernel panic during iterating over flush
-    request"
+pve-kernel (4.15.18-54) pve pmg; urgency=medium

-  * d/rules: kconfig: enable SQUASHFS_DECOMP_MULTI_PERCPU to speed up
-    decompression of mounted squashfs images
+  * update to Ubuntu-4.15.0-89.89

- -- Proxmox Support Team <support@proxmox.com>  Wed, 22 Sep 2021 10:11:11 +0200
+  * bump ABI to 4.15.18-26

-pve-kernel (5.11.22-8) bullseye; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 15 Feb 2020 15:34:24 +0100

-  * update to Ubuntu-5.11.0-34.36
+pve-kernel (4.15.18-53) pve pmg; urgency=medium

-  * fix #3552: cherry-pick PCI probe fixes
+  * update to Ubuntu-4.15.0-87.87

-  * 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 4.15.18-25

-  * bump ABI to 5.11.22-4
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 05 Feb 2020 11:58:15 +0100

- -- Proxmox Support Team <support@proxmox.com>  Fri, 27 Aug 2021 11:51:34 +0200
+pve-kernel (4.15.18-52) pve pmg; urgency=medium

-pve-kernel (5.11.22-7) bullseye; urgency=medium
+  * update to Ubuntu-4.15.0-73.82

-  * cherry-pick fixes for CVE-2021-3656 and CVE-2021-3653
+  * bump ABI to 4.15.18-24

- -- Proxmox Support Team <support@proxmox.com>  Wed, 18 Aug 2021 15:06:12 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 05 Dec 2019 10:14:17 +0100

-pve-kernel (5.11.22-6) bullseye; urgency=medium
+pve-kernel (4.15.18-51) pve pmg; urgency=medium

-  * io_uring: don't block level reissue off completion path
+  * update to Ubuntu-4.15.0-69.78

- -- Proxmox Support Team <support@proxmox.com>  Wed, 28 Jul 2021 10:51:12 +0200
+  * avoid bogus error message about PC Speaker module being already registered
+    on boot

-pve-kernel (5.11.22-5) bullseye; urgency=medium
+  * bump ABI to 4.15.18-23

-  * import Ubuntu-5.11.0-26.28
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 13 Nov 2019 11:20:34 +0100

-  * pull in upstream stable releases from v5.10.44, v5.12.11
+pve-kernel (4.15.18-50) pve pmg; urgency=medium

- -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Jul 2021 18:25:44 +0200
+  * update to Ubuntu-4.15.0-68.77

-pve-kernel (5.11.22-4) bullseye; urgency=medium
+  * fix #2458: fix issues with Linux KVM guest on old Intel CPUs

-  * fix CVE-2021-33909: seq_file: disallow extremely large seq buffer
-    allocations
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 11 Nov 2019 15:28:06 +0100

- -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Jul 2021 21:40:02 +0200
+pve-kernel (4.15.18-49) pve pmg; urgency=medium

-pve-kernel (5.11.22-3) bullseye; urgency=medium
+  * update to Ubuntu-4.15.0-67.76

-  * update ZFS to 2.0.5
+  * bump ABI to 4.15.18-22

-  * pull in upstream stable releases from v5.10.43, v5.12.10
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 23 Oct 2019 20:39:55 +0200

-  * ensure 'performance' is the default frequency CPU governor again, as
-    schedutil seems to cause still some issues in with a few VM workloads
+pve-kernel (4.15.18-48) pve pmg; urgency=medium

- -- Proxmox Support Team <support@proxmox.com>  Sun, 11 Jul 2021 13:45:15 +0200
+  * update to Ubuntu-4.15.0-65.74

-pve-kernel (5.11.22-2) bullseye; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 20 Sep 2019 11:28:30 +0200

-  * net: bridge: sync fdb to new unicast-filtering ports
+pve-kernel (4.15.18-47) pve pmg; urgency=medium

- -- Proxmox Support Team <support@proxmox.com>  Fri, 02 Jul 2021 16:22:45 +0200
+  * update to Ubuntu-4.15.0-63.72

-pve-kernel (5.11.22-1) bullseye; urgency=medium
+  * bump ABI to 4.15.18-21

-  * update sources to stable release 5.11.22 with Ubuntu-5.11.0-23.24
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 06 Sep 2019 16:08:32 +0200

-  * pve-kernel-libc-dev: add version to Provides dependency field for
-    linux-libc-dev to satisfy versioned dependencies from other packages
+pve-kernel (4.15.18-46) pve pmg; urgency=medium

-  * build perf with python3
+  * update to Ubuntu-4.15.0-58.64

-  * fixes #3465: keep unstripped kernel and module files, allowing one to use
-    kdump-tools
+  * bump ABI to 4.15.18-20

- -- Proxmox Support Team <support@proxmox.com>  Wed, 23 Jun 2021 08:53:17 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 8 Aug 2019 10:42:06 +0200

-pve-kernel (5.11.21-1) bullseye; urgency=medium
+pve-kernel (4.15.18-45) unstable; urgency=medium

-  * update sources to stable release 5.11.21 with Ubuntu-5.11.0-19.20
+  * update to Ubuntu-4.15.0-56.62

- -- Proxmox Support Team <support@proxmox.com>  Tue, 01 Jun 2021 16:38:57 +0200
+  * bump ABI to 4.15.18-19

-pve-kernel (5.11.17-1) bullseye; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 26 Jul 2019 09:34:08 +0200

-  * update sources to stable release 5.11.17 with Ubuntu-5.11.0-18.19
+pve-kernel (4.15.18-44) unstable; urgency=medium

- -- Proxmox Support Team <support@proxmox.com>  Wed, 12 May 2021 12:45:37 +0200
+  * update to Ubuntu-4.15.0-55.60

-pve-kernel (5.11.12-1) bullseye; urgency=medium
+  * bump ABI to 4.15.18-18

-  * update sources to Ubuntu-5.11.0-14.15
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 03 Jul 2019 11:19:13 +0200

- -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Apr 2021 10:31:19 +0200
+pve-kernel (4.15.18-43) unstable; urgency=medium

-pve-kernel (5.11.7-1) pve pmg; urgency=medium
+  * backport refinement for TCP SACK mitigations to avoid regressions for some
+    clients

-  * update sources to Ubuntu-5.11.0-12.13
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 25 Jun 2019 17:59:49 +0200

-  * update ZFS to 2.0.4
+pve-kernel (4.15.18-42) unstable; urgency=medium

- -- Proxmox Support Team <support@proxmox.com>  Thu, 18 Mar 2021 14:07:05 +0100
+  * update sources to Ubuntu-4.15.0-53.57

-pve-kernel (5.11.0-1) pve pmg; urgency=medium
+  * bump ABI to 4.15.18-17

-  * update sources to Ubuntu-5.11.0-11.12
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 21 Jun 2019 06:45:23 +0200

-  * update ZFS to 2.0.3
+pve-kernel (4.15.18-41) unstable; urgency=medium

- -- Proxmox Support Team <support@proxmox.com>  Tue, 02 Mar 2021 13:36:01 +0100
+  * update sources to Ubuntu-4.15.0-52.56

-pve-kernel (5.10.6-1) pve pmg; urgency=medium
+  * backport: KVM: x86: Emulate MSR_IA32_ARCH_CAPABILITIES on AMD hosts

-  * update sources to Ubuntu-5.10.0-12.13
+  * backport: net: rds: force to destroy connection if t_sock is NULL in rds_tcp_kill_sock()

-  * update ZFS to 2.0.1
+  * bump ABI to 4.15.18-16

- -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2021 14:27:01 +0100
-
-pve-kernel (5.4.78-2) pve pmg; urgency=medium
-
-  * revert commit 552b270b5784dc3 "scsi: be2iscsi: Fix a theoretical leak in
-    beiscsi_create_eqs()" to avoid hangs and kernel oopses on module load
-
-  * cherry-pick patch to allow unprivileged whiteout device creation
-
-  * bump ABI to 5.4.78-2
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 03 Dec 2020 14:26:17 +0100
-
-pve-kernel (5.4.78-1) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.4.0-57.63
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Nov 2020 10:57:47 +0100
-
-pve-kernel (5.4.73-1) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.4.0-55.61
-
-  * update ZFS to 0.8.5
-
-  * downgrade unregister_netdev waiting to become free error from emergency to
-    error log
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 16 Nov 2020 10:52:16 +0100
-
-pve-kernel (5.4.65-1) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.4.0-49.53
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2020 15:40:22 +0200
-
-pve-kernel (5.4.60-2) pve pmg; urgency=medium
-
-  * improve guards against a packet offset calculation overflow for certain raw
-    packet sockets
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 04 Sep 2020 10:24:50 +0200
-
-pve-kernel (5.4.60-1) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.4.0-46.50
-
-  * bump ABI to 5.4.60-1
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 31 Aug 2020 10:36:22 +0200
-
-pve-kernel (5.4.55-1) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.4.0-43.47
-
-  * bump ABI to 5.4.55-1
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 10 Aug 2020 10:26:27 +0200
-
-pve-kernel (5.4.44-2) pve pmg; urgency=medium
-
-  * fix #2814: config: disable lockdown
-
-  * backport: cgroup: fix cgroup_sk_alloc() for sk_clone_lock()
-
-  * bump ABI to 5.4.44-2
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 01 Jul 2020 16:37:57 +0200
-
-pve-kernel (5.4.44-1) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.4.0-38.42
-
-  * bump ABI to 5.4.44-1
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 12 Jun 2020 08:18:46 +0200
-
-pve-kernel (5.4.41-1) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.4.0-32.36
-
-  * update ZFS to 0.8.4
-
-  * Revert "scsi: lpfc: Fix broken Credit Recovery after driver load" as a
-    workaround for some LP Fibre Channel SCSI boxes.
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 15 May 2020 15:06:08 +0200
-
-pve-kernel (5.4.34-2) pve pmg; urgency=medium
-
-  * backport fix for overlayfs
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 07 May 2020 10:02:02 +0200
-
-pve-kernel (5.4.34-1) pve pmg; urgency=medium
-
-  * update to Ubuntu-5.4.0-30.34
-
-  * bump ABI to 5.4.34-1
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 06 May 2020 10:16:59 +0200
-
-pve-kernel (5.4.30-1) pve pmg; urgency=medium
-
-  * update to Ubuntu-5.4.0-24.28
-
-  * bump ABI to 5.4.30-1
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Apr 2020 09:12:42 +0200
-
-pve-kernel (5.4.27-1) pve pmg; urgency=medium
-
-  * update to Ubuntu-5.4.0-19.23
-
-  * bump ABI to 5.4.27-1
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 23 Mar 2020 15:02:22 +0100
-
-pve-kernel (5.4.24-1) pve pmg; urgency=medium
-
-  * update to Ubuntu-5.4.0-18.22
-
-  * bump ABI to 5.4.24-1
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 09 Mar 2020 12:59:46 +0100
-
-pve-kernel (5.4.22-1) pve pmg; urgency=medium
-
-  * Initial Ubuntu Focal Kernel build, based on 5.4
-
-  * update sources to Ubuntu-5.4.0-17.21
-
-  * bump ABI to 5.4.22-1
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 02 Mar 2020 15:49:45 +0100
-
-pve-kernel (5.3.18-2) pve pmg; urgency=medium
-
-  * bump ABI to 5.3.18-2
-
-  * update to Ubuntu-5.3.0-41.33
-
- -- Proxmox Support Team <support@proxmox.com>  Sat, 15 Feb 2020 15:11:52 +0100
-
-pve-kernel (5.3.18-1) pve pmg; urgency=medium
-
-  * bump ABI to 5.3.18-1
-
-  * update sources to Ubuntu-5.3.0-40.32
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 05 Feb 2020 11:49:10 +0100
-
-pve-kernel (5.3.13-3) pve pmg; urgency=medium
-
-  * backport fixes for information leak within a KVM guest
-
-  * bump ABI to 5.3.13-3
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 31 Jan 2020 08:17:11 +0100
-
-pve-kernel (5.3.13-2) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.3.0-29.31
-
-  * update ZFS to 0.8.3
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 24 Jan 2020 09:49:36 +0100
-
-pve-kernel (5.3.13-1) pve pmg; urgency=medium
-
-  * bump ABI to 5.3.13-1
-
-  * update sources to Ubuntu-5.3.0-25.27
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 05 Dec 2019 07:18:14 +0100
-
-pve-kernel (5.3.10-1) pve pmg; urgency=medium
-
-  * bump ABI to 5.3.10-1
-
-  * update sources to Ubuntu-5.3.0-24.26
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Nov 2019 10:43:13 +0100
-
-pve-kernel (5.3.7-1) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.3.0-20.21
-
-  * bump ABI to 5.3.7-1
-
-  * update ZFS submodule to include FPU/SIMD fixes
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 23 Oct 2019 19:00:21 +0200
-
-pve-kernel (5.3.1-1) pve pmg; urgency=medium
-
-  * Initial Ubuntu Eoan Kernel build, based on 5.3
-
-  * update sources to Ubuntu-5.3.0-16.17
-
-  * bump ABI to 5.3.0-1
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 01 Oct 2019 18:57:21 +0200
-
-pve-kernel (5.0.21-7) pve pmg; urgency=medium
-
-  * update ZFS to 0.8.2
-
-  * bump ABI to 5.0.21-3
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Sep 2019 09:11:02 +0200
-
-pve-kernel (5.0.21-6) pve pmg; urgency=medium
-
-  * backport new FPU register copy helpers
-
-  * ZFS SIMD: FPU register save/restore is also required on 5.0 kernels
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 27 Sep 2019 17:17:02 +0200
-
-pve-kernel (5.0.21-4) pve pmg; urgency=medium
-
-  * update to Ubuntu-5.0.0-30.32
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 20 Sep 2019 11:55:17 +0200
-
-pve-kernel (5.0.21-3) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.0.0-28.30
-
-  * bump ABI to 5.0.21-2
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 05 Sep 2019 13:56:01 +0200
-
-pve-kernel (5.0.21-2) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.0.0-27.28
-
-  * backport vhost_net: disable zerocopy by default
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 28 Aug 2019 15:12:18 +0200
-
-pve-kernel (5.0.21-1) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.0.0-26.27
-
-  * update ZFS to include SIMD compat patch for newer Kernel
-
-  * bump ABI to 5.0.21-1
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Aug 2019 17:16:32 +0200
-
-pve-kernel (5.0.18-3) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.0.0-25.26
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 8 Aug 2019 09:05:29 +0200
-
-pve-kernel (5.0.18-2) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.0.0-24.25
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 2 Aug 2019 14:51:00 +0200
-
-pve-kernel (5.0.18-1) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.0.0-22.23
-
-  * bump ABI to 5.0.18-1
-
-  * backport "rbd: don't assert on writes to snapshots" to fix issues with
-    DISCARD operations on Ceph RBD backed block devices during a snapshot
-    operation.
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 24 Jul 2019 08:13:30 +0200
-
-pve-kernel (5.0.15-1) pve pmg; urgency=medium
-
-  * update to Ubuntu-5.0.0-21.22
-
-  * bump ABI to 5.0.15-1
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 03 Jul 2019 10:51:57 +0200
-
-pve-kernel (5.0.12-1) pve pmg; urgency=medium
-
-  * update sources to Ubuntu-5.0.0-18.19
-
-  * update to ZFS 0.8.1
-
-  * revert KVM nested option default back to off
-
- -- Proxmox Support Team <support@proxmox.com>  Sat, 15 Jun 2019 11:39:18 +0200
-
-pve-kernel (5.0.8-2) pve pmg; urgency=medium
-
-  * update to ZFS 0.8.0
-
-  * bump ABI to 5.0.8-2
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 24 May 2019 20:38:04 +0200
-
-pve-kernel (5.0.8-1) pve pmg; urgency=medium
-
-  * update to Ubuntu-5.0.0-16.17
-
-  * bump ABI to 5.0.8-1
-
-  * build for Debian Buster / PVE/PMG 6
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 22 May 2019 14:06:59 +0200
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 18 Jun 2019 07:36:54 +0200

 pve-kernel (4.15.18-40) unstable; urgency=medium

@@ -8,11 +8,9 @@ Build-Depends: asciidoc-base,
               bison,
               cpio,
               debhelper (>= 10~),
-               dh-python,
-               dwarves,
               file,
               flex,
-               gcc (>= 8.3.0-6),
+               gcc-6 (>= 6.3.0-18+deb9u1),
               git,
               kmod,
               libdw-dev,
@@ -24,16 +22,14 @@ Build-Depends: asciidoc-base,
               libssl-dev,
               libtool,
               lintian,
-               lz4,
               perl-modules,
-               python3-minimal,
+               python-minimal,
               rsync,
               sed,
-               sphinx-common,
               tar,
               xmlto,
-               zlib1g-dev
-Build-Conflicts: pve-headers-@KVNAME@
+               zlib1g-dev,
+Build-Conflicts: pve-headers-@KVNAME@,
 Vcs-Git: git://git.proxmox.com/git/pve-kernel
 Vcs-Browser: https://git.proxmox.com/?p=pve-kernel.git

@@ -41,7 +37,9 @@ 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)
@@ -50,8 +48,9 @@ Package: pve-headers-@KVNAME@
 Section: devel
 Priority: optional
 Architecture: any
-Provides: linux-headers
-Depends: coreutils | fileutils (>= 4.0)
+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

@@ -59,34 +58,11 @@ Package: pve-kernel-@KVNAME@
 Section: admin
 Priority: optional
 Architecture: any
-Provides: linux-image
-Suggests: pve-firmware
-Depends: busybox, initramfs-tools
-Recommends: grub-pc | grub-efi-amd64 | grub-efi-ia32 | grub-efi-arm64
+Provides: linux-image,
+          linux-image-2.6,
+Suggests: pve-firmware,
+Depends: busybox,
+         grub-pc | grub-efi-amd64 | grub-efi-ia32 | grub-efi-arm64,
+         initramfs-tools,
 Description: The Proxmox PVE Kernel Image
 This package contains the linux kernel and initial ramdisk used for booting
-
-Package: pve-kernel-@KVNAME@-dbgsym
-Architecture: any
-Provides: linux-debug
-Section: devel
-Priority: optional
-Build-Profiles: <pkg.pve-kernel.debug>
-Description: The Proxmox PVE 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 pve-kernel modules
- in their unstripped version.
-
-Package: pve-kernel-libc-dev
-Section: devel
-Priority: optional
-Architecture: any
-Provides: linux-libc-dev (=${binary:Version})
-Conflicts: linux-libc-dev
-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.
@@ -14,9 +14,7 @@ include debian/rules.d/${DEB_BUILD_ARCH}.mk
 CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate)

 PVE_KERNEL_PKG=pve-kernel-${KVNAME}
-PVE_DEBUG_KERNEL_PKG=pve-kernel-${KVNAME}-dbgsym
 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

@@ -34,38 +32,18 @@ PVE_CONFIG_OPTS= \
 -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_NLS_ISO8859_1 \
+-e CONFIG_BLK_DEV_NVME \
 -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 \
 -d CONFIG_MODULE_SIG \
 -d CONFIG_MEMCG_DISABLED \
 -e CONFIG_MEMCG_SWAP_ENABLED \
-e CONFIG_HYPERV \
-m CONFIG_VFIO_IOMMU_TYPE1 \
-m CONFIG_VFIO_VIRQFD \
-m CONFIG_VFIO \
-m CONFIG_VFIO_PCI \
-m CONFIG_USB_XHCI_HCD \
-m CONFIG_USB_XHCI_PCI \
-m CONFIG_USB_EHCI_HCD \
-m CONFIG_USB_EHCI_PCI \
-m CONFIG_USB_EHCI_HCD_PLATFORM \
-m CONFIG_USB_OHCI_HCD \
-m CONFIG_USB_OHCI_HCD_PCI \
-m CONFIG_USB_OHCI_HCD_PLATFORM \
-d CONFIG_USB_OHCI_HCD_SSB \
-m CONFIG_USB_UHCI_HCD \
-d CONFIG_USB_SL811_HCD_ISO \
 -e CONFIG_MEMCG_KMEM \
 -d CONFIG_DEFAULT_CFQ \
 -e CONFIG_DEFAULT_DEADLINE \
@@ -76,11 +54,6 @@ PVE_CONFIG_OPTS= \
 -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 ""\
-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)
@@ -96,7 +69,7 @@ debian/control: $(wildcard debian/*.in)

 build: .compile_mark .tools_compile_mark .modules_compile_mark

-install: .install_mark .tools_install_mark .headers_install_mark .usr_headers_install_mark
+install: .install_mark .tools_install_mark .headers_install_mark
 	dh_installdocs -A debian/copyright debian/SOURCE
 	dh_installchangelogs
 	dh_installman
@@ -106,7 +79,7 @@ install: .install_mark .tools_install_mark .headers_install_mark .usr_headers_in

 binary: install
 	debian/rules fwcheck abicheck
-	dh_strip -N${PVE_HEADER_PKG} -N${PVE_USR_HEADER_PKG}
+	dh_strip -N${PVE_HEADER_PKG}
 	dh_makeshlibs
 	dh_shlibdeps
 	dh_installdeb
@@ -117,9 +90,6 @@ binary: install
 .config_mark:
 	cd ${KERNEL_SRC}; scripts/config ${PVE_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}
 	touch $@

 .compile_mark: .config_mark
@@ -134,25 +104,15 @@ binary: install
 	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 latest ibg driver
+	install -m 644 ${MODULES}/igb.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
+	# install latest e1000e driver
+	install -m 644 ${MODULES}/e1000e.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/e1000e/
 	# install zfs drivers
 	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
+	install -m 644 $(addprefix ${MODULES}/,spl.ko splat.ko zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko icp.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
 	# remove firmware
 	rm -rf debian/${PVE_KERNEL_PKG}/lib/firmware
-
-ifeq ($(filter pkg.pve-kernel.debug,$(DEB_BUILD_PROFILES)),)
-	echo "'pkg.pve-kernel.debug' build profile disabled, skipping -dbgsym creation"
-else
-	echo "'pkg.pve-kernel.debug' build profile enabled, creating -dbgsym contents"
-	mkdir -p debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/lib/modules/${KVNAME}
-	mkdir debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/boot
-	install -m 644 ${KERNEL_SRC}/vmlinux debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/boot/vmlinux-${KVNAME}
-	cp -r debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME} debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/lib/modules/
-	rm -f debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/lib/modules/${KVNAME}/source
-	rm -f debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/lib/modules/${KVNAME}/build
-	rm -f debian/${PVE_DEBUG_KERNEL_PKG}/usr/lib/debug/lib/modules/${KVNAME}/modules.*
-endif
-
 	# strip debug info
 	find debian/${PVE_KERNEL_PKG}/lib/modules -name \*.ko -print | while read f ; do strip --strip-debug "$$f"; done
 	# finalize
@@ -167,7 +127,7 @@ endif
 	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'
@@ -189,6 +149,9 @@ endif
 	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 \
@@ -203,6 +166,7 @@ endif
 	        -o -name '*.pl' \
 	    \) \
 	    -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 | \
@@ -216,9 +180,8 @@ endif
 	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 modules_prepare prepare scripts
-	cd ${KERNEL_SRC_COPY}; cp -a include scripts ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
-	find ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG} -name \*.o.ur-\* -o -name '*.cmd' | xargs rm -f
+	${MAKE} -C ${KERNEL_SRC_COPY} O=${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG} -j1 silentoldconfig 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 $@
@@ -230,39 +193,35 @@ endif
 	ln -sf /usr/src/linux-headers-${KVNAME} debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}/build
 	touch $@

-.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_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 {} +
-
-# Move include/asm to arch-specific directory
-	mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
-	mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
-	test ! -d $(OUT_DIR)/include/arch || \
-		mv $(OUT_DIR)/include/arch $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
+.modules_compile_mark: $(addprefix ${MODULES}/,igb.ko e1000e.ko spl.ko zfs.ko)
 	touch $@

-.modules_compile_mark: ${MODULES}/zfs.ko
-	touch $@
+${MODULES}/spl.ko: .compile_mark
+	cd ${MODULES}/${SPLDIR}; ./autogen.sh
+	cd ${MODULES}/${SPLDIR}; ./configure --with-config=kernel --with-linux=${BUILD_DIR}/${KERNEL_SRC} --with-linux-obj=${BUILD_DIR}/${KERNEL_SRC}
+	${MAKE} -C ${MODULES}/${SPLDIR}
+	cp ${MODULES}/${SPLDIR}/module/splat/splat.ko ${MODULES}/
+	cp ${MODULES}/${SPLDIR}/module/spl/spl.ko ${MODULES}/

-${MODULES}/zfs.ko: .compile_mark
+${MODULES}/zfs.ko: .compile_mark ${MODULES}/spl.ko
 	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}
+	cd ${MODULES}/${ZFSDIR}; ./configure --with-spl=${BUILD_DIR}/${MODULES}/${SPLDIR} --with-spl-obj=${BUILD_DIR}/${MODULES}/${SPLDIR} --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/zpios/zpios.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}/igb.ko: .compile_mark
+	${MAKE} -C ${MODULES}/${IGBDIR}/src BUILD_KERNEL=${KVNAME} KSRC=${BUILD_DIR}/${KERNEL_SRC}
+	cp ${MODULES}/${IGBDIR}/src/igb.ko ${MODULES}/
+
+${MODULES}/e1000e.ko: .compile_mark
+	${MAKE} -C ${MODULES}/${E1000EDIR}/src BUILD_KERNEL=${KVNAME} KSRC=${BUILD_DIR}/${KERNEL_SRC}
+	cp ${MODULES}/${E1000EDIR}/src/e1000e.ko ${MODULES}/

 fwlist-${KVNAME}: .compile_mark .modules_compile_mark
 	debian/scripts/find-firmware.pl debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME} >fwlist.tmp
@@ -6,7 +6,7 @@ top=$(pwd)

 if [ "$#" -ne 3 ]; then
    echo "USAGE: $0 repo patchdir ref"
-    printf "\t exports patches from 'repo' to 'patchdir' based on 'ref'\n"
+    echo "\t exports patches from 'repo' to 'patchdir' based on 'ref'"
    exit 1
 fi

@@ -25,10 +25,10 @@ git format-patch \
    --no-cover-letter \
    --zero-commit \
    --no-signature \
-    --diff-algorithm=myers \
-    --output-directory="${top}/${kernel_patchdir}" \
+    --output-dir \
+    "${top}/${kernel_patchdir}" \
    "${base_ref}.."

-git checkout "${base_ref}"
+git checkout ${base_ref}

 cd "${top}"
@@ -8,7 +8,7 @@ die "no directory to scan" if !$dir;

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

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

 my $apiver = $2;

@@ -0,0 +1,37 @@
+diff --git a/src/netdev.c b/src/netdev.c
+index 73b0f9a..aef1bc2 100644
+--- a/src/netdev.c
+++ b/src/netdev.c
+@@ -6724,19 +6724,12 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
+ 	int max_frame = new_mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
+ 
+ 	/* Jumbo frame support */
+-	if ((max_frame > (VLAN_ETH_FRAME_LEN + ETH_FCS_LEN)) &&
+	if ((new_mtu > ETH_DATA_LEN) &&
+ 	    !(adapter->flags & FLAG_HAS_JUMBO_FRAMES)) {
+ 		e_err("Jumbo Frames not supported.\n");
+ 		return -EINVAL;
+ 	}
+ 
+-	/* Supported frame sizes */
+-	if ((new_mtu < (VLAN_ETH_ZLEN + ETH_FCS_LEN)) ||
+-	    (max_frame > adapter->max_hw_frame_size)) {
+-		e_err("Unsupported MTU setting\n");
+-		return -EINVAL;
+-	}
+-
+ 	/* Jumbo frame workaround on 82579 and newer requires CRC be stripped */
+ 	if ((adapter->hw.mac.type >= e1000_pch2lan) &&
+ 	    !(adapter->flags2 & FLAG2_CRC_STRIPPING) &&
+@@ -8262,6 +8255,11 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+ #endif /* HAVE_NETDEV_VLAN_FEATURES */
+ 	}
+ 
+	/* MTU range: 68 - max_hw_frame_size */
+	netdev->min_mtu = ETH_MIN_MTU;
+	netdev->max_mtu = adapter->max_hw_frame_size -
+	                  (VLAN_ETH_HLEN + ETH_FCS_LEN);
+
+ 	if (e1000e_enable_mng_pass_thru(&adapter->hw))
+ 		adapter->flags |= FLAG_MNG_PT_ENABLED;
+ 
@@ -0,0 +1,53 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Tue, 5 Jun 2018 11:16:29 +0200
+Subject: [PATCH] port to new internal kernel timer API
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+diff --git a/src/netdev.c b/src/netdev.c
+--- a/src/netdev.c
+++ b/src/netdev.c
+@@ -5389,9 +5389,10 @@
+  * Need to wait a few seconds after link up to get diagnostic information from
+  * the phy
+  **/
+-static void e1000_update_phy_info(unsigned long data)
+static void e1000_update_phy_info(struct timer_list *t)
+ {
+-	struct e1000_adapter *adapter = (struct e1000_adapter *)data;
+	struct e1000_adapter *adapter;
+	adapter = from_timer(adapter, t, phy_info_timer);
+ 
+ 	if (test_bit(__E1000_DOWN, &adapter->state))
+ 		return;
+@@ -5774,9 +5775,10 @@
+  * e1000_watchdog - Timer Call-back
+  * @data: pointer to adapter cast into an unsigned long
+  **/
+-static void e1000_watchdog(unsigned long data)
+static void e1000_watchdog(struct timer_list *t)
+ {
+-	struct e1000_adapter *adapter = (struct e1000_adapter *)data;
+	struct e1000_adapter *adapter;
+	adapter = from_timer(adapter, t, watchdog_timer);
+ 
+ 	/* Do the rest outside of interrupt context */
+ 	schedule_work(&adapter->watchdog_task);
+@@ -8348,13 +8348,9 @@
+ 		goto err_eeprom;
+ 	}
+ 
+-	init_timer(&adapter->watchdog_timer);
+-	adapter->watchdog_timer.function = e1000_watchdog;
+-	adapter->watchdog_timer.data = (unsigned long)adapter;
+-
+-	init_timer(&adapter->phy_info_timer);
+-	adapter->phy_info_timer.function = e1000_update_phy_info;
+-	adapter->phy_info_timer.data = (unsigned long)adapter;
+	timer_setup(&adapter->watchdog_timer, e1000_watchdog, 0);
+
+	timer_setup(&adapter->phy_info_timer, e1000_update_phy_info, 0);
+ 
+ 	INIT_WORK(&adapter->reset_task, e1000_reset_task);
+ 	INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task);
@@ -0,0 +1,15 @@
+diff --git a/src/igb_main.c.orig b/src/igb_main.c
+index 3ee1ec7..c8adf04 100644
+--- a/src/igb_main.c.orig
+++ b/src/igb_main.c
+@@ -5888,10 +5888,8 @@ static int igb_change_mtu(struct net_dev
+ 	while (test_and_set_bit(__IGB_RESETTING, &adapter->state))
+ 		usleep_range(1000, 2000);
+ 
+-#ifndef HAVE_NETDEVICE_MIN_MAX_MTU
+ 	/* igb_down has a dependency on max_frame_size */
+ 	adapter->max_frame_size = max_frame;
+-#endif
+ 
+ 	if (netif_running(netdev))
+ 		igb_down(adapter);
@@ -0,0 +1,18 @@
+diff --git a/src/Makefile.orig b/src/Makefile
+index 8e962f7..50bcdcc 100644
+--- a/src/Makefile.orig
+++ b/src/Makefile
+@@ -123,6 +123,13 @@ ifeq (,$(CC))
+   $(error Compiler not found)
+ endif
+ 
+# workaround for GCC6's default PIE
+ifeq ($(CC),gcc)
+  PIE_TEST = [ -z "`$(CC) -fno-PIE -no-pie -x c -c /dev/null -o /dev/null 2>&1`" ]
+  PIE_FLAGS := $(shell $(PIE_TEST) && echo '-fno-PIE -no-pie')
+  EXTRA_CFLAGS += $(PIE_FLAGS)
+endif
+
+ # we need to know what platform the driver is being built on
+ # some additional features are only built on Intel platforms
+ ARCH := $(shell uname -m | sed 's/i.86/i386/')
@@ -21,10 +21,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 7 insertions(+), 3 deletions(-)

 diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
-index a72b154de7b0..4dd111086466 100755
+index 87f1fc9801d7..4ef868f1f244 100755
 --- a/scripts/mkcompile_h
 +++ b/scripts/mkcompile_h
-@@ -24,10 +24,14 @@ else
+@@ -33,10 +33,14 @@ else
 	VERSION=$KBUILD_BUILD_VERSION
 fi
 
@@ -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 ba55851fe132..82675e1ecfb8 100644
+index 808e2b914015..b0ad54384826 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)
+@@ -259,10 +259,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br)
 		return false;
 
 	list_for_each_entry(p, &br->port_list, list) {
@@ -51,14 +51,14 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 .../admin-guide/kernel-parameters.txt         |   9 ++
- drivers/pci/quirks.c                          | 102 ++++++++++++++++++
- 2 files changed, 111 insertions(+)
+ drivers/pci/quirks.c                          | 101 ++++++++++++++++++
+ 2 files changed, 110 insertions(+)

 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index ee85be64b680..a38a8e44422e 100644
+index 325a5dd7813d..a95cc0b61b29 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3653,6 +3653,15 @@
+@@ -3181,6 +3181,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,11 +75,11 @@ index ee85be64b680..a38a8e44422e 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 872cd0cecf6d..127401e15384 100644
+index e5d1a00c481d..7ecd84506d8d 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void)
- }
+@@ -3769,6 +3769,106 @@ static int __init pci_apply_final_quirks(void)
+ 
 fs_initcall_sync(pci_apply_final_quirks);
 
 +static bool acs_on_downstream;
@@ -183,14 +183,13 @@ index 872cd0cecf6d..127401e15384 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
-@@ -4886,6 +4986,8 @@ static const struct pci_dev_acs_enabled {
- 	{ PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs },
+  * Following are device-specific reset methods which can be used to
+  * reset a single function if other methods (e.g. FLR, PM D0->D3) are
+@@ -4664,6 +4764,7 @@ static const struct pci_dev_acs_enabled {
+ 	{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
 	/* APM X-Gene */
 	{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },
-+	/* Enable overrides for missing ACS capabilities */
 +	{ PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
- 	/* Ampere Computing */
- 	{ PCI_VENDOR_ID_AMPERE, 0xE005, pci_quirk_xgene_acs },
- 	{ PCI_VENDOR_ID_AMPERE, 0xE006, pci_quirk_xgene_acs },
+ 	{ 0 }
+ };
+ 
@@ -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 16c777d45eb9..8c5341f9a271 100644
+index 706b13f0c698..c6749d154ebc 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
-@@ -77,7 +77,7 @@ module_param(halt_poll_ns, uint, 0644);
+@@ -78,7 +78,7 @@ module_param(halt_poll_ns, uint, 0644);
 EXPORT_SYMBOL_GPL(halt_poll_ns);
 
 /* Default doubles per-vcpu halt_poll_ns. */
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-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
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@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 5cc9226f8e67..7dd94b012533 100644
--- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -10392,7 +10392,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;
- 		}
@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Changwei Ge <ge.changwei@h3c.com>
+Date: Wed, 31 Jan 2018 16:15:02 -0800
+Subject: [PATCH] ocfs2: make metadata estimation accurate and clear
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Current code assume that ::w_unwritten_list always has only one item on.
+This is not right and hard to get understood.  So improve how to count
+unwritten item.
+
+Link: http://lkml.kernel.org/r/1515479070-32653-1-git-send-email-ge.changwei@h3c.com
+Signed-off-by: Changwei Ge <ge.changwei@h3c.com>
+Reported-by: John Lightsey <john@nixnuts.net>
+Tested-by: John Lightsey <john@nixnuts.net>
+Cc: Mark Fasheh <mfasheh@versity.com>
+Cc: Joseph Qi <jiangqi903@gmail.com>
+Cc: Junxiao Bi <junxiao.bi@oracle.com>
+Cc: Joel Becker <jlbec@evilplan.org>
+Cc: Changwei Ge <ge.changwei@h3c.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+(cherry picked from commit 63de8bd9328bf2a778fc277503da163ae3defa3c)
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ fs/ocfs2/aops.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
+index 7de0c9562b70..209cec7efef4 100644
+--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
+@@ -797,6 +797,7 @@ struct ocfs2_write_ctxt {
+ 	struct ocfs2_cached_dealloc_ctxt w_dealloc;
+ 
+ 	struct list_head		w_unwritten_list;
+	unsigned int			w_unwritten_count;
+ };
+ 
+ void ocfs2_unlock_and_free_pages(struct page **pages, int num_pages)
+@@ -1386,6 +1387,7 @@ static int ocfs2_unwritten_check(struct inode *inode,
+ 	desc->c_clear_unwritten = 0;
+ 	list_add_tail(&new->ue_ip_node, &oi->ip_unwritten_list);
+ 	list_add_tail(&new->ue_node, &wc->w_unwritten_list);
+	wc->w_unwritten_count++;
+ 	new = NULL;
+ unlock:
+ 	spin_unlock(&oi->ip_lock);
+@@ -2277,7 +2279,7 @@ static int ocfs2_dio_wr_get_block(struct inode *inode, sector_t iblock,
+ 		ue->ue_phys = desc->c_phys;
+ 
+ 		list_splice_tail_init(&wc->w_unwritten_list, &dwc->dw_zero_list);
+-		dwc->dw_zero_count++;
+		dwc->dw_zero_count += wc->w_unwritten_count;
+ 	}
+ 
+ 	ret = ocfs2_write_end_nolock(inode->i_mapping, pos, len, len, wc);
@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fabian Ebner <f.ebner@proxmox.com>
-Date: Wed, 28 Jul 2021 08:55:31 +0200
-Subject: [PATCH] io_uring: don't block level reissue off completion path
-
-Some setups, like SCSI, can throw spurious -EAGAIN off the softirq
-completion path. Normally we expect this to happen inline as part
-of submission, but apparently SCSI has a weird corner case where it
-can happen as part of normal completions.
-
-This should be solved by having the -EAGAIN bubble back up the stack
-as part of submission, but previous attempts at this failed and we're
-not just quite there yet. Instead we currently use REQ_F_REISSUE to
-handle this case.
-
-For now, catch it in io_rw_should_reissue() and prevent a reissue
-from a bogus path.
-
-Upstream mail:
-https://lore.kernel.org/io-uring/20210727165811.284510-3-axboe@kernel.dk/T/#u
-
-Originally-by: Jens Axboe <axboe@kernel.dk>
-[backport]
-Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- fs/io_uring.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/fs/io_uring.c b/fs/io_uring.c
-index b9353cf8aab9..50d1920d2536 100644
--- a/fs/io_uring.c
-+++ b/fs/io_uring.c
-@@ -2746,6 +2746,13 @@ static bool io_rw_reissue(struct io_kiocb *req, long res)
- 	if (percpu_ref_is_dying(&req->ctx->refs))
- 		return false;
- 
-+	/*
-+	 * Play it safe and assume not safe to re-import and reissue if we're
-+	 * not in the original thread group (or in task context).
-+	 */
-+	if (!same_thread_group(req->task, current) || !in_task())
-+		return false;
-+
- 	lockdep_assert_held(&req->ctx->uring_lock);
- 
- 	ret = io_sq_thread_acquire_mm_files(req->ctx, req);
@@ -0,0 +1,368 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Changwei Ge <ge.changwei@h3c.com>
+Date: Wed, 31 Jan 2018 16:15:06 -0800
+Subject: [PATCH] ocfs2: try to reuse extent block in dealloc without
+ meta_alloc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A crash issue was reported by John Lightsey with a call trace as follows:
+
+  ocfs2_split_extent+0x1ad3/0x1b40 [ocfs2]
+  ocfs2_change_extent_flag+0x33a/0x470 [ocfs2]
+  ocfs2_mark_extent_written+0x172/0x220 [ocfs2]
+  ocfs2_dio_end_io+0x62d/0x910 [ocfs2]
+  dio_complete+0x19a/0x1a0
+  do_blockdev_direct_IO+0x19dd/0x1eb0
+  __blockdev_direct_IO+0x43/0x50
+  ocfs2_direct_IO+0x8f/0xa0 [ocfs2]
+  generic_file_direct_write+0xb2/0x170
+  __generic_file_write_iter+0xc3/0x1b0
+  ocfs2_file_write_iter+0x4bb/0xca0 [ocfs2]
+  __vfs_write+0xae/0xf0
+  vfs_write+0xb8/0x1b0
+  SyS_write+0x4f/0xb0
+  system_call_fastpath+0x16/0x75
+
+The BUG code told that extent tree wants to grow but no metadata was
+reserved ahead of time.  From my investigation into this issue, the root
+cause it that although enough metadata is not reserved, there should be
+enough for following use.  Rightmost extent is merged into its left one
+due to a certain times of marking extent written.  Because during
+marking extent written, we got many physically continuous extents.  At
+last, an empty extent showed up and the rightmost path is removed from
+extent tree.
+
+Add a new mechanism to reuse extent block cached in dealloc which were
+just unlinked from extent tree to solve this crash issue.
+
+Criteria is that during marking extents *written*, if extent rotation
+and merging results in unlinking extent with growing extent tree later
+without any metadata reserved ahead of time, try to reuse those extents
+in dealloc in which deleted extents are cached.
+
+Also, this patch addresses the issue John reported that ::dw_zero_count
+is not calculated properly.
+
+After applying this patch, the issue John reported was gone.  Thanks for
+the reproducer provided by John.  And this patch has passed
+ocfs2-test(29 cases) suite running by New H3C Group.
+
+[ge.changwei@h3c.com: fix static checker warnning]
+  Link: http://lkml.kernel.org/r/63ADC13FD55D6546B7DECE290D39E373F29196AE@H3CMLB12-EX.srv.huawei-3com.com
+[akpm@linux-foundation.org: brelse(NULL) is legal]
+Link: http://lkml.kernel.org/r/1515479070-32653-2-git-send-email-ge.changwei@h3c.com
+Signed-off-by: Changwei Ge <ge.changwei@h3c.com>
+Reported-by: John Lightsey <john@nixnuts.net>
+Tested-by: John Lightsey <john@nixnuts.net>
+Cc: Joel Becker <jlbec@evilplan.org>
+Cc: Joseph Qi <jiangqi903@gmail.com>
+Cc: Junxiao Bi <junxiao.bi@oracle.com>
+Cc: Dan Carpenter <dan.carpenter@oracle.com>
+Cc: Mark Fasheh <mfasheh@versity.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+(cherry picked from commit 71a36944042b7d9dd71f6a5d1c5ea1c2353b5d42)
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ fs/ocfs2/alloc.c | 206 ++++++++++++++++++++++++++++++++++++++++++++---
+ fs/ocfs2/alloc.h |   1 +
+ fs/ocfs2/aops.c  |   6 ++
+ 3 files changed, 203 insertions(+), 10 deletions(-)
+
+diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
+index 6b177de324c0..3760888f2e76 100644
+--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
+@@ -165,6 +165,13 @@ static int ocfs2_dinode_insert_check(struct ocfs2_extent_tree *et,
+ 				     struct ocfs2_extent_rec *rec);
+ static int ocfs2_dinode_sanity_check(struct ocfs2_extent_tree *et);
+ static void ocfs2_dinode_fill_root_el(struct ocfs2_extent_tree *et);
+
+static int ocfs2_reuse_blk_from_dealloc(handle_t *handle,
+					struct ocfs2_extent_tree *et,
+					struct buffer_head **new_eb_bh,
+					int blk_wanted, int *blk_given);
+static int ocfs2_is_dealloc_empty(struct ocfs2_extent_tree *et);
+
+ static const struct ocfs2_extent_tree_operations ocfs2_dinode_et_ops = {
+ 	.eo_set_last_eb_blk	= ocfs2_dinode_set_last_eb_blk,
+ 	.eo_get_last_eb_blk	= ocfs2_dinode_get_last_eb_blk,
+@@ -448,6 +455,7 @@ static void __ocfs2_init_extent_tree(struct ocfs2_extent_tree *et,
+ 	if (!obj)
+ 		obj = (void *)bh->b_data;
+ 	et->et_object = obj;
+	et->et_dealloc = NULL;
+ 
+ 	et->et_ops->eo_fill_root_el(et);
+ 	if (!et->et_ops->eo_fill_max_leaf_clusters)
+@@ -1158,7 +1166,7 @@ static int ocfs2_add_branch(handle_t *handle,
+ 			    struct buffer_head **last_eb_bh,
+ 			    struct ocfs2_alloc_context *meta_ac)
+ {
+-	int status, new_blocks, i;
+	int status, new_blocks, i, block_given = 0;
+ 	u64 next_blkno, new_last_eb_blk;
+ 	struct buffer_head *bh;
+ 	struct buffer_head **new_eb_bhs = NULL;
+@@ -1213,11 +1221,31 @@ static int ocfs2_add_branch(handle_t *handle,
+ 		goto bail;
+ 	}
+ 
+-	status = ocfs2_create_new_meta_bhs(handle, et, new_blocks,
+-					   meta_ac, new_eb_bhs);
+-	if (status < 0) {
+-		mlog_errno(status);
+-		goto bail;
+	/* Firstyly, try to reuse dealloc since we have already estimated how
+	 * many extent blocks we may use.
+	 */
+	if (!ocfs2_is_dealloc_empty(et)) {
+		status = ocfs2_reuse_blk_from_dealloc(handle, et,
+						      new_eb_bhs, new_blocks,
+						      &block_given);
+		if (status < 0) {
+			mlog_errno(status);
+			goto bail;
+		}
+	}
+
+	BUG_ON(block_given > new_blocks);
+
+	if (block_given < new_blocks) {
+		BUG_ON(!meta_ac);
+		status = ocfs2_create_new_meta_bhs(handle, et,
+						   new_blocks - block_given,
+						   meta_ac,
+						   &new_eb_bhs[block_given]);
+		if (status < 0) {
+			mlog_errno(status);
+			goto bail;
+		}
+ 	}
+ 
+ 	/* Note: new_eb_bhs[new_blocks - 1] is the guy which will be
+@@ -1340,15 +1368,25 @@ static int ocfs2_shift_tree_depth(handle_t *handle,
+ 				  struct ocfs2_alloc_context *meta_ac,
+ 				  struct buffer_head **ret_new_eb_bh)
+ {
+-	int status, i;
+	int status, i, block_given = 0;
+ 	u32 new_clusters;
+ 	struct buffer_head *new_eb_bh = NULL;
+ 	struct ocfs2_extent_block *eb;
+ 	struct ocfs2_extent_list  *root_el;
+ 	struct ocfs2_extent_list  *eb_el;
+ 
+-	status = ocfs2_create_new_meta_bhs(handle, et, 1, meta_ac,
+-					   &new_eb_bh);
+	if (!ocfs2_is_dealloc_empty(et)) {
+		status = ocfs2_reuse_blk_from_dealloc(handle, et,
+						      &new_eb_bh, 1,
+						      &block_given);
+	} else if (meta_ac) {
+		status = ocfs2_create_new_meta_bhs(handle, et, 1, meta_ac,
+						   &new_eb_bh);
+
+	} else {
+		BUG();
+	}
+
+ 	if (status < 0) {
+ 		mlog_errno(status);
+ 		goto bail;
+@@ -1511,7 +1549,7 @@ static int ocfs2_grow_tree(handle_t *handle, struct ocfs2_extent_tree *et,
+ 	int depth = le16_to_cpu(el->l_tree_depth);
+ 	struct buffer_head *bh = NULL;
+ 
+-	BUG_ON(meta_ac == NULL);
+	BUG_ON(meta_ac == NULL && ocfs2_is_dealloc_empty(et));
+ 
+ 	shift = ocfs2_find_branch_target(et, &bh);
+ 	if (shift < 0) {
+@@ -6585,6 +6623,154 @@ ocfs2_find_per_slot_free_list(int type,
+ 	return fl;
+ }
+ 
+static struct ocfs2_per_slot_free_list *
+ocfs2_find_preferred_free_list(int type,
+			       int preferred_slot,
+			       int *real_slot,
+			       struct ocfs2_cached_dealloc_ctxt *ctxt)
+{
+	struct ocfs2_per_slot_free_list *fl = ctxt->c_first_suballocator;
+
+	while (fl) {
+		if (fl->f_inode_type == type && fl->f_slot == preferred_slot) {
+			*real_slot = fl->f_slot;
+			return fl;
+		}
+
+		fl = fl->f_next_suballocator;
+	}
+
+	/* If we can't find any free list matching preferred slot, just use
+	 * the first one.
+	 */
+	fl = ctxt->c_first_suballocator;
+	*real_slot = fl->f_slot;
+
+	return fl;
+}
+
+/* Return Value 1 indicates empty */
+static int ocfs2_is_dealloc_empty(struct ocfs2_extent_tree *et)
+{
+	struct ocfs2_per_slot_free_list *fl = NULL;
+
+	if (!et->et_dealloc)
+		return 1;
+
+	fl = et->et_dealloc->c_first_suballocator;
+	if (!fl)
+		return 1;
+
+	if (!fl->f_first)
+		return 1;
+
+	return 0;
+}
+
+/* If extent was deleted from tree due to extent rotation and merging, and
+ * no metadata is reserved ahead of time. Try to reuse some extents
+ * just deleted. This is only used to reuse extent blocks.
+ * It is supposed to find enough extent blocks in dealloc if our estimation
+ * on metadata is accurate.
+ */
+static int ocfs2_reuse_blk_from_dealloc(handle_t *handle,
+					struct ocfs2_extent_tree *et,
+					struct buffer_head **new_eb_bh,
+					int blk_wanted, int *blk_given)
+{
+	int i, status = 0, real_slot;
+	struct ocfs2_cached_dealloc_ctxt *dealloc;
+	struct ocfs2_per_slot_free_list *fl;
+	struct ocfs2_cached_block_free *bf;
+	struct ocfs2_extent_block *eb;
+	struct ocfs2_super *osb =
+		OCFS2_SB(ocfs2_metadata_cache_get_super(et->et_ci));
+
+	*blk_given = 0;
+
+	/* If extent tree doesn't have a dealloc, this is not faulty. Just
+	 * tell upper caller dealloc can't provide any block and it should
+	 * ask for alloc to claim more space.
+	 */
+	dealloc = et->et_dealloc;
+	if (!dealloc)
+		goto bail;
+
+	for (i = 0; i < blk_wanted; i++) {
+		/* Prefer to use local slot */
+		fl = ocfs2_find_preferred_free_list(EXTENT_ALLOC_SYSTEM_INODE,
+						    osb->slot_num, &real_slot,
+						    dealloc);
+		/* If no more block can be reused, we should claim more
+		 * from alloc. Just return here normally.
+		 */
+		if (!fl) {
+			status = 0;
+			break;
+		}
+
+		bf = fl->f_first;
+		fl->f_first = bf->free_next;
+
+		new_eb_bh[i] = sb_getblk(osb->sb, bf->free_blk);
+		if (new_eb_bh[i] == NULL) {
+			status = -ENOMEM;
+			mlog_errno(status);
+			goto bail;
+		}
+
+		mlog(0, "Reusing block(%llu) from "
+		     "dealloc(local slot:%d, real slot:%d)\n",
+		     bf->free_blk, osb->slot_num, real_slot);
+
+		ocfs2_set_new_buffer_uptodate(et->et_ci, new_eb_bh[i]);
+
+		status = ocfs2_journal_access_eb(handle, et->et_ci,
+						 new_eb_bh[i],
+						 OCFS2_JOURNAL_ACCESS_CREATE);
+		if (status < 0) {
+			mlog_errno(status);
+			goto bail;
+		}
+
+		memset(new_eb_bh[i]->b_data, 0, osb->sb->s_blocksize);
+		eb = (struct ocfs2_extent_block *) new_eb_bh[i]->b_data;
+
+		/* We can't guarantee that buffer head is still cached, so
+		 * polutlate the extent block again.
+		 */
+		strcpy(eb->h_signature, OCFS2_EXTENT_BLOCK_SIGNATURE);
+		eb->h_blkno = cpu_to_le64(bf->free_blk);
+		eb->h_fs_generation = cpu_to_le32(osb->fs_generation);
+		eb->h_suballoc_slot = cpu_to_le16(real_slot);
+		eb->h_suballoc_loc = cpu_to_le64(bf->free_bg);
+		eb->h_suballoc_bit = cpu_to_le16(bf->free_bit);
+		eb->h_list.l_count =
+			cpu_to_le16(ocfs2_extent_recs_per_eb(osb->sb));
+
+		/* We'll also be dirtied by the caller, so
+		 * this isn't absolutely necessary.
+		 */
+		ocfs2_journal_dirty(handle, new_eb_bh[i]);
+
+		if (!fl->f_first) {
+			dealloc->c_first_suballocator = fl->f_next_suballocator;
+			kfree(fl);
+		}
+		kfree(bf);
+	}
+
+	*blk_given = i;
+
+bail:
+	if (unlikely(status < 0)) {
+		for (i = 0; i < blk_wanted; i++)
+			brelse(new_eb_bh[i]);
+	}
+
+	return status;
+}
+
+ int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt,
+ 			      int type, int slot, u64 suballoc,
+ 			      u64 blkno, unsigned int bit)
+diff --git a/fs/ocfs2/alloc.h b/fs/ocfs2/alloc.h
+index 27b75cf32cfa..250bcacdf9e9 100644
+--- a/fs/ocfs2/alloc.h
+++ b/fs/ocfs2/alloc.h
+@@ -61,6 +61,7 @@ struct ocfs2_extent_tree {
+ 	ocfs2_journal_access_func		et_root_journal_access;
+ 	void					*et_object;
+ 	unsigned int				et_max_leaf_clusters;
+	struct ocfs2_cached_dealloc_ctxt	*et_dealloc;
+ };
+ 
+ /*
+diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
+index 209cec7efef4..1cf7ac84b70b 100644
+--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
+@@ -2353,6 +2353,12 @@ static int ocfs2_dio_end_io_write(struct inode *inode,
+ 
+ 	ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), di_bh);
+ 
+	/* Attach dealloc with extent tree in case that we may reuse extents
+	 * which are already unlinked from current extent tree due to extent
+	 * rotation and merging.
+	 */
+	et.et_dealloc = &dealloc;
+
+ 	ret = ocfs2_lock_allocators(inode, &et, 0, dwc->dw_zero_count*2,
+ 				    &data_ac, &meta_ac);
+ 	if (ret) {
@@ -1,105 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Mon, 2 Aug 2021 10:22:30 +0200
-Subject: [PATCH] Revert "PCI: Coalesce host bridge contiguous apertures"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit c2ff8072deba40887560dc73dd2e558ec539ea09.
-
-was reverted upstream because of reports similar to
-
-Link: https://bugzilla.proxmox.com/show_bug.cgi?id=3552
-Link: https://lore.kernel.org/r/20210709231529.GA3270116@roeck-us.net
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- drivers/pci/probe.c | 52 +++++----------------------------------------
- 1 file changed, 5 insertions(+), 47 deletions(-)
-
-diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index b5fdf42c4c2a..be51670572fa 100644
--- a/drivers/pci/probe.c
-+++ b/drivers/pci/probe.c
-@@ -19,7 +19,6 @@
- #include <linux/hypervisor.h>
- #include <linux/irqdomain.h>
- #include <linux/pm_runtime.h>
-#include <linux/list_sort.h>
- #include "pci.h"
- 
- #define CARDBUS_LATENCY_TIMER	176	/* secondary latency timer */
-@@ -875,31 +874,14 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus)
- 	dev_set_msi_domain(&bus->dev, d);
- }
- 
-static int res_cmp(void *priv, const struct list_head *a,
-		  const struct list_head *b)
-{
-	struct resource_entry *entry1, *entry2;
-
-	entry1 = container_of(a, struct resource_entry, node);
-	entry2 = container_of(b, struct resource_entry, node);
-
-	if (entry1->res->flags != entry2->res->flags)
-		return entry1->res->flags > entry2->res->flags;
-
-	if (entry1->offset != entry2->offset)
-		return entry1->offset > entry2->offset;
-
-	return entry1->res->start > entry2->res->start;
-}
-
- static int pci_register_host_bridge(struct pci_host_bridge *bridge)
- {
- 	struct device *parent = bridge->dev.parent;
-	struct resource_entry *window, *next, *n;
-+	struct resource_entry *window, *n;
- 	struct pci_bus *bus, *b;
-	resource_size_t offset, next_offset;
-+	resource_size_t offset;
- 	LIST_HEAD(resources);
-	struct resource *res, *next_res;
-+	struct resource *res;
- 	char addr[64], *fmt;
- 	const char *name;
- 	int err;
-@@ -977,35 +959,11 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
- 	if (nr_node_ids > 1 && pcibus_to_node(bus) == NUMA_NO_NODE)
- 		dev_warn(&bus->dev, "Unknown NUMA node; performance will be reduced\n");
- 
-	/* Sort and coalesce contiguous windows */
-	list_sort(NULL, &resources, res_cmp);
-	resource_list_for_each_entry_safe(window, n, &resources) {
-		if (list_is_last(&window->node, &resources))
-			break;
-
-		next = list_next_entry(window, node);
-		offset = window->offset;
-		res = window->res;
-		next_offset = next->offset;
-		next_res = next->res;
-
-		if (res->flags != next_res->flags || offset != next_offset)
-			continue;
-
-		if (res->end + 1 == next_res->start) {
-			next_res->start = res->start;
-			res->flags = res->start = res->end = 0;
-		}
-	}
-
- 	/* Add initial resources to the bus */
- 	resource_list_for_each_entry_safe(window, n, &resources) {
-		offset = window->offset;
-		res = window->res;
-		if (!res->end)
-			continue;
-
- 		list_move_tail(&window->node, &bridge->windows);
-+		offset = window->offset;
-+		res = window->res;
- 
- 		if (res->flags & IORESOURCE_BUS)
- 			pci_bus_insert_busn_res(bus, bus->number, res->end);
@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Tue, 3 Apr 2018 14:59:26 +0200
+Subject: [PATCH] Revert "UBUNTU: [Packaging] retpoline -- add safe usage hint
+ support"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This (partially) reverts commit 1e39020902132b3065bedf0a0c33031e89f9f57a.
+
+this modifies the upstream kernel build to call an Ubuntu script which
+we remove before building. it would also be required by any module
+builds afterwards and is not shipped by Ubuntu's kernel packages either.
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ scripts/Makefile.build | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/scripts/Makefile.build b/scripts/Makefile.build
+index 5d72aa39d3c1..451546219dfc 100644
+--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
+@@ -295,27 +295,19 @@ objtool_dep = $(objtool_obj)					\
+ 	      $(wildcard include/config/orc/unwinder.h		\
+ 			 include/config/stack/validation.h)
+ 
+-ifdef CONFIG_RETPOLINE
+-cmd_ubuntu_retpoline = $(CONFIG_SHELL) $(srctree)/scripts/ubuntu-retpoline-extract-one $(@) $(<) "$(filter -m16 %code16gcc.h,$(a_flags))";
+-else
+-cmd_ubuntu_retpoline =
+-endif
+-
+ define rule_cc_o_c
+ 	$(call echo-cmd,checksrc) $(cmd_checksrc)			  \
+ 	$(call cmd_and_fixdep,cc_o_c)					  \
+ 	$(cmd_checkdoc)							  \
+ 	$(call echo-cmd,objtool) $(cmd_objtool)				  \
+ 	$(cmd_modversions_c)						  \
+-	$(call echo-cmd,ubuntu-retpoline) $(cmd_ubuntu_retpoline)	  \
+ 	$(call echo-cmd,record_mcount) $(cmd_record_mcount)
+ endef
+ 
+ define rule_as_o_S
+ 	$(call cmd_and_fixdep,as_o_S)					  \
+ 	$(call echo-cmd,objtool) $(cmd_objtool)				  \
+-	$(cmd_modversions_S)						  \
+-	$(call echo-cmd,ubuntu-retpoline) $(cmd_ubuntu_retpoline)
+	$(cmd_modversions_S)
+ endef
+ 
+ # List module undefined symbols (or empty line if not enabled)
@@ -0,0 +1,168 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Christoffer Dall <christoffer.dall@linaro.org>
+Date: Mon, 4 Dec 2017 21:35:23 +0100
+Subject: [PATCH] KVM: Take vcpu->mutex outside vcpu_load
+
+As we're about to call vcpu_load() from architecture-specific
+implementations of the KVM vcpu ioctls, but yet we access data
+structures protected by the vcpu->mutex in the generic code, factor
+this logic out from vcpu_load().
+
+x86 is the only architecture which calls vcpu_load() outside of the main
+vcpu ioctl function, and these calls will no longer take the vcpu mutex
+following this patch.  However, with the exception of
+kvm_arch_vcpu_postcreate (see below), the callers are either in the
+creation or destruction path of the VCPU, which means there cannot be
+any concurrent access to the data structure, because the file descriptor
+is not yet accessible, or is already gone.
+
+kvm_arch_vcpu_postcreate makes the newly created vcpu potentially
+accessible by other in-kernel threads through the kvm->vcpus array, and
+we therefore take the vcpu mutex in this case directly.
+
+Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
+Reviewed-by: Cornelia Huck <cohuck@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+(cherry picked from commit ec7660ccdd2b71d8c7f0243f8590253713e9b75d)
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ arch/x86/kvm/vmx.c       |  4 +---
+ arch/x86/kvm/x86.c       | 16 ++++++----------
+ include/linux/kvm_host.h |  2 +-
+ virt/kvm/kvm_main.c      | 17 ++++++-----------
+ 4 files changed, 14 insertions(+), 25 deletions(-)
+
+diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
+index 6875c8d13052..5dc2144a0991 100644
+--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
+@@ -10017,10 +10017,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs)
+ static void vmx_free_vcpu_nested(struct kvm_vcpu *vcpu)
+ {
+        struct vcpu_vmx *vmx = to_vmx(vcpu);
+-       int r;
+ 
+-       r = vcpu_load(vcpu);
+-       BUG_ON(r);
+       vcpu_load(vcpu);
+        vmx_switch_vmcs(vcpu, &vmx->vmcs01);
+        free_nested(vmx);
+        vcpu_put(vcpu);
+diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
+index 960b14ba645e..6b1e434ceaf8 100644
+--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
+@@ -8061,17 +8061,13 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
+ 
+ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
+ {
+-	int r;
+-
+ 	vcpu->arch.arch_capabilities = kvm_get_arch_capabilities();
+ 	kvm_vcpu_mtrr_init(vcpu);
+-	r = vcpu_load(vcpu);
+-	if (r)
+-		return r;
+	vcpu_load(vcpu);
+ 	kvm_vcpu_reset(vcpu, false);
+ 	kvm_mmu_setup(vcpu);
+ 	vcpu_put(vcpu);
+-	return r;
+	return 0;
+ }
+ 
+ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
+@@ -8081,13 +8077,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
+ 
+ 	kvm_hv_vcpu_postcreate(vcpu);
+ 
+-	if (vcpu_load(vcpu))
+	if (mutex_lock_killable(&vcpu->mutex))
+ 		return;
+	vcpu_load(vcpu);
+ 	msr.data = 0x0;
+ 	msr.index = MSR_IA32_TSC;
+ 	msr.host_initiated = true;
+ 	kvm_write_tsc(vcpu, &msr);
+ 	vcpu_put(vcpu);
+	mutex_unlock(&vcpu->mutex);
+ 
+ 	if (!kvmclock_periodic_sync)
+ 		return;
+@@ -8474,9 +8472,7 @@ int kvm_arch_post_init_vm(struct kvm *kvm)
+ 
+ static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)
+ {
+-	int r;
+-	r = vcpu_load(vcpu);
+-	BUG_ON(r);
+	vcpu_load(vcpu);
+ 	kvm_mmu_unload(vcpu);
+ 	vcpu_put(vcpu);
+ }
+diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
+index f182bbfb0ac5..f8b7ac63219d 100644
+--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
+@@ -560,7 +560,7 @@ static inline int kvm_vcpu_get_idx(struct kvm_vcpu *vcpu)
+ int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id);
+ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
+ 
+-int __must_check vcpu_load(struct kvm_vcpu *vcpu);
+void vcpu_load(struct kvm_vcpu *vcpu);
+ void vcpu_put(struct kvm_vcpu *vcpu);
+ 
+ #ifdef __KVM_HAVE_IOAPIC
+diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
+index c6749d154ebc..66998264619b 100644
+--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
+@@ -172,17 +172,12 @@ bool kvm_is_reserved_pfn(kvm_pfn_t pfn)
+ /*
+  * Switches to specified vcpu, until a matching vcpu_put()
+  */
+-int vcpu_load(struct kvm_vcpu *vcpu)
+void vcpu_load(struct kvm_vcpu *vcpu)
+ {
+-	int cpu;
+-
+-	if (mutex_lock_killable(&vcpu->mutex))
+-		return -EINTR;
+-	cpu = get_cpu();
+	int cpu = get_cpu();
+ 	preempt_notifier_register(&vcpu->preempt_notifier);
+ 	kvm_arch_vcpu_load(vcpu, cpu);
+ 	put_cpu();
+-	return 0;
+ }
+ EXPORT_SYMBOL_GPL(vcpu_load);
+ 
+@@ -192,7 +187,6 @@ void vcpu_put(struct kvm_vcpu *vcpu)
+ 	kvm_arch_vcpu_put(vcpu);
+ 	preempt_notifier_unregister(&vcpu->preempt_notifier);
+ 	preempt_enable();
+-	mutex_unlock(&vcpu->mutex);
+ }
+ EXPORT_SYMBOL_GPL(vcpu_put);
+ 
+@@ -2786,9 +2780,9 @@ static long kvm_vcpu_ioctl(struct file *filp,
+ #endif
+ 
+ 
+-	r = vcpu_load(vcpu);
+-	if (r)
+-		return r;
+	if (mutex_lock_killable(&vcpu->mutex))
+		return -EINTR;
+	vcpu_load(vcpu);
+ 	switch (ioctl) {
+ 	case KVM_RUN: {
+ 		struct pid *oldpid;
+@@ -2961,6 +2955,7 @@ static long kvm_vcpu_ioctl(struct file *filp,
+ 	}
+ out:
+ 	vcpu_put(vcpu);
+	mutex_unlock(&vcpu->mutex);
+ 	kfree(fpu);
+ 	kfree(kvm_sregs);
+ 	return r;
@@ -1,113 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Date: Tue, 13 Jul 2021 20:50:07 +0800
-Subject: [PATCH] PCI: Reinstate "PCI: Coalesce host bridge contiguous
- apertures"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Built-in graphics on HP EliteDesk 805 G6 doesn't work because graphics
-can't get the BAR it needs:
-  pci_bus 0000:00: root bus resource [mem 0x10020200000-0x100303fffff window]
-  pci_bus 0000:00: root bus resource [mem 0x10030400000-0x100401fffff window]
-
-  pci 0000:00:08.1:   bridge window [mem 0xd2000000-0xd23fffff]
-  pci 0000:00:08.1:   bridge window [mem 0x10030000000-0x100401fffff 64bit pref]
-  pci 0000:00:08.1: can't claim BAR 15 [mem 0x10030000000-0x100401fffff 64bit pref]: no compatible bridge window
-  pci 0000:00:08.1: [mem 0x10030000000-0x100401fffff 64bit pref] clipped to [mem 0x10030000000-0x100303fffff 64bit pref]
-  pci 0000:00:08.1:   bridge window [mem 0x10030000000-0x100303fffff 64bit pref]
-  pci 0000:07:00.0: can't claim BAR 0 [mem 0x10030000000-0x1003fffffff 64bit pref]: no compatible bridge window
-  pci 0000:07:00.0: can't claim BAR 2 [mem 0x10040000000-0x100401fffff 64bit pref]: no compatible bridge window
-
-However, the root bus has two contiguous apertures that can contain the
-child resource requested.
-
-Coalesce contiguous apertures so we can allocate from the entire contiguous
-region.
-
-This is the second take of commit 65db04053efe ("PCI: Coalesce host
-bridge contiguous apertures"). The original approach sorts the apertures
-by address, but that makes NVMe stop working on QEMU ppc:sam460ex:
-  PCI host bridge to bus 0002:00
-  pci_bus 0002:00: root bus resource [io  0x0000-0xffff]
-  pci_bus 0002:00: root bus resource [mem 0xd80000000-0xdffffffff] (bus address [0x80000000-0xffffffff])
-  pci_bus 0002:00: root bus resource [mem 0xc0ee00000-0xc0eefffff] (bus address [0x00000000-0x000fffff])
-
-After the offending commit:
-  PCI host bridge to bus 0002:00
-  pci_bus 0002:00: root bus resource [io  0x0000-0xffff]
-  pci_bus 0002:00: root bus resource [mem 0xc0ee00000-0xc0eefffff] (bus address [0x00000000-0x000fffff])
-  pci_bus 0002:00: root bus resource [mem 0xd80000000-0xdffffffff] (bus address [0x80000000-0xffffffff])
-
-Since the apertures on HP EliteDesk 805 G6 are already in ascending
-order, doing a precautious sorting is not necessary.
-
-Remove the sorting part to avoid the regression on ppc:sam460ex.
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=212013
-Cc: Guenter Roeck <linux@roeck-us.net>
-Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
-Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- drivers/pci/probe.c | 33 ++++++++++++++++++++++++++++-----
- 1 file changed, 28 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index be51670572fa..133f5d2b189d 100644
--- a/drivers/pci/probe.c
-+++ b/drivers/pci/probe.c
-@@ -877,11 +877,11 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus)
- static int pci_register_host_bridge(struct pci_host_bridge *bridge)
- {
- 	struct device *parent = bridge->dev.parent;
-	struct resource_entry *window, *n;
-+	struct resource_entry *window, *next, *n;
- 	struct pci_bus *bus, *b;
-	resource_size_t offset;
-+	resource_size_t offset, next_offset;
- 	LIST_HEAD(resources);
-	struct resource *res;
-+	struct resource *res, *next_res;
- 	char addr[64], *fmt;
- 	const char *name;
- 	int err;
-@@ -959,11 +959,34 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
- 	if (nr_node_ids > 1 && pcibus_to_node(bus) == NUMA_NO_NODE)
- 		dev_warn(&bus->dev, "Unknown NUMA node; performance will be reduced\n");
- 
-+	/* Coalesce contiguous windows */
-+	resource_list_for_each_entry_safe(window, n, &resources) {
-+		if (list_is_last(&window->node, &resources))
-+			break;
-+
-+		next = list_next_entry(window, node);
-+		offset = window->offset;
-+		res = window->res;
-+		next_offset = next->offset;
-+		next_res = next->res;
-+
-+		if (res->flags != next_res->flags || offset != next_offset)
-+			continue;
-+
-+		if (res->end + 1 == next_res->start) {
-+			next_res->start = res->start;
-+			res->flags = res->start = res->end = 0;
-+		}
-+	}
-+
- 	/* Add initial resources to the bus */
- 	resource_list_for_each_entry_safe(window, n, &resources) {
-+		offset = window->offset;
-+		res = window->res;
-+		if (!res->end)
-+			continue;
-+
- 		list_move_tail(&window->node, &bridge->windows);
-		offset = window->offset;
-		res = window->res;
- 
- 		if (res->flags & IORESOURCE_BUS)
- 			pci_bus_insert_busn_res(bus, bus->number, res->end);
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jim Mattson <jmattson@google.com>
+Date: Tue, 30 Oct 2018 12:20:21 -0700
+Subject: [PATCH] kvm: x86: Don't modify MSR_PLATFORM_INFO on vCPU reset
+
+If userspace has provided a different value for this MSR (e.g with the
+turbo bits set), the userspace-provided value should survive a vCPU
+reset. For backwards compatibility, MSR_PLATFORM_INFO is initialized
+in kvm_arch_vcpu_setup.
+
+Signed-off-by: Jim Mattson <jmattson@google.com>
+Reviewed-by: Drew Schmitt <dasch@google.com>
+Cc: Abhiroop Dabral <adabral@paloaltonetworks.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+(cherry picked from commit e53d88af63ab4104e1226b8f9959f1e9903da10b)
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ arch/x86/kvm/x86.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
+index 6b1e434ceaf8..93bc3504d39e 100644
+--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
+@@ -8062,6 +8062,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
+ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
+ {
+ 	vcpu->arch.arch_capabilities = kvm_get_arch_capabilities();
+	vcpu->arch.msr_platform_info = MSR_PLATFORM_INFO_CPUID_FAULT;
+ 	kvm_vcpu_mtrr_init(vcpu);
+ 	vcpu_load(vcpu);
+ 	kvm_vcpu_reset(vcpu, false);
+@@ -8157,7 +8158,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
+ 		kvm_pmu_reset(vcpu);
+ 		vcpu->arch.smbase = 0x30000;
+ 
+-		vcpu->arch.msr_platform_info = MSR_PLATFORM_INFO_CPUID_FAULT;
+ 		vcpu->arch.msr_misc_features_enables = 0;
+ 
+ 		vcpu->arch.xcr0 = XFEATURE_MASK_FP;
@@ -1,76 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Valentin Vidic <vvidic@valentin-vidic.from.hr>
-Date: Wed, 29 Sep 2021 20:06:54 +0200
-Subject: [PATCH] ocfs2: mount fails with buffer overflow in strlen
-
-Starting with kernel 5.11 built with CONFIG_FORTIFY_SOURCE mouting an
-ocfs2 filesystem with either o2cb or pcmk cluster stack fails with the
-trace below. Problem seems to be that strings for cluster stack and
-cluster name are not guaranteed to be null terminated in the disk
-representation, while strlcpy assumes that the source string is always
-null terminated. This causes a read outside of the source string
-triggering the buffer overflow detection.
-
-detected buffer overflow in strlen
------------[ cut here ]------------
-kernel BUG at lib/string.c:1149!
-invalid opcode: 0000 [#1] SMP PTI
-CPU: 1 PID: 910 Comm: mount.ocfs2 Not tainted 5.14.0-1-amd64 #1
-  Debian 5.14.6-2
-RIP: 0010:fortify_panic+0xf/0x11
-...
-Call Trace:
- ocfs2_initialize_super.isra.0.cold+0xc/0x18 [ocfs2]
- ocfs2_fill_super+0x359/0x19b0 [ocfs2]
- mount_bdev+0x185/0x1b0
- ? ocfs2_remount+0x440/0x440 [ocfs2]
- legacy_get_tree+0x27/0x40
- vfs_get_tree+0x25/0xb0
- path_mount+0x454/0xa20
- __x64_sys_mount+0x103/0x140
- do_syscall_64+0x3b/0xc0
- entry_SYSCALL_64_after_hwframe+0x44/0xae
-
-Signed-off-by: Valentin Vidic <vvidic@valentin-vidic.from.hr>
-Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- fs/ocfs2/super.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
-index 2febc76e9de7..435f82892432 100644
--- a/fs/ocfs2/super.c
-+++ b/fs/ocfs2/super.c
-@@ -2171,11 +2171,17 @@ static int ocfs2_initialize_super(struct super_block *sb,
- 	}
- 
- 	if (ocfs2_clusterinfo_valid(osb)) {
-+		/*
-+		 * ci_stack and ci_cluster in ocfs2_cluster_info may not be null
-+		 * terminated, so make sure no overflow happens here by using
-+		 * memcpy. Destination strings will always be null terminated
-+		 * because osb is allocated using kzalloc.
-+		 */
- 		osb->osb_stackflags =
- 			OCFS2_RAW_SB(di)->s_cluster_info.ci_stackflags;
-		strlcpy(osb->osb_cluster_stack,
-+		memcpy(osb->osb_cluster_stack,
- 		       OCFS2_RAW_SB(di)->s_cluster_info.ci_stack,
-		       OCFS2_STACK_LABEL_LEN + 1);
-+		       OCFS2_STACK_LABEL_LEN);
- 		if (strlen(osb->osb_cluster_stack) != OCFS2_STACK_LABEL_LEN) {
- 			mlog(ML_ERROR,
- 			     "couldn't mount because of an invalid "
-@@ -2184,9 +2190,9 @@ static int ocfs2_initialize_super(struct super_block *sb,
- 			status = -EINVAL;
- 			goto bail;
- 		}
-		strlcpy(osb->osb_cluster_name,
-+		memcpy(osb->osb_cluster_name,
- 			OCFS2_RAW_SB(di)->s_cluster_info.ci_cluster,
-			OCFS2_CLUSTER_NAME_LEN + 1);
-+			OCFS2_CLUSTER_NAME_LEN);
- 	} else {
- 		/* The empty string is identical with classic tools that
- 		 * don't know about s_cluster_info. */
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Fri, 6 Sep 2019 13:04:30 +0200
+Subject: [PATCH] ntb test: remove unused conflicting SZ_4G define
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ drivers/ntb/test/ntb_perf.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
+index 427112cf101a..1f8ee33a07a2 100644
+--- a/drivers/ntb/test/ntb_perf.c
+++ b/drivers/ntb/test/ntb_perf.c
+@@ -74,7 +74,6 @@
+ #define MAX_SRCS		32
+ #define DMA_OUT_RESOURCE_TO	msecs_to_jiffies(50)
+ #define DMA_RETRIES		20
+-#define SZ_4G			(1ULL << 32)
+ #define MAX_SEG_ORDER		20 /* no larger than 1M for kmalloc buffer */
+ #define PIDX			NTB_DEF_PEER_IDX
+
Author	SHA1	Message	Date
Fabian Grünbichler	511b4b4393	update ABI file for 4.15.18-30-pve (generated with debian/scripts/abi-generate) Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>	2020-06-16 16:07:50 +02:00
Fabian Grünbichler	403f9c3342	bump version to 4.15.18-58 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>	2020-06-12 14:21:52 +02:00
Fabian Grünbichler	7e76e05428	update sources to Ubuntu-4.15.0-107.108 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>	2020-06-12 13:50:05 +02:00
Thomas Lamprecht	1f316d97f5	update ABI file for 4.15.18-29-pve (generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-05-18 15:48:05 +02:00
Thomas Lamprecht	6689bad81a	bump version to 4.15.18-57 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-05-18 14:35:07 +02:00
Thomas Lamprecht	c52b38d4c1	rebase patches on top of Ubuntu-4.15.0-102.103 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-05-18 14:04:32 +02:00
Thomas Lamprecht	9ae490b531	update sources to Ubuntu-4.15.0-102.103 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-05-18 14:04:32 +02:00
Thomas Lamprecht	9aea2a8582	update ABI file for 4.15.18-28-pve (generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-04-09 07:50:19 +02:00
Thomas Lamprecht	74ff6ea27e	bump version to 4.15.18-56 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-04-08 20:06:22 +02:00
Thomas Lamprecht	383cc4b935	rebase patches on top of Ubuntu-4.15.0-97.98 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-04-08 19:43:11 +02:00
Thomas Lamprecht	92ecb0dc4a	update sources to Ubuntu-4.15.0-97.98 (generated with debian/scripts/import-upstream-tag + some manual hunk drop) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-04-08 19:42:37 +02:00
Thomas Lamprecht	e83375c7a4	update ABI file for 4.15.18-27-pve (generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-03-17 16:33:06 +01:00
Thomas Lamprecht	71941be42c	bump version to 4.15.18-54 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-03-17 15:32:39 +01:00
Thomas Lamprecht	688dd00fb2	rebase patches on top of Ubuntu-4.15.0-92.93 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-03-17 14:58:35 +01:00
Thomas Lamprecht	d7745ec6d3	update sources to Ubuntu-4.15.0-92.93 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-03-17 14:58:35 +01:00
Thomas Lamprecht	f685c270c2	update ABI file for 4.15.18-26-pve (generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-02-15 16:10:46 +01:00
Thomas Lamprecht	85116af6a4	bump version to 4.15.18-54 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-02-15 15:34:52 +01:00
Thomas Lamprecht	3f3987d405	update sources to Ubuntu-4.15.0-89.89 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-02-15 15:33:27 +01:00
Thomas Lamprecht	5d53aaf90c	update ABI file for 4.15.18-25-pve (generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-02-05 15:07:20 +01:00
Thomas Lamprecht	2cacd0fca4	bump version to 4.15.18-53 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-02-05 11:58:57 +01:00
Thomas Lamprecht	e7be3bc9b1	rebase patches on top of Ubuntu-4.15.0-87.87 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-02-05 11:55:40 +01:00
Thomas Lamprecht	3e80fdd8b1	update sources to Ubuntu-4.15.0-87.87 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-02-05 11:55:40 +01:00
Thomas Lamprecht	3cd6c93ea3	update sources to Ubuntu-4.15.0-76.86 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2020-01-31 13:21:52 +01:00
Thomas Lamprecht	928ebd9e9e	update ABI file for 4.15.18-24-pve (generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-12-05 11:17:48 +01:00
Thomas Lamprecht	749152cc40	bump version to 4.15.18-52 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-12-05 10:14:32 +01:00
Thomas Lamprecht	32c96a9e46	rebase patches on top of Ubuntu-4.15.0-73.82 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-12-05 09:27:32 +01:00
Thomas Lamprecht	81ff40a1f6	update sources to Ubuntu-4.15.0-73.82 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-12-05 09:27:32 +01:00
Thomas Lamprecht	011ae0b915	update ABI file for 4.15.18-23-pve (generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-11-13 11:46:11 +01:00
Thomas Lamprecht	2425182d60	bump version to 4.15.18-51; ABI bump to 4.15.18-23 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-11-13 11:21:54 +01:00
Thomas Lamprecht	90e18b45c8	rebase patches on top of Ubuntu-4.15.0-69.78 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-11-13 11:19:27 +01:00
Thomas Lamprecht	0969dc7a3a	update sources to Ubuntu-4.15.0-69.78-pve (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-11-13 11:19:18 +01:00
Thomas Lamprecht	4f0610f2b8	disable alsa snd pcspkr module The PC speaker (beeper) can only be managed by one module, and there are two which could do so. The very basic INPUT_PCSPKR, and the more advanced SND_PCSP which allows it to be used as primitive ALSA soundcard, which for Proxmox Server projects, and all modern workstations is not much of use. As they both were aliased to the "pcspkr" module name, and used the same internal driver name (being a replacment of the other), one would get the following error message when both are loaded: "Error: Driver 'pcspkr' is already registered, aborting..." in the kernel log. This happens as by default both are tried to get loaded. We do not want the more complex ALSA one, so disable that. Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> (cherry picked from commit `b481f89770`) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-11-12 15:43:38 +01:00
Thomas Lamprecht	7b6cf206b5	bump version to 4.15.18-50 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-11-11 15:36:11 +01:00
Thomas Lamprecht	051682a35d	update sources to Ubuntu-4.15.0-68.77 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-11-11 15:27:11 +01:00
Thomas Lamprecht	bafa9b7ca1	revert: KVM: x86: Manually calculate reserved bits when loading PDPTRS Problematic on old Intel CPUs: https://forum.proxmox.com/threads/pve-kernel-5-0-21-4-pve-cause-debian-guests-to-reboot-loop-on-older-intel-cpus.59377/page-3#post-276413 https://bugzilla.kernel.org/show_bug.cgi?id=205441#c1 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-11-11 15:24:04 +01:00
Thomas Lamprecht	ecfcc52270	update ABI file for 4.15.18-22-pve (generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-10-23 21:20:55 +02:00
Thomas Lamprecht	862a942d89	bump version to 4.15.18-49 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-10-23 20:40:32 +02:00
Thomas Lamprecht	82650658f2	rebase patches on top of Ubuntu-4.15.0-67.76 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-10-23 19:29:18 +02:00
Thomas Lamprecht	3c1c73bb62	update sources to Ubuntu-4.15.0-67.76 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-10-23 19:29:18 +02:00
Thomas Lamprecht	074569d349	bump version to 4.15.18-48 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-09-20 11:28:46 +02:00
Thomas Lamprecht	7c6813388e	update submodule to Ubuntu-4.15.0-65.74 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-09-20 11:27:34 +02:00
Thomas Lamprecht	eafd579cc9	update ABI file for 4.15.18-21-pve (generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-09-09 12:52:19 +02:00
Thomas Lamprecht	42adb8504b	bump version to 4.15.18-47 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-09-06 16:08:52 +02:00
Thomas Lamprecht	5aa9d0068e	update submodule and patches to Ubuntu-4.15.0-63.72 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-09-06 15:27:21 +02:00
Fabian Grünbichler	6e9b6a3eae	update ABI file for 4.15.18-20-pve (generated with debian/scripts/abi-generate) Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>	2019-08-08 12:35:37 +02:00
Fabian Grünbichler	9c6f52252f	bump version to 4.15.18-46 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>	2019-08-08 10:52:41 +02:00
Fabian Grünbichler	00163cc277	rebase patches on top of Ubuntu-4.15.0-58.64 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>	2019-08-08 09:16:29 +02:00
Fabian Grünbichler	b3c9b5ae54	update sources to Ubuntu-4.15.0-58.64 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>	2019-08-08 09:16:29 +02:00
Thomas Lamprecht	7abb5775ca	update ABI file for 4.15.18-19-pve (generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-07-26 10:26:19 +02:00
Thomas Lamprecht	15cba06a57	update firmware list Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-07-26 10:26:10 +02:00
Thomas Lamprecht	acfcf229bf	bump version to 4.15.18-45 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-07-26 09:47:52 +02:00
Thomas Lamprecht	442a3e9243	rebase patches on top of Ubuntu-4.15.0-56.62 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-07-26 09:47:52 +02:00
Thomas Lamprecht	6a0e26366e	update sources to Ubuntu-4.15.0-56.62 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-07-26 09:47:52 +02:00
Thomas Lamprecht	52ca7a7fc5	update zfsonlinux submodule to current stable-5 branch no new ZFS release related changes Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-07-26 09:47:52 +02:00
Thomas Lamprecht	16cc4bcb40	update ABI file for 4.15.18-18-pve (generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-07-03 13:01:49 +02:00
Thomas Lamprecht	34c76b7752	bump version to 4.15.18-44 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-07-03 11:42:19 +02:00
Thomas Lamprecht	58b67f303a	rebase patches on top of Ubuntu-4.15.0-55.60 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-07-03 11:21:14 +02:00
Thomas Lamprecht	90281c3c81	update submodule to Ubuntu-4.15.0-55.60 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-07-03 11:21:14 +02:00
Thomas Lamprecht	b24b578cd6	bump version to 4.15.18-43 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-06-27 13:00:08 +02:00
Thomas Lamprecht	6ba8c6bc5d	backport TCP SACK mitigation refinement Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-06-27 12:59:48 +02:00
Thomas Lamprecht	b2a761cbba	update ABI file for 4.15.18-17-pve (generated with debian/scripts/abi-generate) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-06-21 12:04:25 +02:00
Thomas Lamprecht	3ef09f5906	bump version to 4.15.18-42 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-06-21 11:45:58 +02:00
Thomas Lamprecht	94d096fde1	rebase patches on top of Ubuntu-4.15.0-53.57 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-06-21 10:12:33 +02:00
Thomas Lamprecht	d753974f8a	update sources to Ubuntu-4.15.0-53.57 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-06-21 10:12:33 +02:00
Thomas Lamprecht	8af6fd0319	update ABI file for 4.15.18-16-pve Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-06-18 08:24:10 +02:00
Thomas Lamprecht	86df970f42	bump version to 4.15.18-41 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-06-18 08:05:26 +02:00
Thomas Lamprecht	71090250db	rebase patches on top of Ubuntu-4.15.0-52.56 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-06-18 07:35:35 +02:00
Thomas Lamprecht	1f08d6d78b	update sources to Ubuntu-4.15.0-52.56 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-06-18 07:35:35 +02:00
Thomas Lamprecht	045bc2ba9d	backport: KVM: x86: Emulate MSR_IA32_ARCH_CAPABILITIES on AMD hosts backport this and supporting patches to ensure Ryzen/Epyc CPUs work with QEMU and it's new MDS mitigation helpers, which also base on MSRs Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-06-14 12:11:41 +02:00
Thomas Lamprecht	c523771b01	backport: net: rds: force to destroy connection if t_sock is NULL in rds_tcp_kill_sock() Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2019-06-13 20:55:56 +02:00