From bb73d94f802853e4c230a8dd2345bb87abd30789 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 13 Mar 2023 08:45:45 -0400 Subject: [PATCH] Drop KVM patches from 4.19 --- ...using-macros-instead-of-magic-values.patch | 38 ---------------- ...change-icr-on-write-to-apic_self_ipi.patch | 44 ------------------- queue-4.19/series | 2 - 3 files changed, 84 deletions(-) delete mode 100644 queue-4.19/kvm-using-macros-instead-of-magic-values.patch delete mode 100644 queue-4.19/kvm-x86-do-not-change-icr-on-write-to-apic_self_ipi.patch diff --git a/queue-4.19/kvm-using-macros-instead-of-magic-values.patch b/queue-4.19/kvm-using-macros-instead-of-magic-values.patch deleted file mode 100644 index a326a91c6b6..00000000000 --- a/queue-4.19/kvm-using-macros-instead-of-magic-values.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c9dc1d71195527f1e0f9da9ed5569b4cd78e9a5b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 21 Jul 2020 16:23:54 +0800 -Subject: KVM: Using macros instead of magic values - -From: Haiwei Li - -[ Upstream commit 9c2475f3e46a1de22bcae3b2c98c398937261c8a ] - -Instead of using magic values, use macros. - -Signed-off-by: Haiwei Li -Message-Id: <4c072161-80dd-b7ed-7adb-02acccaa0701@gmail.com> -Reviewed-by: Vitaly Kuznetsov -Signed-off-by: Paolo Bonzini -Stable-dep-of: ba5838abb053 ("KVM: x86: Inject #GP if WRMSR sets reserved bits in APIC Self-IPI") -Signed-off-by: Sasha Levin ---- - arch/x86/kvm/lapic.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c -index 027941e3df682..81801b0c24e9a 100644 ---- a/arch/x86/kvm/lapic.c -+++ b/arch/x86/kvm/lapic.c -@@ -1921,7 +1921,8 @@ int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) - - case APIC_SELF_IPI: - if (apic_x2apic_mode(apic)) { -- kvm_lapic_reg_write(apic, APIC_ICR, 0x40000 | (val & 0xff)); -+ kvm_lapic_reg_write(apic, APIC_ICR, -+ APIC_DEST_SELF | (val & APIC_VECTOR_MASK)); - } else - ret = 1; - break; --- -2.39.2 - diff --git a/queue-4.19/kvm-x86-do-not-change-icr-on-write-to-apic_self_ipi.patch b/queue-4.19/kvm-x86-do-not-change-icr-on-write-to-apic_self_ipi.patch deleted file mode 100644 index 59159f89143..00000000000 --- a/queue-4.19/kvm-x86-do-not-change-icr-on-write-to-apic_self_ipi.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1013ff7442f5bb83000ba62161d5b8fdb1342023 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 24 Feb 2022 09:53:36 -0500 -Subject: KVM: x86: Do not change ICR on write to APIC_SELF_IPI - -From: Paolo Bonzini - -[ Upstream commit d22a81b304a27fca6124174a8e842e826c193466 ] - -Emulating writes to SELF_IPI with a write to ICR has an unwanted side effect: -the value of ICR in vAPIC page gets changed. The lists SELF_IPI as write-only, -with no associated MMIO offset, so any write should have no visible side -effect in the vAPIC page. - -Reported-by: Chao Gao -Reviewed-by: Sean Christopherson -Signed-off-by: Paolo Bonzini -Stable-dep-of: ba5838abb053 ("KVM: x86: Inject #GP if WRMSR sets reserved bits in APIC Self-IPI") -Signed-off-by: Sasha Levin ---- - arch/x86/kvm/lapic.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c -index 81801b0c24e9a..47d25a696588e 100644 ---- a/arch/x86/kvm/lapic.c -+++ b/arch/x86/kvm/lapic.c -@@ -1920,10 +1920,9 @@ int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val) - break; - - case APIC_SELF_IPI: -- if (apic_x2apic_mode(apic)) { -- kvm_lapic_reg_write(apic, APIC_ICR, -- APIC_DEST_SELF | (val & APIC_VECTOR_MASK)); -- } else -+ if (apic_x2apic_mode(apic)) -+ kvm_apic_send_ipi(apic, APIC_DEST_SELF | (val & APIC_VECTOR_MASK), 0); -+ else - ret = 1; - break; - default: --- -2.39.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 743532b0a7e..fb4fb6ea088 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -14,8 +14,6 @@ udf-detect-system-inodes-linked-into-directory-hiera.patch fs-dlm-public-header-in-out-utility.patch fs-dlm-add-union-in-dlm-header-for-lockspace-id.patch fs-dlm-fix-log-of-lowcomms-vs-midcomms.patch -kvm-using-macros-instead-of-magic-values.patch -kvm-x86-do-not-change-icr-on-write-to-apic_self_ipi.patch riscv-using-patchable_function_entry-instead-of-mcou.patch arm-dts-exynos-fix-language-typo-and-indentation.patch riscv-ftrace-remove-wasted-nops-for-riscv_isa_c.patch -- 2.47.3