public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Sean Christopherson <seanjc@google.com>
To: linux-kernel@vger.kernel.org
Cc: Sean Christopherson <seanjc@google.com>
Subject: [RFC PATCH 003/105] KVM: selftest: Add another underscore to inner ioctl helpers
Date: Fri, 11 Mar 2022 05:49:14 +0000	[thread overview]
Message-ID: <20220311055056.57265-4-seanjc@google.com> (raw)
In-Reply-To: <20220311055056.57265-1-seanjc@google.com>

Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 .../selftests/kvm/aarch64/get-reg-list.c      |  6 ++---
 .../testing/selftests/kvm/aarch64/vgic_init.c |  2 +-
 .../selftests/kvm/include/kvm_util_base.h     |  8 +++----
 tools/testing/selftests/kvm/lib/kvm_util.c    | 24 +++++++++----------
 .../selftests/kvm/lib/riscv/processor.c       |  2 +-
 tools/testing/selftests/kvm/s390x/memop.c     | 14 +++++------
 tools/testing/selftests/kvm/s390x/resets.c    |  4 ++--
 tools/testing/selftests/kvm/steal_time.c      |  6 ++---
 .../selftests/kvm/x86_64/hyperv_cpuid.c       |  4 ++--
 .../selftests/kvm/x86_64/set_boot_cpu_id.c    |  6 ++---
 .../kvm/x86_64/vmx_nested_tsc_scaling_test.c  |  2 +-
 11 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/tools/testing/selftests/kvm/aarch64/get-reg-list.c b/tools/testing/selftests/kvm/aarch64/get-reg-list.c
index 336de3e574d0..422f9a4792ba 100644
--- a/tools/testing/selftests/kvm/aarch64/get-reg-list.c
+++ b/tools/testing/selftests/kvm/aarch64/get-reg-list.c
@@ -452,7 +452,7 @@ static void run_test(struct vcpu_config *c)
 		bool reject_reg = false;
 		int ret;
 
-		ret = _vcpu_ioctl(vm, 0, KVM_GET_ONE_REG, &reg);
+		ret = __vcpu_ioctl(vm, 0, KVM_GET_ONE_REG, &reg);
 		if (ret) {
 			printf("%s: Failed to get ", config_name(c));
 			print_reg(c, reg.id);
@@ -464,7 +464,7 @@ static void run_test(struct vcpu_config *c)
 		for_each_sublist(c, s) {
 			if (s->rejects_set && find_reg(s->rejects_set, s->rejects_set_n, reg.id)) {
 				reject_reg = true;
-				ret = _vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, &reg);
+				ret = __vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, &reg);
 				if (ret != -1 || errno != EPERM) {
 					printf("%s: Failed to reject (ret=%d, errno=%d) ", config_name(c), ret, errno);
 					print_reg(c, reg.id);
@@ -476,7 +476,7 @@ static void run_test(struct vcpu_config *c)
 		}
 
 		if (!reject_reg) {
-			ret = _vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, &reg);
+			ret = __vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, &reg);
 			if (ret) {
 				printf("%s: Failed to set ", config_name(c));
 				print_reg(c, reg.id);
diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c
index 0f046e3e953d..373c8005c2e7 100644
--- a/tools/testing/selftests/kvm/aarch64/vgic_init.c
+++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c
@@ -55,7 +55,7 @@ static void guest_code(void)
 static int run_vcpu(struct kvm_vm *vm, uint32_t vcpuid)
 {
 	ucall_init(vm, NULL);
-	int ret = _vcpu_ioctl(vm, vcpuid, KVM_RUN, NULL);
+	int ret = __vcpu_ioctl(vm, vcpuid, KVM_RUN, NULL);
 	if (ret)
 		return -errno;
 	return 0;
diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h
index bbc66442f91f..77aaac4d344e 100644
--- a/tools/testing/selftests/kvm/include/kvm_util_base.h
+++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
@@ -154,12 +154,12 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm,
 
 void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl,
 		void *arg);
-int _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl,
-		void *arg);
+int __vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl,
+		 void *arg);
 void vm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);
