Commit 4d2dc9a2 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-tdx-userspace-exit' into HEAD 

Introduces support for VM exits that are forwarded the host VMM in
userspace.  These are initiated from the TDCALL exit code; although
these userspace exits have the same TDX exit code, they result in several
different types of exits to userspace.

When a guest TD issues a TDVMCALL, it
exits to VMM with a new exit reason.  The arguments from the guest TD and
return values from the VMM are passed through the guest registers.  The
ABI details for the guest TD hypercalls are specified in the TDX GHCI
specification.

There are two types of hypercalls defined in the GHCI specification:

- Standard TDVMCALLs: When input of R10 from guest TD is set to 0, it
  indicates that the TDVMCALL sub-function used in R11 is defined in GHCI
  specification.

- Vendor-Specific TDVMCALLs: When input of R10 from guest TD is non-zero,
  it indicates a vendor-specific TDVMCALL. KVM hypercalls from the guest
  follow this interface, using R10 as KVM hypercall number and R11-R14 as
  4 arguments.  The error code returned in R10.

This series includes basic standard TDVMCALLs that map to existing eixt
reasons:

- TDG.VP.VMCALL<MapGPA> reuses exit reason KVM_EXIT_HYPERCALL with the
  hypercall number KVM_HC_MAP_GPA_RANGE.

- TDG.VP.VMCALL<ReportFatalError> reuses exit reason KVM_EXIT_SYSTEM_EVENT
  with a new event type KVM_SYSTEM_EVENT_TDX_FATAL.

- TDG.VP.VMCALL<Instruction.IO> reuses exit reason KVM_EXIT_IO.

- TDG.VP.VMCALL<#VE.RequestMMIO> reuses exit reason KVM_EXIT_MMIO.

Notably, handling for TDG.VP.VMCALL<SetupEventNotifyInterrupt> and
TDG.VP.VMCALL<GetQuote> is not included yet.
parents 77ab80c6 bb723beb

Documentation/virt/kvm/api.rst

+6 −0
Original line number Diff line number Diff line
@@ -6823,6 +6823,7 @@ should put the acknowledged interrupt vector into the 'epr' field. 
  #define KVM_SYSTEM_EVENT_WAKEUP         4

  #define KVM_SYSTEM_EVENT_SUSPEND        5

  #define KVM_SYSTEM_EVENT_SEV_TERM       6

  #define KVM_SYSTEM_EVENT_TDX_FATAL      7

			__u32 type;

                        __u32 ndata;

                        __u64 data[16];
@@ -6849,6 +6850,11 @@ Valid values for 'type' are: 
   reset/shutdown of the VM.

 - KVM_SYSTEM_EVENT_SEV_TERM -- an AMD SEV guest requested termination.

   The guest physical address of the guest's GHCB is stored in `data[0]`.

 - KVM_SYSTEM_EVENT_TDX_FATAL -- a TDX guest reported a fatal error state.

   KVM doesn't do any parsing or conversion, it just dumps 16 general-purpose

   registers to userspace, in ascending order of the 4-bit indices for x86-64

   general-purpose registers in instruction encoding, as defined in the Intel

   SDM.

 - KVM_SYSTEM_EVENT_WAKEUP -- the exiting vCPU is in a suspended state and

   KVM has recognized a wakeup event. Userspace may honor this event by

   marking the exiting vCPU as runnable, or deny it and call KVM_RUN again.

arch/x86/include/asm/shared/tdx.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
#define TDVMCALL_STATUS_SUCCESS		0x0000000000000000ULL

#define TDVMCALL_STATUS_RETRY		0x0000000000000001ULL

#define TDVMCALL_STATUS_INVALID_OPERAND	0x8000000000000000ULL

#define TDVMCALL_STATUS_ALIGN_ERROR	0x8000000000000002ULL



/*

 * Bitmasks of exposed registers (with VMM).

arch/x86/include/asm/tdx.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 * TDX module.

 */

#define TDX_ERROR			_BITUL(63)

#define TDX_NON_RECOVERABLE		_BITUL(62)

#define TDX_SW_ERROR			(TDX_ERROR | GENMASK_ULL(47, 40))

