svn commit: r367825 - stable/12/sys/dev/nvme

[Alexander Motin]

Author: mav
Date: Thu Nov 19 02:44:08 2020
New Revision: 367825
URL: https://svnweb.freebsd.org/changeset/base/367825

Log:
  MFC r367625: Fix panic if NVMe is detached before the intrhook call.

Modified:
  stable/12/sys/dev/nvme/nvme.c
  stable/12/sys/dev/nvme/nvme_ctrlr.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/nvme/nvme.c
==============================================================================
--- stable/12/sys/dev/nvme/nvme.c	Thu Nov 19 02:20:38 2020	(r367824)
+++ stable/12/sys/dev/nvme/nvme.c	Thu Nov 19 02:44:08 2020	(r367825)
@@ -145,9 +145,14 @@ nvme_attach(device_t dev)
 }
 
 int
-nvme_detach (device_t dev)
+nvme_detach(device_t dev)
 {
 	struct nvme_controller	*ctrlr = DEVICE2SOFTC(dev);
+
+	if (ctrlr->config_hook.ich_arg != NULL) {
+		config_intrhook_disestablish(&ctrlr->config_hook);
+		ctrlr->config_hook.ich_arg = NULL;
+	}
 
 	nvme_ctrlr_destruct(ctrlr, dev);
 	return (0);

Modified: stable/12/sys/dev/nvme/nvme_ctrlr.c
==============================================================================
--- stable/12/sys/dev/nvme/nvme_ctrlr.c	Thu Nov 19 02:20:38 2020	(r367824)
+++ stable/12/sys/dev/nvme/nvme_ctrlr.c	Thu Nov 19 02:44:08 2020	(r367825)
@@ -1099,6 +1099,7 @@ nvme_ctrlr_start_config_hook(void *arg)
 fail:
 		nvme_ctrlr_fail(ctrlr);
 		config_intrhook_disestablish(&ctrlr->config_hook);
+		ctrlr->config_hook.ich_arg = NULL;
 		return;
 	}
 
@@ -1116,6 +1117,7 @@ fail:
 
 	nvme_sysctl_initialize_ctrlr(ctrlr);
 	config_intrhook_disestablish(&ctrlr->config_hook);
+	ctrlr->config_hook.ich_arg = NULL;
 
 	ctrlr->is_initialized = 1;
 	nvme_notify_new_controller(ctrlr);