 @@ -1,14 +1,14 @@
-/*	$NetBSD: nvmm.c,v 1.30 2020/05/24 08:08:49 maxv Exp $	*/
+/*	$NetBSD: nvmm.c,v 1.31 2020/06/25 17:01:19 maxv Exp $	*/
 /*
  * Copyright (c) 2018-2019 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,41 +20,41 @@
  * ``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.30 2020/05/24 08:08:49 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.31 2020/06/25 17:01:19 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>
-#include <sys/kauth.h>
+#include <sys/device.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_page.h>
 #include "ioconf.h"
 #include <dev/nvmm/nvmm.h>
 #include <dev/nvmm/nvmm_internal.h>
 #include <dev/nvmm/nvmm_ioctl.h>
 static struct nvmm_machine machines[NVMM_MAX_MACHINES];
 static volatile unsigned int nmachines __cacheline_aligned;
 @@ -950,42 +950,47 @@ nvmm_ctl_mach_info(struct nvmm_owner *ow
 static int
 nvmm_ctl(struct nvmm_owner *owner, struct nvmm_ioc_ctl *args)
+{
 	switch (args->op) {
 	case NVMM_CTL_MACH_INFO:
 		return nvmm_ctl_mach_info(owner, args);
 	default:
 		return EINVAL;
+	}
+}
 /* -------------------------------------------------------------------------- */
 static const struct nvmm_impl *
 nvmm_ident(void)
+{
 	size_t i;
 	for (i = 0; i < __arraycount(nvmm_impl_list); i++) {
 		if ((*nvmm_impl_list[i]->ident)())
 			return nvmm_impl_list[i];
+	}
 	return NULL;
+}
 static int
 nvmm_init(void)
