]>
Commit | Line | Data |
---|---|---|
9a2449d7 | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
3202de98 SS |
2 | From: Stefan Sterz <s.sterz@proxmox.com> |
3 | Date: Wed, 18 Oct 2023 10:45:45 +0200 | |
9a2449d7 TL |
4 | Subject: [PATCH] Revert "nSVM: Check for reserved encodings of TLB_CONTROL in |
5 | nested VMCB" | |
3202de98 SS |
6 | |
7 | This reverts commit 174a921b6975ef959dd82ee9e8844067a62e3ec1. | |
8 | ||
9 | Signed-off-by: Stefan Sterz <s.sterz@proxmox.com> | |
10 | --- | |
11 | arch/x86/kvm/svm/nested.c | 15 --------------- | |
12 | 1 file changed, 15 deletions(-) | |
13 | ||
14 | diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c | |
15 | index add65dd59756..61a6c0235519 100644 | |
16 | --- a/arch/x86/kvm/svm/nested.c | |
17 | +++ b/arch/x86/kvm/svm/nested.c | |
18 | @@ -242,18 +242,6 @@ static bool nested_svm_check_bitmap_pa(struct kvm_vcpu *vcpu, u64 pa, u32 size) | |
19 | kvm_vcpu_is_legal_gpa(vcpu, addr + size - 1); | |
20 | } | |
9a2449d7 | 21 | |
3202de98 SS |
22 | -static bool nested_svm_check_tlb_ctl(struct kvm_vcpu *vcpu, u8 tlb_ctl) |
23 | -{ | |
24 | - /* Nested FLUSHBYASID is not supported yet. */ | |
25 | - switch(tlb_ctl) { | |
26 | - case TLB_CONTROL_DO_NOTHING: | |
27 | - case TLB_CONTROL_FLUSH_ALL_ASID: | |
28 | - return true; | |
29 | - default: | |
30 | - return false; | |
31 | - } | |
32 | -} | |
33 | - | |
34 | static bool __nested_vmcb_check_controls(struct kvm_vcpu *vcpu, | |
35 | struct vmcb_ctrl_area_cached *control) | |
36 | { | |
37 | @@ -273,9 +261,6 @@ static bool __nested_vmcb_check_controls(struct kvm_vcpu *vcpu, | |
38 | IOPM_SIZE))) | |
39 | return false; | |
9a2449d7 | 40 | |
3202de98 SS |
41 | - if (CC(!nested_svm_check_tlb_ctl(vcpu, control->tlb_ctl))) |
42 | - return false; | |
43 | - | |
44 | return true; | |
45 | } | |
9a2449d7 | 46 |