Commit 415a3c33 authored by Wei Wang's avatar Wei Wang Committed by Paolo Bonzini
Browse files

kvm: selftests: Add support for KVM_CAP_XSAVE2 



When KVM_CAP_XSAVE2 is supported, userspace is expected to allocate
buffer for KVM_GET_XSAVE2 and KVM_SET_XSAVE using the size returned
by KVM_CHECK_EXTENSION(KVM_CAP_XSAVE2).

Signed-off-by: default avatarWei Wang <wei.w.wang@intel.com>
Signed-off-by: default avatarGuang Zeng <guang.zeng@intel.com>
Signed-off-by: default avatarJing Liu <jing2.liu@intel.com>
Signed-off-by: default avatarYang Zhong <yang.zhong@intel.com>
Message-Id: <20220105123532.12586-20-yang.zhong@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent be50b206

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

+15 −1
Original line number Diff line number Diff line
@@ -373,9 +373,23 @@ struct kvm_debugregs { 
	__u64 reserved[9];

};



/* for KVM_CAP_XSAVE */

/* for KVM_CAP_XSAVE and KVM_CAP_XSAVE2 */

struct kvm_xsave {

	/*

	 * KVM_GET_XSAVE2 and KVM_SET_XSAVE write and read as many bytes

	 * as are returned by KVM_CHECK_EXTENSION(KVM_CAP_XSAVE2)

	 * respectively, when invoked on the vm file descriptor.

	 *

	 * The size value returned by KVM_CHECK_EXTENSION(KVM_CAP_XSAVE2)

	 * will always be at least 4096. Currently, it is only greater

	 * than 4096 if a dynamic feature has been enabled with

	 * ``arch_prctl()``, but this may change in the future.

	 *

	 * The offsets of the state save areas in struct kvm_xsave follow

	 * the contents of CPUID leaf 0xD on the host.

	 */

	__u32 region[1024];

	__u32 extra[0];

};



#define KVM_MAX_XCRS	16

tools/include/uapi/linux/kvm.h

+3 −0
Original line number Diff line number Diff line
@@ -1131,6 +1131,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_EXIT_ON_EMULATION_FAILURE 204

#define KVM_CAP_ARM_MTE 205

#define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206

#define KVM_CAP_XSAVE2 207



#ifdef KVM_CAP_IRQ_ROUTING
@@ -1551,6 +1552,8 @@ struct kvm_s390_ucas_mapping { 
/* Available with KVM_CAP_XSAVE */

#define KVM_GET_XSAVE		  _IOR(KVMIO,  0xa4, struct kvm_xsave)

#define KVM_SET_XSAVE		  _IOW(KVMIO,  0xa5, struct kvm_xsave)

/* Available with KVM_CAP_XSAVE2 */

#define KVM_GET_XSAVE2		  _IOR(KVMIO,  0xcf, struct kvm_xsave)

/* Available with KVM_CAP_XCRS */

#define KVM_GET_XCRS		  _IOR(KVMIO,  0xa6, struct kvm_xcrs)

#define KVM_SET_XCRS		  _IOW(KVMIO,  0xa7, struct kvm_xcrs)

tools/testing/selftests/kvm/include/kvm_util_base.h

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ extern const struct vm_guest_mode_params vm_guest_mode_params[]; 
int open_path_or_exit(const char *path, int flags);

int open_kvm_dev_path_or_exit(void);

int kvm_check_cap(long cap);

int vm_check_cap(struct kvm_vm *vm, long cap);

int vm_enable_cap(struct kvm_vm *vm, struct kvm_enable_cap *cap);

int vcpu_enable_cap(struct kvm_vm *vm, uint32_t vcpu_id,

		    struct kvm_enable_cap *cap);
@@ -344,6 +345,7 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus, 
 *   guest_code - The vCPU's entry point

 */

void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code);

void vm_xsave_req_perm(void);



bool vm_is_unrestricted_guest(struct kvm_vm *vm);

tools/testing/selftests/kvm/include/x86_64/processor.h

+10 −0
Original line number Diff line number Diff line
@@ -10,8 +10,10 @@ 


#include <assert.h>

#include <stdint.h>

#include <syscall.h>



#include <asm/msr-index.h>

#include <asm/prctl.h>



#include "../kvm_util.h"
@@ -352,6 +354,7 @@ struct kvm_x86_state; 
struct kvm_x86_state *vcpu_save_state(struct kvm_vm *vm, uint32_t vcpuid);

void vcpu_load_state(struct kvm_vm *vm, uint32_t vcpuid,

		     struct kvm_x86_state *state);

void kvm_x86_state_cleanup(struct kvm_x86_state *state);



struct kvm_msr_list *kvm_get_msr_index_list(void);

uint64_t kvm_get_feature_msr(uint64_t msr_index);
@@ -443,4 +446,11 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, 
/* VMX_EPT_VPID_CAP bits */

#define VMX_EPT_VPID_CAP_AD_BITS       (1ULL << 21)



#define XSTATE_XTILE_CFG_BIT		17

#define XSTATE_XTILE_DATA_BIT		18



#define XSTATE_XTILE_CFG_MASK		(1ULL << XSTATE_XTILE_CFG_BIT)

#define XSTATE_XTILE_DATA_MASK		(1ULL << XSTATE_XTILE_DATA_BIT)

#define XFEATURE_XTILE_MASK		(XSTATE_XTILE_CFG_MASK | \

					XSTATE_XTILE_DATA_MASK)

#endif /* SELFTEST_KVM_PROCESSOR_H */

tools/testing/selftests/kvm/lib/kvm_util.c

+32 −0
Original line number Diff line number Diff line
@@ -85,6 +85,33 @@ int kvm_check_cap(long cap) 
	return ret;

}



/* VM Check Capability

 *

 * Input Args:

 *   vm - Virtual Machine

 *   cap - Capability

 *

 * Output Args: None

 *

 * Return:

 *   On success, the Value corresponding to the capability (KVM_CAP_*)

 *   specified by the value of cap.  On failure a TEST_ASSERT failure

 *   is produced.

 *

 * Looks up and returns the value corresponding to the capability

 * (KVM_CAP_*) given by cap.

 */

int vm_check_cap(struct kvm_vm *vm, long cap)

{

	int ret;



	ret = ioctl(vm->fd, KVM_CHECK_EXTENSION, cap);

	TEST_ASSERT(ret >= 0, "KVM_CHECK_EXTENSION VM IOCTL failed,\n"

		"  rc: %i errno: %i", ret, errno);



	return ret;

}



/* VM Enable Capability

 *

 * Input Args:
@@ -366,6 +393,11 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus, 
	struct kvm_vm *vm;

	int i;



	/*

	 * Permission needs to be requested before KVM_SET_CPUID2.

	 */

	vm_xsave_req_perm();



	/* Force slot0 memory size not small than DEFAULT_GUEST_PHY_PAGES */

	if (slot0_mem_pages < DEFAULT_GUEST_PHY_PAGES)

		slot0_mem_pages = DEFAULT_GUEST_PHY_PAGES;