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 470f240..771a995 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,10 +55,10 @@ 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 efb9e8b66652..b2331a9c08dd 100644 +index de9ec3722356..bcaa2a8ac8fe 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -3943,6 +3943,15 @@ +@@ -3945,6 +3945,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). 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 c0645bb..d82038f 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 fefdf3a6dae3..b1f35bc88be5 100644 +index 0816b8018cde..5118cfb1765b 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 6ba774b..f8d36cf 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,10 +10,10 @@ 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 6111506a4105..564801ce82ba 100644 +index 12b1811cb488..9bbb7ef7537d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -10528,7 +10528,7 @@ static void netdev_wait_allrefs(struct net_device *dev) +@@ -10529,7 +10529,7 @@ static void netdev_wait_allrefs(struct net_device *dev) if (refcnt != 1 && time_after(jiffies, warning_time + netdev_unregister_timeout_secs * HZ)) { 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 6ed99cc..f007129 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 @@ -92,7 +92,7 @@ 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 ce3847499d85..0bac2c9ebb4a 100644 +index d85f30a85ee7..ca25e0bc1269 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) diff --git a/patches/kernel/0010-drivers-firmware-Don-t-mark-as-busy-the-simple-frame.patch b/patches/kernel/0010-drivers-firmware-Don-t-mark-as-busy-the-simple-frame.patch index f210f5e..83b53aa 100644 --- a/patches/kernel/0010-drivers-firmware-Don-t-mark-as-busy-the-simple-frame.patch +++ b/patches/kernel/0010-drivers-firmware-Don-t-mark-as-busy-the-simple-frame.patch @@ -20,10 +20,10 @@ 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 757cc8b9f3de..bda8712bfd8c 100644 +index eac51c2a27ba..a353e27f83f5 100644 --- a/drivers/firmware/sysfb_simplefb.c +++ b/drivers/firmware/sysfb_simplefb.c -@@ -99,7 +99,7 @@ __init int sysfb_create_simplefb(const struct screen_info *si, +@@ -99,7 +99,7 @@ __init struct platform_device *sysfb_create_simplefb(const struct screen_info *s /* setup IORESOURCE_MEM as framebuffer memory */ memset(&res, 0, sizeof(res)); diff --git a/patches/kernel/0011-drm-simpledrm-Request-memory-region-in-driver.patch b/patches/kernel/0011-drm-simpledrm-Request-memory-region-in-driver.patch index 4249147..7569cf8 100644 --- a/patches/kernel/0011-drm-simpledrm-Request-memory-region-in-driver.patch +++ b/patches/kernel/0011-drm-simpledrm-Request-memory-region-in-driver.patch @@ -19,7 +19,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/tiny/simpledrm.c b/drivers/gpu/drm/tiny/simpledrm.c -index 3e3f9ba1e885..806fdc3237b3 100644 +index f3c2c173ca4b..da58c0d0f44d 100644 --- a/drivers/gpu/drm/tiny/simpledrm.c +++ b/drivers/gpu/drm/tiny/simpledrm.c @@ -525,21 +525,33 @@ static int simpledrm_device_init_mm(struct simpledrm_device *sdev) 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 eb02097..a51eaa6 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 @@ -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 604716996c5d..673262228f3e 100644 +index 70250d7ca0d7..3d9ddc2ca808 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -12449,6 +12449,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_vmgexit_msr_protocol_exit); +@@ -12468,6 +12468,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 d3d3557..6bc18d1 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 867febee8fc3..fb48dd8773e1 100644 +index e7c7d3066642..f450e1011792 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 867febee8fc3..fb48dd8773e1 100644 enum x86_intercept; enum x86_intercept_stage; -@@ -1463,8 +1464,8 @@ struct kvm_x86_ops { +@@ -1466,8 +1467,8 @@ struct kvm_x86_ops { void (*setup_mce)(struct kvm_vcpu *vcpu); int (*smi_allowed)(struct kvm_vcpu *vcpu, bool for_injection); @@ -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 21f747eacc9a..d903120811b9 100644 +index bec1de282c79..8011e8053906 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c -@@ -4302,12 +4302,14 @@ static int svm_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection) +@@ -4304,12 +4304,14 @@ static int svm_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection) return !svm_smi_blocked(vcpu); } @@ -124,7 +124,7 @@ index 21f747eacc9a..d903120811b9 100644 if (!is_guest_mode(vcpu)) return 0; -@@ -4349,7 +4351,7 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, char *smstate) +@@ -4351,7 +4353,7 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, char *smstate) return 0; } @@ -133,7 +133,7 @@ index 21f747eacc9a..d903120811b9 100644 { struct vcpu_svm *svm = to_svm(vcpu); struct kvm_host_map map, map_save; -@@ -4357,6 +4359,8 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const char *smstate) +@@ -4359,6 +4361,8 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const char *smstate) struct vmcb *vmcb12; int ret; @@ -143,10 +143,10 @@ index 21f747eacc9a..d903120811b9 100644 return 0; diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c -index 417176817d80..a45a43bcc844 100644 +index fae3bcff22cf..b8163ac61dae 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c -@@ -7594,7 +7594,7 @@ static int vmx_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection) +@@ -7595,7 +7595,7 @@ static int vmx_smi_allowed(struct kvm_vcpu *vcpu, bool for_injection) return !is_smm(vcpu); } @@ -155,7 +155,7 @@ index 417176817d80..a45a43bcc844 100644 { struct vcpu_vmx *vmx = to_vmx(vcpu); -@@ -7608,7 +7608,7 @@ static int vmx_enter_smm(struct kvm_vcpu *vcpu, char *smstate) +@@ -7609,7 +7609,7 @@ static int vmx_enter_smm(struct kvm_vcpu *vcpu, char *smstate) return 0; } @@ -165,10 +165,10 @@ index 417176817d80..a45a43bcc844 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 673262228f3e..37edf00584f8 100644 +index 3d9ddc2ca808..95a93b41d5c0 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -7312,9 +7312,9 @@ static void emulator_exiting_smm(struct x86_emulate_ctxt *ctxt) +@@ -7322,9 +7322,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 673262228f3e..37edf00584f8 100644 } static void emulator_triple_fault(struct x86_emulate_ctxt *ctxt) -@@ -9171,25 +9171,25 @@ static void enter_smm(struct kvm_vcpu *vcpu) +@@ -9183,25 +9183,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 d57f700..3a37fa2 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 @@ -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 37edf00584f8..11e62b1f1764 100644 +index 95a93b41d5c0..ea10c080c15c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -9025,22 +9025,18 @@ static u32 enter_smm_get_segment_flags(struct kvm_segment *seg) +@@ -9037,22 +9037,18 @@ static u32 enter_smm_get_segment_flags(struct kvm_segment *seg) return flags; } @@ -179,7 +179,7 @@ index 37edf00584f8..11e62b1f1764 100644 } #ifdef CONFIG_X86_64 -@@ -9061,54 +9057,47 @@ static void enter_smm_save_seg_64(struct kvm_vcpu *vcpu, char *buf, int n) +@@ -9073,54 +9069,47 @@ static void enter_smm_save_seg_64(struct kvm_vcpu *vcpu, char *buf, int n) } #endif @@ -257,7 +257,7 @@ index 37edf00584f8..11e62b1f1764 100644 } #ifdef CONFIG_X86_64 -@@ -9179,7 +9168,7 @@ static void enter_smm(struct kvm_vcpu *vcpu) +@@ -9191,7 +9180,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 1a06cc2..2cc98b6 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 @@ -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 11e62b1f1764..5c4be3873c0d 100644 +index ea10c080c15c..e43bc36a0aa1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -9040,20 +9040,17 @@ static void enter_smm_save_seg_32(struct kvm_vcpu *vcpu, +@@ -9052,20 +9052,17 @@ static void enter_smm_save_seg_32(struct kvm_vcpu *vcpu, } #ifdef CONFIG_X86_64 @@ -185,7 +185,7 @@ index 11e62b1f1764..5c4be3873c0d 100644 } #endif -@@ -9101,57 +9098,51 @@ static void enter_smm_save_state_32(struct kvm_vcpu *vcpu, struct kvm_smram_stat +@@ -9113,57 +9110,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 11e62b1f1764..5c4be3873c0d 100644 } #endif -@@ -9165,7 +9156,7 @@ static void enter_smm(struct kvm_vcpu *vcpu) +@@ -9177,7 +9168,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 1cc4769..dd055d2 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 fb48dd8773e1..0362d3fba42a 100644 +index f450e1011792..23c6712ccecf 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h -@@ -1932,12 +1932,6 @@ static inline int kvm_cpu_get_apicid(int mps_cpu) +@@ -1935,12 +1935,6 @@ static inline int kvm_cpu_get_apicid(int mps_cpu) #endif } @@ -34,10 +34,10 @@ index fb48dd8773e1..0362d3fba42a 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 d903120811b9..742497b1d4c3 100644 +index 8011e8053906..7c640e8561ff 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c -@@ -4308,15 +4308,11 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram) +@@ -4310,15 +4310,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 d903120811b9..742497b1d4c3 100644 svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX]; svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP]; -@@ -4355,28 +4351,23 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram) +@@ -4357,28 +4353,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 d903120811b9..742497b1d4c3 100644 return 1; ret = 1; -@@ -4401,7 +4392,7 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram) +@@ -4403,7 +4394,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 501be1d..62d9a16 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 742497b1d4c3..938b9b24f0ee 100644 +index 7c640e8561ff..544f5886b461 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c -@@ -4311,6 +4311,15 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram) +@@ -4313,6 +4313,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 78ae05f..f8d4870 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 @@ -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 5c4be3873c0d..461c9d815d6c 100644 +index e43bc36a0aa1..c6802f4e3b16 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -7299,6 +7299,11 @@ static void emulator_set_nmi_mask(struct x86_emulate_ctxt *ctxt, bool masked) +@@ -7309,6 +7309,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 5c4be3873c0d..461c9d815d6c 100644 static unsigned emulator_get_hflags(struct x86_emulate_ctxt *ctxt) { return emul_to_vcpu(ctxt)->arch.hflags; -@@ -7368,6 +7373,7 @@ static const struct x86_emulate_ops emulate_ops = { +@@ -7378,6 +7383,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 5c4be3873c0d..461c9d815d6c 100644 .get_hflags = emulator_get_hflags, .exiting_smm = emulator_exiting_smm, .leave_smm = emulator_leave_smm, -@@ -9095,6 +9101,8 @@ static void enter_smm_save_state_32(struct kvm_vcpu *vcpu, struct kvm_smram_stat +@@ -9107,6 +9113,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 5c4be3873c0d..461c9d815d6c 100644 } #ifdef CONFIG_X86_64 -@@ -9143,6 +9151,8 @@ static void enter_smm_save_state_64(struct kvm_vcpu *vcpu, struct kvm_smram_stat +@@ -9155,6 +9163,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 5c4be3873c0d..461c9d815d6c 100644 } #endif -@@ -9179,6 +9189,8 @@ static void enter_smm(struct kvm_vcpu *vcpu) +@@ -9191,6 +9201,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/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 index 8382faf..9d23bc8 100644 --- 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 @@ -31,10 +31,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index 461c9d815d6c..b46677baf396 100644 +index c6802f4e3b16..feb9336d97a7 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -3236,6 +3236,7 @@ static void record_steal_time(struct kvm_vcpu *vcpu) +@@ -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; @@ -42,7 +42,7 @@ index 461c9d815d6c..b46677baf396 100644 u64 steal; u32 version; -@@ -3253,13 +3254,12 @@ static void record_steal_time(struct kvm_vcpu *vcpu) +@@ -3255,13 +3256,12 @@ static void record_steal_time(struct kvm_vcpu *vcpu) slots = kvm_memslots(vcpu->kvm); if (unlikely(slots->generation != ghc->generation || 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 index b61364e..7095edf 100644 --- 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 @@ -26,18 +26,18 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 2 insertions(+) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index b46677baf396..48aaff0ce3b9 100644 +index feb9336d97a7..1f37d12acd46 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -4370,6 +4370,7 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu) +@@ -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; - if (!(vcpu->arch.st.msr_val & KVM_MSR_ENABLED)) - return; -@@ -4384,6 +4385,7 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu) + /* + * 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 || 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 index 83025b9..d375457 100644 --- 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 @@ -23,7 +23,7 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c -index af8df5a800c6..7caf573af58e 100644 +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) @@ -53,7 +53,7 @@ index af8df5a800c6..7caf573af58e 100644 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 42b29f4fd937..e63272487788 100644 +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) diff --git a/patches/kernel/0031-gfs2-Fix-gfs2_file_buffered_write-endless-loop-worka.patch b/patches/kernel/0031-gfs2-Fix-gfs2_file_buffered_write-endless-loop-worka.patch deleted file mode 100644 index ae012b9..0000000 --- a/patches/kernel/0031-gfs2-Fix-gfs2_file_buffered_write-endless-loop-worka.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -Date: Thu, 17 Mar 2022 14:47:24 +0100 -Subject: [PATCH] gfs2: Fix gfs2_file_buffered_write endless loop workaround - -[ Upstream commit 46f3e0421ccb5474b5c006b0089b9dfd42534bb6 ] - -Since commit 554c577cee95b, gfs2_file_buffered_write() can accidentally -return a truncated iov_iter, which might confuse callers. Fix that. - -Fixes: 554c577cee95b ("gfs2: Prevent endless loops in gfs2_file_buffered_write") -Signed-off-by: Andreas Gruenbacher -Signed-off-by: Sasha Levin -Signed-off-by: Thomas Lamprecht ---- - fs/gfs2/file.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c -index 60390f9dc31f..e93185d804e0 100644 ---- a/fs/gfs2/file.c -+++ b/fs/gfs2/file.c -@@ -1086,6 +1086,7 @@ static ssize_t gfs2_file_buffered_write(struct kiocb *iocb, - gfs2_holder_uninit(gh); - if (statfs_gh) - kfree(statfs_gh); -+ from->count = orig_count - read; - return read ? read : ret; - } -