[PATCH v1 20/23] KVM: selftests: Add FRED VMCS fields to evmcs

From: Xin Li
Date: Wed Nov 08 2023 - 14:01:34 EST

Next message: Xin Li: "[PATCH v1 21/23] KVM: selftests: Run debug_regs test with FRED enabled"
Previous message: Xin Li: "[PATCH v1 17/23] KVM: nVMX: Add support for VMX FRED controls"
In reply to: Xin Li: "[PATCH v1 17/23] KVM: nVMX: Add support for VMX FRED controls"
Next in thread: Xin Li: "[PATCH v1 21/23] KVM: selftests: Run debug_regs test with FRED enabled"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Add FRED VMCS fields to evmcs.

Signed-off-by: Xin Li <xin3.li@xxxxxxxxx>
---
.../selftests/kvm/include/x86_64/evmcs.h | 146 ++++++++++++++++++
.../selftests/kvm/include/x86_64/vmx.h | 20 +++
2 files changed, 166 insertions(+)

diff --git a/tools/testing/selftests/kvm/include/x86_64/evmcs.h b/tools/testing/selftests/kvm/include/x86_64/evmcs.h
index 901caf0e0939..afd35f0c34fd 100644
--- a/tools/testing/selftests/kvm/include/x86_64/evmcs.h
+++ b/tools/testing/selftests/kvm/include/x86_64/evmcs.h
@@ -216,6 +216,27 @@ struct hv_enlightened_vmcs {
u64 host_ssp;
u64 host_ia32_int_ssp_table_addr;
u64 padding64_6;
+
+ u64 host_ia32_fred_config;
+ u64 host_ia32_fred_rsp1;
+ u64 host_ia32_fred_rsp2;
+ u64 host_ia32_fred_rsp3;
+ u64 host_ia32_fred_stklvls;
+ u64 host_ia32_fred_ssp1;
+ u64 host_ia32_fred_ssp2;
+ u64 host_ia32_fred_ssp3;
+
+ u64 guest_ia32_fred_config;
+ u64 guest_ia32_fred_rsp1;
+ u64 guest_ia32_fred_rsp2;
+ u64 guest_ia32_fred_rsp3;
+ u64 guest_ia32_fred_stklvls;
+ u64 guest_ia32_fred_ssp1;
+ u64 guest_ia32_fred_ssp2;
+ u64 guest_ia32_fred_ssp3;
+
+ u64 injected_event_data;
+ u64 original_event_data;
} __packed;

#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE 0
@@ -450,6 +471,9 @@ static inline int evmcs_vmread(uint64_t encoding, uint64_t *value)
case GUEST_LINEAR_ADDRESS:
*value = current_evmcs->guest_linear_address;
break;
+ case ORIGINAL_EVENT_DATA:
+ *value = current_evmcs->original_event_data;
+ break;
case VM_EXIT_MSR_STORE_ADDR:
*value = current_evmcs->vm_exit_msr_store_addr;
break;
@@ -492,6 +516,9 @@ static inline int evmcs_vmread(uint64_t encoding, uint64_t *value)
case VM_ENTRY_EXCEPTION_ERROR_CODE:
*value = current_evmcs->vm_entry_exception_error_code;
break;
+ case INJECTED_EVENT_DATA:
+ *value = current_evmcs->injected_event_data;
+ break;
case VM_ENTRY_INSTRUCTION_LEN:
*value = current_evmcs->vm_entry_instruction_len;
break;
@@ -669,6 +696,54 @@ static inline int evmcs_vmread(uint64_t encoding, uint64_t *value)
case TSC_MULTIPLIER:
*value = current_evmcs->tsc_multiplier;
break;
+ case HOST_IA32_FRED_CONFIG:
+ *value = current_evmcs->host_ia32_fred_config;
+ break;
+ case HOST_IA32_FRED_RSP1:
+ *value = current_evmcs->host_ia32_fred_rsp1;
+ break;
+ case HOST_IA32_FRED_RSP2:
+ *value = current_evmcs->host_ia32_fred_rsp2;
+ break;
+ case HOST_IA32_FRED_RSP3:
+ *value = current_evmcs->host_ia32_fred_rsp3;
+ break;
+ case HOST_IA32_FRED_STKLVLS:
+ *value = current_evmcs->host_ia32_fred_stklvls;
+ break;
+ case HOST_IA32_FRED_SSP1:
+ *value = current_evmcs->host_ia32_fred_ssp1;
+ break;
+ case HOST_IA32_FRED_SSP2:
+ *value = current_evmcs->host_ia32_fred_ssp2;
+ break;
+ case HOST_IA32_FRED_SSP3:
+ *value = current_evmcs->host_ia32_fred_ssp3;
+ break;
+ case GUEST_IA32_FRED_CONFIG:
+ *value = current_evmcs->guest_ia32_fred_config;
+ break;
+ case GUEST_IA32_FRED_RSP1:
+ *value = current_evmcs->guest_ia32_fred_rsp1;
+ break;
+ case GUEST_IA32_FRED_RSP2:
+ *value = current_evmcs->guest_ia32_fred_rsp2;
+ break;
+ case GUEST_IA32_FRED_RSP3:
+ *value = current_evmcs->guest_ia32_fred_rsp3;
+ break;
+ case GUEST_IA32_FRED_STKLVLS:
+ *value = current_evmcs->guest_ia32_fred_stklvls;
+ break;
+ case GUEST_IA32_FRED_SSP1:
+ *value = current_evmcs->guest_ia32_fred_ssp1;
+ break;
+ case GUEST_IA32_FRED_SSP2:
+ *value = current_evmcs->guest_ia32_fred_ssp2;
+ break;
+ case GUEST_IA32_FRED_SSP3:
+ *value = current_evmcs->guest_ia32_fred_ssp3;
+ break;
default: return 1;
}