+{
 	size_t i, n;
-	for (i = 0; i < __arraycount(nvmm_impl_list); i++) {
+	nvmm_impl = nvmm_ident();
-		if (!(*nvmm_impl_list[i]->ident)()) {
+	if (nvmm_impl == NULL)
 			continue;
 		nvmm_impl = nvmm_impl_list[i];
 		break;
 	if (nvmm_impl == NULL) {
 		printf("NVMM: CPU not supported\n");
 		return ENOTSUP;
 	for (i = 0; i < NVMM_MAX_MACHINES; i++) {
 		machines[i].machid = i;
 		rw_init(&machines[i].lock);
 		for (n = 0; n < NVMM_MAX_VCPUS; n++) {
 			machines[i].cpus[n].present = false;
 			machines[i].cpus[n].cpuid = n;
 			mutex_init(&machines[i].cpus[n].lock, MUTEX_DEFAULT,
 			    IPL_NONE);
+		}
+	}
 	(*nvmm_impl->init)();
 @@ -1159,70 +1164,149 @@ nvmm_ioctl(file_t *fp, u_long cmd, void
 	case NVMM_IOC_HVA_MAP:
 		return nvmm_hva_map(owner, data);
 	case NVMM_IOC_HVA_UNMAP:
 		return nvmm_hva_unmap(owner, data);
 	case NVMM_IOC_CTL:
 		return nvmm_ctl(owner, data);
 	default:
 		return EINVAL;
+	}
+}
 /* -------------------------------------------------------------------------- */
 static int nvmm_match(device_t, cfdata_t, void *);
 static void nvmm_attach(device_t, device_t, void *);
 static int nvmm_detach(device_t, int);
 extern struct cfdriver nvmm_cd;
 CFATTACH_DECL_NEW(nvmm, 0, nvmm_match, nvmm_attach, nvmm_detach, NULL);
 static struct cfdata nvmm_cfdata[] = {
+	{
 		.cf_name = "nvmm",
 		.cf_atname = "nvmm",
 		.cf_unit = 0,
 		.cf_fstate = FSTATE_STAR,
 		.cf_loc = NULL,
 		.cf_flags = 0,
 		.cf_pspec = NULL,
 	},
 	{ NULL, NULL, 0, FSTATE_NOTFOUND, NULL, 0, NULL }
 };
 static int
 nvmm_match(device_t self, cfdata_t cfdata, void *arg)
+{
 	return 1;
+}
 static void
 nvmm_attach(device_t parent, device_t self, void *aux)
+{
 	int error;
 	error = nvmm_init();
 	if (error)
 		panic("%s: impossible", __func__);
 	aprint_normal_dev(self, "attached\n");
+}
 static int
 nvmm_detach(device_t self, int flags)
+{
 	if (nmachines > 0)
 		return EBUSY;
 	nvmm_fini();
 	return 0;
+}
 void
 nvmmattach(int nunits)
+{
 	/* nothing */
+}
 MODULE(MODULE_CLASS_MISC, nvmm, NULL);
 #if defined(_MODULE)
 CFDRIVER_DECL(nvmm, DV_VIRTUAL, NULL);
 #endif
 static int
 nvmm_modcmd(modcmd_t cmd, void *arg)
+{
 #if defined(_MODULE)
 	devmajor_t bmajor = NODEVMAJOR;
 	devmajor_t cmajor = 345;
 #endif
 	int error;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
-		error = nvmm_init();
+		if (nvmm_ident() == NULL) {
 			aprint_error("%s: cpu not supported\n",
 			    nvmm_cd.cd_name);
 			return ENOTSUP;
+		}
 #if defined(_MODULE)
 		error = config_cfdriver_attach(&nvmm_cd);
 		if (error)
 			return error;
 #endif
 		error = config_cfattach_attach(nvmm_cd.cd_name, &nvmm_ca);
 		if (error) {
 			config_cfdriver_detach(&nvmm_cd);
 			aprint_error("%s: config_cfattach_attach failed\n",
 			    nvmm_cd.cd_name);
 			return error;
+		}
 		error = config_cfdata_attach(nvmm_cfdata, 1);
 		if (error) {
 			config_cfattach_detach(nvmm_cd.cd_name, &nvmm_ca);
 			config_cfdriver_detach(&nvmm_cd);
 			aprint_error("%s: unable to register cfdata\n",
 			    nvmm_cd.cd_name);
 			return error;
+		}
 		if (config_attach_pseudo(nvmm_cfdata) == NULL) {
 			aprint_error("%s: config_attach_pseudo failed\n",
 			    nvmm_cd.cd_name);
 			config_cfattach_detach(nvmm_cd.cd_name, &nvmm_ca);
 			config_cfdriver_detach(&nvmm_cd);
 			return ENXIO;
+		}
 #if defined(_MODULE)
 		/* mknod /dev/nvmm c 345 0 */
-			devmajor_t bmajor = NODEVMAJOR;
+		error = devsw_attach(nvmm_cd.cd_name, NULL, &bmajor,
-			devmajor_t cmajor = 345;
+			&nvmm_cdevsw, &cmajor);
 		if (error) {
-			/* mknod /dev/nvmm c 345 0 */
+			aprint_error("%s: unable to register devsw\n",
-			error = devsw_attach("nvmm", NULL, &bmajor,
+			    nvmm_cd.cd_name);
-			    &nvmm_cdevsw, &cmajor);
+			config_cfattach_detach(nvmm_cd.cd_name, &nvmm_ca);
-			if (error) {
+			config_cfdriver_detach(&nvmm_cd);
-				nvmm_fini();
+			return error;
 				return error;
+		}
 #endif
 		return 0;
 	case MODULE_CMD_FINI:
-		if (nmachines > 0) {
+		error = config_cfdata_detach(nvmm_cfdata);
-			return EBUSY;
+		if (error)
 			return error;
 		error = config_cfattach_detach(nvmm_cd.cd_name, &nvmm_ca);
 		if (error)
 			return error;
 #if defined(_MODULE)
 		config_cfdriver_detach(&nvmm_cd);
-			error = devsw_detach(NULL, &nvmm_cdevsw);
+		devsw_detach(NULL, &nvmm_cdevsw);
 			if (error) {
 				return error;
 #endif
 		nvmm_fini();
 		return 0;
 	case MODULE_CMD_AUTOUNLOAD:
 		return EBUSY;
 	default:
 		return ENOTTY;
+	}
+}

 @@ -1,14 +1,14 @@
-#	$NetBSD: files.nvmm,v 1.2 2019/03/28 19:00:40 maxv Exp $
+#	$NetBSD: files.nvmm,v 1.3 2020/06/25 17:01:19 maxv Exp $
-defpseudo nvmm
+defpseudodev nvmm
 file	dev/nvmm/nvmm.c			nvmm
 ifdef amd64
 file	dev/nvmm/x86/nvmm_x86.c		nvmm
 file	dev/nvmm/x86/nvmm_x86_svm.c	nvmm
 file	dev/nvmm/x86/nvmm_x86_svmfunc.S	nvmm
 file	dev/nvmm/x86/nvmm_x86_vmx.c	nvmm
 file	dev/nvmm/x86/nvmm_x86_vmxfunc.S	nvmm
 endif

 @@ -1,7 +1,8 @@
-#	$NetBSD: nvmm.ioconf,v 1.1 2018/11/07 07:43:08 maxv Exp $
+#	$NetBSD: nvmm.ioconf,v 1.2 2020/06/25 17:01:20 maxv Exp $
 ioconf		nvmm
 include		"conf/files"
 include		"dev/nvmm/files.nvmm"
 pseudo-device   nvmm