Compare commits
111 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 65813c84e9 | |||
| a8fc8edb4d | |||
| a5bdb43175 | |||
| 60a431b5fd | |||
| deaf04345e | |||
| d33b94b407 | |||
| 9ea98bbe8e | |||
| f9e8708607 | |||
| d218c2c38e | |||
| c82c59a3d4 | |||
| 384f9c14cf | |||
| 75ff911cd0 | |||
| ab14960899 | |||
| 4b77d2927f | |||
| 18fc3af8e5 | |||
| 5c1696be0c | |||
| 1a4013e9e2 | |||
| 8e0b5d8931 | |||
| e6e243d359 | |||
| c2f10a7bb3 | |||
| 05c68c9253 | |||
| c61d020839 | |||
| adaa1ed1b0 | |||
| 38d6968961 | |||
| 80a41f6354 | |||
| 61ac9aca18 | |||
| 24f053e52d | |||
| 01f60dbd5e | |||
| 344b784396 | |||
| 9c27c5eb47 | |||
| e89035c6af | |||
| a2169a9463 | |||
| 6b191b0e13 | |||
| 36afc72ee7 | |||
| fd3839f733 | |||
| 12596da3c2 | |||
| 304314fb8f | |||
| a5424f26ff | |||
| 86127be35d | |||
| 6d27ecc907 | |||
| 9fc612b928 | |||
| 7216aed92b | |||
| 4ae51f204a | |||
| f8b324a82f | |||
| 09ab71333a | |||
| 28b6460ee9 | |||
| 6d461b2d33 | |||
| e1db45b15e | |||
| 624ad631a5 | |||
| 0e3917d51f | |||
| 09e761dba8 | |||
| ced00e40e2 | |||
| d930563013 | |||
| 94c8fa26c9 | |||
| aff7c5e55d | |||
| ec345ffc74 | |||
| f4485c6c02 | |||
| 79281c1321 | |||
| 81f24f4c36 | |||
| 19ab15b7a3 | |||
| cac072e773 | |||
| f12aea9cac | |||
| ebbe0c5101 | |||
| 0fb400434c | |||
| 9276de2e36 | |||
| 8c7431e839 | |||
| 35eed63155 | |||
| f290af2cd5 | |||
| 916656976b | |||
| 701d2bac1b | |||
| a9d3e3c380 | |||
| 0a9202604f | |||
| 49aec382fe | |||
| 60c7ce8ccc | |||
| c0ccc95d9a | |||
| 1733af1256 | |||
| bea47224e7 | |||
| 36eda89b86 | |||
| c90a7b384c | |||
| dd03250dc8 | |||
| ac46634ed1 | |||
| 8121a674a1 | |||
| 5c9ca70ef3 | |||
| 7e2796e160 | |||
| bcd11a2cce | |||
| 24755f9c71 | |||
| ee60bb7ce0 | |||
| cd81f880a4 | |||
| 6af8a76c7f | |||
| 6be7078ae0 | |||
| c3fdfb17a5 | |||
| fc2e5bd657 | |||
| 447fbc7008 | |||
| aed65cb97b | |||
| 04a72a8970 | |||
| c3459f5147 | |||
| 67b7f5c72a | |||
| 9410e09737 | |||
| 7c6fb61916 | |||
| 77470417db | |||
| cbc90f2383 | |||
| 4078fc25f1 | |||
| 5b0d645b50 | |||
| 996fdfe192 | |||
| 6d861e84e6 | |||
| 3261e6e147 | |||
| 3e5eaeade4 | |||
| f261ed26fa | |||
| 46f9b46ea1 | |||
| 8603b9e2f3 | |||
| 0657a49870 |
@@ -1,12 +1,12 @@
|
||||
# also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
|
||||
KERNEL_MAJ=5
|
||||
KERNEL_MIN=4
|
||||
KERNEL_PATCHLEVEL=78
|
||||
KERNEL_PATCHLEVEL=203
|
||||
# increment KREL if the ABI changes (abicheck target in debian/rules)
|
||||
# rebuild packages with new KREL and run 'make abiupdate'
|
||||
KREL=2
|
||||
KREL=1
|
||||
|
||||
PKGREL=2
|
||||
PKGREL=1
|
||||
|
||||
KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
|
||||
KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)
|
||||
@@ -46,9 +46,11 @@ DIRS=KERNEL_SRC 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} ${LINUX_TOOLS_DEB}
|
||||
DEBS=${DST_DEB} ${HDR_DEB} ${USR_HDR_DEB} ${LINUX_TOOLS_DEB} ${LINUX_TOOLS_DBG_DEB}
|
||||
|
||||
all: deb
|
||||
deb: ${DEBS}
|
||||
@@ -102,7 +104,7 @@ ${ZFSDIR}.prepared: ${ZFSONLINUX_SUBMODULE}
|
||||
|
||||
.PHONY: upload
|
||||
upload: ${DEBS}
|
||||
tar cf - ${DEBS}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch ${ARCH}
|
||||
tar cf - ${DEBS}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster --arch ${ARCH}
|
||||
|
||||
.PHONY: distclean
|
||||
distclean: clean
|
||||
|
||||
+23836
File diff suppressed because it is too large
Load Diff
-23810
File diff suppressed because it is too large
Load Diff
Vendored
+206
@@ -1,3 +1,209 @@
|
||||
pve-kernel (5.4.203-1) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-126.142
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 26 Aug 2022 14:43:35 +0200
|
||||
|
||||
pve-kernel (5.4.195-1) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-123.139
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 13 Jul 2022 13:19:46 +0200
|
||||
|
||||
pve-kernel (5.4.192-1) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-122.138
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Thu, 23 Jun 2022 11:56:26 +0200
|
||||
|
||||
pve-kernel (5.4.189-2) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-117.132
|
||||
|
||||
* fixes: CVE-2022-1966, CVE-2022-21499, CVE-2022-28390, CVE-2022-29581,
|
||||
CVE-2022-1116
|
||||
|
||||
* bump ABI to 5.4.189-2
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 13 Jun 2022 09:39:53 +0200
|
||||
|
||||
pve-kernel (5.4.189-1) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-112.126
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 11 May 2022 07:10:20 +0200
|
||||
|
||||
pve-kernel (5.4.178-1) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-108.122
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 30 Mar 2022 15:16:31 +0200
|
||||
|
||||
pve-kernel (5.4.174-2) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-105.119
|
||||
|
||||
* bump ABI to 5.4.174-2
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Thu, 10 Mar 2022 15:58:44 +0100
|
||||
|
||||
pve-kernel (5.4.174-1) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-101.114
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 21 Feb 2022 08:21:31 +0100
|
||||
|
||||
pve-kernel (5.4.166-1) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-98.111
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 02 Feb 2022 08:05:40 +0100
|
||||
|
||||
pve-kernel (5.4.162-2) buster; urgency=medium
|
||||
|
||||
* backport "vfs: fs_context: fix up param length parsing in
|
||||
legacy_parse_param"
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Thu, 20 Jan 2022 16:38:53 +0100
|
||||
|
||||
pve-kernel (5.4.162-1) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-95.107
|
||||
|
||||
* bump ABI to 5.4.162-1
|
||||
|
||||
* update ZFS to 2.0.7
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 12 Jan 2022 18:49:53 +0100
|
||||
|
||||
pve-kernel (5.4.157-1) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-92.103
|
||||
|
||||
* bump ABI to 5.4.157-1
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 29 Nov 2021 12:01:44 +0100
|
||||
|
||||
pve-kernel (5.4.151-1) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-91.102
|
||||
|
||||
* bump ABI to 5.4.151-1
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Sat, 06 Nov 2021 16:10:09 +0100
|
||||
|
||||
pve-kernel (5.4.148-1) buster; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-90.101
|
||||
|
||||
* bump ABI to 5.4.148-1
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 18 Oct 2021 15:24:06 +0200
|
||||
|
||||
pve-kernel (5.4.143-1) buster; urgency=medium
|
||||
|
||||
* update Sources to Ubuntu-5.4.0-89.100
|
||||
|
||||
* bump ABI to 5.4.143-1
|
||||
|
||||
* update ZFS to 2.0.6
|
||||
|
||||
* fix #3558: backport "bnx2x: Fix enabling network interfaces without VFs"
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 28 Sep 2021 09:10:37 +0200
|
||||
|
||||
pve-kernel (5.4.140-1) buster; urgency=medium
|
||||
|
||||
* update sources to 5.4.140 stable release based on Ubuntu-5.4.0-85.95
|
||||
|
||||
* ZFS: cherry-pick revert of "Consolidate arc_buf allocation checks" (ZFS GH
|
||||
issue #11531)
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 08 Sep 2021 16:21:59 +0200
|
||||
|
||||
pve-kernel (5.4.128-2) buster; urgency=medium
|
||||
|
||||
* cherry-pick fixes for CVE-2021-3656 and CVE-2021-3653
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 18 Aug 2021 16:20:02 +0200
|
||||
|
||||
pve-kernel (5.4.128-1) buster; urgency=medium
|
||||
|
||||
* update sources to 5.4.128 stable release based on Ubuntu-5.4.0-81.91
|
||||
|
||||
* update ZFS to 2.0.5
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 21 Jul 2021 18:32:02 +0200
|
||||
|
||||
pve-kernel (5.4.124-2) buster; urgency=medium
|
||||
|
||||
* fix CVE-2021-33909: seq_file: disallow extremely large seq buffer
|
||||
allocations
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 20 Jul 2021 21:43:44 +0200
|
||||
|
||||
pve-kernel (5.4.124-1) buster; urgency=medium
|
||||
|
||||
* update sources to 5.4.124 stable release based on Ubuntu-5.4.0-78.87
|
||||
|
||||
* pve-kernel-libc-dev: add version to Provides dependency field for
|
||||
linux-libc-dev to satisfy versioned dependencies from other packages
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 23 Jun 2021 13:47:09 +0200
|
||||
|
||||
pve-kernel (5.4.119-1) buster; urgency=medium
|
||||
|
||||
* update sources to 5.4.119 stable release based on Ubuntu-5.4.0-75.84
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 01 Jun 2021 15:32:00 +0200
|
||||
|
||||
pve-kernel (5.4.114-1) buster; urgency=medium
|
||||
|
||||
* update sources to 5.4.114 stable release based on Ubuntu-5.4.0-74.83
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Sun, 09 May 2021 17:13:05 +0200
|
||||
|
||||
pve-kernel (5.4.106-1) pve pmg; urgency=medium
|
||||
|
||||
* update sources to 5.4.106 stable release
|
||||
|
||||
* update ZFS to 2.0.4
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 19 Mar 2021 11:08:47 +0100
|
||||
|
||||
pve-kernel (5.4.103-1) pve pmg; urgency=medium
|
||||
|
||||
* update sources to 5.4.103 stable release
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Sun, 07 Mar 2021 15:55:09 +0100
|
||||
|
||||
pve-kernel (5.4.101-1) pve pmg; urgency=medium
|
||||
|
||||
* update sources to 5.4.101 stable release
|
||||
|
||||
* fix #3320: backport "kvm: x86: replace kvm_spec_ctrl_test_value with
|
||||
runtime test on the host"
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 26 Feb 2021 13:13:09 +0100
|
||||
|
||||
pve-kernel (5.4.98-1) pve pmg; urgency=medium
|
||||
|
||||
* update sources to 5.4.98 stable release
|
||||
|
||||
* update ZFS to 2.0.3
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 15 Feb 2021 16:33:27 +0100
|
||||
|
||||
pve-kernel (5.4.86-1) pve pmg; urgency=medium
|
||||
|
||||
* update sources to Ubuntu-5.4.0-66.74
|
||||
|
||||
* bump ABI to 5.4.86-1
|
||||
|
||||
* update ZFS to 2.0.1
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Thu, 28 Jan 2021 14:56:38 +0100
|
||||
|
||||
pve-kernel (5.4.78-2) pve pmg; urgency=medium
|
||||
|
||||
* revert commit 552b270b5784dc3 "scsi: be2iscsi: Fix a theoretical leak in
|
||||
|
||||
Vendored
+3
-2
@@ -9,6 +9,7 @@ Build-Depends: asciidoc-base,
|
||||
cpio,
|
||||
debhelper (>= 10~),
|
||||
dh-python,
|
||||
dwarves (>= 1.13~),
|
||||
file,
|
||||
flex,
|
||||
gcc (>= 8.3.0-6),
|
||||
@@ -25,7 +26,7 @@ Build-Depends: asciidoc-base,
|
||||
lintian,
|
||||
lz4,
|
||||
perl-modules,
|
||||
python-minimal,
|
||||
python2-minimal,
|
||||
rsync,
|
||||
sed,
|
||||
sphinx-common,
|
||||
@@ -74,7 +75,7 @@ Package: pve-kernel-libc-dev
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Architecture: any
|
||||
Provides: linux-libc-dev,
|
||||
Provides: linux-libc-dev (=${binary:Version}),
|
||||
Conflicts: linux-libc-dev,
|
||||
Replaces: linux-libc-dev,
|
||||
Depends: ${misc:Depends}
|
||||
|
||||
Vendored
+2
@@ -73,6 +73,8 @@ 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 \
|
||||
|
||||
Vendored
+3
-4
@@ -6,7 +6,7 @@ top=$(pwd)
|
||||
|
||||
if [ "$#" -ne 3 ]; then
|
||||
echo "USAGE: $0 repo patchdir ref"
|
||||
echo "\t exports patches from 'repo' to 'patchdir' based on 'ref'"
|
||||
printf "\t exports patches from 'repo' to 'patchdir' based on 'ref'\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -26,10 +26,9 @@ git format-patch \
|
||||
--zero-commit \
|
||||
--no-signature \
|
||||
--diff-algorithm=myers \
|
||||
--output-dir \
|
||||
"${top}/${kernel_patchdir}" \
|
||||
--output-directory="${top}/${kernel_patchdir}" \
|
||||
"${base_ref}.."
|
||||
|
||||
git checkout ${base_ref}
|
||||
git checkout "${base_ref}"
|
||||
|
||||
cd "${top}"
|
||||
|
||||
@@ -14,6 +14,9 @@ advansys/mcode.bin kernel/drivers/scsi/advansys.ko
|
||||
agere_ap_fw.bin kernel/drivers/net/wireless/intersil/orinoco/orinoco.ko
|
||||
agere_sta_fw.bin kernel/drivers/net/wireless/intersil/orinoco/orinoco.ko
|
||||
aic94xx-seq.fw kernel/drivers/scsi/aic94xx/aic94xx.ko
|
||||
amd/amd_sev_fam17h_model0xh.sbin kernel/drivers/crypto/ccp/ccp.ko
|
||||
amd/amd_sev_fam17h_model3xh.sbin kernel/drivers/crypto/ccp/ccp.ko
|
||||
amd/amd_sev_fam19h_model0xh.sbin kernel/drivers/crypto/ccp/ccp.ko
|
||||
amdgpu/banks_k_2_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
|
||||
amdgpu/bonaire_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
|
||||
amdgpu/bonaire_k_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
|
||||
|
||||
@@ -21,7 +21,7 @@ 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 d1d757c6edf4..7b57571cf574 100755
|
||||
index 06c1e9e3bc38..6e7012175600 100755
|
||||
--- a/scripts/mkcompile_h
|
||||
+++ b/scripts/mkcompile_h
|
||||
@@ -34,10 +34,14 @@ else
|
||||
|
||||
@@ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
2 files changed, 111 insertions(+)
|
||||
|
||||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
||||
index 6351dd00e363..7e8ea458052b 100644
|
||||
index 1520dc3ad4d2..d3db42dface6 100644
|
||||
--- a/Documentation/admin-guide/kernel-parameters.txt
|
||||
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
||||
@@ -3441,6 +3441,15 @@
|
||||
@@ -3489,6 +3489,15 @@
|
||||
Also, it enforces the PCI Local Bus spec
|
||||
rule that those bits should be 0 in system reset
|
||||
events (useful for kexec/kdump cases).
|
||||
@@ -75,10 +75,10 @@ index 6351dd00e363..7e8ea458052b 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 706f27a86a8e..c3eac7a5426e 100644
|
||||
index ff07d35046b0..81f720abe39e 100644
|
||||
--- a/drivers/pci/quirks.c
|
||||
+++ b/drivers/pci/quirks.c
|
||||
@@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
|
||||
@@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void)
|
||||
}
|
||||
fs_initcall_sync(pci_apply_final_quirks);
|
||||
|
||||
@@ -185,8 +185,8 @@ index 706f27a86a8e..c3eac7a5426e 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
|
||||
@@ -4825,6 +4925,8 @@ static const struct pci_dev_acs_enabled {
|
||||
{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
|
||||
@@ -4948,6 +5048,8 @@ static const struct pci_dev_acs_enabled {
|
||||
{ PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs },
|
||||
/* APM X-Gene */
|
||||
{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },
|
||||
+ /* Enable overrides for missing ACS capabilities */
|
||||
|
||||
@@ -13,7 +13,7 @@ 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 8769538a3d1d..d540a7d7f85c 100644
|
||||
index 98edde13ec17..8344711583bc 100644
|
||||
--- a/virt/kvm/kvm_main.c
|
||||
+++ b/virt/kvm/kvm_main.c
|
||||
@@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644);
|
||||
|
||||
@@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
|
||||
index 2a1ed3aae100..c5dd076e8e61 100644
|
||||
index 435dfebf5867..82c2afe46ebf 100644
|
||||
--- a/arch/x86/kvm/vmx/vmx.c
|
||||
+++ b/arch/x86/kvm/vmx/vmx.c
|
||||
@@ -103,7 +103,7 @@ module_param(enable_apicv, bool, S_IRUGO);
|
||||
|
||||
@@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/net/core/dev.c b/net/core/dev.c
|
||||
index 134add2cc8da..5be8d3b4cf68 100644
|
||||
index f2c6fc836f9d..8940c12333b0 100644
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -9279,7 +9279,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
|
||||
@@ -9368,7 +9368,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
|
||||
refcnt = netdev_refcnt_read(dev);
|
||||
|
||||
if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) {
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
Date: Thu, 3 Dec 2020 07:45:18 +0100
|
||||
Subject: [PATCH] Revert "scsi: be2iscsi: Fix a theoretical leak in
|
||||
beiscsi_create_eqs()"
|
||||
|
||||
This reverts commit 552b270b5784dc322807df89eb359e74fc570fde.
|
||||
---
|
||||
drivers/scsi/be2iscsi/be_main.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
|
||||
index 0fa455357594..0760d0bd8a10 100644
|
||||
--- a/drivers/scsi/be2iscsi/be_main.c
|
||||
+++ b/drivers/scsi/be2iscsi/be_main.c
|
||||
@@ -3020,7 +3020,6 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
|
||||
goto create_eq_error;
|
||||
}
|
||||
|
||||
- mem->dma = paddr;
|
||||
mem->va = eq_vaddress;
|
||||
ret = be_fill_queue(eq, phba->params.num_eq_entries,
|
||||
sizeof(struct be_eq_entry), eq_vaddress);
|
||||
@@ -3030,6 +3029,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
|
||||
goto create_eq_error;
|
||||
}
|
||||
|
||||
+ mem->dma = paddr;
|
||||
ret = beiscsi_cmd_eq_create(&phba->ctrl, eq,
|
||||
BEISCSI_EQ_DELAY_DEF);
|
||||
if (ret) {
|
||||
@@ -3086,7 +3086,6 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
|
||||
goto create_cq_error;
|
||||
}
|
||||
|
||||
- mem->dma = paddr;
|
||||
ret = be_fill_queue(cq, phba->params.num_cq_entries,
|
||||
sizeof(struct sol_cqe), cq_vaddress);
|
||||
if (ret) {
|
||||
@@ -3096,6 +3095,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
|
||||
goto create_cq_error;
|
||||
}
|
||||
|
||||
+ mem->dma = paddr;
|
||||
ret = beiscsi_cmd_cq_create(&phba->ctrl, cq, eq, false,
|
||||
false, 0);
|
||||
if (ret) {
|
||||
+2
-2
@@ -39,7 +39,7 @@ index c5e6eff5a381..ba0ded7842a7 100644
|
||||
exact_match, exact_lock, p);
|
||||
if (error)
|
||||
diff --git a/fs/namei.c b/fs/namei.c
|
||||
index 311da290a58d..4d46e093c4ea 100644
|
||||
index f9c46c7abd80..a5e907558b88 100644
|
||||
--- a/fs/namei.c
|
||||
+++ b/fs/namei.c
|
||||
@@ -3690,12 +3690,14 @@ EXPORT_SYMBOL(user_path_create);
|
||||
@@ -104,7 +104,7 @@ index 8557efe096dc..fc989487c273 100644
|
||||
type = DEVCG_DEV_BLOCK;
|
||||
else
|
||||
diff --git a/include/linux/fs.h b/include/linux/fs.h
|
||||
index 21f93dfaf9d0..ae31b55fb69c 100644
|
||||
index 2bd06577c02a..fc22bade5b21 100644
|
||||
--- a/include/linux/fs.h
|
||||
+++ b/include/linux/fs.h
|
||||
@@ -1719,7 +1719,11 @@ extern int vfs_link(struct dentry *, struct inode *, struct dentry *, struct ino
|
||||
@@ -0,0 +1,35 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Chuck Lever <chuck.lever@oracle.com>
|
||||
Date: Thu, 30 Jun 2022 16:48:18 -0400
|
||||
Subject: [PATCH] SUNRPC: Fix READ_PLUS crasher
|
||||
|
||||
commit a23dd544debcda4ee4a549ec7de59e85c3c8345c upstream.
|
||||
|
||||
Looks like there are still cases when "space_left - frag1bytes" can
|
||||
legitimately exceed PAGE_SIZE. Ensure that xdr->end always remains
|
||||
within the current encode buffer.
|
||||
|
||||
Reported-by: Bruce Fields <bfields@fieldses.org>
|
||||
Reported-by: Zorro Lang <zlang@redhat.com>
|
||||
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216151
|
||||
Fixes: 6c254bf3b637 ("SUNRPC: Fix the calculation of xdr->end in xdr_get_next_encode_buffer()")
|
||||
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
net/sunrpc/xdr.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
|
||||
index cb8740d15633..daa4165f1179 100644
|
||||
--- a/net/sunrpc/xdr.c
|
||||
+++ b/net/sunrpc/xdr.c
|
||||
@@ -608,7 +608,7 @@ static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
|
||||
*/
|
||||
xdr->p = (void *)p + frag2bytes;
|
||||
space_left = xdr->buf->buflen - xdr->buf->len;
|
||||
- if (space_left - nbytes >= PAGE_SIZE)
|
||||
+ if (space_left - frag1bytes >= PAGE_SIZE)
|
||||
xdr->end = (void *)p + PAGE_SIZE;
|
||||
else
|
||||
xdr->end = (void *)p + space_left - frag1bytes;
|
||||
@@ -0,0 +1,42 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Trond Myklebust <trond.myklebust@hammerspace.com>
|
||||
Date: Tue, 2 Aug 2022 15:48:50 -0400
|
||||
Subject: [PATCH] NFSv4/pnfs: Fix a use-after-free bug in open
|
||||
|
||||
commit 2135e5d56278ffdb1c2e6d325dc6b87f669b9dac upstream.
|
||||
|
||||
If someone cancels the open RPC call, then we must not try to free
|
||||
either the open slot or the layoutget operation arguments, since they
|
||||
are likely still in use by the hung RPC call.
|
||||
|
||||
Fixes: 6949493884fe ("NFSv4: Don't hold the layoutget locks across multiple RPC calls")
|
||||
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
fs/nfs/nfs4proc.c | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
|
||||
index eee2d67d3ac9..831a16fec616 100644
|
||||
--- a/fs/nfs/nfs4proc.c
|
||||
+++ b/fs/nfs/nfs4proc.c
|
||||
@@ -3041,12 +3041,13 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
|
||||
}
|
||||
|
||||
out:
|
||||
- if (opendata->lgp) {
|
||||
- nfs4_lgopen_release(opendata->lgp);
|
||||
- opendata->lgp = NULL;
|
||||
- }
|
||||
- if (!opendata->cancelled)
|
||||
+ if (!opendata->cancelled) {
|
||||
+ if (opendata->lgp) {
|
||||
+ nfs4_lgopen_release(opendata->lgp);
|
||||
+ opendata->lgp = NULL;
|
||||
+ }
|
||||
nfs4_sequence_free_slot(&opendata->o_res.seq_res);
|
||||
+ }
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nilesh Javali <njavali@marvell.com>
|
||||
Date: Tue, 12 Jul 2022 22:20:36 -0700
|
||||
Subject: [PATCH] scsi: Revert "scsi: qla2xxx: Fix disk failure to rediscover"
|
||||
|
||||
commit 5bc7b01c513a4a9b4cfe306e8d1720cfcfd3b8a3 upstream.
|
||||
|
||||
This fixes the regression of NVMe discovery failure during driver load
|
||||
time.
|
||||
|
||||
This reverts commit 6a45c8e137d4e2c72eecf1ac7cf64f2fdfcead99.
|
||||
|
||||
Link: https://lore.kernel.org/r/20220713052045.10683-2-njavali@marvell.com
|
||||
Cc: stable@vger.kernel.org
|
||||
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
|
||||
Signed-off-by: Nilesh Javali <njavali@marvell.com>
|
||||
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
drivers/scsi/qla2xxx/qla_init.c | 5 ++---
|
||||
drivers/scsi/qla2xxx/qla_nvme.c | 5 -----
|
||||
2 files changed, 2 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
|
||||
index 1800eb0aad1c..c662c8af6cc1 100644
|
||||
--- a/drivers/scsi/qla2xxx/qla_init.c
|
||||
+++ b/drivers/scsi/qla2xxx/qla_init.c
|
||||
@@ -5422,8 +5422,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)
|
||||
if (atomic_read(&fcport->state) == FCS_ONLINE)
|
||||
return;
|
||||
|
||||
- qla2x00_set_fcport_state(fcport, FCS_ONLINE);
|
||||
-
|
||||
rport_ids.node_name = wwn_to_u64(fcport->node_name);
|
||||
rport_ids.port_name = wwn_to_u64(fcport->port_name);
|
||||
rport_ids.port_id = fcport->d_id.b.domain << 16 |
|
||||
@@ -5519,7 +5517,6 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
|
||||
qla2x00_reg_remote_port(vha, fcport);
|
||||
break;
|
||||
case MODE_TARGET:
|
||||
- qla2x00_set_fcport_state(fcport, FCS_ONLINE);
|
||||
if (!vha->vha_tgt.qla_tgt->tgt_stop &&
|
||||
!vha->vha_tgt.qla_tgt->tgt_stopped)
|
||||
qlt_fc_port_added(vha, fcport);
|
||||
@@ -5534,6 +5531,8 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
|
||||
break;
|
||||
}
|
||||
|
||||
+ qla2x00_set_fcport_state(fcport, FCS_ONLINE);
|
||||
+
|
||||
if (IS_IIDMA_CAPABLE(vha->hw) && vha->hw->flags.gpsc_supported) {
|
||||
if (fcport->id_changed) {
|
||||
fcport->id_changed = 0;
|
||||
diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
|
||||
index a15af048cd82..f0de7089e9ae 100644
|
||||
--- a/drivers/scsi/qla2xxx/qla_nvme.c
|
||||
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
|
||||
@@ -36,11 +36,6 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport)
|
||||
(fcport->nvme_flag & NVME_FLAG_REGISTERED))
|
||||
return 0;
|
||||
|
||||
- if (atomic_read(&fcport->state) == FCS_ONLINE)
|
||||
- return 0;
|
||||
-
|
||||
- qla2x00_set_fcport_state(fcport, FCS_ONLINE);
|
||||
-
|
||||
fcport->nvme_flag &= ~NVME_FLAG_RESETTING;
|
||||
|
||||
memset(&req, 0, sizeof(struct nvme_fc_port_info));
|
||||
@@ -0,0 +1,73 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Li Lingfeng <lilingfeng3@huawei.com>
|
||||
Date: Fri, 17 Jun 2022 14:25:15 +0800
|
||||
Subject: [PATCH] ext4: recover csum seed of tmp_inode after migrating to
|
||||
extents
|
||||
|
||||
[ Upstream commit 07ea7a617d6b278fb7acedb5cbe1a81ce2de7d0c ]
|
||||
|
||||
When migrating to extents, the checksum seed of temporary inode
|
||||
need to be replaced by inode's, otherwise the inode checksums
|
||||
will be incorrect when swapping the inodes data.
|
||||
|
||||
However, the temporary inode can not match it's checksum to
|
||||
itself since it has lost it's own checksum seed.
|
||||
|
||||
mkfs.ext4 -F /dev/sdc
|
||||
mount /dev/sdc /mnt/sdc
|
||||
xfs_io -fc "pwrite 4k 4k" -c "fsync" /mnt/sdc/testfile
|
||||
chattr -e /mnt/sdc/testfile
|
||||
chattr +e /mnt/sdc/testfile
|
||||
umount /dev/sdc
|
||||
fsck -fn /dev/sdc
|
||||
|
||||
========
|
||||
...
|
||||
Pass 1: Checking inodes, blocks, and sizes
|
||||
Inode 13 passes checks, but checksum does not match inode. Fix? no
|
||||
...
|
||||
========
|
||||
|
||||
The fix is simple, save the checksum seed of temporary inode, and
|
||||
recover it after migrating to extents.
|
||||
|
||||
Fixes: e81c9302a6c3 ("ext4: set csum seed in tmp inode while migrating to extents")
|
||||
Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
|
||||
Reviewed-by: Jan Kara <jack@suse.cz>
|
||||
Link: https://lore.kernel.org/r/20220617062515.2113438-1-lilingfeng3@huawei.com
|
||||
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
||||
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
fs/ext4/migrate.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c
|
||||
index c5b2ea1a9372..1faa8e4ffb9d 100644
|
||||
--- a/fs/ext4/migrate.c
|
||||
+++ b/fs/ext4/migrate.c
|
||||
@@ -435,7 +435,7 @@ int ext4_ext_migrate(struct inode *inode)
|
||||
struct inode *tmp_inode = NULL;
|
||||
struct migrate_struct lb;
|
||||
unsigned long max_entries;
|
||||
- __u32 goal;
|
||||
+ __u32 goal, tmp_csum_seed;
|
||||
uid_t owner[2];
|
||||
|
||||
/*
|
||||
@@ -483,6 +483,7 @@ int ext4_ext_migrate(struct inode *inode)
|
||||
* the migration.
|
||||
*/
|
||||
ei = EXT4_I(inode);
|
||||
+ tmp_csum_seed = EXT4_I(tmp_inode)->i_csum_seed;
|
||||
EXT4_I(tmp_inode)->i_csum_seed = ei->i_csum_seed;
|
||||
i_size_write(tmp_inode, i_size_read(inode));
|
||||
/*
|
||||
@@ -593,6 +594,7 @@ int ext4_ext_migrate(struct inode *inode)
|
||||
* the inode is not visible to user space.
|
||||
*/
|
||||
tmp_inode->i_blocks = 0;
|
||||
+ EXT4_I(tmp_inode)->i_csum_seed = tmp_csum_seed;
|
||||
|
||||
/* Reset the extent details */
|
||||
ext4_ext_tree_init(handle, tmp_inode);
|
||||
@@ -0,0 +1,72 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Wilson <chris.p.wilson@intel.com>
|
||||
Date: Tue, 12 Jul 2022 16:21:33 +0100
|
||||
Subject: [PATCH] drm/i915/gt: Serialize TLB invalidates with GT resets
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
[ Upstream commit a1c5a7bf79c1faa5633b918b5c0666545e84c4d1 ]
|
||||
|
||||
Avoid trying to invalidate the TLB in the middle of performing an
|
||||
engine reset, as this may result in the reset timing out. Currently,
|
||||
the TLB invalidate is only serialised by its own mutex, forgoing the
|
||||
uncore lock, but we can take the uncore->lock as well to serialise
|
||||
the mmio access, thereby serialising with the GDRST.
|
||||
|
||||
Tested on a NUC5i7RYB, BIOS RYBDWi35.86A.0380.2019.0517.1530 with
|
||||
i915 selftest/hangcheck.
|
||||
|
||||
Cc: stable@vger.kernel.org # v4.4 and upper
|
||||
Fixes: 7938d61591d3 ("drm/i915: Flush TLBs before releasing backing store")
|
||||
Reported-by: Mauro Carvalho Chehab <mchehab@kernel.org>
|
||||
Tested-by: Mauro Carvalho Chehab <mchehab@kernel.org>
|
||||
Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>
|
||||
Signed-off-by: Chris Wilson <chris.p.wilson@intel.com>
|
||||
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
|
||||
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
|
||||
Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
|
||||
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
|
||||
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
|
||||
Link: https://patchwork.freedesktop.org/patch/msgid/1e59a7c45dd919a530256b9ac721ac6ea86c0677.1657639152.git.mchehab@kernel.org
|
||||
(cherry picked from commit 33da97894758737895e90c909f16786052680ef4)
|
||||
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
|
||||
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
drivers/gpu/drm/i915/gt/intel_gt.c | 15 ++++++++++++++-
|
||||
1 file changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
|
||||
index c8c070375d29..f6d7f5d307d7 100644
|
||||
--- a/drivers/gpu/drm/i915/gt/intel_gt.c
|
||||
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
|
||||
@@ -339,6 +339,20 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt)
|
||||
mutex_lock(>->tlb_invalidate_lock);
|
||||
intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
|
||||
|
||||
+ spin_lock_irq(&uncore->lock); /* serialise invalidate with GT reset */
|
||||
+
|
||||
+ for_each_engine(engine, gt, id) {
|
||||
+ struct reg_and_bit rb;
|
||||
+
|
||||
+ rb = get_reg_and_bit(engine, regs == gen8_regs, regs, num);
|
||||
+ if (!i915_mmio_reg_offset(rb.reg))
|
||||
+ continue;
|
||||
+
|
||||
+ intel_uncore_write_fw(uncore, rb.reg, rb.bit);
|
||||
+ }
|
||||
+
|
||||
+ spin_unlock_irq(&uncore->lock);
|
||||
+
|
||||
for_each_engine(engine, gt, id) {
|
||||
/*
|
||||
* HW architecture suggest typical invalidation time at 40us,
|
||||
@@ -353,7 +367,6 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt)
|
||||
if (!i915_mmio_reg_offset(rb.reg))
|
||||
continue;
|
||||
|
||||
- intel_uncore_write_fw(uncore, rb.reg, rb.bit);
|
||||
if (__intel_wait_for_register_fw(uncore,
|
||||
rb.reg, rb.bit, 0,
|
||||
timeout_us, timeout_ms,
|
||||
+1
-1
Submodule submodules/ubuntu-focal updated: f8a15b6729...7417995cec
+1
-1
Submodule submodules/zfsonlinux updated: 5548e2b0b1...ff279e6b9b
Reference in New Issue
Block a user