Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 25 May 2016 03:39:42 +0000 (UTC)
From:      Sepherosa Ziehau <sephe@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r300645 - head/sys/dev/hyperv/vmbus
Message-ID:  <201605250339.u4P3dgKv054878@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: sephe
Date: Wed May 25 03:39:42 2016
New Revision: 300645
URL: https://svnweb.freebsd.org/changeset/base/300645

Log:
  hyperv/vmbus: Allocate/setup IDT vector after all ISR resources are ready
  
  And release IDT vector before releasing ISR resources on interrupt
  teardown path.  We still have some work to do on the interrupt tearing
  down path.
  
  MFC after:	1 week
  Sponsored by:	Microsoft OSTC
  Differential Revision:	https://reviews.freebsd.org/D6519

Modified:
  head/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c

Modified: head/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c	Wed May 25 03:30:56 2016	(r300644)
+++ head/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c	Wed May 25 03:39:42 2016	(r300645)
@@ -377,34 +377,17 @@ vmbus_intr_setup(struct vmbus_softc *sc)
 {
 	int cpu;
 
-	/*
-	 * Find a free IDT vector for vmbus messages/events.
-	 */
-	sc->vmbus_idtvec = lapic_ipi_alloc(IDTVEC(hv_vmbus_callback));
-	if (sc->vmbus_idtvec < 0) {
-		device_printf(sc->vmbus_dev, "cannot find free IDT vector\n");
-		return ENXIO;
-	}
-	if(bootverbose) {
-		device_printf(sc->vmbus_dev, "vmbus IDT vector %d\n",
-		    sc->vmbus_idtvec);
-	}
-
 	CPU_FOREACH(cpu) {
 		char buf[MAXCOMLEN + 1];
+		cpuset_t cpu_mask;
 
+		/* Allocate an interrupt counter for Hyper-V interrupt */
 		snprintf(buf, sizeof(buf), "cpu%d:hyperv", cpu);
 		intrcnt_add(buf, VMBUS_PCPU_PTR(sc, intr_cnt, cpu));
-	}
-
-	/*
-	 * Per cpu setup.
-	 */
-	CPU_FOREACH(cpu) {
-		cpuset_t cpu_mask;
 
 		/*
-		 * Setup taskqueue to handle events
+		 * Setup taskqueue to handle events.  Task will be per-
+		 * channel.
 		 */
 		hv_vmbus_g_context.hv_event_queue[cpu] =
 		    taskqueue_create_fast("hyperv event", M_WAITOK,
@@ -416,7 +399,7 @@ vmbus_intr_setup(struct vmbus_softc *sc)
 		    &cpu_mask, "hvevent%d", cpu);
 
 		/*
-		 * Setup per-cpu tasks and taskqueues to handle msg.
+		 * Setup tasks and taskqueues to handle messages.
 		 */
 		hv_vmbus_g_context.hv_msg_tq[cpu] = taskqueue_create_fast(
 		    "hyperv msg", M_WAITOK, taskqueue_thread_enqueue,
@@ -428,6 +411,20 @@ vmbus_intr_setup(struct vmbus_softc *sc)
 		TASK_INIT(&hv_vmbus_g_context.hv_msg_task[cpu], 0,
 		    vmbus_msg_task, sc);
 	}
+
+	/*
+	 * All Hyper-V ISR required resources are setup, now let's find a
+	 * free IDT vector for Hyper-V ISR and set it up.
+	 */
+	sc->vmbus_idtvec = lapic_ipi_alloc(IDTVEC(hv_vmbus_callback));
+	if (sc->vmbus_idtvec < 0) {
+		device_printf(sc->vmbus_dev, "cannot find free IDT vector\n");
+		return ENXIO;
+	}
+	if(bootverbose) {
+		device_printf(sc->vmbus_dev, "vmbus IDT vector %d\n",
+		    sc->vmbus_idtvec);
+	}
 	return 0;
 }
 
@@ -436,6 +433,11 @@ vmbus_intr_teardown(struct vmbus_softc *
 {
 	int cpu;
 
+	if (sc->vmbus_idtvec >= 0) {
+		lapic_ipi_free(sc->vmbus_idtvec);
+		sc->vmbus_idtvec = -1;
+	}
+
 	CPU_FOREACH(cpu) {
 		if (hv_vmbus_g_context.hv_event_queue[cpu] != NULL) {
 			taskqueue_free(hv_vmbus_g_context.hv_event_queue[cpu]);
@@ -448,10 +450,6 @@ vmbus_intr_teardown(struct vmbus_softc *
 			hv_vmbus_g_context.hv_msg_tq[cpu] = NULL;
 		}
 	}
-	if (sc->vmbus_idtvec >= 0) {
-		lapic_ipi_free(sc->vmbus_idtvec);
-		sc->vmbus_idtvec = -1;
-	}
 }
 
 static int
@@ -623,16 +621,16 @@ vmbus_bus_init(void)
 	sc = vmbus_get_softc();
 
 	/*
-	 * Setup interrupt.
+	 * Allocate DMA stuffs.
 	 */
-	ret = vmbus_intr_setup(sc);
+	ret = vmbus_dma_alloc(sc);
 	if (ret != 0)
 		goto cleanup;
 
 	/*
-	 * Allocate DMA stuffs.
+	 * Setup interrupt.
 	 */
-	ret = vmbus_dma_alloc(sc);
+	ret = vmbus_intr_setup(sc);
 	if (ret != 0)
 		goto cleanup;
 
@@ -664,8 +662,8 @@ vmbus_bus_init(void)
 	return (ret);
 
 cleanup:
-	vmbus_dma_free(sc);
 	vmbus_intr_teardown(sc);
+	vmbus_dma_free(sc);
 
 	return (ret);
 }
@@ -732,8 +730,8 @@ vmbus_detach(device_t dev)
 
 	smp_rendezvous(NULL, vmbus_synic_teardown, NULL, NULL);
 
-	vmbus_dma_free(sc);
 	vmbus_intr_teardown(sc);
+	vmbus_dma_free(sc);
 
 	return (0);
 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605250339.u4P3dgKv054878>