-int _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg);
+int __vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg);
 void kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);
-int _kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);
+int __kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);
 void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags);
 void vm_mem_region_move(struct kvm_vm *vm, uint32_t slot, uint64_t new_gpa);
 void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot);
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index 3e9654e65a67..6f515333abe0 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -1680,7 +1680,7 @@ struct kvm_reg_list *vcpu_get_reg_list(struct kvm_vm *vm, uint32_t vcpuid)
 	struct kvm_reg_list reg_list_n = { .n = 0 }, *reg_list;
 	int ret;
 
-	ret = _vcpu_ioctl(vm, vcpuid, KVM_GET_REG_LIST, &reg_list_n);
+	ret = __vcpu_ioctl(vm, vcpuid, KVM_GET_REG_LIST, &reg_list_n);
 	TEST_ASSERT(ret == -1 && errno == E2BIG, "KVM_GET_REG_LIST n=0");
 	reg_list = calloc(1, sizeof(*reg_list) + reg_list_n.n * sizeof(__u64));
 	reg_list->n = reg_list_n.n;
@@ -1866,7 +1866,7 @@ void vcpu_fpu_get(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_fpu *fpu)
 {
 	int ret;
 
-	ret = _vcpu_ioctl(vm, vcpuid, KVM_GET_FPU, fpu);
+	ret = __vcpu_ioctl(vm, vcpuid, KVM_GET_FPU, fpu);
 	TEST_ASSERT(ret == 0, "KVM_GET_FPU failed, rc: %i errno: %i (%s)",
 		    ret, errno, strerror(errno));
 }
@@ -1875,7 +1875,7 @@ void vcpu_fpu_set(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_fpu *fpu)
 {
 	int ret;
 
-	ret = _vcpu_ioctl(vm, vcpuid, KVM_SET_FPU, fpu);
+	ret = __vcpu_ioctl(vm, vcpuid, KVM_SET_FPU, fpu);
 	TEST_ASSERT(ret == 0, "KVM_SET_FPU failed, rc: %i errno: %i (%s)",
 		    ret, errno, strerror(errno));
 }
@@ -1884,7 +1884,7 @@ void vcpu_get_reg(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_one_reg *reg)
 {
 	int ret;
 
-	ret = _vcpu_ioctl(vm, vcpuid, KVM_GET_ONE_REG, reg);
+	ret = __vcpu_ioctl(vm, vcpuid, KVM_GET_ONE_REG, reg);
 	TEST_ASSERT(ret == 0, "KVM_GET_ONE_REG failed, rc: %i errno: %i (%s)",
 		    ret, errno, strerror(errno));
 }
@@ -1893,7 +1893,7 @@ void vcpu_set_reg(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_one_reg *reg)
 {
 	int ret;
 
-	ret = _vcpu_ioctl(vm, vcpuid, KVM_SET_ONE_REG, reg);
+	ret = __vcpu_ioctl(vm, vcpuid, KVM_SET_ONE_REG, reg);
 	TEST_ASSERT(ret == 0, "KVM_SET_ONE_REG failed, rc: %i errno: %i (%s)",
 		    ret, errno, strerror(errno));
 }
@@ -1916,13 +1916,13 @@ void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid,
 {
 	int ret;
 
-	ret = _vcpu_ioctl(vm, vcpuid, cmd, arg);
+	ret = __vcpu_ioctl(vm, vcpuid, cmd, arg);
 	TEST_ASSERT(ret == 0, "vcpu ioctl %lu failed, rc: %i errno: %i (%s)",
 		cmd, ret, errno, strerror(errno));
 }
 
-int _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid,
-		unsigned long cmd, void *arg)
+int __vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid,
+		 unsigned long cmd, void *arg)
 {
 	struct vcpu *vcpu = vcpu_find(vm, vcpuid);
 	int ret;
@@ -1986,12 +1986,12 @@ void vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)
 {
 	int ret;
 
-	ret = _vm_ioctl(vm, cmd, arg);
+	ret = __vm_ioctl(vm, cmd, arg);
 	TEST_ASSERT(ret == 0, "vm ioctl %lu failed, rc: %i errno: %i (%s)",
 		cmd, ret, errno, strerror(errno));
 }
 
