 @@ -1,14 +1,14 @@
-/*	$NetBSD: nvmm.c,v 1.35 2020/08/18 17:04:37 maxv Exp $	*/
+/*	$NetBSD: nvmm.c,v 1.36 2020/08/26 16:28:17 maxv Exp $	*/
 /*
  * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.35 2020/08/18 17:04:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.36 2020/08/26 16:28:17 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 #include <sys/conf.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/proc.h>
 #include <sys/mman.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 @@ -102,37 +102,37 @@ nvmm_machine_free(struct nvmm_machine *m
 	KASSERT(rw_write_held(&mach->lock));
 	KASSERT(mach->present);
 	mach->present = false;
 	atomic_dec_uint(&nmachines);
+}
 static int
 nvmm_machine_get(struct nvmm_owner *owner, nvmm_machid_t machid,
     struct nvmm_machine **ret, bool writer)
+{
 	struct nvmm_machine *mach;
 	krw_t op = writer ? RW_WRITER : RW_READER;
-	if (machid >= NVMM_MAX_MACHINES) {
+	if (__predict_false(machid >= NVMM_MAX_MACHINES)) {
 		return EINVAL;
+	}
 	mach = &machines[machid];
 	rw_enter(&mach->lock, op);
-	if (!mach->present) {
+	if (__predict_false(!mach->present)) {
 		rw_exit(&mach->lock);
 		return ENOENT;
+	}
-	if (owner != &root_owner && mach->owner != owner) {
+	if (__predict_false(mach->owner != owner && owner != &root_owner)) {
 		rw_exit(&mach->lock);
 		return EPERM;
+	}
 	*ret = mach;
 	return 0;
+}
 static void
 nvmm_machine_put(struct nvmm_machine *mach)
+{
 	rw_exit(&mach->lock);
+}
 @@ -169,33 +169,33 @@ nvmm_vcpu_free(struct nvmm_machine *mach
 	KASSERT(mutex_owned(&vcpu->lock));
 	vcpu->present = false;
 	if (vcpu->comm != NULL) {
 		uvm_deallocate(kernel_map, (vaddr_t)vcpu->comm, PAGE_SIZE);
+	}
+}
 static int
 nvmm_vcpu_get(struct nvmm_machine *mach, nvmm_cpuid_t cpuid,
     struct nvmm_cpu **ret)
+{
 	struct nvmm_cpu *vcpu;
-	if (cpuid >= NVMM_MAX_VCPUS) {
+	if (__predict_false(cpuid >= NVMM_MAX_VCPUS)) {
 		return EINVAL;
+	}
 	vcpu = &mach->cpus[cpuid];
 	mutex_enter(&vcpu->lock);
-	if (!vcpu->present) {
+	if (__predict_false(!vcpu->present)) {
 		mutex_exit(&vcpu->lock);
 		return ENOENT;
+	}
 	*ret = vcpu;
 	return 0;
+}
 static void
 nvmm_vcpu_put(struct nvmm_cpu *vcpu)
+{
 	mutex_exit(&vcpu->lock);
+}
 @@ -217,26 +217,27 @@ nvmm_kill_machines(struct nvmm_owner *ow
 		if (!mach->present || mach->owner != owner) {
 			rw_exit(&mach->lock);
 			continue;
+		}
 		/* Kill it. */
 		for (j = 0; j < NVMM_MAX_VCPUS; j++) {
 			error = nvmm_vcpu_get(mach, j, &vcpu);
 			if (error)
 				continue;
 			(*nvmm_impl->vcpu_destroy)(mach, vcpu);
 			nvmm_vcpu_free(mach, vcpu);
 			nvmm_vcpu_put(vcpu);
 			atomic_dec_uint(&mach->ncpus);
+		}
 		(*nvmm_impl->machine_destroy)(mach);
 		uvmspace_free(mach->vm);
 		/* Drop the kernel UOBJ refs. */
 		for (j = 0; j < NVMM_MAX_HMAPPINGS; j++) {
 			if (!mach->hmap[j].present)
 				continue;
 			uao_detach(mach->hmap[j].uobj);
+		}
 		nvmm_machine_free(mach);
 @@ -304,26 +305,27 @@ nvmm_machine_destroy(struct nvmm_owner *
 	error = nvmm_machine_get(owner, args->machid, &mach, true);
 	if (error)
 		return error;
 	for (i = 0; i < NVMM_MAX_VCPUS; i++) {
 		error = nvmm_vcpu_get(mach, i, &vcpu);
 		if (error)
 			continue;
 		(*nvmm_impl->vcpu_destroy)(mach, vcpu);
 		nvmm_vcpu_free(mach, vcpu);
 		nvmm_vcpu_put(vcpu);
 		atomic_dec_uint(&mach->ncpus);
+	}
 	(*nvmm_impl->machine_destroy)(mach);
 	/* Free the machine vmspace. */
 	uvmspace_free(mach->vm);
 	/* Drop the kernel UOBJ refs. */
 	for (i = 0; i < NVMM_MAX_HMAPPINGS; i++) {
 		if (!mach->hmap[i].present)
 			continue;
 		uao_detach(mach->hmap[i].uobj);
+	}
 @@ -404,53 +406,51 @@ nvmm_vcpu_create(struct nvmm_owner *owne
 		nvmm_vcpu_put(vcpu);
 		goto out;
+	}
 	memset(vcpu->comm, 0, PAGE_SIZE);
 	error = (*nvmm_impl->vcpu_create)(mach, vcpu);
 	if (error) {
 		nvmm_vcpu_free(mach, vcpu);
 		nvmm_vcpu_put(vcpu);
 		goto out;
+	}
 	nvmm_vcpu_put(vcpu);
 	atomic_inc_uint(&mach->ncpus);
 out:
 	nvmm_machine_put(mach);
 	return error;
+}
 static int
 nvmm_vcpu_destroy(struct nvmm_owner *owner, struct nvmm_ioc_vcpu_destroy *args)