@@ -906,6 +981,10 @@ static inline int evmcs_vmwrite(uint64_t encoding, uint64_t value)
current_evmcs->guest_linear_address = value;
current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE;
break;
+ case ORIGINAL_EVENT_DATA:
+ current_evmcs->original_event_data = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE;
+ break;
case VM_EXIT_MSR_STORE_ADDR:
current_evmcs->vm_exit_msr_store_addr = value;
current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL;
@@ -962,6 +1041,10 @@ static inline int evmcs_vmwrite(uint64_t encoding, uint64_t value)
current_evmcs->vm_entry_exception_error_code = value;
current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT;
break;
+ case INJECTED_EVENT_DATA:
+ current_evmcs->injected_event_data = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT;
+ break;
case VM_ENTRY_INSTRUCTION_LEN:
current_evmcs->vm_entry_instruction_len = value;
current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT;
@@ -1198,6 +1281,69 @@ static inline int evmcs_vmwrite(uint64_t encoding, uint64_t value)
current_evmcs->tsc_multiplier = value;
current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2;
break;
+ case HOST_IA32_FRED_CONFIG:
+ current_evmcs->host_ia32_fred_config = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER;
+ break;
+ case HOST_IA32_FRED_RSP1:
+ current_evmcs->host_ia32_fred_rsp1 = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER;
+ break;
+ case HOST_IA32_FRED_RSP2:
+ current_evmcs->host_ia32_fred_rsp2 = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER;
+ break;
+ case HOST_IA32_FRED_RSP3:
+ current_evmcs->host_ia32_fred_rsp3 = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER;
+ break;
+ case HOST_IA32_FRED_STKLVLS:
+ current_evmcs->host_ia32_fred_stklvls = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER;
+ break;
+ case HOST_IA32_FRED_SSP1:
+ current_evmcs->host_ia32_fred_ssp1 = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER;
+ break;
+ case HOST_IA32_FRED_SSP2:
+ current_evmcs->host_ia32_fred_ssp2 = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER;
+ break;
+ case HOST_IA32_FRED_SSP3:
+ current_evmcs->host_ia32_fred_ssp3 = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER;
+ break;
+ case GUEST_IA32_FRED_CONFIG:
+ current_evmcs->guest_ia32_fred_config = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2;
+ case GUEST_IA32_FRED_RSP1:
+ current_evmcs->guest_ia32_fred_rsp1 = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2;
+ break;
+ case GUEST_IA32_FRED_RSP2:
+ current_evmcs->guest_ia32_fred_rsp2 = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2;
+ break;
+ case GUEST_IA32_FRED_RSP3:
+ current_evmcs->guest_ia32_fred_rsp3 = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2;
+ break;
+ case GUEST_IA32_FRED_STKLVLS:
+ current_evmcs->guest_ia32_fred_stklvls = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2;
+ break;
+ case GUEST_IA32_FRED_SSP1:
+ current_evmcs->guest_ia32_fred_ssp1 = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2;
+ break;
+ case GUEST_IA32_FRED_SSP2:
+ current_evmcs->guest_ia32_fred_ssp2 = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2;
+ break;
+ case GUEST_IA32_FRED_SSP3:
+ current_evmcs->guest_ia32_fred_ssp3 = value;
+ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2;
+ break;
default: return 1;
}

