From 548f585b4536e4b45289d324cd44c74093c4e11b Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 20 Apr 2023 12:00:40 +0200 Subject: [PATCH] update kernel to Proxmox-5.15.107-1 and refresh patches Signed-off-by: Thomas Lamprecht --- ...-Don-t-mark-as-busy-the-simple-frame.patch | 2 +- ...-smm-add-structs-for-KVM-s-smram-lay.patch | 4 +- ...-smm-use-smram-structs-in-the-common.patch | 8 +- ...-smm-use-smram-struct-for-32-bit-smr.patch | 2 +- ...-smm-use-smram-struct-for-64-bit-smr.patch | 2 +- ...-smm-preserve-interrupt-shadow-in-SM.patch | 2 +- ...evert-rtnl_lock-that-causes-deadlock.patch | 88 ------------------- submodules/ubuntu-kernel | 2 +- 8 files changed, 11 insertions(+), 99 deletions(-) delete mode 100644 patches/kernel/0025-igb-revert-rtnl_lock-that-causes-deadlock.patch diff --git a/patches/kernel/0011-drivers-firmware-Don-t-mark-as-busy-the-simple-frame.patch b/patches/kernel/0011-drivers-firmware-Don-t-mark-as-busy-the-simple-frame.patch index 83b53aa..17bd084 100644 --- a/patches/kernel/0011-drivers-firmware-Don-t-mark-as-busy-the-simple-frame.patch +++ b/patches/kernel/0011-drivers-firmware-Don-t-mark-as-busy-the-simple-frame.patch @@ -20,7 +20,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/sysfb_simplefb.c b/drivers/firmware/sysfb_simplefb.c -index eac51c2a27ba..a353e27f83f5 100644 +index fd4fa923088a..ca907f7e76c6 100644 --- a/drivers/firmware/sysfb_simplefb.c +++ b/drivers/firmware/sysfb_simplefb.c @@ -99,7 +99,7 @@ __init struct platform_device *sysfb_create_simplefb(const struct screen_info *s diff --git a/patches/kernel/0018-KVM-x86-emulator-smm-add-structs-for-KVM-s-smram-lay.patch b/patches/kernel/0018-KVM-x86-emulator-smm-add-structs-for-KVM-s-smram-lay.patch index 6ae94b4..242a3c8 100644 --- a/patches/kernel/0018-KVM-x86-emulator-smm-add-structs-for-KVM-s-smram-lay.patch +++ b/patches/kernel/0018-KVM-x86-emulator-smm-add-structs-for-KVM-s-smram-lay.patch @@ -267,10 +267,10 @@ index fb09cd22cb7f..0b2bbcce321a 100644 #if defined(CONFIG_X86_32) #define X86EMUL_MODE_HOST X86EMUL_MODE_PROT32 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index 2380f44b9658..aba497add3d3 100644 +index 386b92c2e4aa..1b2f6cd3cc8d 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -12621,6 +12621,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_vmgexit_msr_protocol_exit); +@@ -12642,6 +12642,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_vmgexit_msr_protocol_exit); static int __init kvm_x86_init(void) { kvm_mmu_x86_module_init(); diff --git a/patches/kernel/0019-KVM-x86-emulator-smm-use-smram-structs-in-the-common.patch b/patches/kernel/0019-KVM-x86-emulator-smm-use-smram-structs-in-the-common.patch index c3c2782..ab5df66 100644 --- a/patches/kernel/0019-KVM-x86-emulator-smm-use-smram-structs-in-the-common.patch +++ b/patches/kernel/0019-KVM-x86-emulator-smm-use-smram-structs-in-the-common.patch @@ -143,10 +143,10 @@ index b0b87c36be3d..545e321998d3 100644 return 0; diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c -index 5c2692190739..5443da6de531 100644 +index 7db4c69ac77b..0e52ddd14c57 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c -@@ -7621,7 +7621,7 @@ static int vmx_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection) +@@ -7615,7 +7615,7 @@ static int vmx_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection) return !is_smm(vcpu); } @@ -155,7 +155,7 @@ index 5c2692190739..5443da6de531 100644 { struct vcpu_vmx *vmx = to_vmx(vcpu); -@@ -7635,7 +7635,7 @@ static int vmx_enter_smm(struct kvm_vcpu *vcpu, char *smstate) +@@ -7629,7 +7629,7 @@ static int vmx_enter_smm(struct kvm_vcpu *vcpu, char *smstate) return 0; } @@ -165,7 +165,7 @@ index 5c2692190739..5443da6de531 100644 struct vcpu_vmx *vmx = to_vmx(vcpu); int ret; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index aba497add3d3..714ebf2c3125 100644 +index 1b2f6cd3cc8d..1b7e08590493 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7440,9 +7440,9 @@ static void emulator_exiting_smm(struct x86_emulate_ctxt *ctxt) diff --git a/patches/kernel/0020-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch b/patches/kernel/0020-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch index a65e1d5..b13924e 100644 --- a/patches/kernel/0020-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch +++ b/patches/kernel/0020-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch @@ -145,7 +145,7 @@ index d3cc1b8e2ea6..0dd18d66f3b7 100644 if (ret != X86EMUL_CONTINUE) goto emulate_shutdown; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index 714ebf2c3125..13530fd436d2 100644 +index 1b7e08590493..678318e5e0b4 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -9175,22 +9175,18 @@ static u32 enter_smm_get_segment_flags(struct kvm_segment *seg) diff --git a/patches/kernel/0021-KVM-x86-emulator-smm-use-smram-struct-for-64-bit-smr.patch b/patches/kernel/0021-KVM-x86-emulator-smm-use-smram-struct-for-64-bit-smr.patch index 0e6c841..1293c87 100644 --- a/patches/kernel/0021-KVM-x86-emulator-smm-use-smram-struct-for-64-bit-smr.patch +++ b/patches/kernel/0021-KVM-x86-emulator-smm-use-smram-struct-for-64-bit-smr.patch @@ -154,7 +154,7 @@ index 0dd18d66f3b7..37c1662b5508 100644 #endif ret = rsm_load_state_32(ctxt, &smram.smram32); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index 13530fd436d2..d59a78f6b607 100644 +index 678318e5e0b4..de1b88836442 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -9190,20 +9190,17 @@ static void enter_smm_save_seg_32(struct kvm_vcpu *vcpu, diff --git a/patches/kernel/0024-KVM-x86-emulator-smm-preserve-interrupt-shadow-in-SM.patch b/patches/kernel/0024-KVM-x86-emulator-smm-preserve-interrupt-shadow-in-SM.patch index e264dff..1ed9798 100644 --- a/patches/kernel/0024-KVM-x86-emulator-smm-preserve-interrupt-shadow-in-SM.patch +++ b/patches/kernel/0024-KVM-x86-emulator-smm-preserve-interrupt-shadow-in-SM.patch @@ -128,7 +128,7 @@ index 3b37b3e17379..a64c190abf28 100644 __CHECK_SMRAM64_OFFSET(auto_hlt_restart, 0xFEC9); __CHECK_SMRAM64_OFFSET(reserved2, 0xFECA); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index d59a78f6b607..5a38e73a80de 100644 +index de1b88836442..e95c254b450f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7427,6 +7427,11 @@ static void emulator_set_nmi_mask(struct x86_emulate_ctxt *ctxt, bool masked) diff --git a/patches/kernel/0025-igb-revert-rtnl_lock-that-causes-deadlock.patch b/patches/kernel/0025-igb-revert-rtnl_lock-that-causes-deadlock.patch deleted file mode 100644 index cb0e26f..0000000 --- a/patches/kernel/0025-igb-revert-rtnl_lock-that-causes-deadlock.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Lin Ma -Date: Tue, 7 Mar 2023 23:29:17 +0800 -Subject: [PATCH] igb: revert rtnl_lock() that causes deadlock - -commit 65f69851e44d71248b952a687e44759a7abb5016 upstream. - -The commit 6faee3d4ee8b ("igb: Add lock to avoid data race") adds -rtnl_lock to eliminate a false data race shown below - - (FREE from device detaching) | (USE from netdev core) -igb_remove | igb_ndo_get_vf_config - igb_disable_sriov | vf >= adapter->vfs_allocated_count? - kfree(adapter->vf_data) | - adapter->vfs_allocated_count = 0 | - | memcpy(... adapter->vf_data[vf] - -The above race will never happen and the extra rtnl_lock causes deadlock -below - -[ 141.420169] -[ 141.420672] __schedule+0x2dd/0x840 -[ 141.421427] schedule+0x50/0xc0 -[ 141.422041] schedule_preempt_disabled+0x11/0x20 -[ 141.422678] __mutex_lock.isra.13+0x431/0x6b0 -[ 141.423324] unregister_netdev+0xe/0x20 -[ 141.423578] igbvf_remove+0x45/0xe0 [igbvf] -[ 141.423791] pci_device_remove+0x36/0xb0 -[ 141.423990] device_release_driver_internal+0xc1/0x160 -[ 141.424270] pci_stop_bus_device+0x6d/0x90 -[ 141.424507] pci_stop_and_remove_bus_device+0xe/0x20 -[ 141.424789] pci_iov_remove_virtfn+0xba/0x120 -[ 141.425452] sriov_disable+0x2f/0xf0 -[ 141.425679] igb_disable_sriov+0x4e/0x100 [igb] -[ 141.426353] igb_remove+0xa0/0x130 [igb] -[ 141.426599] pci_device_remove+0x36/0xb0 -[ 141.426796] device_release_driver_internal+0xc1/0x160 -[ 141.427060] driver_detach+0x44/0x90 -[ 141.427253] bus_remove_driver+0x55/0xe0 -[ 141.427477] pci_unregister_driver+0x2a/0xa0 -[ 141.428296] __x64_sys_delete_module+0x141/0x2b0 -[ 141.429126] ? mntput_no_expire+0x4a/0x240 -[ 141.429363] ? syscall_trace_enter.isra.19+0x126/0x1a0 -[ 141.429653] do_syscall_64+0x5b/0x80 -[ 141.429847] ? exit_to_user_mode_prepare+0x14d/0x1c0 -[ 141.430109] ? syscall_exit_to_user_mode+0x12/0x30 -[ 141.430849] ? do_syscall_64+0x67/0x80 -[ 141.431083] ? syscall_exit_to_user_mode_prepare+0x183/0x1b0 -[ 141.431770] ? syscall_exit_to_user_mode+0x12/0x30 -[ 141.432482] ? do_syscall_64+0x67/0x80 -[ 141.432714] ? exc_page_fault+0x64/0x140 -[ 141.432911] entry_SYSCALL_64_after_hwframe+0x72/0xdc - -Since the igb_disable_sriov() will call pci_disable_sriov() before -releasing any resources, the netdev core will synchronize the cleanup to -avoid any races. This patch removes the useless rtnl_(un)lock to guarantee -correctness. - -CC: stable@vger.kernel.org -Fixes: 6faee3d4ee8b ("igb: Add lock to avoid data race") -Reported-by: Corinna Vinschen -Link: https://lore.kernel.org/intel-wired-lan/ZAcJvkEPqWeJHO2r@calimero.vinschen.de/ -Signed-off-by: Lin Ma -Tested-by: Corinna Vinschen -Reviewed-by: Jacob Keller -Reviewed-by: Simon Horman -Tested-by: Rafal Romanowski -Signed-off-by: Tony Nguyen -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Thomas Lamprecht ---- - drivers/net/ethernet/intel/igb/igb_main.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c -index b246ff8b7c20..bff9649d8abd 100644 ---- a/drivers/net/ethernet/intel/igb/igb_main.c -+++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -3820,9 +3820,7 @@ static void igb_remove(struct pci_dev *pdev) - igb_release_hw_control(adapter); - - #ifdef CONFIG_PCI_IOV -- rtnl_lock(); - igb_disable_sriov(pdev); -- rtnl_unlock(); - #endif - - unregister_netdev(netdev); diff --git a/submodules/ubuntu-kernel b/submodules/ubuntu-kernel index 55a9b21..39b1ad2 160000 --- a/submodules/ubuntu-kernel +++ b/submodules/ubuntu-kernel @@ -1 +1 @@ -Subproject commit 55a9b215943bc987caecf105b13a5962dd0c7bc7 +Subproject commit 39b1ad2696b8e76f7e33aae243d20117c70b5d50