Commit 9e083ec7 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: nSVM: Split off common definitions for Hyper-V on KVM and KVM on Hyper-V 



In preparation to implementing Enlightened MSR-Bitmap feature for Hyper-V
on KVM, split off the required definitions into common 'svm/hyperv.h'
header.

No functional change intended.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20220202095100.129834-4-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ce385917

arch/x86/kvm/svm/hyperv.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Common Hyper-V on KVM and KVM on Hyper-V definitions (SVM).

 */



#ifndef __ARCH_X86_KVM_SVM_HYPERV_H__

#define __ARCH_X86_KVM_SVM_HYPERV_H__



#include <asm/mshyperv.h>



#include "../hyperv.h"



/*

 * Hyper-V uses the software reserved 32 bytes in VMCB

 * control area to expose SVM enlightenments to guests.

 */

struct hv_enlightenments {

	struct __packed hv_enlightenments_control {

		u32 nested_flush_hypercall:1;

		u32 msr_bitmap:1;

		u32 enlightened_npt_tlb: 1;

		u32 reserved:29;

	} __packed hv_enlightenments_control;

	u32 hv_vp_id;

	u64 hv_vm_id;

	u64 partition_assist_page;

	u64 reserved;

} __packed;



/*

 * Hyper-V uses the software reserved clean bit in VMCB

 */

#define VMCB_HV_NESTED_ENLIGHTENMENTS VMCB_SW



#endif /* __ARCH_X86_KVM_SVM_HYPERV_H__ */

arch/x86/kvm/svm/svm_onhyperv.h

+1 −24
Original line number Diff line number Diff line
@@ -7,35 +7,12 @@ 
#define __ARCH_X86_KVM_SVM_ONHYPERV_H__



#if IS_ENABLED(CONFIG_HYPERV)

#include <asm/mshyperv.h>



#include "hyperv.h"

#include "kvm_onhyperv.h"

#include "svm/hyperv.h"



static struct kvm_x86_ops svm_x86_ops;



/*

 * Hyper-V uses the software reserved 32 bytes in VMCB

 * control area to expose SVM enlightenments to guests.

 */

struct hv_enlightenments {

	struct __packed hv_enlightenments_control {

		u32 nested_flush_hypercall:1;

		u32 msr_bitmap:1;

		u32 enlightened_npt_tlb: 1;

		u32 reserved:29;

	} __packed hv_enlightenments_control;

	u32 hv_vp_id;

	u64 hv_vm_id;

	u64 partition_assist_page;

	u64 reserved;

} __packed;



/*

 * Hyper-V uses the software reserved clean bit in VMCB

 */

#define VMCB_HV_NESTED_ENLIGHTENMENTS VMCB_SW



int svm_hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu);



static inline void svm_hv_init_vmcb(struct vmcb *vmcb)