+{
 	struct nvmm_machine *mach;
 	struct nvmm_cpu *vcpu;
 	int error;
 	error = nvmm_machine_get(owner, args->machid, &mach, false);
 	if (error)
 		return error;
 	error = nvmm_vcpu_get(mach, args->cpuid, &vcpu);
 	if (error)
 		goto out;
 	(*nvmm_impl->vcpu_destroy)(mach, vcpu);
 	nvmm_vcpu_free(mach, vcpu);
 	nvmm_vcpu_put(vcpu);
 	atomic_dec_uint(&mach->ncpus);
 out:
 	nvmm_machine_put(mach);
 	return error;
+}
 static int
 nvmm_vcpu_configure(struct nvmm_owner *owner,
     struct nvmm_ioc_vcpu_configure *args)
+{
 	struct nvmm_machine *mach;
 	struct nvmm_cpu *vcpu;
 @@ -897,48 +897,40 @@ nvmm_gpa_unmap(struct nvmm_owner *owner,
 out:
 	nvmm_machine_put(mach);
 	return error;
+}
 /* -------------------------------------------------------------------------- */
 static int
 nvmm_ctl_mach_info(struct nvmm_owner *owner, struct nvmm_ioc_ctl *args)
+{
 	struct nvmm_ctl_mach_info ctl;
 	struct nvmm_machine *mach;
 	struct nvmm_cpu *vcpu;
 	int error;
 	size_t i;
 	if (args->size != sizeof(ctl))
 		return EINVAL;
 	error = copyin(args->data, &ctl, sizeof(ctl));
 	if (error)
 		return error;
 	error = nvmm_machine_get(owner, ctl.machid, &mach, true);
 	if (error)
 		return error;
-	ctl.nvcpus = 0;
+	ctl.nvcpus = mach->ncpus;
 	for (i = 0; i < NVMM_MAX_VCPUS; i++) {
 		error = nvmm_vcpu_get(mach, i, &vcpu);
 		if (error)
 			continue;
 		ctl.nvcpus++;
 		nvmm_vcpu_put(vcpu);
 	ctl.nram = 0;
 	for (i = 0; i < NVMM_MAX_HMAPPINGS; i++) {
 		if (!mach->hmap[i].present)
 			continue;
 		ctl.nram += mach->hmap[i].size;
+	}
 	ctl.pid = mach->owner->pid;
 	ctl.time = mach->time;
 	nvmm_machine_put(mach);