-int _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)
+int __vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)
 {
 	return ioctl(vm->fd, cmd, arg);
 }
@@ -2017,7 +2017,7 @@ void kvm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)
 		cmd, ret, errno, strerror(errno));
 }
 
-int _kvm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)
+int __kvm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)
 {
 	return ioctl(vm->kvm_fd, cmd, arg);
 }
@@ -2146,7 +2146,7 @@ int _kvm_irq_line(struct kvm_vm *vm, uint32_t irq, int level)
 		.level  = level,
 	};
 
-	return _vm_ioctl(vm, KVM_IRQ_LINE, &irq_level);
+	return __vm_ioctl(vm, KVM_IRQ_LINE, &irq_level);
 }
 
 void kvm_irq_line(struct kvm_vm *vm, uint32_t irq, int level)
diff --git a/tools/testing/selftests/kvm/lib/riscv/processor.c b/tools/testing/selftests/kvm/lib/riscv/processor.c
index d377f2603d98..1a404749094a 100644
--- a/tools/testing/selftests/kvm/lib/riscv/processor.c
+++ b/tools/testing/selftests/kvm/lib/riscv/processor.c
@@ -294,7 +294,7 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code)
 	 * are powered-on using KVM_SET_MP_STATE ioctl().
 	 */
 	mps.mp_state = KVM_MP_STATE_RUNNABLE;
-	r = _vcpu_ioctl(vm, vcpuid, KVM_SET_MP_STATE, &mps);
+	r = __vcpu_ioctl(vm, vcpuid, KVM_SET_MP_STATE, &mps);
 	TEST_ASSERT(!r, "IOCTL KVM_SET_MP_STATE failed (error %d)", r);
 
 	/* Setup global pointer of guest to be same as the host */
diff --git a/tools/testing/selftests/kvm/s390x/memop.c b/tools/testing/selftests/kvm/s390x/memop.c
index 9f49ead380ab..460799cc2098 100644
--- a/tools/testing/selftests/kvm/s390x/memop.c
+++ b/tools/testing/selftests/kvm/s390x/memop.c
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
 	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
 	ksmo.buf = (uintptr_t)mem1;
 	ksmo.ar = 0;
-	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
+	rv = __vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
 	TEST_ASSERT(rv == -1 && errno == E2BIG, "ioctl allows insane sizes");
 
 	/* Zero size: */
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
 	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
 	ksmo.buf = (uintptr_t)mem1;
 	ksmo.ar = 0;
-	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
+	rv = __vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
 	TEST_ASSERT(rv == -1 && (errno == EINVAL || errno == ENOMEM),
 		    "ioctl allows 0 as size");
 
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
 	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
 	ksmo.buf = (uintptr_t)mem1;
 	ksmo.ar = 0;
-	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
+	rv = __vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
 	TEST_ASSERT(rv == -1 && errno == EINVAL, "ioctl allows all flags");
 
 	/* Bad operation: */
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
 	ksmo.op = -1;
 	ksmo.buf = (uintptr_t)mem1;
 	ksmo.ar = 0;
-	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
+	rv = __vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
 	TEST_ASSERT(rv == -1 && errno == EINVAL, "ioctl allows bad operations");
 
 	/* Bad guest address: */
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
 	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
 	ksmo.buf = (uintptr_t)mem1;
 	ksmo.ar = 0;
-	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
+	rv = __vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
 	TEST_ASSERT(rv > 0, "ioctl does not report bad guest memory access");
 
 	/* Bad host address: */
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
 	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
 	ksmo.buf = 0;
 	ksmo.ar = 0;
-	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
+	rv = __vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
 	TEST_ASSERT(rv == -1 && errno == EFAULT,
 		    "ioctl does not report bad host memory address");
 
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
 	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
 	ksmo.buf = (uintptr_t)mem1;
 	ksmo.ar = 17;