diff --git a/tools/testing/selftests/kvm/include/x86_64/vmx.h b/tools/testing/selftests/kvm/include/x86_64/vmx.h
index 5f0c0a29c556..e1fdbc293af7 100644
--- a/tools/testing/selftests/kvm/include/x86_64/vmx.h
+++ b/tools/testing/selftests/kvm/include/x86_64/vmx.h
@@ -165,8 +165,12 @@ enum vmcs_field {
ENCLS_EXITING_BITMAP_HIGH = 0x0000202F,
TSC_MULTIPLIER = 0x00002032,
TSC_MULTIPLIER_HIGH = 0x00002033,
+ INJECTED_EVENT_DATA = 0x00002052,
+ INJECTED_EVENT_DATA_HIGH = 0x00002053,
GUEST_PHYSICAL_ADDRESS = 0x00002400,
GUEST_PHYSICAL_ADDRESS_HIGH = 0x00002401,
+ ORIGINAL_EVENT_DATA = 0x00002404,
+ ORIGINAL_EVENT_DATA_HIGH = 0x00002405,
VMCS_LINK_POINTER = 0x00002800,
VMCS_LINK_POINTER_HIGH = 0x00002801,
GUEST_IA32_DEBUGCTL = 0x00002802,
@@ -187,12 +191,28 @@ enum vmcs_field {
GUEST_PDPTR3_HIGH = 0x00002811,
GUEST_BNDCFGS = 0x00002812,
GUEST_BNDCFGS_HIGH = 0x00002813,
+ GUEST_IA32_FRED_CONFIG = 0x0000281a,
+ GUEST_IA32_FRED_RSP1 = 0x0000281c,
+ GUEST_IA32_FRED_RSP2 = 0x0000281e,
+ GUEST_IA32_FRED_RSP3 = 0x00002820,
+ GUEST_IA32_FRED_STKLVLS = 0x00002822,
+ GUEST_IA32_FRED_SSP1 = 0x00002824,
+ GUEST_IA32_FRED_SSP2 = 0x00002826,
+ GUEST_IA32_FRED_SSP3 = 0x00002828,
HOST_IA32_PAT = 0x00002c00,
HOST_IA32_PAT_HIGH = 0x00002c01,
HOST_IA32_EFER = 0x00002c02,
HOST_IA32_EFER_HIGH = 0x00002c03,
HOST_IA32_PERF_GLOBAL_CTRL = 0x00002c04,
HOST_IA32_PERF_GLOBAL_CTRL_HIGH = 0x00002c05,
+ HOST_IA32_FRED_CONFIG = 0x00002c08,
+ HOST_IA32_FRED_RSP1 = 0x00002c0a,
+ HOST_IA32_FRED_RSP2 = 0x00002c0c,
+ HOST_IA32_FRED_RSP3 = 0x00002c0e,
+ HOST_IA32_FRED_STKLVLS = 0x00002c10,
+ HOST_IA32_FRED_SSP1 = 0x00002c12,
+ HOST_IA32_FRED_SSP2 = 0x00002c14,
+ HOST_IA32_FRED_SSP3 = 0x00002c16,
PIN_BASED_VM_EXEC_CONTROL = 0x00004000,
CPU_BASED_VM_EXEC_CONTROL = 0x00004002,
EXCEPTION_BITMAP = 0x00004004,
--
2.42.0

Next message: Xin Li: "[PATCH v1 21/23] KVM: selftests: Run debug_regs test with FRED enabled"
Previous message: Xin Li: "[PATCH v1 17/23] KVM: nVMX: Add support for VMX FRED controls"
In reply to: Xin Li: "[PATCH v1 17/23] KVM: nVMX: Add support for VMX FRED controls"
Next in thread: Xin Li: "[PATCH v1 21/23] KVM: selftests: Run debug_regs test with FRED enabled"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]