Commit a50f673f authored by Isaku Yamahata's avatar Isaku Yamahata Committed by Paolo Bonzini
Browse files

KVM: TDX: Do TDX specific vcpu initialization 



TD guest vcpu needs TDX specific initialization before running.  Repurpose
KVM_MEMORY_ENCRYPT_OP to vcpu-scope, add a new sub-command
KVM_TDX_INIT_VCPU, and implement the callback for it.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarIsaku Yamahata <isaku.yamahata@intel.com>
Co-developed-by: default avatarTony Lindgren <tony.lindgren@linux.intel.com>
Signed-off-by: default avatarTony Lindgren <tony.lindgren@linux.intel.com>
Co-developed-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarRick Edgecombe <rick.p.edgecombe@intel.com>
---
 - Fix comment: https://lore.kernel.org/kvm/Z36OYfRW9oPjW8be@google.com/


   (Sean)
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9002f8cf

arch/x86/include/asm/kvm-x86-ops.h

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ KVM_X86_OP(enable_smi_window) 
#endif

KVM_X86_OP_OPTIONAL(dev_get_attr)

KVM_X86_OP(mem_enc_ioctl)

KVM_X86_OP_OPTIONAL(vcpu_mem_enc_ioctl)

KVM_X86_OP_OPTIONAL(mem_enc_register_region)

KVM_X86_OP_OPTIONAL(mem_enc_unregister_region)

KVM_X86_OP_OPTIONAL(vm_copy_enc_context_from)

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -1849,6 +1849,7 @@ struct kvm_x86_ops { 


	int (*dev_get_attr)(u32 group, u64 attr, u64 *val);

	int (*mem_enc_ioctl)(struct kvm *kvm, void __user *argp);

	int (*vcpu_mem_enc_ioctl)(struct kvm_vcpu *vcpu, void __user *argp);

	int (*mem_enc_register_region)(struct kvm *kvm, struct kvm_enc_region *argp);

	int (*mem_enc_unregister_region)(struct kvm *kvm, struct kvm_enc_region *argp);

	int (*vm_copy_enc_context_from)(struct kvm *kvm, unsigned int source_fd);

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

+1 −0
Original line number Diff line number Diff line
@@ -931,6 +931,7 @@ struct kvm_hyperv_eventfd { 
enum kvm_tdx_cmd_id {

	KVM_TDX_CAPABILITIES = 0,

	KVM_TDX_INIT_VM,

	KVM_TDX_INIT_VCPU,



	KVM_TDX_CMD_NR_MAX,

};

arch/x86/kvm/lapic.c

+1 −0
Original line number Diff line number Diff line
@@ -2657,6 +2657,7 @@ int kvm_apic_set_base(struct kvm_vcpu *vcpu, u64 value, bool host_initiated) 
	kvm_recalculate_apic_map(vcpu->kvm);

	return 0;

}

EXPORT_SYMBOL_GPL(kvm_apic_set_base);



void kvm_apic_update_apicv(struct kvm_vcpu *vcpu)

{

arch/x86/kvm/vmx/main.c

+9 −0
Original line number Diff line number Diff line
@@ -106,6 +106,14 @@ static int vt_mem_enc_ioctl(struct kvm *kvm, void __user *argp) 
	return tdx_vm_ioctl(kvm, argp);

}



static int vt_vcpu_mem_enc_ioctl(struct kvm_vcpu *vcpu, void __user *argp)

{

	if (!is_td_vcpu(vcpu))

		return -EINVAL;



	return tdx_vcpu_ioctl(vcpu, argp);

}



#define VMX_REQUIRED_APICV_INHIBITS				\

	(BIT(APICV_INHIBIT_REASON_DISABLED) |			\

	 BIT(APICV_INHIBIT_REASON_ABSENT) |			\
@@ -262,6 +270,7 @@ struct kvm_x86_ops vt_x86_ops __initdata = { 
	.get_untagged_addr = vmx_get_untagged_addr,



	.mem_enc_ioctl = vt_mem_enc_ioctl,

	.vcpu_mem_enc_ioctl = vt_vcpu_mem_enc_ioctl,

};



struct kvm_x86_init_ops vt_init_ops __initdata = {