Commit 813e38cd authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: selftests: Make get_supported_cpuid() returns "const" 



Tag the returned CPUID pointers from kvm_get_supported_cpuid(),
kvm_get_supported_hv_cpuid(), and vcpu_get_supported_hv_cpuid() "const"
to prevent reintroducing the broken pattern of modifying the static
"cpuid" variable used by kvm_get_supported_cpuid() to cache the results
of KVM_GET_SUPPORTED_CPUID.

Update downstream consumers as needed.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20220614200707.3315957-31-seanjc@google.com
parent 7ed5a54e

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

+12 −12
Original line number Diff line number Diff line
@@ -585,7 +585,9 @@ static inline void vcpu_xcrs_set(struct kvm_vcpu *vcpu, struct kvm_xcrs *xcrs) 
	vcpu_ioctl(vcpu, KVM_SET_XCRS, xcrs);

}



struct kvm_cpuid2 *kvm_get_supported_cpuid(void);

const struct kvm_cpuid2 *kvm_get_supported_cpuid(void);

const struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void);

const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu);



bool kvm_cpuid_has(const struct kvm_cpuid2 *cpuid,

		   struct kvm_x86_cpu_feature feature);
@@ -618,15 +620,17 @@ static inline struct kvm_cpuid2 *allocate_kvm_cpuid2(int nr_entries) 
	return cpuid;

}



struct kvm_cpuid_entry2 *get_cpuid_entry(struct kvm_cpuid2 *cpuid,

const struct kvm_cpuid_entry2 *get_cpuid_entry(const struct kvm_cpuid2 *cpuid,

					       uint32_t function, uint32_t index);

void vcpu_init_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid);

void vcpu_init_cpuid(struct kvm_vcpu *vcpu, const struct kvm_cpuid2 *cpuid);

void vcpu_set_hv_cpuid(struct kvm_vcpu *vcpu);



static inline struct kvm_cpuid_entry2 *__vcpu_get_cpuid_entry(struct kvm_vcpu *vcpu,

							      uint32_t function,

							      uint32_t index)

{

	return get_cpuid_entry(vcpu->cpuid, function, index);

	return (struct kvm_cpuid_entry2 *)get_cpuid_entry(vcpu->cpuid,

							  function, index);

}



static inline struct kvm_cpuid_entry2 *vcpu_get_cpuid_entry(struct kvm_vcpu *vcpu,
@@ -678,14 +682,13 @@ static inline void vcpu_clear_cpuid_feature(struct kvm_vcpu *vcpu, 
	vcpu_set_or_clear_cpuid_feature(vcpu, feature, false);

}



static inline struct kvm_cpuid_entry2 *kvm_get_supported_cpuid_index(uint32_t function,

static inline const struct kvm_cpuid_entry2 *kvm_get_supported_cpuid_index(uint32_t function,

									   uint32_t index)

{

	return get_cpuid_entry(kvm_get_supported_cpuid(), function, index);

}



static inline struct kvm_cpuid_entry2 *

kvm_get_supported_cpuid_entry(uint32_t function)

static inline const struct kvm_cpuid_entry2 *kvm_get_supported_cpuid_entry(uint32_t function)

{

	return kvm_get_supported_cpuid_index(function, 0);

}
@@ -804,9 +807,6 @@ void vm_set_page_table_entry(struct kvm_vm *vm, struct kvm_vcpu *vcpu, 
uint64_t kvm_hypercall(uint64_t nr, uint64_t a0, uint64_t a1, uint64_t a2,

		       uint64_t a3);



struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void);

void vcpu_set_hv_cpuid(struct kvm_vcpu *vcpu);

struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu);

void vm_xsave_req_perm(int bit);



enum pg_level {

tools/testing/selftests/kvm/lib/x86_64/processor.c

+8 −19
Original line number Diff line number Diff line
@@ -676,18 +676,7 @@ void vcpu_arch_free(struct kvm_vcpu *vcpu) 
		free(vcpu->cpuid);

}



/*

 * KVM Supported CPUID Get

 *

 * Input Args: None

 *

 * Output Args:

 *

 * Return: The supported KVM CPUID

 *

 * Get the guest CPUID supported by KVM.

 */

struct kvm_cpuid2 *kvm_get_supported_cpuid(void)

const struct kvm_cpuid2 *kvm_get_supported_cpuid(void)

{

	static struct kvm_cpuid2 *cpuid;

	int kvm_fd;
@@ -745,7 +734,7 @@ uint64_t kvm_get_feature_msr(uint64_t msr_index) 
	return buffer.entry.data;

}



void vcpu_init_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid)

void vcpu_init_cpuid(struct kvm_vcpu *vcpu, const struct kvm_cpuid2 *cpuid)

{

	TEST_ASSERT(cpuid != vcpu->cpuid, "@cpuid can't be the vCPU's CPUID");
@@ -1079,7 +1068,7 @@ uint32_t kvm_get_cpuid_max_extended(void) 


void kvm_get_cpu_address_width(unsigned int *pa_bits, unsigned int *va_bits)

{

	struct kvm_cpuid_entry2 *entry;

	const struct kvm_cpuid_entry2 *entry;

	bool pae;



	/* SDM 4.1.4 */
@@ -1208,7 +1197,7 @@ void assert_on_unhandled_exception(struct kvm_vcpu *vcpu) 
	}

}



struct kvm_cpuid_entry2 *get_cpuid_entry(struct kvm_cpuid2 *cpuid,

const struct kvm_cpuid_entry2 *get_cpuid_entry(const struct kvm_cpuid2 *cpuid,

					       uint32_t function, uint32_t index)

{

	int i;
@@ -1235,7 +1224,7 @@ uint64_t kvm_hypercall(uint64_t nr, uint64_t a0, uint64_t a1, uint64_t a2, 
	return r;

}



struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void)

const struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void)

{

	static struct kvm_cpuid2 *cpuid;

	int kvm_fd;
@@ -1255,7 +1244,7 @@ struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void) 
void vcpu_set_hv_cpuid(struct kvm_vcpu *vcpu)

{

	static struct kvm_cpuid2 *cpuid_full;

	struct kvm_cpuid2 *cpuid_sys, *cpuid_hv;

	const struct kvm_cpuid2 *cpuid_sys, *cpuid_hv;

	int i, nent = 0;



	if (!cpuid_full) {
@@ -1285,7 +1274,7 @@ void vcpu_set_hv_cpuid(struct kvm_vcpu *vcpu) 
	vcpu_init_cpuid(vcpu, cpuid_full);

}



struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu)

const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu)

{

	struct kvm_cpuid2 *cpuid = allocate_kvm_cpuid2(MAX_NR_CPUID_ENTRIES);

tools/testing/selftests/kvm/x86_64/cpuid_test.c

+5 −7
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void guest_main(struct kvm_cpuid2 *guest_cpuid) 
	GUEST_DONE();

}



static bool is_cpuid_mangled(struct kvm_cpuid_entry2 *entrie)

static bool is_cpuid_mangled(const struct kvm_cpuid_entry2 *entrie)

{

	int i;
@@ -79,9 +79,10 @@ static bool is_cpuid_mangled(struct kvm_cpuid_entry2 *entrie) 
	return false;

}



static void compare_cpuids(struct kvm_cpuid2 *cpuid1, struct kvm_cpuid2 *cpuid2)

static void compare_cpuids(const struct kvm_cpuid2 *cpuid1,

			   const struct kvm_cpuid2 *cpuid2)

{

	struct kvm_cpuid_entry2 *e1, *e2;

	const struct kvm_cpuid_entry2 *e1, *e2;

	int i;



	TEST_ASSERT(cpuid1->nent == cpuid2->nent,
@@ -174,7 +175,6 @@ static void set_cpuid_after_run(struct kvm_vcpu *vcpu) 


int main(void)

{

	struct kvm_cpuid2 *supp_cpuid;

	struct kvm_vcpu *vcpu;

	vm_vaddr_t cpuid_gva;

	struct kvm_vm *vm;
@@ -182,9 +182,7 @@ int main(void) 


	vm = vm_create_with_one_vcpu(&vcpu, guest_main);



	supp_cpuid = kvm_get_supported_cpuid();



	compare_cpuids(supp_cpuid, vcpu->cpuid);

	compare_cpuids(kvm_get_supported_cpuid(), vcpu->cpuid);



	vcpu_alloc_cpuid(vm, &cpuid_gva, vcpu->cpuid);

tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c

+5 −5
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static bool smt_possible(void) 
	return res;

}



static void test_hv_cpuid(struct kvm_cpuid2 *hv_cpuid_entries,

static void test_hv_cpuid(const struct kvm_cpuid2 *hv_cpuid_entries,

			  bool evmcs_expected)

{

	int i;
@@ -56,7 +56,7 @@ static void test_hv_cpuid(struct kvm_cpuid2 *hv_cpuid_entries, 
		    nent_expected, hv_cpuid_entries->nent);



	for (i = 0; i < hv_cpuid_entries->nent; i++) {

		struct kvm_cpuid_entry2 *entry = &hv_cpuid_entries->entries[i];

		const struct kvm_cpuid_entry2 *entry = &hv_cpuid_entries->entries[i];



		TEST_ASSERT((entry->function >= 0x40000000) &&

			    (entry->function <= 0x40000082),
@@ -131,7 +131,7 @@ void test_hv_cpuid_e2big(struct kvm_vm *vm, struct kvm_vcpu *vcpu) 
int main(int argc, char *argv[])

{

	struct kvm_vm *vm;

	struct kvm_cpuid2 *hv_cpuid_entries;

	const struct kvm_cpuid2 *hv_cpuid_entries;

	struct kvm_vcpu *vcpu;



	/* Tell stdout not to buffer its content */
@@ -146,7 +146,7 @@ int main(int argc, char *argv[]) 


	hv_cpuid_entries = vcpu_get_supported_hv_cpuid(vcpu);

	test_hv_cpuid(hv_cpuid_entries, false);

	free(hv_cpuid_entries);

	free((void *)hv_cpuid_entries);



	if (!kvm_cpu_has(X86_FEATURE_VMX) ||

	    !kvm_has_cap(KVM_CAP_HYPERV_ENLIGHTENED_VMCS)) {
@@ -156,7 +156,7 @@ int main(int argc, char *argv[]) 
	vcpu_enable_evmcs(vcpu);

	hv_cpuid_entries = vcpu_get_supported_hv_cpuid(vcpu);

	test_hv_cpuid(hv_cpuid_entries, true);

	free(hv_cpuid_entries);

	free((void *)hv_cpuid_entries);



do_sys:

	/* Test system ioctl version */

tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c

+5 −5
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ static void test_pmu_config_disable(void (*guest_code)(void)) 
 * counter per logical processor, an EBX bit vector of length greater

 * than 5, and EBX[5] clear.

 */

static bool check_intel_pmu_leaf(struct kvm_cpuid_entry2 *entry)

static bool check_intel_pmu_leaf(const struct kvm_cpuid_entry2 *entry)

{

	union cpuid10_eax eax = { .full = entry->eax };

	union cpuid10_ebx ebx = { .full = entry->ebx };
@@ -400,10 +400,10 @@ static bool check_intel_pmu_leaf(struct kvm_cpuid_entry2 *entry) 
 */

static bool use_intel_pmu(void)

{

	struct kvm_cpuid_entry2 *entry;

	const struct kvm_cpuid_entry2 *entry;



	entry = kvm_get_supported_cpuid_index(0xa, 0);

	return is_intel_cpu() && entry && check_intel_pmu_leaf(entry);

	return is_intel_cpu() && check_intel_pmu_leaf(entry);

}



static bool is_zen1(uint32_t eax)
@@ -432,10 +432,10 @@ static bool is_zen3(uint32_t eax) 
 */

static bool use_amd_pmu(void)

{

	struct kvm_cpuid_entry2 *entry;

	const struct kvm_cpuid_entry2 *entry;



	entry = kvm_get_supported_cpuid_index(1, 0);

	return is_amd_cpu() && entry &&

	return is_amd_cpu() &&

		(is_zen1(entry->eax) ||

		 is_zen2(entry->eax) ||

		 is_zen3(entry->eax));