mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
VMX: convert vmx_tertiary_exec_control
... to a field in the capability/controls struct. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Roger Pau Monné <roger.pau@citrix.com>
This commit is contained in:
Jan Beulich committed
1 parent
11077f1660
commit
5d8cbdd465
2 files changed
+6
-10
No files matched your search
@@ -164,7 +164,6 @@ static int cf_check parse_ept_param_runtime(const char *s)
|
||||
|
||||
/* Dynamic (run-time adjusted) execution control flags. */
|
||||
struct vmx_caps __ro_after_init vmx_caps;
|
||||
uint64_t vmx_tertiary_exec_control __read_mostly;
|
||||
u32 vmx_vmexit_control __read_mostly;
|
||||
u32 vmx_vmentry_control __read_mostly;
|
||||
u64 vmx_ept_vpid_cap __read_mostly;
|
||||
@@ -263,7 +262,6 @@ static int vmx_init_vmcs_config(bool bsp)
|
||||
{
|
||||
u32 vmx_basic_msr_low, vmx_basic_msr_high, min, opt;
|
||||
struct vmx_caps caps = {};
|
||||
uint64_t _vmx_tertiary_exec_control = 0;
|
||||
u64 _vmx_ept_vpid_cap = 0;
|
||||
u64 _vmx_misc_cap = 0;
|
||||
u32 _vmx_vmexit_control;
|
||||
@@ -367,7 +365,7 @@ static int vmx_init_vmcs_config(bool bsp)
|
||||
uint64_t opt = (TERTIARY_EXEC_VIRT_SPEC_CTRL |
|
||||
TERTIARY_EXEC_EPT_PAGING_WRITE);
|
||||
|
||||
_vmx_tertiary_exec_control = adjust_vmx_controls2(
|
||||
caps.tertiary_exec_control = adjust_vmx_controls2(
|
||||
"Tertiary Exec Control", 0, opt,
|
||||
MSR_IA32_VMX_PROCBASED_CTLS3, &mismatch);
|
||||
}
|
||||
@@ -499,7 +497,6 @@ static int vmx_init_vmcs_config(bool bsp)
|
||||
{
|
||||
/* First time through. */
|
||||
vmx_caps = caps;
|
||||
vmx_tertiary_exec_control = _vmx_tertiary_exec_control;
|
||||
vmx_ept_vpid_cap = _vmx_ept_vpid_cap;
|
||||
vmx_vmexit_control = _vmx_vmexit_control;
|
||||
vmx_vmentry_control = _vmx_vmentry_control;
|
||||
@@ -536,7 +533,7 @@ static int vmx_init_vmcs_config(bool bsp)
|
||||
vmx_caps.secondary_exec_control, caps.secondary_exec_control);
|
||||
mismatch |= cap_check(
|
||||
"Tertiary Exec Control",
|
||||
vmx_tertiary_exec_control, _vmx_tertiary_exec_control);
|
||||
vmx_caps.tertiary_exec_control, caps.tertiary_exec_control);
|
||||
mismatch |= cap_check(
|
||||
"VMExit Control",
|
||||
vmx_vmexit_control, _vmx_vmexit_control);
|
||||
@@ -1115,7 +1112,7 @@ static int construct_vmcs(struct vcpu *v)
|
||||
v->arch.hvm.vmx.exec_control |= CPU_BASED_RDTSC_EXITING;
|
||||
|
||||
v->arch.hvm.vmx.secondary_exec_control = vmx_caps.secondary_exec_control;
|
||||
v->arch.hvm.vmx.tertiary_exec_control = vmx_tertiary_exec_control;
|
||||
v->arch.hvm.vmx.tertiary_exec_control = vmx_caps.tertiary_exec_control;
|
||||
|
||||
/*
|
||||
* Disable features which we don't want active by default:
|
||||
@@ -2224,7 +2221,6 @@ int __init vmx_vmcs_init(void)
|
||||
* Make sure all dependent features are off as well.
|
||||
*/
|
||||
memset(&vmx_caps, 0, sizeof(vmx_caps));
|
||||
vmx_tertiary_exec_control = 0;
|
||||
vmx_vmexit_control = 0;
|
||||
vmx_vmentry_control = 0;
|
||||
vmx_ept_vpid_cap = 0;
|
||||
|
||||
@@ -265,13 +265,12 @@ extern u32 vmx_vmentry_control;
|
||||
#define TERTIARY_EXEC_GUEST_PAGING_VERIFY BIT(3, UL)
|
||||
#define TERTIARY_EXEC_IPI_VIRT BIT(4, UL)
|
||||
#define TERTIARY_EXEC_VIRT_SPEC_CTRL BIT(7, UL)
|
||||
extern uint64_t vmx_tertiary_exec_control;
|
||||
|
||||
#define cpu_has_vmx_virt_spec_ctrl \
|
||||
(vmx_tertiary_exec_control & TERTIARY_EXEC_VIRT_SPEC_CTRL)
|
||||
(vmx_caps.tertiary_exec_control & TERTIARY_EXEC_VIRT_SPEC_CTRL)
|
||||
|
||||
#define cpu_has_vmx_ept_paging_write \
|
||||
(vmx_tertiary_exec_control & TERTIARY_EXEC_EPT_PAGING_WRITE)
|
||||
(vmx_caps.tertiary_exec_control & TERTIARY_EXEC_EPT_PAGING_WRITE)
|
||||
|
||||
#define VMX_EPT_EXEC_ONLY_SUPPORTED 0x00000001
|
||||
#define VMX_EPT_WALK_LENGTH_4_SUPPORTED 0x00000040
|
||||
@@ -303,6 +302,7 @@ struct vmx_caps {
|
||||
uint32_t pin_based_exec_control;
|
||||
uint32_t cpu_based_exec_control;
|
||||
uint32_t secondary_exec_control;
|
||||
uint64_t tertiary_exec_control;
|
||||
};
|
||||
extern struct vmx_caps vmx_caps;
|
||||
|
||||
|
||||