-	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
+	rv = __vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
 	TEST_ASSERT(rv == -1 && errno == EINVAL, "ioctl allows ARs > 15");
 	run->psw_mask &= ~(3UL << (63 - 17));   /* Disable AR mode */
 	vcpu_run(vm, VCPU_ID);                  /* Run to sync new state */
diff --git a/tools/testing/selftests/kvm/s390x/resets.c b/tools/testing/selftests/kvm/s390x/resets.c
index b143db6d8693..cc4b7c86d69f 100644
--- a/tools/testing/selftests/kvm/s390x/resets.c
+++ b/tools/testing/selftests/kvm/s390x/resets.c
@@ -76,7 +76,7 @@ static void assert_noirq(void)
 
 	irq_state.len = sizeof(buf);
 	irq_state.buf = (unsigned long)buf;
-	irqs = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_GET_IRQ_STATE, &irq_state);
+	irqs = __vcpu_ioctl(vm, VCPU_ID, KVM_S390_GET_IRQ_STATE, &irq_state);
 	/*
 	 * irqs contains the number of retrieved interrupts. Any interrupt
 	 * (notably, the emergency call interrupt we have injected) should
@@ -196,7 +196,7 @@ static void inject_irq(int cpu_id)
 	irq_state.buf = (unsigned long)buf;
 	irq->type = KVM_S390_INT_EMERGENCY;
 	irq->u.emerg.code = cpu_id;
-	irqs = _vcpu_ioctl(vm, cpu_id, KVM_S390_SET_IRQ_STATE, &irq_state);
+	irqs = __vcpu_ioctl(vm, cpu_id, KVM_S390_SET_IRQ_STATE, &irq_state);
 	TEST_ASSERT(irqs >= 0, "Error injecting EMERGENCY IRQ errno %d\n", errno);
 }
 
diff --git a/tools/testing/selftests/kvm/steal_time.c b/tools/testing/selftests/kvm/steal_time.c
index 62f2eb9ee3d5..1d6a91a53eae 100644
--- a/tools/testing/selftests/kvm/steal_time.c
+++ b/tools/testing/selftests/kvm/steal_time.c
@@ -173,7 +173,7 @@ static void steal_time_init(struct kvm_vm *vm)
 	};
 	int i, ret;
 
-	ret = _vcpu_ioctl(vm, 0, KVM_HAS_DEVICE_ATTR, &dev);
+	ret = __vcpu_ioctl(vm, 0, KVM_HAS_DEVICE_ATTR, &dev);
 	if (ret != 0 && errno == ENXIO) {
 		print_skip("steal-time not supported");
 		exit(KSFT_SKIP);
@@ -191,13 +191,13 @@ static void steal_time_init(struct kvm_vm *vm)
 		sync_global_to_guest(vm, st_gva[i]);
 
 		st_ipa = (ulong)st_gva[i] | 1;
-		ret = _vcpu_ioctl(vm, i, KVM_SET_DEVICE_ATTR, &dev);
+		ret = __vcpu_ioctl(vm, i, KVM_SET_DEVICE_ATTR, &dev);
 		TEST_ASSERT(ret == -1 && errno == EINVAL, "Bad IPA didn't report EINVAL");
 
 		st_ipa = (ulong)st_gva[i];
 		vcpu_ioctl(vm, i, KVM_SET_DEVICE_ATTR, &dev);
 
-		ret = _vcpu_ioctl(vm, i, KVM_SET_DEVICE_ATTR, &dev);
+		ret = __vcpu_ioctl(vm, i, KVM_SET_DEVICE_ATTR, &dev);
 		TEST_ASSERT(ret == -1 && errno == EEXIST, "Set IPA twice without EEXIST");
 
 	}
diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
index 8c245ab2d98a..7e45a3df8f98 100644
--- a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
+++ b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
@@ -121,9 +121,9 @@ void test_hv_cpuid_e2big(struct kvm_vm *vm, bool system)
 	int ret;
 
 	if (!system)
-		ret = _vcpu_ioctl(vm, VCPU_ID, KVM_GET_SUPPORTED_HV_CPUID, &cpuid);
+		ret = __vcpu_ioctl(vm, VCPU_ID, KVM_GET_SUPPORTED_HV_CPUID, &cpuid);
 	else
-		ret = _kvm_ioctl(vm, KVM_GET_SUPPORTED_HV_CPUID, &cpuid);
+		ret = __kvm_ioctl(vm, KVM_GET_SUPPORTED_HV_CPUID, &cpuid);
 
 	TEST_ASSERT(ret == -1 && errno == E2BIG,
 		    "%s KVM_GET_SUPPORTED_HV_CPUID didn't fail with -E2BIG when"
diff --git a/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c b/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c
index 2fe893ccedd0..ee3d058a9fe1 100644
--- a/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c
+++ b/tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c
@@ -42,7 +42,7 @@ static void test_set_boot_busy(struct kvm_vm *vm)
 {
 	int res;
 
-	res = _vm_ioctl(vm, KVM_SET_BOOT_CPU_ID, (void *) VCPU_ID0);
+	res = __vm_ioctl(vm, KVM_SET_BOOT_CPU_ID, (void *) VCPU_ID0);
 	TEST_ASSERT(res == -1 && errno == EBUSY,
 			"KVM_SET_BOOT_CPU_ID set while running vm");
 }
@@ -133,13 +133,13 @@ static void check_set_bsp_busy(void)
 	add_x86_vcpu(vm, VCPU_ID0, true);
 	add_x86_vcpu(vm, VCPU_ID1, false);
 
-	res = _vm_ioctl(vm, KVM_SET_BOOT_CPU_ID, (void *) VCPU_ID1);
+	res = __vm_ioctl(vm, KVM_SET_BOOT_CPU_ID, (void *) VCPU_ID1);
 	TEST_ASSERT(res == -1 && errno == EBUSY, "KVM_SET_BOOT_CPU_ID set after adding vcpu");
 
 	run_vcpu(vm, VCPU_ID0);
 	run_vcpu(vm, VCPU_ID1);
 
-	res = _vm_ioctl(vm, KVM_SET_BOOT_CPU_ID, (void *) VCPU_ID1);
+	res = __vm_ioctl(vm, KVM_SET_BOOT_CPU_ID, (void *) VCPU_ID1);
 	TEST_ASSERT(res == -1 && errno == EBUSY, "KVM_SET_BOOT_CPU_ID set to a terminated vcpu");
 
 	kvm_vm_free(vm);
diff --git a/tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c b/tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c
index 280c01fd2412..c35ada9f7f9c 100644
--- a/tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c
+++ b/tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
 	vcpu_alloc_vmx(vm, &vmx_pages_gva);
 	vcpu_args_set(vm, VCPU_ID, 1, vmx_pages_gva);
 
-	tsc_khz = _vcpu_ioctl(vm, VCPU_ID, KVM_GET_TSC_KHZ, NULL);
+	tsc_khz = __vcpu_ioctl(vm, VCPU_ID, KVM_GET_TSC_KHZ, NULL);
 	TEST_ASSERT(tsc_khz != -1, "vcpu ioctl KVM_GET_TSC_KHZ failed");
 
 	/* scale down L1's TSC frequency */
