KVM: SVM: add struct kvm_svm to hold SVM specific KVM vars (81811c16) · Commits · e / devices / android_kernel_fairphone_FP4

arch/x86/include/asm/kvm_host.h

+0 −18

Original line number	Original line	Diff line number	Diff line
	@@ -770,15 +770,6 @@ enum kvm_irqchip_mode {
	KVM_IRQCHIP_SPLIT, /* created with KVM_CAP_SPLIT_IRQCHIP */		KVM_IRQCHIP_SPLIT, /* created with KVM_CAP_SPLIT_IRQCHIP */
	};		};

	struct kvm_sev_info {
	bool active; /* SEV enabled guest */
	unsigned int asid; /* ASID used for this guest */
	unsigned int handle; /* SEV firmware handle */
	int fd; /* SEV device fd */
	unsigned long pages_locked; /* Number of pages locked */
	struct list_head regions_list; /* List of registered regions */
	};

	struct kvm_arch {		struct kvm_arch {
	unsigned int n_used_mmu_pages;		unsigned int n_used_mmu_pages;
	unsigned int n_requested_mmu_pages;		unsigned int n_requested_mmu_pages;
	@@ -857,17 +848,8 @@ struct kvm_arch {

	bool disabled_lapic_found;		bool disabled_lapic_found;

	/* Struct members for AVIC */
	u32 avic_vm_id;
	u32 ldr_mode;
	struct page *avic_logical_id_table_page;
	struct page *avic_physical_id_table_page;
	struct hlist_node hnode;

	bool x2apic_format;		bool x2apic_format;
	bool x2apic_broadcast_quirk_disabled;		bool x2apic_broadcast_quirk_disabled;

	struct kvm_sev_info sev_info;
	};		};

	struct kvm_vm_stat {		struct kvm_vm_stat {

arch/x86/kvm/svm.c

+79 −55

Original line number	Original line	Diff line number	Diff line
	@@ -132,6 +132,28 @@ static const u32 host_save_user_msrs[] = {

	#define NR_HOST_SAVE_USER_MSRS ARRAY_SIZE(host_save_user_msrs)		#define NR_HOST_SAVE_USER_MSRS ARRAY_SIZE(host_save_user_msrs)

			struct kvm_sev_info {
			bool active; /* SEV enabled guest */
			unsigned int asid; /* ASID used for this guest */
			unsigned int handle; /* SEV firmware handle */
			int fd; /* SEV device fd */
			unsigned long pages_locked; /* Number of pages locked */
			struct list_head regions_list; /* List of registered regions */
			};

			struct kvm_svm {
			struct kvm kvm;

			/* Struct members for AVIC */
			u32 avic_vm_id;
			u32 ldr_mode;
			struct page *avic_logical_id_table_page;
			struct page *avic_physical_id_table_page;
			struct hlist_node hnode;

			struct kvm_sev_info sev_info;
			};

	struct kvm_vcpu;		struct kvm_vcpu;

	struct nested_state {		struct nested_state {
	@@ -353,6 +375,12 @@ struct enc_region {
	unsigned long size;		unsigned long size;
	};		};


			static inline struct kvm_svm to_kvm_svm(struct kvm kvm)
			{
			return container_of(kvm, struct kvm_svm, kvm);
			}

	static inline bool svm_sev_enabled(void)		static inline bool svm_sev_enabled(void)
	{		{
	return max_sev_asid;		return max_sev_asid;
	@@ -360,14 +388,14 @@ static inline bool svm_sev_enabled(void)

	static inline bool sev_guest(struct kvm *kvm)		static inline bool sev_guest(struct kvm *kvm)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;

	return sev->active;		return sev->active;
	}		}

	static inline int sev_get_asid(struct kvm *kvm)		static inline int sev_get_asid(struct kvm *kvm)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;

	return sev->asid;		return sev->asid;
	}		}
	@@ -1084,7 +1112,7 @@ static void disable_nmi_singlestep(struct vcpu_svm *svm)
	}		}

	/* Note:		/* Note:
	* This hash table is used to map VM_ID to a struct kvm_arch,		* This hash table is used to map VM_ID to a struct kvm_svm,
	* when handling AMD IOMMU GALOG notification to schedule in		* when handling AMD IOMMU GALOG notification to schedule in
	* a particular vCPU.		* a particular vCPU.
	*/		*/
	@@ -1101,7 +1129,7 @@ static DEFINE_SPINLOCK(svm_vm_data_hash_lock);
	static int avic_ga_log_notifier(u32 ga_tag)		static int avic_ga_log_notifier(u32 ga_tag)
	{		{
	unsigned long flags;		unsigned long flags;
	struct kvm_arch *ka = NULL;		struct kvm_svm *kvm_svm;
	struct kvm_vcpu *vcpu = NULL;		struct kvm_vcpu *vcpu = NULL;
	u32 vm_id = AVIC_GATAG_TO_VMID(ga_tag);		u32 vm_id = AVIC_GATAG_TO_VMID(ga_tag);
	u32 vcpu_id = AVIC_GATAG_TO_VCPUID(ga_tag);		u32 vcpu_id = AVIC_GATAG_TO_VCPUID(ga_tag);
	@@ -1109,13 +1137,10 @@ static int avic_ga_log_notifier(u32 ga_tag)
	pr_debug("SVM: %s: vm_id=%#x, vcpu_id=%#x\n", __func__, vm_id, vcpu_id);		pr_debug("SVM: %s: vm_id=%#x, vcpu_id=%#x\n", __func__, vm_id, vcpu_id);

	spin_lock_irqsave(&svm_vm_data_hash_lock, flags);		spin_lock_irqsave(&svm_vm_data_hash_lock, flags);
	hash_for_each_possible(svm_vm_data_hash, ka, hnode, vm_id) {		hash_for_each_possible(svm_vm_data_hash, kvm_svm, hnode, vm_id) {
	struct kvm *kvm = container_of(ka, struct kvm, arch);		if (kvm_svm->avic_vm_id != vm_id)
	struct kvm_arch *vm_data = &kvm->arch;

	if (vm_data->avic_vm_id != vm_id)
	continue;		continue;
	vcpu = kvm_get_vcpu_by_id(kvm, vcpu_id);		vcpu = kvm_get_vcpu_by_id(&kvm_svm->kvm, vcpu_id);
	break;		break;
	}		}
	spin_unlock_irqrestore(&svm_vm_data_hash_lock, flags);		spin_unlock_irqrestore(&svm_vm_data_hash_lock, flags);
	@@ -1329,10 +1354,10 @@ static void svm_write_tsc_offset(struct kvm_vcpu *vcpu, u64 offset)
	static void avic_init_vmcb(struct vcpu_svm *svm)		static void avic_init_vmcb(struct vcpu_svm *svm)
	{		{
	struct vmcb *vmcb = svm->vmcb;		struct vmcb *vmcb = svm->vmcb;
	struct kvm_arch *vm_data = &svm->vcpu.kvm->arch;		struct kvm_svm *kvm_svm = to_kvm_svm(svm->vcpu.kvm);
	phys_addr_t bpa = __sme_set(page_to_phys(svm->avic_backing_page));		phys_addr_t bpa = __sme_set(page_to_phys(svm->avic_backing_page));
	phys_addr_t lpa = __sme_set(page_to_phys(vm_data->avic_logical_id_table_page));		phys_addr_t lpa = __sme_set(page_to_phys(kvm_svm->avic_logical_id_table_page));
	phys_addr_t ppa = __sme_set(page_to_phys(vm_data->avic_physical_id_table_page));		phys_addr_t ppa = __sme_set(page_to_phys(kvm_svm->avic_physical_id_table_page));

	vmcb->control.avic_backing_page = bpa & AVIC_HPA_MASK;		vmcb->control.avic_backing_page = bpa & AVIC_HPA_MASK;
	vmcb->control.avic_logical_id = lpa & AVIC_HPA_MASK;		vmcb->control.avic_logical_id = lpa & AVIC_HPA_MASK;
	@@ -1500,12 +1525,12 @@ static u64 avic_get_physical_id_entry(struct kvm_vcpu vcpu,
	unsigned int index)		unsigned int index)
	{		{
	u64 *avic_physical_id_table;		u64 *avic_physical_id_table;
	struct kvm_arch *vm_data = &vcpu->kvm->arch;		struct kvm_svm *kvm_svm = to_kvm_svm(vcpu->kvm);

	if (index >= AVIC_MAX_PHYSICAL_ID_COUNT)		if (index >= AVIC_MAX_PHYSICAL_ID_COUNT)
	return NULL;		return NULL;

	avic_physical_id_table = page_address(vm_data->avic_physical_id_table_page);		avic_physical_id_table = page_address(kvm_svm->avic_physical_id_table_page);

	return &avic_physical_id_table[index];		return &avic_physical_id_table[index];
	}		}
	@@ -1588,7 +1613,7 @@ static void __sev_asid_free(int asid)

	static void sev_asid_free(struct kvm *kvm)		static void sev_asid_free(struct kvm *kvm)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;

	__sev_asid_free(sev->asid);		__sev_asid_free(sev->asid);
	}		}
	@@ -1628,7 +1653,7 @@ static struct page *sev_pin_memory(struct kvm kvm, unsigned long uaddr,
	unsigned long ulen, unsigned long *n,		unsigned long ulen, unsigned long *n,
	int write)		int write)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
	unsigned long npages, npinned, size;		unsigned long npages, npinned, size;
	unsigned long locked, lock_limit;		unsigned long locked, lock_limit;
	struct page **pages;		struct page **pages;
	@@ -1679,7 +1704,7 @@ static struct page *sev_pin_memory(struct kvm kvm, unsigned long uaddr,
	static void sev_unpin_memory(struct kvm kvm, struct page *pages,		static void sev_unpin_memory(struct kvm kvm, struct page *pages,
	unsigned long npages)		unsigned long npages)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;

	release_pages(pages, npages);		release_pages(pages, npages);
	kvfree(pages);		kvfree(pages);
	@@ -1719,17 +1744,18 @@ static void __unregister_enc_region_locked(struct kvm *kvm,

	static struct kvm *svm_vm_alloc(void)		static struct kvm *svm_vm_alloc(void)
	{		{
	return kzalloc(sizeof(struct kvm), GFP_KERNEL);		struct kvm_svm *kvm_svm = kzalloc(sizeof(struct kvm_svm), GFP_KERNEL);
			return &kvm_svm->kvm;
	}		}

	static void svm_vm_free(struct kvm *kvm)		static void svm_vm_free(struct kvm *kvm)
	{		{
	kfree(kvm);		kfree(to_kvm_svm(kvm));
	}		}

	static void sev_vm_destroy(struct kvm *kvm)		static void sev_vm_destroy(struct kvm *kvm)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
	struct list_head *head = &sev->regions_list;		struct list_head *head = &sev->regions_list;
	struct list_head pos, q;		struct list_head pos, q;

	@@ -1758,18 +1784,18 @@ static void sev_vm_destroy(struct kvm *kvm)
	static void avic_vm_destroy(struct kvm *kvm)		static void avic_vm_destroy(struct kvm *kvm)
	{		{
	unsigned long flags;		unsigned long flags;
	struct kvm_arch *vm_data = &kvm->arch;		struct kvm_svm *kvm_svm = to_kvm_svm(kvm);

	if (!avic)		if (!avic)
	return;		return;

	if (vm_data->avic_logical_id_table_page)		if (kvm_svm->avic_logical_id_table_page)
	__free_page(vm_data->avic_logical_id_table_page);		__free_page(kvm_svm->avic_logical_id_table_page);
	if (vm_data->avic_physical_id_table_page)		if (kvm_svm->avic_physical_id_table_page)
	__free_page(vm_data->avic_physical_id_table_page);		__free_page(kvm_svm->avic_physical_id_table_page);

	spin_lock_irqsave(&svm_vm_data_hash_lock, flags);		spin_lock_irqsave(&svm_vm_data_hash_lock, flags);
	hash_del(&vm_data->hnode);		hash_del(&kvm_svm->hnode);
	spin_unlock_irqrestore(&svm_vm_data_hash_lock, flags);		spin_unlock_irqrestore(&svm_vm_data_hash_lock, flags);
	}		}

	@@ -1783,10 +1809,10 @@ static int avic_vm_init(struct kvm *kvm)
	{		{
	unsigned long flags;		unsigned long flags;
	int err = -ENOMEM;		int err = -ENOMEM;
	struct kvm_arch *vm_data = &kvm->arch;		struct kvm_svm *kvm_svm = to_kvm_svm(kvm);
			struct kvm_svm *k2;
	struct page *p_page;		struct page *p_page;
	struct page *l_page;		struct page *l_page;
	struct kvm_arch *ka;
	u32 vm_id;		u32 vm_id;

	if (!avic)		if (!avic)
	@@ -1797,7 +1823,7 @@ static int avic_vm_init(struct kvm *kvm)
	if (!p_page)		if (!p_page)
	goto free_avic;		goto free_avic;

	vm_data->avic_physical_id_table_page = p_page;		kvm_svm->avic_physical_id_table_page = p_page;
	clear_page(page_address(p_page));		clear_page(page_address(p_page));

	/* Allocating logical APIC ID table (4KB) */		/* Allocating logical APIC ID table (4KB) */
	@@ -1805,7 +1831,7 @@ static int avic_vm_init(struct kvm *kvm)
	if (!l_page)		if (!l_page)
	goto free_avic;		goto free_avic;

	vm_data->avic_logical_id_table_page = l_page;		kvm_svm->avic_logical_id_table_page = l_page;
	clear_page(page_address(l_page));		clear_page(page_address(l_page));

	spin_lock_irqsave(&svm_vm_data_hash_lock, flags);		spin_lock_irqsave(&svm_vm_data_hash_lock, flags);
	@@ -1817,15 +1843,13 @@ static int avic_vm_init(struct kvm *kvm)
	}		}
	/* Is it still in use? Only possible if wrapped at least once */		/* Is it still in use? Only possible if wrapped at least once */
	if (next_vm_id_wrapped) {		if (next_vm_id_wrapped) {
	hash_for_each_possible(svm_vm_data_hash, ka, hnode, vm_id) {		hash_for_each_possible(svm_vm_data_hash, k2, hnode, vm_id) {
	struct kvm *k2 = container_of(ka, struct kvm, arch);		if (k2->avic_vm_id == vm_id)
	struct kvm_arch *vd2 = &k2->arch;
	if (vd2->avic_vm_id == vm_id)
	goto again;		goto again;
	}		}
	}		}
	vm_data->avic_vm_id = vm_id;		kvm_svm->avic_vm_id = vm_id;
	hash_add(svm_vm_data_hash, &vm_data->hnode, vm_data->avic_vm_id);		hash_add(svm_vm_data_hash, &kvm_svm->hnode, kvm_svm->avic_vm_id);
	spin_unlock_irqrestore(&svm_vm_data_hash_lock, flags);		spin_unlock_irqrestore(&svm_vm_data_hash_lock, flags);

	return 0;		return 0;
	@@ -4354,7 +4378,7 @@ static int avic_incomplete_ipi_interception(struct vcpu_svm *svm)

	static u32 avic_get_logical_id_entry(struct kvm_vcpu vcpu, u32 ldr, bool flat)		static u32 avic_get_logical_id_entry(struct kvm_vcpu vcpu, u32 ldr, bool flat)
	{		{
	struct kvm_arch *vm_data = &vcpu->kvm->arch;		struct kvm_svm *kvm_svm = to_kvm_svm(vcpu->kvm);
	int index;		int index;
	u32 *logical_apic_id_table;		u32 *logical_apic_id_table;
	int dlid = GET_APIC_LOGICAL_ID(ldr);		int dlid = GET_APIC_LOGICAL_ID(ldr);
	@@ -4376,7 +4400,7 @@ static u32 avic_get_logical_id_entry(struct kvm_vcpu vcpu, u32 ldr, bool flat)
	index = (cluster << 2) + apic;		index = (cluster << 2) + apic;
	}		}

	logical_apic_id_table = (u32 *) page_address(vm_data->avic_logical_id_table_page);		logical_apic_id_table = (u32 *) page_address(kvm_svm->avic_logical_id_table_page);

	return &logical_apic_id_table[index];		return &logical_apic_id_table[index];
	}		}
	@@ -4456,7 +4480,7 @@ static int avic_handle_apic_id_update(struct kvm_vcpu *vcpu)
	static int avic_handle_dfr_update(struct kvm_vcpu *vcpu)		static int avic_handle_dfr_update(struct kvm_vcpu *vcpu)
	{		{
	struct vcpu_svm *svm = to_svm(vcpu);		struct vcpu_svm *svm = to_svm(vcpu);
	struct kvm_arch *vm_data = &vcpu->kvm->arch;		struct kvm_svm *kvm_svm = to_kvm_svm(vcpu->kvm);
	u32 dfr = kvm_lapic_get_reg(vcpu->arch.apic, APIC_DFR);		u32 dfr = kvm_lapic_get_reg(vcpu->arch.apic, APIC_DFR);
	u32 mod = (dfr >> 28) & 0xf;		u32 mod = (dfr >> 28) & 0xf;

	@@ -4465,11 +4489,11 @@ static int avic_handle_dfr_update(struct kvm_vcpu *vcpu)
	* If this changes, we need to flush the AVIC logical		* If this changes, we need to flush the AVIC logical
	* APID id table.		* APID id table.
	*/		*/
	if (vm_data->ldr_mode == mod)		if (kvm_svm->ldr_mode == mod)
	return 0;		return 0;

	clear_page(page_address(vm_data->avic_logical_id_table_page));		clear_page(page_address(kvm_svm->avic_logical_id_table_page));
	vm_data->ldr_mode = mod;		kvm_svm->ldr_mode = mod;

	if (svm->ldr_reg)		if (svm->ldr_reg)
	avic_handle_ldr_update(vcpu);		avic_handle_ldr_update(vcpu);
	@@ -5105,7 +5129,7 @@ static int svm_update_pi_irte(struct kvm *kvm, unsigned int host_irq,
	/* Try to enable guest_mode in IRTE */		/* Try to enable guest_mode in IRTE */
	pi.base = __sme_set(page_to_phys(svm->avic_backing_page) &		pi.base = __sme_set(page_to_phys(svm->avic_backing_page) &
	AVIC_HPA_MASK);		AVIC_HPA_MASK);
	pi.ga_tag = AVIC_GATAG(kvm->arch.avic_vm_id,		pi.ga_tag = AVIC_GATAG(to_kvm_svm(kvm)->avic_vm_id,
	svm->vcpu.vcpu_id);		svm->vcpu.vcpu_id);
	pi.is_guest_mode = true;		pi.is_guest_mode = true;
	pi.vcpu_data = &vcpu_info;		pi.vcpu_data = &vcpu_info;
	@@ -6074,7 +6098,7 @@ static int sev_asid_new(void)

	static int sev_guest_init(struct kvm kvm, struct kvm_sev_cmd argp)		static int sev_guest_init(struct kvm kvm, struct kvm_sev_cmd argp)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
	int asid, ret;		int asid, ret;

	ret = -EBUSY;		ret = -EBUSY;
	@@ -6139,14 +6163,14 @@ static int __sev_issue_cmd(int fd, int id, void data, int error)

	static int sev_issue_cmd(struct kvm kvm, int id, void data, int *error)		static int sev_issue_cmd(struct kvm kvm, int id, void data, int *error)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;

	return __sev_issue_cmd(sev->fd, id, data, error);		return __sev_issue_cmd(sev->fd, id, data, error);
	}		}

	static int sev_launch_start(struct kvm kvm, struct kvm_sev_cmd argp)		static int sev_launch_start(struct kvm kvm, struct kvm_sev_cmd argp)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
	struct sev_data_launch_start *start;		struct sev_data_launch_start *start;
	struct kvm_sev_launch_start params;		struct kvm_sev_launch_start params;
	void dh_blob, session_blob;		void dh_blob, session_blob;
	@@ -6244,7 +6268,7 @@ static int get_num_contig_pages(int idx, struct page **inpages,
	static int sev_launch_update_data(struct kvm kvm, struct kvm_sev_cmd argp)		static int sev_launch_update_data(struct kvm kvm, struct kvm_sev_cmd argp)
	{		{
	unsigned long vaddr, vaddr_end, next_vaddr, npages, size;		unsigned long vaddr, vaddr_end, next_vaddr, npages, size;
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
	struct kvm_sev_launch_update_data params;		struct kvm_sev_launch_update_data params;
	struct sev_data_launch_update_data *data;		struct sev_data_launch_update_data *data;
	struct page **inpages;		struct page **inpages;
	@@ -6320,7 +6344,7 @@ static int sev_launch_update_data(struct kvm kvm, struct kvm_sev_cmd argp)
	static int sev_launch_measure(struct kvm kvm, struct kvm_sev_cmd argp)		static int sev_launch_measure(struct kvm kvm, struct kvm_sev_cmd argp)
	{		{
	void __user measure = (void __user )(uintptr_t)argp->data;		void __user measure = (void __user )(uintptr_t)argp->data;
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
	struct sev_data_launch_measure *data;		struct sev_data_launch_measure *data;
	struct kvm_sev_launch_measure params;		struct kvm_sev_launch_measure params;
	void __user *p = NULL;		void __user *p = NULL;
	@@ -6388,7 +6412,7 @@ static int sev_launch_measure(struct kvm kvm, struct kvm_sev_cmd argp)

	static int sev_launch_finish(struct kvm kvm, struct kvm_sev_cmd argp)		static int sev_launch_finish(struct kvm kvm, struct kvm_sev_cmd argp)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
	struct sev_data_launch_finish *data;		struct sev_data_launch_finish *data;
	int ret;		int ret;

	@@ -6408,7 +6432,7 @@ static int sev_launch_finish(struct kvm kvm, struct kvm_sev_cmd argp)

	static int sev_guest_status(struct kvm kvm, struct kvm_sev_cmd argp)		static int sev_guest_status(struct kvm kvm, struct kvm_sev_cmd argp)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
	struct kvm_sev_guest_status params;		struct kvm_sev_guest_status params;
	struct sev_data_guest_status *data;		struct sev_data_guest_status *data;
	int ret;		int ret;
	@@ -6440,7 +6464,7 @@ static int __sev_issue_dbg_cmd(struct kvm *kvm, unsigned long src,
	unsigned long dst, int size,		unsigned long dst, int size,
	int *error, bool enc)		int *error, bool enc)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
	struct sev_data_dbg *data;		struct sev_data_dbg *data;
	int ret;		int ret;

	@@ -6672,7 +6696,7 @@ static int sev_dbg_crypt(struct kvm kvm, struct kvm_sev_cmd argp, bool dec)

	static int sev_launch_secret(struct kvm kvm, struct kvm_sev_cmd argp)		static int sev_launch_secret(struct kvm kvm, struct kvm_sev_cmd argp)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
	struct sev_data_launch_secret *data;		struct sev_data_launch_secret *data;
	struct kvm_sev_launch_secret params;		struct kvm_sev_launch_secret params;
	struct page **pages;		struct page **pages;
	@@ -6796,7 +6820,7 @@ static int svm_mem_enc_op(struct kvm kvm, void __user argp)
	static int svm_register_enc_region(struct kvm *kvm,		static int svm_register_enc_region(struct kvm *kvm,
	struct kvm_enc_region *range)		struct kvm_enc_region *range)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
	struct enc_region *region;		struct enc_region *region;
	int ret = 0;		int ret = 0;

	@@ -6838,7 +6862,7 @@ static int svm_register_enc_region(struct kvm *kvm,
	static struct enc_region *		static struct enc_region *
	find_enc_region(struct kvm kvm, struct kvm_enc_region range)		find_enc_region(struct kvm kvm, struct kvm_enc_region range)
	{		{
	struct kvm_sev_info *sev = &kvm->arch.sev_info;		struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
	struct list_head *head = &sev->regions_list;		struct list_head *head = &sev->regions_list;
	struct enc_region *i;		struct enc_region *i;