#define TDX_SEAMCALL_VMFAILINVALID	(TDX_SW_ERROR | _UL(0xFFFF0000))

arch/x86/include/uapi/asm/vmx.h

+3 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
#define EXIT_REASON_TPAUSE              68

#define EXIT_REASON_BUS_LOCK            74

#define EXIT_REASON_NOTIFY              75

#define EXIT_REASON_TDCALL              77



#define VMX_EXIT_REASONS \

	{ EXIT_REASON_EXCEPTION_NMI,         "EXCEPTION_NMI" }, \
@@ -155,7 +156,8 @@ 
	{ EXIT_REASON_UMWAIT,                "UMWAIT" }, \

	{ EXIT_REASON_TPAUSE,                "TPAUSE" }, \

	{ EXIT_REASON_BUS_LOCK,              "BUS_LOCK" }, \

	{ EXIT_REASON_NOTIFY,                "NOTIFY" }

	{ EXIT_REASON_NOTIFY,                "NOTIFY" }, \

	{ EXIT_REASON_TDCALL,                "TDCALL" }



#define VMX_EXIT_REASON_FLAGS \

	{ VMX_EXIT_REASONS_FAILED_VMENTRY,	"FAILED_VMENTRY" }

arch/x86/kvm/vmx/main.c

+35 −3
Original line number Diff line number Diff line
@@ -181,6 +181,15 @@ static fastpath_t vt_vcpu_run(struct kvm_vcpu *vcpu, bool force_immediate_exit) 
	return vmx_vcpu_run(vcpu, force_immediate_exit);

}



static int vt_handle_exit(struct kvm_vcpu *vcpu,

			  enum exit_fastpath_completion fastpath)

{

	if (is_td_vcpu(vcpu))

		return tdx_handle_exit(vcpu, fastpath);



	return vmx_handle_exit(vcpu, fastpath);

}



static void vt_flush_tlb_all(struct kvm_vcpu *vcpu)

{

	if (is_td_vcpu(vcpu)) {
@@ -228,6 +237,29 @@ static void vt_load_mmu_pgd(struct kvm_vcpu *vcpu, hpa_t root_hpa, 
	vmx_load_mmu_pgd(vcpu, root_hpa, pgd_level);

}



static void vt_get_entry_info(struct kvm_vcpu *vcpu, u32 *intr_info, u32 *error_code)

{

	*intr_info = 0;

	*error_code = 0;



	if (is_td_vcpu(vcpu))

		return;



	vmx_get_entry_info(vcpu, intr_info, error_code);

}



static void vt_get_exit_info(struct kvm_vcpu *vcpu, u32 *reason,

			u64 *info1, u64 *info2, u32 *intr_info, u32 *error_code)

{

	if (is_td_vcpu(vcpu)) {

		tdx_get_exit_info(vcpu, reason, info1, info2, intr_info,

				  error_code);

		return;

	}



	vmx_get_exit_info(vcpu, reason, info1, info2, intr_info, error_code);

}



static int vt_mem_enc_ioctl(struct kvm *kvm, void __user *argp)

{

	if (!is_td(kvm))
@@ -323,7 +355,7 @@ struct kvm_x86_ops vt_x86_ops __initdata = { 


	.vcpu_pre_run = vt_vcpu_pre_run,

	.vcpu_run = vt_vcpu_run,

	.handle_exit = vmx_handle_exit,

	.handle_exit = vt_handle_exit,

	.skip_emulated_instruction = vmx_skip_emulated_instruction,

	.update_emulated_instruction = vmx_update_emulated_instruction,

	.set_interrupt_shadow = vmx_set_interrupt_shadow,
@@ -357,8 +389,8 @@ struct kvm_x86_ops vt_x86_ops __initdata = { 
	.set_identity_map_addr = vmx_set_identity_map_addr,

	.get_mt_mask = vmx_get_mt_mask,



	.get_exit_info = vmx_get_exit_info,

	.get_entry_info = vmx_get_entry_info,

	.get_exit_info = vt_get_exit_info,

	.get_entry_info = vt_get_entry_info,



	.vcpu_after_set_cpuid = vmx_vcpu_after_set_cpuid,