-- 
2.35.1.723.g4982287a31-goog


  parent reply	other threads:[~2022-03-11  5:51 UTC|newest]

Thread overview: 112+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-11  5:49 [RFC PATCH 000/105] KVM: selftests: Overhaul APIs, purge VCPU_ID Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 001/105] KVM: selftests: Fix buggy check in test_v3_new_redist_regions() Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 002/105] KVM: selftests: Always open VM file descriptors with O_RDWR Sean Christopherson
2022-03-11  5:49 ` Sean Christopherson [this message]
2022-03-11  5:49 ` [RFC PATCH 004/105] KVM: selftests: Make vcpu_ioctl() a wrapper to pretty print ioctl name Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 005/105] KVM: selftests: Drop @mode from common vm_create() helper Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 006/105] KVM: selftests: Split vcpu_set_nested_state() into two helpers Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 007/105] KVM: selftests: Add hyperv_svm_test test binary to .gitignore Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 008/105] KVM: sefltests: Use vcpu_ioctl() and __vcpu_ioctl() helpers Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 009/105] KVM: selftests: Add __vcpu_run() helper Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 010/105] KVM: selftests: Use vcpu_access_device_attr() in arm64 code Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 011/105] KVM: selftests: Remove vcpu_get_fd() Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 012/105] KVM: selftests: Add vcpu_get() to retrieve and assert on vCPU existence Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 013/105] KVM: selftests: Make vm_ioctl() a wrapper to pretty print ioctl name Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 014/105] KVM: sefltests: Use vm_ioctl() and __vm_ioctl() helpers Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 015/105] KVM: selftests: Make kvm_ioctl() a wrapper to pretty print ioctl name Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 016/105] KVM: selftests: Use kvm_ioctl() helpers Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 017/105] KVM: selftests: Make x86-64's register dump helpers static Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 018/105] KVM: selftests: Get rid of kvm_util_internal.h Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 019/105] KVM: selftests: Use KVM_IOCTL_ERROR() for one-off arm64 ioctls Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 020/105] KVM: selftests: Drop @test param from kvm_create_device() Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 021/105] KVM: selftests: Move KVM_CREATE_DEVICE_TEST code to separate helper Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 022/105] KVM: selftests: Multiplex return code and fd in __kvm_create_device() Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 023/105] KVM: selftests: Rename KVM_HAS_DEVICE_ATTR helpers for consistency Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 024/105] KVM: selftests: Drop 'int' return from asserting *_device_has_attr() Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 025/105] KVM: selftests: Split get/set device_attr helpers Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 026/105] KVM: selftests: Add a VM backpointer to 'struct vcpu' Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 027/105] KVM: selftests: Add vm_create_*() variants to expose/return " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 028/105] KVM: selftests: Rename vcpu.state => vcpu.run Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 029/105] KVM: selftests: Rename 'struct vcpu' to 'struct kvm_vcpu' Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 030/105] KVM: selftests: Return the created vCPU from vm_vcpu_add() Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 031/105] KVM: selftests: Convert memslot_perf_test away from VCPU_ID Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 032/105] KVM: selftests: Convert rseq_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 033/105] KVM: selftests: Convert xss_msr_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 034/105] KVM: selftests: Convert vmx_preemption_timer_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 035/105] KVM: selftests: Convert vmx_pmu_msrs_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 036/105] KVM: selftests: Convert vmx_set_nested_state_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 037/105] KVM: selftests: Convert vmx_tsc_adjust_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 038/105] KVM: selftests: Convert mmu_role_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 039/105] KVM: selftests: Convert pmu_event_filter_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 040/105] KVM: selftests: Convert smm_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 041/105] KVM: selftests: Convert state_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 042/105] KVM: selftests: Convert svm_int_ctl_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 043/105] KVM: selftests: Convert svm_vmcall_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 044/105] KVM: selftests: Convert sync_regs_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 045/105] KVM: selftests: Convert hyperv_cpuid " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 046/105] KVM: selftests: Convert kvm_pv_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 047/105] KVM: selftests: Convert platform_info_test " Sean Christopherson
2022-03-11  5:49 ` [RFC PATCH 048/105] KVM: selftests: Convert vmx_nested_tsc_scaling_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 049/105] KVM: selftests: Convert set_sregs_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 050/105] KVM: selftests: Convert vmx_dirty_log_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 051/105] KVM: selftests: Convert vmx_close_while_nested_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 052/105] KVM: selftests: Convert vmx_apic_access_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 053/105] KVM: selftests: Convert userspace_msr_exit_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 054/105] KVM: selftests: Convert vmx_exception_with_invalid_guest_state " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 055/105] KVM: selftests: Convert tsc_msrs_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 056/105] KVM: selftests: Convert kvm_clock_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 057/105] KVM: selftests: Convert hyperv_svm_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 058/105] KVM: selftests: Convert hyperv_features " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 059/105] KVM: selftests: Convert hyperv_clock " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 060/105] KVM: selftests: Convert evmcs_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 061/105] KVM: selftests: Convert emulator_error_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 062/105] KVM: selftests: Convert debug_regs " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 063/105] KVM: selftests: Add proper helper for advancing RIP in debug_regs Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 064/105] KVM: selftests: Convert amx_test away from VCPU_ID Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 065/105] KVM: selftests: Convert cr4_cpuid_sync_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 066/105] KVM: selftests: Convert cpuid_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 067/105] KVM: selftests: Convert userspace_io_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 068/105] KVM: selftests: Convert vmx_invalid_nested_guest_state " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 069/105] KVM: selftests: Convert xen_vmcall_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 070/105] KVM: selftests: Convert xen_shinfo_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 071/105] KVM: selftests: Convert dirty_log_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 072/105] KVM: selftests: Convert set_memory_region_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 073/105] KVM: selftests: Convert system_counter_offset_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 074/105] KVM: selftests: Convert debug-exceptions " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 075/105] KVM: selftests: Convert vgic_irq.c include/aarch64/vgic.h lib/aarch64/vgic " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 076/105] KVM: selftests: Make arm64's guest_get_vcpuid() declaration arm64-only Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 077/105] KVM: selftests: Move vm_is_unrestricted_guest() to x86-64 Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 078/105] KVM: selftests: Add "arch" to common utils that have arch implementations Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 079/105] KVM: selftests: Return created vcpu from vm_vcpu_add_default() Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 080/105] KVM: selftests: Rename vm_vcpu_add* helpers to better show relationships Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 081/105] KVM: selftests: Convert set_boot_cpu_id away from VCPU_ID Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 082/105] KVM: selftests: Convert psci_cpu_on_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 083/105] KVM: selftests: Convert hardware_disable_test " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 084/105] KVM: selftests: Add VM creation helper that "returns" vCPUs Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 085/105] KVM: selftests: Convert steal_time away from VCPU_ID Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 086/105] KVM: selftests: Convert arch_timer " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 087/105] KVM: selftests: Fix typo in vgic_init test Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 088/105] KVM: selftests: Convert vgic_init away from vm_create_default_with_vcpus() Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 089/105] KVM: selftests: Convert xapic_ipi_test away from *_VCPU_ID Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 090/105] KVM: selftests: Convert sync_regs_test away from VCPU_ID Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 091/105] KVM: selftests: Convert resets " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 092/105] KVM: selftests: Convert memop " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 093/105] KVM: selftests: Convert s390x/diag318_test_handler " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 094/105] KVM: selftests: Drop vm_create_default* helpers Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 095/105] KVM: selftests: Drop vcpuids param from VM creators Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 096/105] KVM: selftests: Convert kvm_page_table_test away from reliance on vcpu_id Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 097/105] KVM: selftests: Convert kvm_binary_stats_test away from VCPU_ID Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 098/105] KVM: selftests: Convert get-reg-list " Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 099/105] KVM: selftests: Stop conflating vCPU index and ID in perf tests Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 100/105] KVM: selftests: Remove vcpu_get() usage from dirty_log_test Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 101/105] KVM: selftests: Require vCPU output array when creating VM with vCPUs Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 102/105] KVM: selftest: Purge vm+vcpu_id == vcpu silliness Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 103/105] KVM: selftests: Drop vcpu_get(), rename vcpu_find() => vcpu_exists() Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 104/105] KVM: selftests: Remove vcpu_state() helper Sean Christopherson
2022-03-11  5:50 ` [RFC PATCH 105/105] KVM: selftests: Open code and drop kvm_vm accessors Sean Christopherson
2022-03-14  9:49 ` [RFC PATCH 000/105] KVM: selftests: Overhaul APIs, purge VCPU_ID Vitaly Kuznetsov
2022-03-14 11:06 ` Andrew Jones
2022-03-14 17:56   ` Oliver Upton
2022-03-15  8:08     ` Andrew Jones
2022-03-28 19:02   ` Sean Christopherson
2022-04-06 16:50 ` David Matlack

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220311055056.57265-4-seanjc@google.com \
    --to=seanjc@google.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox