From 15c9538c9aba67b12cf039ef9b6048dfcc30aeed Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sun, 16 Mar 2025 20:02:20 +0100 Subject: [PATCH] update source and patches to Ubuntu-6.8.0-58.60 Signed-off-by: Thomas Lamprecht --- ...ides-for-missing-ACS-capabilities-4..patch | 4 +- ...-default-dynamic-halt-polling-growth.patch | 2 +- ...de-unregister_netdevice-refcount-lea.patch | 4 +- ...sk-out-PKRU-bit-in-xfeatures-if-vCPU.patch | 2 +- ...allow-pass-through-on-broken-hardwar.patch | 4 +- ...-Advertise-support-for-flush-by-ASID.patch | 4 +- ...CE-iommu-intel-disable-DMAR-for-SKL.patch} | 4 +- ...pu-pm-Don-t-use-OD-table-on-Arcturus.patch | 69 ------------------- ...t-subreq-iov-iter-before-tail-clean.patch} | 0 ...ble-PCID-when-INVLPG-has-been-fixed.patch} | 0 ...ockup-on-tx-to-unregistering-netdev.patch} | 7 +- ...r-virtualized-VMLOAD-VMSAVE-on-Zen4-.patch | 44 ------------ submodules/ubuntu-kernel | 2 +- 13 files changed, 15 insertions(+), 131 deletions(-) rename patches/kernel/{0015-Revert-UBUNTU-SAUCE-iommu-intel-disable-DMAR-for-SKL.patch => 0014-Revert-UBUNTU-SAUCE-iommu-intel-disable-DMAR-for-SKL.patch} (97%) delete mode 100644 patches/kernel/0014-drm-amdgpu-pm-Don-t-use-OD-table-on-Arcturus.patch rename patches/kernel/{0016-netfs-reset-subreq-iov-iter-before-tail-clean.patch => 0015-netfs-reset-subreq-iov-iter-before-tail-clean.patch} (100%) rename patches/kernel/{0018-x86-mm-Don-t-disable-PCID-when-INVLPG-has-been-fixed.patch => 0016-x86-mm-Don-t-disable-PCID-when-INVLPG-has-been-fixed.patch} (100%) rename patches/kernel/{0019-openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch => 0017-openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch} (95%) delete mode 100644 patches/kernel/0017-x86-CPU-AMD-Clear-virtualized-VMLOAD-VMSAVE-on-Zen4-.patch diff --git a/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index 6a807d6..82d874a 100644 --- a/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -75,7 +75,7 @@ index 4d27542bebcbff40ae27446410207cd32272f2b7..87480be6e054df3927c5691a49c0dd18 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 bd2470ec3922f13843f2adcf0df41b5be91fbf94..0d0781ede9235c154e061eb11b38815931c352f7 100644 +index baf2f6e94ea536bb223422bde537c441bc002f78..230f4f2a89772d61e50b4295b95fd7d22b520ac1 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -300,6 +300,106 @@ static int __init pci_apply_final_quirks(void) @@ -185,7 +185,7 @@ index bd2470ec3922f13843f2adcf0df41b5be91fbf94..0d0781ede9235c154e061eb11b388159 /* * 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 -@@ -5113,6 +5213,8 @@ static const struct pci_dev_acs_enabled { +@@ -5124,6 +5224,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 }, diff --git a/patches/kernel/0005-kvm-disable-default-dynamic-halt-polling-growth.patch b/patches/kernel/0005-kvm-disable-default-dynamic-halt-polling-growth.patch index 69afad9..dbbc47c 100644 --- a/patches/kernel/0005-kvm-disable-default-dynamic-halt-polling-growth.patch +++ b/patches/kernel/0005-kvm-disable-default-dynamic-halt-polling-growth.patch @@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index 6de2c9889d4722b39717896614f3ffc20a879d35..fef608f130d3ba0934dba0dd74c1dc1bd6446b87 100644 +index 4222c56aef226a52efb13e0742392e9fb819a330..1e462d00c2a340fec2d3e1294b261af38c66086c 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -82,7 +82,7 @@ module_param(halt_poll_ns, uint, 0644); diff --git a/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch b/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch index 60bac14..382d0ac 100644 --- a/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch +++ b/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch @@ -14,10 +14,10 @@ Signed-off-by: Fabian Grünbichler 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c -index e578afa66bcd2189a5113ccef69227fa619dc16c..86adbe2df8e860d524c6a74e758502b80f64a79d 100644 +index 56c33e44224dbab9845b1c5afc591eae2ac0770e..136d397dabd1d8e819c2abb6b4918b269f6538cc 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -10475,7 +10475,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list) +@@ -10481,7 +10481,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list) if (time_after(jiffies, warning_time + READ_ONCE(netdev_unregister_timeout_secs) * HZ)) { list_for_each_entry(dev, list, todo_list) { diff --git a/patches/kernel/0008-kvm-xsave-set-mask-out-PKRU-bit-in-xfeatures-if-vCPU.patch b/patches/kernel/0008-kvm-xsave-set-mask-out-PKRU-bit-in-xfeatures-if-vCPU.patch index 643b7d0..dd100bc 100644 --- a/patches/kernel/0008-kvm-xsave-set-mask-out-PKRU-bit-in-xfeatures-if-vCPU.patch +++ b/patches/kernel/0008-kvm-xsave-set-mask-out-PKRU-bit-in-xfeatures-if-vCPU.patch @@ -110,7 +110,7 @@ index da4e23e32cffa430f04d1589d6fa2d4a856ed714..e33c2269c5a075d57c53d817ebeaf1b6 int cpuid_query_maxphyaddr(struct kvm_vcpu *vcpu); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index 898b191954eb2423a42a62bae40be72a7e91f38c..558e267ae0def34227f6f854a0955a26766a6e2c 100644 +index e9b22cee10c8ce9f2b7aeb988bd9184c347a5521..0d0529edf6def8a1f4a8c13cb5b91c23daaf792a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5580,6 +5580,19 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu, diff --git a/patches/kernel/0009-allow-opt-in-to-allow-pass-through-on-broken-hardwar.patch b/patches/kernel/0009-allow-opt-in-to-allow-pass-through-on-broken-hardwar.patch index bb03c5b..259d9a5 100644 --- a/patches/kernel/0009-allow-opt-in-to-allow-pass-through-on-broken-hardwar.patch +++ b/patches/kernel/0009-allow-opt-in-to-allow-pass-through-on-broken-hardwar.patch @@ -11,7 +11,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c -index 3ea9bbaf77f1e7dd89326cadad13994257aed3aa..0cbec26d432e75098d6f6272647511efc6e1a517 100644 +index cfaa45df8eced0d8b11c07e2121e033210c530d4..2596661e7806062953cc05cbc0613f0bec8c11f4 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -234,6 +234,7 @@ static int dmar_map_gfx = 1; @@ -32,7 +32,7 @@ index 3ea9bbaf77f1e7dd89326cadad13994257aed3aa..0cbec26d432e75098d6f6272647511ef } else { pr_notice("Unknown option - '%s'\n", str); } -@@ -2470,7 +2474,7 @@ static bool device_rmrr_is_relaxable(struct device *dev) +@@ -2482,7 +2486,7 @@ static bool device_rmrr_is_relaxable(struct device *dev) return false; pdev = to_pci_dev(dev); diff --git a/patches/kernel/0010-KVM-nSVM-Advertise-support-for-flush-by-ASID.patch b/patches/kernel/0010-KVM-nSVM-Advertise-support-for-flush-by-ASID.patch index d9c1f87..3d91a7f 100644 --- a/patches/kernel/0010-KVM-nSVM-Advertise-support-for-flush-by-ASID.patch +++ b/patches/kernel/0010-KVM-nSVM-Advertise-support-for-flush-by-ASID.patch @@ -24,10 +24,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c -index 9d070f7da796ebc18b04481d84a05586be726725..2ac30170f887caa2c191db46678cb3ad678b9568 100644 +index 38591fe3cf3d06eb20642ad306697ec280af63eb..1980e279a21397f89fa3d2b247c60fd31b2bf715 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c -@@ -5114,6 +5114,7 @@ static __init void svm_set_cpu_caps(void) +@@ -5116,6 +5116,7 @@ static __init void svm_set_cpu_caps(void) if (nested) { kvm_cpu_cap_set(X86_FEATURE_SVM); kvm_cpu_cap_set(X86_FEATURE_VMCBCLEAN); diff --git a/patches/kernel/0015-Revert-UBUNTU-SAUCE-iommu-intel-disable-DMAR-for-SKL.patch b/patches/kernel/0014-Revert-UBUNTU-SAUCE-iommu-intel-disable-DMAR-for-SKL.patch similarity index 97% rename from patches/kernel/0015-Revert-UBUNTU-SAUCE-iommu-intel-disable-DMAR-for-SKL.patch rename to patches/kernel/0014-Revert-UBUNTU-SAUCE-iommu-intel-disable-DMAR-for-SKL.patch index 2d7eb12..5ec852a 100644 --- a/patches/kernel/0015-Revert-UBUNTU-SAUCE-iommu-intel-disable-DMAR-for-SKL.patch +++ b/patches/kernel/0014-Revert-UBUNTU-SAUCE-iommu-intel-disable-DMAR-for-SKL.patch @@ -17,10 +17,10 @@ gfx"). 1 file changed, 68 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c -index 0cbec26d432e75098d6f6272647511efc6e1a517..9d88215d0350691ec0a1ecbf76344668ef4fd740 100644 +index 2596661e7806062953cc05cbc0613f0bec8c11f4..c53b6257890cac07a420d5329abd7409b1035dcc 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c -@@ -5034,74 +5034,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx); +@@ -5048,74 +5048,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx); diff --git a/patches/kernel/0014-drm-amdgpu-pm-Don-t-use-OD-table-on-Arcturus.patch b/patches/kernel/0014-drm-amdgpu-pm-Don-t-use-OD-table-on-Arcturus.patch deleted file mode 100644 index 1df03d6..0000000 --- a/patches/kernel/0014-drm-amdgpu-pm-Don-t-use-OD-table-on-Arcturus.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ma Jun -Date: Tue, 19 Mar 2024 11:02:29 +0800 -Subject: [PATCH] drm/amdgpu/pm: Don't use OD table on Arcturus - -OD is not supported on Arcturus, so the OD table -should not be used. - -Signed-off-by: Ma Jun -Acked-by: Alex Deucher -Signed-off-by: Alex Deucher -(cherry picked from commit bc55c344b06f7e6f99eb92d393ff0a84c1532514) -Signed-off-by: Fiona Ebner ---- - .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 33 +++---------------- - 1 file changed, 5 insertions(+), 28 deletions(-) - -diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c -index 437ac31b1673986f96a5a714e3e017d06e053dc9..415032f58522f8eefcfe1ddad5dc992f6f3e2e3d 100644 ---- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c -+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c -@@ -1283,11 +1283,8 @@ static int arcturus_get_power_limit(struct smu_context *smu, - uint32_t *max_power_limit, - uint32_t *min_power_limit) - { -- struct smu_11_0_powerplay_table *powerplay_table = -- (struct smu_11_0_powerplay_table *)smu->smu_table.power_play_table; -- struct smu_11_0_overdrive_table *od_settings = smu->od_settings; - PPTable_t *pptable = smu->smu_table.driver_pptable; -- uint32_t power_limit, od_percent_upper = 0, od_percent_lower = 0; -+ uint32_t power_limit; - - if (smu_v11_0_get_current_power_limit(smu, &power_limit)) { - /* the last hope to figure out the ppt limit */ -@@ -1303,30 +1300,10 @@ static int arcturus_get_power_limit(struct smu_context *smu, - *current_power_limit = power_limit; - if (default_power_limit) - *default_power_limit = power_limit; -- -- if (powerplay_table) { -- if (smu->od_enabled && -- od_settings->cap[SMU_11_0_ODCAP_POWER_LIMIT]) { -- od_percent_upper = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE]); -- od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]); -- } else if (od_settings->cap[SMU_11_0_ODCAP_POWER_LIMIT]) { -- od_percent_upper = 0; -- od_percent_lower = le32_to_cpu(powerplay_table->overdrive_table.min[SMU_11_0_ODSETTING_POWERPERCENTAGE]); -- } -- } -- -- dev_dbg(smu->adev->dev, "od percent upper:%d, od percent lower:%d (default power: %d)\n", -- od_percent_upper, od_percent_lower, power_limit); -- -- if (max_power_limit) { -- *max_power_limit = power_limit * (100 + od_percent_upper); -- *max_power_limit /= 100; -- } -- -- if (min_power_limit) { -- *min_power_limit = power_limit * (100 - od_percent_lower); -- *min_power_limit /= 100; -- } -+ if (max_power_limit) -+ *max_power_limit = power_limit; -+ if (min_power_limit) -+ *min_power_limit = power_limit; - - return 0; - } diff --git a/patches/kernel/0016-netfs-reset-subreq-iov-iter-before-tail-clean.patch b/patches/kernel/0015-netfs-reset-subreq-iov-iter-before-tail-clean.patch similarity index 100% rename from patches/kernel/0016-netfs-reset-subreq-iov-iter-before-tail-clean.patch rename to patches/kernel/0015-netfs-reset-subreq-iov-iter-before-tail-clean.patch diff --git a/patches/kernel/0018-x86-mm-Don-t-disable-PCID-when-INVLPG-has-been-fixed.patch b/patches/kernel/0016-x86-mm-Don-t-disable-PCID-when-INVLPG-has-been-fixed.patch similarity index 100% rename from patches/kernel/0018-x86-mm-Don-t-disable-PCID-when-INVLPG-has-been-fixed.patch rename to patches/kernel/0016-x86-mm-Don-t-disable-PCID-when-INVLPG-has-been-fixed.patch diff --git a/patches/kernel/0019-openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch b/patches/kernel/0017-openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch similarity index 95% rename from patches/kernel/0019-openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch rename to patches/kernel/0017-openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch index f08f31f..9d2fb2b 100644 --- a/patches/kernel/0019-openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch +++ b/patches/kernel/0017-openvswitch-fix-lockup-on-tx-to-unregistering-netdev.patch @@ -1,4 +1,4 @@ -From 48ebfb955228ae4804c2c666a7b200bd38f330b0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ilya Maximets Date: Thu, 9 Jan 2025 13:21:24 +0100 Subject: [PATCH] openvswitch: fix lockup on tx to unregistering netdev with @@ -58,7 +58,7 @@ Signed-off-by: Friedrich Weber 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c -index 964225580824..0c0e4fb58bf4 100644 +index 96422558082476316bc0ab6a28e41c8103c44b8a..0c0e4fb58bf4d5d180bf883e430573c9aa359143 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -925,7 +925,9 @@ static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port, @@ -72,6 +72,3 @@ index 964225580824..0c0e4fb58bf4 100644 u16 mru = OVS_CB(skb)->mru; u32 cutlen = OVS_CB(skb)->cutlen; --- -2.39.5 - diff --git a/patches/kernel/0017-x86-CPU-AMD-Clear-virtualized-VMLOAD-VMSAVE-on-Zen4-.patch b/patches/kernel/0017-x86-CPU-AMD-Clear-virtualized-VMLOAD-VMSAVE-on-Zen4-.patch deleted file mode 100644 index 94ce254..0000000 --- a/patches/kernel/0017-x86-CPU-AMD-Clear-virtualized-VMLOAD-VMSAVE-on-Zen4-.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mario Limonciello -Date: Tue, 5 Nov 2024 10:02:34 -0600 -Subject: [PATCH] x86/CPU/AMD: Clear virtualized VMLOAD/VMSAVE on Zen4 client - -A number of Zen4 client SoCs advertise the ability to use virtualized -VMLOAD/VMSAVE, but using these instructions is reported to be a cause -of a random host reboot. - -These instructions aren't intended to be advertised on Zen4 client -so clear the capability. - -Signed-off-by: Mario Limonciello -Signed-off-by: Borislav Petkov (AMD) -Cc: stable@vger.kernel.org -Link: https://bugzilla.kernel.org/show_bug.cgi?id=219009 -(cherry picked from commit a5ca1dc46a6b610dd4627d8b633d6c84f9724ef0) -Signed-off-by: Fiona Ebner ---- - arch/x86/kernel/cpu/amd.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c -index 809a66d522c1131c850f7fda26b61752f122e192..edc1b32b502106089833c1f327768848a5145081 100644 ---- a/arch/x86/kernel/cpu/amd.c -+++ b/arch/x86/kernel/cpu/amd.c -@@ -1061,6 +1061,17 @@ static void init_amd_zen4(struct cpuinfo_x86 *c) - - if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) - msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT); -+ -+ /* -+ * These Zen4 SoCs advertise support for virtualized VMLOAD/VMSAVE -+ * in some BIOS versions but they can lead to random host reboots. -+ */ -+ switch (c->x86_model) { -+ case 0x18 ... 0x1f: -+ case 0x60 ... 0x7f: -+ clear_cpu_cap(c, X86_FEATURE_V_VMSAVE_VMLOAD); -+ break; -+ } - } - - static void init_amd_zen5(struct cpuinfo_x86 *c) diff --git a/submodules/ubuntu-kernel b/submodules/ubuntu-kernel index 5748450..1286e4a 160000 --- a/submodules/ubuntu-kernel +++ b/submodules/ubuntu-kernel @@ -1 +1 @@ -Subproject commit 5748450da0f43f2212cad2e3942c24db8a68913d +Subproject commit 1286e4adc08a6cd8b3bc881c34b8a8bbc6ff1e8a