From 95d22b9bec5cc53a5a297922ff2714fc4a3229fe Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 13 Oct 2022 10:28:51 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-5.15.0-51.57 (generated with debian/scripts/import-upstream-tag) 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 | 2 +- ...group-always-terminate-io.stat-lines.patch | 14 ++-- ...r-em_sysexit-should-update-ctxt-mode.patch | 4 +- ...-introduce-emulator_recalc_and_set_m.patch | 8 +-- ...-update-the-emulation-mode-after-rsm.patch | 4 +- ...-update-the-emulation-mode-after-CR0.patch | 4 +- ...-smm-add-structs-for-KVM-s-smram-lay.patch | 8 +-- ...-smm-use-smram-structs-in-the-common.patch | 26 +++---- ...-smm-use-smram-struct-for-32-bit-smr.patch | 16 ++--- ...-smm-use-smram-struct-for-64-bit-smr.patch | 16 ++--- .../0024-KVM-x86-SVM-use-smram-structs.patch | 12 ++-- ...t-save-SVM-state-to-SMRAM-when-VM-is.patch | 4 +- ...-smm-preserve-interrupt-shadow-in-SM.patch | 20 +++--- ...5-Adjust-log_max_qp-to-be-18-at-most.patch | 37 ---------- ...te-steal-time-cache-if-MSR-value-cha.patch | 60 ---------------- ...eport-preemption-if-the-steal-time-c.patch | 47 ------------- ...-qla2xxx-Fix-disk-failure-to-redisco.patch | 70 ------------------- 19 files changed, 72 insertions(+), 286 deletions(-) delete mode 100644 patches/kernel/0027-net-mlx5-Adjust-log_max_qp-to-be-18-at-most.patch delete mode 100644 patches/kernel/0028-KVM-x86-revalidate-steal-time-cache-if-MSR-value-cha.patch delete mode 100644 patches/kernel/0029-KVM-x86-do-not-report-preemption-if-the-steal-time-c.patch delete mode 100644 patches/kernel/0030-scsi-Revert-scsi-qla2xxx-Fix-disk-failure-to-redisco.patch diff --git a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index 771a995..c6d917c 100644 --- a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -55,7 +55,7 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 111 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index de9ec3722356..bcaa2a8ac8fe 100644 +index bfc1f87aa9ae..ed601c66eef0 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3945,6 +3945,15 @@ @@ -75,7 +75,7 @@ index de9ec3722356..bcaa2a8ac8fe 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 1c566b0cbee9..d49c54c579bb 100644 +index 153bce71e35b..d573392879f8 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void) diff --git a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch index d82038f..135bd5d 100644 --- a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch +++ b/patches/kernel/0004-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 0816b8018cde..5118cfb1765b 100644 +index 86fc429a0e43..0bf84788ff5b 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -79,7 +79,7 @@ module_param(halt_poll_ns, uint, 0644); diff --git a/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch b/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch index f8d36cf..8a4d2b9 100644 --- a/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch +++ b/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch @@ -10,7 +10,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c -index 12b1811cb488..9bbb7ef7537d 100644 +index 276cca563325..c96ddc500eb3 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -10529,7 +10529,7 @@ static void netdev_wait_allrefs(struct net_device *dev) diff --git a/patches/kernel/0009-blk-cgroup-always-terminate-io.stat-lines.patch b/patches/kernel/0009-blk-cgroup-always-terminate-io.stat-lines.patch index f007129..7d3023c 100644 --- a/patches/kernel/0009-blk-cgroup-always-terminate-io.stat-lines.patch +++ b/patches/kernel/0009-blk-cgroup-always-terminate-io.stat-lines.patch @@ -64,10 +64,10 @@ index ce5858dadca5..aa43ed94deb6 100644 static int blkcg_print_stat(struct seq_file *sf, void *v) diff --git a/block/blk-iocost.c b/block/blk-iocost.c -index 10851493940c..21db328c0bcc 100644 +index 069193dee95b..352c43ab95e5 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c -@@ -3005,13 +3005,13 @@ static void ioc_pd_free(struct blkg_policy_data *pd) +@@ -3011,13 +3011,13 @@ static void ioc_pd_free(struct blkg_policy_data *pd) kfree(iocg); } @@ -83,7 +83,7 @@ index 10851493940c..21db328c0bcc 100644 if (iocg->level == 0) { unsigned vp10k = DIV64_U64_ROUND_CLOSEST( -@@ -3027,7 +3027,6 @@ static bool ioc_pd_stat(struct blkg_policy_data *pd, struct seq_file *s) +@@ -3033,7 +3033,6 @@ static bool ioc_pd_stat(struct blkg_policy_data *pd, struct seq_file *s) iocg->last_stat.wait_us, iocg->last_stat.indebt_us, iocg->last_stat.indelay_us); @@ -92,10 +92,10 @@ index 10851493940c..21db328c0bcc 100644 static u64 ioc_weight_prfill(struct seq_file *sf, struct blkg_policy_data *pd, diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c -index d85f30a85ee7..ca25e0bc1269 100644 +index bdef8395af6e..a5f13743a280 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c -@@ -902,7 +902,7 @@ static int iolatency_print_limit(struct seq_file *sf, void *v) +@@ -906,7 +906,7 @@ static int iolatency_print_limit(struct seq_file *sf, void *v) return 0; } @@ -104,7 +104,7 @@ index d85f30a85ee7..ca25e0bc1269 100644 { struct latency_stat stat; int cpu; -@@ -925,17 +925,16 @@ static bool iolatency_ssd_stat(struct iolatency_grp *iolat, struct seq_file *s) +@@ -929,17 +929,16 @@ static bool iolatency_ssd_stat(struct iolatency_grp *iolat, struct seq_file *s) (unsigned long long)stat.ps.missed, (unsigned long long)stat.ps.total, iolat->rq_depth.max_depth); @@ -124,7 +124,7 @@ index d85f30a85ee7..ca25e0bc1269 100644 if (iolat->ssd) return iolatency_ssd_stat(iolat, s); -@@ -948,7 +947,6 @@ static bool iolatency_pd_stat(struct blkg_policy_data *pd, struct seq_file *s) +@@ -952,7 +951,6 @@ static bool iolatency_pd_stat(struct blkg_policy_data *pd, struct seq_file *s) else seq_printf(s, " depth=%u avg_lat=%llu win=%llu", iolat->rq_depth.max_depth, avg_lat, cur_win); diff --git a/patches/kernel/0016-KVM-x86-emulator-em_sysexit-should-update-ctxt-mode.patch b/patches/kernel/0016-KVM-x86-emulator-em_sysexit-should-update-ctxt-mode.patch index f7f8c6a..3ab10ff 100644 --- a/patches/kernel/0016-KVM-x86-emulator-em_sysexit-should-update-ctxt-mode.patch +++ b/patches/kernel/0016-KVM-x86-emulator-em_sysexit-should-update-ctxt-mode.patch @@ -18,10 +18,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c -index 318a78379ca6..35b12692739c 100644 +index 8496ffc67c32..1856de48be6b 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c -@@ -2862,6 +2862,7 @@ static int em_sysexit(struct x86_emulate_ctxt *ctxt) +@@ -2861,6 +2861,7 @@ static int em_sysexit(struct x86_emulate_ctxt *ctxt) ops->set_segment(ctxt, ss_sel, &ss, 0, VCPU_SREG_SS); ctxt->_eip = rdx; diff --git a/patches/kernel/0017-KVM-x86-emulator-introduce-emulator_recalc_and_set_m.patch b/patches/kernel/0017-KVM-x86-emulator-introduce-emulator_recalc_and_set_m.patch index a95e51e..c565c8c 100644 --- a/patches/kernel/0017-KVM-x86-emulator-introduce-emulator_recalc_and_set_m.patch +++ b/patches/kernel/0017-KVM-x86-emulator-introduce-emulator_recalc_and_set_m.patch @@ -21,7 +21,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 57 insertions(+), 28 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c -index 35b12692739c..6a597d68d456 100644 +index 1856de48be6b..7cf3cd26748d 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -795,8 +795,7 @@ static int linearize(struct x86_emulate_ctxt *ctxt, @@ -129,7 +129,7 @@ index 35b12692739c..6a597d68d456 100644 } static inline int jmp_rel(struct x86_emulate_ctxt *ctxt, int rel) -@@ -2154,7 +2183,7 @@ static int em_jmp_far(struct x86_emulate_ctxt *ctxt) +@@ -2153,7 +2182,7 @@ static int em_jmp_far(struct x86_emulate_ctxt *ctxt) if (rc != X86EMUL_CONTINUE) return rc; @@ -138,7 +138,7 @@ index 35b12692739c..6a597d68d456 100644 /* Error handling is not implemented. */ if (rc != X86EMUL_CONTINUE) return X86EMUL_UNHANDLEABLE; -@@ -2235,7 +2264,7 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt) +@@ -2234,7 +2263,7 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt) &new_desc); if (rc != X86EMUL_CONTINUE) return rc; @@ -147,7 +147,7 @@ index 35b12692739c..6a597d68d456 100644 /* Error handling is not implemented. */ if (rc != X86EMUL_CONTINUE) return X86EMUL_UNHANDLEABLE; -@@ -3459,7 +3488,7 @@ static int em_call_far(struct x86_emulate_ctxt *ctxt) +@@ -3458,7 +3487,7 @@ static int em_call_far(struct x86_emulate_ctxt *ctxt) if (rc != X86EMUL_CONTINUE) return rc; diff --git a/patches/kernel/0018-KVM-x86-emulator-update-the-emulation-mode-after-rsm.patch b/patches/kernel/0018-KVM-x86-emulator-update-the-emulation-mode-after-rsm.patch index 0f1c9ca..a510334 100644 --- a/patches/kernel/0018-KVM-x86-emulator-update-the-emulation-mode-after-rsm.patch +++ b/patches/kernel/0018-KVM-x86-emulator-update-the-emulation-mode-after-rsm.patch @@ -17,10 +17,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 5 insertions(+) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c -index 6a597d68d456..49697d589f87 100644 +index 7cf3cd26748d..5be4b9927221 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c -@@ -2639,6 +2639,11 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt) +@@ -2638,6 +2638,11 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt) if (ret != X86EMUL_CONTINUE) goto emulate_shutdown; diff --git a/patches/kernel/0019-KVM-x86-emulator-update-the-emulation-mode-after-CR0.patch b/patches/kernel/0019-KVM-x86-emulator-update-the-emulation-mode-after-CR0.patch index f9a69ce..ee2ba48 100644 --- a/patches/kernel/0019-KVM-x86-emulator-update-the-emulation-mode-after-CR0.patch +++ b/patches/kernel/0019-KVM-x86-emulator-update-the-emulation-mode-after-CR0.patch @@ -19,10 +19,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c -index 49697d589f87..89f035fc52e7 100644 +index 5be4b9927221..8e8975496a2d 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c -@@ -3635,11 +3635,23 @@ static int em_movbe(struct x86_emulate_ctxt *ctxt) +@@ -3634,11 +3634,23 @@ static int em_movbe(struct x86_emulate_ctxt *ctxt) static int em_cr_write(struct x86_emulate_ctxt *ctxt) { diff --git a/patches/kernel/0020-KVM-x86-emulator-smm-add-structs-for-KVM-s-smram-lay.patch b/patches/kernel/0020-KVM-x86-emulator-smm-add-structs-for-KVM-s-smram-lay.patch index a51eaa6..bcae075 100644 --- a/patches/kernel/0020-KVM-x86-emulator-smm-add-structs-for-KVM-s-smram-lay.patch +++ b/patches/kernel/0020-KVM-x86-emulator-smm-add-structs-for-KVM-s-smram-lay.patch @@ -17,10 +17,10 @@ Signed-off-by: Thomas Lamprecht 3 files changed, 225 insertions(+) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c -index 89f035fc52e7..bfaf5d24bf1e 100644 +index 8e8975496a2d..58bc09040b3b 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c -@@ -5825,3 +5825,9 @@ bool emulator_can_use_gpa(struct x86_emulate_ctxt *ctxt) +@@ -5824,3 +5824,9 @@ bool emulator_can_use_gpa(struct x86_emulate_ctxt *ctxt) return true; } @@ -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 70250d7ca0d7..3d9ddc2ca808 100644 +index 7a06f7599c8f..1a6dde98d521 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -12468,6 +12468,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_vmgexit_msr_protocol_exit); +@@ -12479,6 +12479,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/0021-KVM-x86-emulator-smm-use-smram-structs-in-the-common.patch b/patches/kernel/0021-KVM-x86-emulator-smm-use-smram-structs-in-the-common.patch index 6bc18d1..e14bee3 100644 --- a/patches/kernel/0021-KVM-x86-emulator-smm-use-smram-structs-in-the-common.patch +++ b/patches/kernel/0021-KVM-x86-emulator-smm-use-smram-structs-in-the-common.patch @@ -17,7 +17,7 @@ Signed-off-by: Thomas Lamprecht 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h -index e7c7d3066642..f450e1011792 100644 +index 4a25a459412e..0669a533451d 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -200,6 +200,7 @@ typedef enum exit_fastpath_completion fastpath_t; @@ -28,7 +28,7 @@ index e7c7d3066642..f450e1011792 100644 enum x86_intercept; enum x86_intercept_stage; -@@ -1466,8 +1467,8 @@ struct kvm_x86_ops { +@@ -1467,8 +1468,8 @@ struct kvm_x86_ops { void (*setup_mce)(struct kvm_vcpu *vcpu); int (*smi_allowed)(struct kvm_vcpu *vcpu, bool for_injection); @@ -40,10 +40,10 @@ index e7c7d3066642..f450e1011792 100644 int (*mem_enc_op)(struct kvm *kvm, void __user *argp); diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c -index bfaf5d24bf1e..730c3e2662d6 100644 +index 58bc09040b3b..6b579368b813 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c -@@ -2567,16 +2567,18 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, +@@ -2566,16 +2566,18 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, static int em_rsm(struct x86_emulate_ctxt *ctxt) { unsigned long cr0, cr4, efer; @@ -64,7 +64,7 @@ index bfaf5d24bf1e..730c3e2662d6 100644 if (ret != X86EMUL_CONTINUE) return X86EMUL_UNHANDLEABLE; -@@ -2626,15 +2628,15 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt) +@@ -2625,15 +2627,15 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt) * state (e.g. enter guest mode) before loading state from the SMM * state-save area. */ @@ -105,10 +105,10 @@ index 0b2bbcce321a..3b37b3e17379 100644 int (*set_xcr)(struct x86_emulate_ctxt *ctxt, u32 index, u64 xcr); }; diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c -index bec1de282c79..8011e8053906 100644 +index d1ba4da93985..dee4d66ff5b5 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c -@@ -4304,12 +4304,14 @@ static int svm_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection) +@@ -4313,12 +4313,14 @@ static int svm_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection) return !svm_smi_blocked(vcpu); } @@ -124,7 +124,7 @@ index bec1de282c79..8011e8053906 100644 if (!is_guest_mode(vcpu)) return 0; -@@ -4351,7 +4353,7 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, char *smstate) +@@ -4360,7 +4362,7 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, char *smstate) return 0; } @@ -133,7 +133,7 @@ index bec1de282c79..8011e8053906 100644 { struct vcpu_svm *svm = to_svm(vcpu); struct kvm_host_map map, map_save; -@@ -4359,6 +4361,8 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const char *smstate) +@@ -4368,6 +4370,8 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const char *smstate) struct vmcb *vmcb12; int ret; @@ -143,7 +143,7 @@ index bec1de282c79..8011e8053906 100644 return 0; diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c -index fae3bcff22cf..b8163ac61dae 100644 +index 1bc7f76fa0d2..fc0bb685283d 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -7595,7 +7595,7 @@ static int vmx_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection) @@ -165,10 +165,10 @@ index fae3bcff22cf..b8163ac61dae 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 3d9ddc2ca808..95a93b41d5c0 100644 +index 1a6dde98d521..5554e4bd70fd 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -7322,9 +7322,9 @@ static void emulator_exiting_smm(struct x86_emulate_ctxt *ctxt) +@@ -7333,9 +7333,9 @@ static void emulator_exiting_smm(struct x86_emulate_ctxt *ctxt) } static int emulator_leave_smm(struct x86_emulate_ctxt *ctxt, @@ -180,7 +180,7 @@ index 3d9ddc2ca808..95a93b41d5c0 100644 } static void emulator_triple_fault(struct x86_emulate_ctxt *ctxt) -@@ -9183,25 +9183,25 @@ static void enter_smm(struct kvm_vcpu *vcpu) +@@ -9194,25 +9194,25 @@ static void enter_smm(struct kvm_vcpu *vcpu) struct kvm_segment cs, ds; struct desc_ptr dt; unsigned long cr0; diff --git a/patches/kernel/0022-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch b/patches/kernel/0022-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch index 3a37fa2..c3a3850 100644 --- a/patches/kernel/0022-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch +++ b/patches/kernel/0022-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch @@ -15,10 +15,10 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 60 insertions(+), 96 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c -index 730c3e2662d6..ad5d2ab9ab84 100644 +index 6b579368b813..63e9c9ef25a2 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c -@@ -2344,25 +2344,17 @@ static void rsm_set_desc_flags(struct desc_struct *desc, u32 flags) +@@ -2343,25 +2343,17 @@ static void rsm_set_desc_flags(struct desc_struct *desc, u32 flags) desc->type = (flags >> 8) & 15; } @@ -50,7 +50,7 @@ index 730c3e2662d6..ad5d2ab9ab84 100644 } #ifdef CONFIG_X86_64 -@@ -2433,63 +2425,46 @@ static int rsm_enter_protected_mode(struct x86_emulate_ctxt *ctxt, +@@ -2432,63 +2424,46 @@ static int rsm_enter_protected_mode(struct x86_emulate_ctxt *ctxt, } static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, @@ -135,7 +135,7 @@ index 730c3e2662d6..ad5d2ab9ab84 100644 } #ifdef CONFIG_X86_64 -@@ -2636,7 +2611,7 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt) +@@ -2635,7 +2610,7 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt) ret = rsm_load_state_64(ctxt, (const char *)&smram); else #endif @@ -145,10 +145,10 @@ index 730c3e2662d6..ad5d2ab9ab84 100644 if (ret != X86EMUL_CONTINUE) goto emulate_shutdown; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index 95a93b41d5c0..ea10c080c15c 100644 +index 5554e4bd70fd..13e457996477 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -9037,22 +9037,18 @@ static u32 enter_smm_get_segment_flags(struct kvm_segment *seg) +@@ -9048,22 +9048,18 @@ static u32 enter_smm_get_segment_flags(struct kvm_segment *seg) return flags; } @@ -179,7 +179,7 @@ index 95a93b41d5c0..ea10c080c15c 100644 } #ifdef CONFIG_X86_64 -@@ -9073,54 +9069,47 @@ static void enter_smm_save_seg_64(struct kvm_vcpu *vcpu, char *buf, int n) +@@ -9084,54 +9080,47 @@ static void enter_smm_save_seg_64(struct kvm_vcpu *vcpu, char *buf, int n) } #endif @@ -257,7 +257,7 @@ index 95a93b41d5c0..ea10c080c15c 100644 } #ifdef CONFIG_X86_64 -@@ -9191,7 +9180,7 @@ static void enter_smm(struct kvm_vcpu *vcpu) +@@ -9202,7 +9191,7 @@ static void enter_smm(struct kvm_vcpu *vcpu) enter_smm_save_state_64(vcpu, (char *)&smram); else #endif diff --git a/patches/kernel/0023-KVM-x86-emulator-smm-use-smram-struct-for-64-bit-smr.patch b/patches/kernel/0023-KVM-x86-emulator-smm-use-smram-struct-for-64-bit-smr.patch index 2cc98b6..9e85763 100644 --- a/patches/kernel/0023-KVM-x86-emulator-smm-use-smram-struct-for-64-bit-smr.patch +++ b/patches/kernel/0023-KVM-x86-emulator-smm-use-smram-struct-for-64-bit-smr.patch @@ -16,10 +16,10 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 62 insertions(+), 101 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c -index ad5d2ab9ab84..4eb35a0a33a5 100644 +index 63e9c9ef25a2..2677a342fb10 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c -@@ -2358,24 +2358,16 @@ static void rsm_load_seg_32(struct x86_emulate_ctxt *ctxt, +@@ -2357,24 +2357,16 @@ static void rsm_load_seg_32(struct x86_emulate_ctxt *ctxt, } #ifdef CONFIG_X86_64 @@ -51,7 +51,7 @@ index ad5d2ab9ab84..4eb35a0a33a5 100644 } #endif -@@ -2469,71 +2461,49 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, +@@ -2468,71 +2460,49 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, #ifdef CONFIG_X86_64 static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, @@ -144,7 +144,7 @@ index ad5d2ab9ab84..4eb35a0a33a5 100644 return X86EMUL_CONTINUE; } -@@ -2608,7 +2578,7 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt) +@@ -2607,7 +2577,7 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt) #ifdef CONFIG_X86_64 if (emulator_has_longmode(ctxt)) @@ -154,10 +154,10 @@ index ad5d2ab9ab84..4eb35a0a33a5 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 ea10c080c15c..e43bc36a0aa1 100644 +index 13e457996477..6aa50ec9b2a9 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -9052,20 +9052,17 @@ static void enter_smm_save_seg_32(struct kvm_vcpu *vcpu, +@@ -9063,20 +9063,17 @@ static void enter_smm_save_seg_32(struct kvm_vcpu *vcpu, } #ifdef CONFIG_X86_64 @@ -185,7 +185,7 @@ index ea10c080c15c..e43bc36a0aa1 100644 } #endif -@@ -9113,57 +9110,51 @@ static void enter_smm_save_state_32(struct kvm_vcpu *vcpu, struct kvm_smram_stat +@@ -9124,57 +9121,51 @@ static void enter_smm_save_state_32(struct kvm_vcpu *vcpu, struct kvm_smram_stat } #ifdef CONFIG_X86_64 @@ -268,7 +268,7 @@ index ea10c080c15c..e43bc36a0aa1 100644 } #endif -@@ -9177,7 +9168,7 @@ static void enter_smm(struct kvm_vcpu *vcpu) +@@ -9188,7 +9179,7 @@ static void enter_smm(struct kvm_vcpu *vcpu) memset(smram.bytes, 0, sizeof(smram.bytes)); #ifdef CONFIG_X86_64 if (guest_cpuid_has(vcpu, X86_FEATURE_LM)) diff --git a/patches/kernel/0024-KVM-x86-SVM-use-smram-structs.patch b/patches/kernel/0024-KVM-x86-SVM-use-smram-structs.patch index dd055d2..c6974b3 100644 --- a/patches/kernel/0024-KVM-x86-SVM-use-smram-structs.patch +++ b/patches/kernel/0024-KVM-x86-SVM-use-smram-structs.patch @@ -17,10 +17,10 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h -index f450e1011792..23c6712ccecf 100644 +index 0669a533451d..5673d08daa67 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h -@@ -1935,12 +1935,6 @@ static inline int kvm_cpu_get_apicid(int mps_cpu) +@@ -1936,12 +1936,6 @@ static inline int kvm_cpu_get_apicid(int mps_cpu) #endif } @@ -34,10 +34,10 @@ index f450e1011792..23c6712ccecf 100644 int alloc_all_memslots_rmaps(struct kvm *kvm); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c -index 8011e8053906..7c640e8561ff 100644 +index dee4d66ff5b5..423a32287357 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c -@@ -4310,15 +4310,11 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram) +@@ -4319,15 +4319,11 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram) struct kvm_host_map map_save; int ret; @@ -55,7 +55,7 @@ index 8011e8053906..7c640e8561ff 100644 svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX]; svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP]; -@@ -4357,28 +4353,23 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram) +@@ -4366,28 +4362,23 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram) { struct vcpu_svm *svm = to_svm(vcpu); struct kvm_host_map map, map_save; @@ -87,7 +87,7 @@ index 8011e8053906..7c640e8561ff 100644 return 1; ret = 1; -@@ -4403,7 +4394,7 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram) +@@ -4412,7 +4403,7 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram) vmcb12 = map.hva; nested_load_control_from_vmcb12(svm, &vmcb12->control); diff --git a/patches/kernel/0025-KVM-x86-SVM-don-t-save-SVM-state-to-SMRAM-when-VM-is.patch b/patches/kernel/0025-KVM-x86-SVM-don-t-save-SVM-state-to-SMRAM-when-VM-is.patch index 62d9a16..f25c592 100644 --- a/patches/kernel/0025-KVM-x86-SVM-don-t-save-SVM-state-to-SMRAM-when-VM-is.patch +++ b/patches/kernel/0025-KVM-x86-SVM-don-t-save-SVM-state-to-SMRAM-when-VM-is.patch @@ -19,10 +19,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 9 insertions(+) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c -index 7c640e8561ff..544f5886b461 100644 +index 423a32287357..1d7f6fba034c 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c -@@ -4313,6 +4313,15 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram) +@@ -4322,6 +4322,15 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram) if (!is_guest_mode(vcpu)) return 0; diff --git a/patches/kernel/0026-KVM-x86-emulator-smm-preserve-interrupt-shadow-in-SM.patch b/patches/kernel/0026-KVM-x86-emulator-smm-preserve-interrupt-shadow-in-SM.patch index f8d4870..8d94209 100644 --- a/patches/kernel/0026-KVM-x86-emulator-smm-preserve-interrupt-shadow-in-SM.patch +++ b/patches/kernel/0026-KVM-x86-emulator-smm-preserve-interrupt-shadow-in-SM.patch @@ -30,10 +30,10 @@ Signed-off-by: Thomas Lamprecht 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c -index 4eb35a0a33a5..3e6ea2951e2b 100644 +index 2677a342fb10..3ccd0d0f451f 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c -@@ -2420,7 +2420,7 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, +@@ -2419,7 +2419,7 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, const struct kvm_smram_state_32 *smstate) { struct desc_ptr dt; @@ -42,7 +42,7 @@ index 4eb35a0a33a5..3e6ea2951e2b 100644 ctxt->eflags = smstate->eflags | X86_EFLAGS_FIXED; ctxt->_eip = smstate->eip; -@@ -2455,8 +2455,16 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, +@@ -2454,8 +2454,16 @@ static int rsm_load_state_32(struct x86_emulate_ctxt *ctxt, ctxt->ops->set_smbase(ctxt, smstate->smbase); @@ -61,7 +61,7 @@ index 4eb35a0a33a5..3e6ea2951e2b 100644 } #ifdef CONFIG_X86_64 -@@ -2505,6 +2513,9 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, +@@ -2504,6 +2512,9 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt, rsm_load_seg_64(ctxt, &smstate->fs, VCPU_SREG_FS); rsm_load_seg_64(ctxt, &smstate->gs, VCPU_SREG_GS); @@ -128,10 +128,10 @@ 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 e43bc36a0aa1..c6802f4e3b16 100644 +index 6aa50ec9b2a9..85b0a31c1999 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -7309,6 +7309,11 @@ static void emulator_set_nmi_mask(struct x86_emulate_ctxt *ctxt, bool masked) +@@ -7320,6 +7320,11 @@ static void emulator_set_nmi_mask(struct x86_emulate_ctxt *ctxt, bool masked) static_call(kvm_x86_set_nmi_mask)(emul_to_vcpu(ctxt), masked); } @@ -143,7 +143,7 @@ index e43bc36a0aa1..c6802f4e3b16 100644 static unsigned emulator_get_hflags(struct x86_emulate_ctxt *ctxt) { return emul_to_vcpu(ctxt)->arch.hflags; -@@ -7378,6 +7383,7 @@ static const struct x86_emulate_ops emulate_ops = { +@@ -7389,6 +7394,7 @@ static const struct x86_emulate_ops emulate_ops = { .guest_has_fxsr = emulator_guest_has_fxsr, .guest_has_rdpid = emulator_guest_has_rdpid, .set_nmi_mask = emulator_set_nmi_mask, @@ -151,7 +151,7 @@ index e43bc36a0aa1..c6802f4e3b16 100644 .get_hflags = emulator_get_hflags, .exiting_smm = emulator_exiting_smm, .leave_smm = emulator_leave_smm, -@@ -9107,6 +9113,8 @@ static void enter_smm_save_state_32(struct kvm_vcpu *vcpu, struct kvm_smram_stat +@@ -9118,6 +9124,8 @@ static void enter_smm_save_state_32(struct kvm_vcpu *vcpu, struct kvm_smram_stat smram->cr4 = kvm_read_cr4(vcpu); smram->smm_revision = 0x00020000; smram->smbase = vcpu->arch.smbase; @@ -160,7 +160,7 @@ index e43bc36a0aa1..c6802f4e3b16 100644 } #ifdef CONFIG_X86_64 -@@ -9155,6 +9163,8 @@ static void enter_smm_save_state_64(struct kvm_vcpu *vcpu, struct kvm_smram_stat +@@ -9166,6 +9174,8 @@ static void enter_smm_save_state_64(struct kvm_vcpu *vcpu, struct kvm_smram_stat enter_smm_save_seg_64(vcpu, &smram->ds, VCPU_SREG_DS); enter_smm_save_seg_64(vcpu, &smram->fs, VCPU_SREG_FS); enter_smm_save_seg_64(vcpu, &smram->gs, VCPU_SREG_GS); @@ -169,7 +169,7 @@ index e43bc36a0aa1..c6802f4e3b16 100644 } #endif -@@ -9191,6 +9201,8 @@ static void enter_smm(struct kvm_vcpu *vcpu) +@@ -9202,6 +9212,8 @@ static void enter_smm(struct kvm_vcpu *vcpu) kvm_set_rflags(vcpu, X86_EFLAGS_FIXED); kvm_rip_write(vcpu, 0x8000); diff --git a/patches/kernel/0027-net-mlx5-Adjust-log_max_qp-to-be-18-at-most.patch b/patches/kernel/0027-net-mlx5-Adjust-log_max_qp-to-be-18-at-most.patch deleted file mode 100644 index 261abb0..0000000 --- a/patches/kernel/0027-net-mlx5-Adjust-log_max_qp-to-be-18-at-most.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Maher Sanalla -Date: Sun, 24 Jul 2022 11:28:21 +0300 -Subject: [PATCH] net/mlx5: Adjust log_max_qp to be 18 at most - -[ Upstream commit a6e9085d791f8306084fd5bc44dd3fdd4e1ac27b ] - -The cited commit limited log_max_qp to be 17 due to FW capabilities. -Recently, it turned out that there are old FW versions that supported -more than 17, so the cited commit caused a degradation. - -Thus, set the maximum log_max_qp back to 18 as it was before the -cited commit. - -Fixes: 7f839965b2d7 ("net/mlx5: Update log_max_qp value to be 17 at most") -Signed-off-by: Maher Sanalla -Reviewed-by: Maor Gottlieb -Signed-off-by: Saeed Mahameed -Signed-off-by: Sasha Levin -Signed-off-by: Thomas Lamprecht ---- - drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c -index 4ed740994279..5a6606c843ed 100644 ---- a/drivers/net/ethernet/mellanox/mlx5/core/main.c -+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c -@@ -516,7 +516,7 @@ static int handle_hca_cap(struct mlx5_core_dev *dev, void *set_ctx) - - /* Check log_max_qp from HCA caps to set in current profile */ - if (prof->log_max_qp == LOG_MAX_SUPPORTED_QPS) { -- prof->log_max_qp = min_t(u8, 17, MLX5_CAP_GEN_MAX(dev, log_max_qp)); -+ prof->log_max_qp = min_t(u8, 18, MLX5_CAP_GEN_MAX(dev, log_max_qp)); - } else if (MLX5_CAP_GEN_MAX(dev, log_max_qp) < prof->log_max_qp) { - mlx5_core_warn(dev, "log_max_qp value in current profile is %d, changing it to HCA capability limit (%d)\n", - prof->log_max_qp, diff --git a/patches/kernel/0028-KVM-x86-revalidate-steal-time-cache-if-MSR-value-cha.patch b/patches/kernel/0028-KVM-x86-revalidate-steal-time-cache-if-MSR-value-cha.patch deleted file mode 100644 index 9d23bc8..0000000 --- a/patches/kernel/0028-KVM-x86-revalidate-steal-time-cache-if-MSR-value-cha.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Thu, 4 Aug 2022 15:28:32 +0200 -Subject: [PATCH] KVM: x86: revalidate steal time cache if MSR value changes - -commit 901d3765fa804ce42812f1d5b1f3de2dfbb26723 upstream. - -Commit 7e2175ebd695 ("KVM: x86: Fix recording of guest steal time -/ preempted status", 2021-11-11) open coded the previous call to -kvm_map_gfn, but in doing so it dropped the comparison between the cached -guest physical address and the one in the MSR. This cause an incorrect -cache hit if the guest modifies the steal time address while the memslots -remain the same. This can happen with kexec, in which case the steal -time data is written at the address used by the old kernel instead of -the old one. - -While at it, rename the variable from gfn to gpa since it is a plain -physical address and not a right-shifted one. - -Reported-by: Dave Young -Reported-by: Xiaoying Yan -Analyzed-by: Dr. David Alan Gilbert -Cc: David Woodhouse -Cc: stable@vger.kernel.org -Fixes: 7e2175ebd695 ("KVM: x86: Fix recording of guest steal time / preempted status") -Signed-off-by: Paolo Bonzini -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Thomas Lamprecht ---- - arch/x86/kvm/x86.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index c6802f4e3b16..feb9336d97a7 100644 ---- a/arch/x86/kvm/x86.c -+++ b/arch/x86/kvm/x86.c -@@ -3238,6 +3238,7 @@ static void record_steal_time(struct kvm_vcpu *vcpu) - struct gfn_to_hva_cache *ghc = &vcpu->arch.st.cache; - struct kvm_steal_time __user *st; - struct kvm_memslots *slots; -+ gpa_t gpa = vcpu->arch.st.msr_val & KVM_STEAL_VALID_BITS; - u64 steal; - u32 version; - -@@ -3255,13 +3256,12 @@ static void record_steal_time(struct kvm_vcpu *vcpu) - slots = kvm_memslots(vcpu->kvm); - - if (unlikely(slots->generation != ghc->generation || -+ gpa != ghc->gpa || - kvm_is_error_hva(ghc->hva) || !ghc->memslot)) { -- gfn_t gfn = vcpu->arch.st.msr_val & KVM_STEAL_VALID_BITS; -- - /* We rely on the fact that it fits in a single page. */ - BUILD_BUG_ON((sizeof(*st) - 1) & KVM_STEAL_VALID_BITS); - -- if (kvm_gfn_to_hva_cache_init(vcpu->kvm, ghc, gfn, sizeof(*st)) || -+ if (kvm_gfn_to_hva_cache_init(vcpu->kvm, ghc, gpa, sizeof(*st)) || - kvm_is_error_hva(ghc->hva) || !ghc->memslot) - return; - } diff --git a/patches/kernel/0029-KVM-x86-do-not-report-preemption-if-the-steal-time-c.patch b/patches/kernel/0029-KVM-x86-do-not-report-preemption-if-the-steal-time-c.patch deleted file mode 100644 index 7095edf..0000000 --- a/patches/kernel/0029-KVM-x86-do-not-report-preemption-if-the-steal-time-c.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Thu, 4 Aug 2022 15:28:32 +0200 -Subject: [PATCH] KVM: x86: do not report preemption if the steal time cache is - stale - -commit c3c28d24d910a746b02f496d190e0e8c6560224b upstream. - -Commit 7e2175ebd695 ("KVM: x86: Fix recording of guest steal time -/ preempted status", 2021-11-11) open coded the previous call to -kvm_map_gfn, but in doing so it dropped the comparison between the cached -guest physical address and the one in the MSR. This cause an incorrect -cache hit if the guest modifies the steal time address while the memslots -remain the same. This can happen with kexec, in which case the preempted -bit is written at the address used by the old kernel instead of -the old one. - -Cc: David Woodhouse -Cc: stable@vger.kernel.org -Fixes: 7e2175ebd695 ("KVM: x86: Fix recording of guest steal time / preempted status") -Signed-off-by: Paolo Bonzini -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Thomas Lamprecht ---- - arch/x86/kvm/x86.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index feb9336d97a7..1f37d12acd46 100644 ---- a/arch/x86/kvm/x86.c -+++ b/arch/x86/kvm/x86.c -@@ -4372,6 +4372,7 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu) - struct kvm_steal_time __user *st; - struct kvm_memslots *slots; - static const u8 preempted = KVM_VCPU_PREEMPTED; -+ gpa_t gpa = vcpu->arch.st.msr_val & KVM_STEAL_VALID_BITS; - - /* - * The vCPU can be marked preempted if and only if the VM-Exit was on -@@ -4399,6 +4400,7 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu) - slots = kvm_memslots(vcpu->kvm); - - if (unlikely(slots->generation != ghc->generation || -+ gpa != ghc->gpa || - kvm_is_error_hva(ghc->hva) || !ghc->memslot)) - return; - diff --git a/patches/kernel/0030-scsi-Revert-scsi-qla2xxx-Fix-disk-failure-to-redisco.patch b/patches/kernel/0030-scsi-Revert-scsi-qla2xxx-Fix-disk-failure-to-redisco.patch deleted file mode 100644 index d375457..0000000 --- a/patches/kernel/0030-scsi-Revert-scsi-qla2xxx-Fix-disk-failure-to-redisco.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nilesh Javali -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 -Signed-off-by: Nilesh Javali -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Thomas Lamprecht ---- - 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 c3ba2995209b..b538d65efe29 100644 ---- a/drivers/scsi/qla2xxx/qla_init.c -+++ b/drivers/scsi/qla2xxx/qla_init.c -@@ -5749,8 +5749,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 | -@@ -5858,7 +5856,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); -@@ -5873,6 +5870,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 1bf3ab10846a..3e167dc4eec7 100644 ---- a/drivers/scsi/qla2xxx/qla_nvme.c -+++ b/drivers/scsi/qla2xxx/qla_nvme.c -@@ -35,11 +35,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));