c/pve-kernel-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

normalize patches

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-10-21 15:15:35 +02:00
parent 3202de9857
commit 9a2449d7c2
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
patches/kernel/0014-Revert-nSVM-Check-for-reserved-encodings-of-TLB_CONT.patch
View File

@ -1,8 +1,8 @@
From 379ad2e0326c55682d0bb9391f16f1072fe400d2 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Stefan Sterz <s.sterz@proxmox.com> From: Stefan Sterz <s.sterz@proxmox.com>
Date: Wed, 18 Oct 2023 10:45:45 +0200 Date: Wed, 18 Oct 2023 10:45:45 +0200
Subject: [PATCH 1/2] Revert "nSVM: Check for reserved encodings of TLB_CONTROL Subject: [PATCH] Revert "nSVM: Check for reserved encodings of TLB_CONTROL in
in nested VMCB" nested VMCB"
This reverts commit 174a921b6975ef959dd82ee9e8844067a62e3ec1. This reverts commit 174a921b6975ef959dd82ee9e8844067a62e3ec1.
@ -18,7 +18,7 @@ index add65dd59756..61a6c0235519 100644
@@ -242,18 +242,6 @@ static bool nested_svm_check_bitmap_pa(struct kvm_vcpu *vcpu, u64 pa, u32 size) @@ -242,18 +242,6 @@ static bool nested_svm_check_bitmap_pa(struct kvm_vcpu *vcpu, u64 pa, u32 size)
kvm_vcpu_is_legal_gpa(vcpu, addr + size - 1); kvm_vcpu_is_legal_gpa(vcpu, addr + size - 1);
} }
-static bool nested_svm_check_tlb_ctl(struct kvm_vcpu *vcpu, u8 tlb_ctl) -static bool nested_svm_check_tlb_ctl(struct kvm_vcpu *vcpu, u8 tlb_ctl)
-{ -{
- /* Nested FLUSHBYASID is not supported yet. */ - /* Nested FLUSHBYASID is not supported yet. */
@ -37,13 +37,10 @@ index add65dd59756..61a6c0235519 100644
@@ -273,9 +261,6 @@ static bool __nested_vmcb_check_controls(struct kvm_vcpu *vcpu, @@ -273,9 +261,6 @@ static bool __nested_vmcb_check_controls(struct kvm_vcpu *vcpu,
IOPM_SIZE))) IOPM_SIZE)))
return false; return false;
- if (CC(!nested_svm_check_tlb_ctl(vcpu, control->tlb_ctl))) - if (CC(!nested_svm_check_tlb_ctl(vcpu, control->tlb_ctl)))
- return false; - return false;
- -
return true; return true;
} }
--
2.39.2

13
patches/kernel/0015-KVM-nSVM-Advertise-support-for-flush-by-ASID.patch
View File

@ -1,7 +1,7 @@
From 42af81abf0b96ab661591d024aed55c05dd85b91 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Sean Christopherson <seanjc@google.com> From: Sean Christopherson <seanjc@google.com>
Date: Wed, 18 Oct 2023 12:41:04 -0700 Date: Wed, 18 Oct 2023 12:41:04 -0700
Subject: [PATCH 2/2] KVM: nSVM: Advertise support for flush-by-ASID Subject: [PATCH] KVM: nSVM: Advertise support for flush-by-ASID
Advertise support for FLUSHBYASID when nested SVM is enabled, as KVM can Advertise support for FLUSHBYASID when nested SVM is enabled, as KVM can
always emulate flushing TLB entries for a vmcb12 ASID, e.g. by running L2 always emulate flushing TLB entries for a vmcb12 ASID, e.g. by running L2
@ -23,17 +23,14 @@ Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 9a194aa1a75a..0fde9b0c464b 100644 index fb9cde86930d..db8028864094 100644
--- a/arch/x86/kvm/svm/svm.c --- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c
@@ -4880,6 +4880,7 @@ static __init void svm_set_cpu_caps(void) @@ -4921,6 +4921,7 @@ static __init void svm_set_cpu_caps(void)
if (nested) { if (nested) {
kvm_cpu_cap_set(X86_FEATURE_SVM); kvm_cpu_cap_set(X86_FEATURE_SVM);
kvm_cpu_cap_set(X86_FEATURE_VMCBCLEAN); kvm_cpu_cap_set(X86_FEATURE_VMCBCLEAN);
+ kvm_cpu_cap_set(X86_FEATURE_FLUSHBYASID); + kvm_cpu_cap_set(X86_FEATURE_FLUSHBYASID);
if (nrips) if (nrips)
kvm_cpu_cap_set(X86_FEATURE_NRIPS); kvm_cpu_cap_set(X86_FEATURE_NRIPS);
--
2.39.2