swi: Pass cpuid to swi register and unregister

Pass -1 as cpuid then these functions will try pin the ithread to
different CPU based on the 'intr' to be registered/unregistered.

Device and taskqueue swi ithreads' cpuid is not explicitly specified,
i.e. -1 is used, swi_vm still runs on CPU0.

diff --git a/sys/bus/cam/cam_xpt.c b/sys/bus/cam/cam_xpt.c
index 14813ce..61a9ef3 100644 (file)
--- a/sys/bus/cam/cam_xpt.c
+++ b/sys/bus/cam/cam_xpt.c
@@ -1534,7 +1534,7 @@ xpt_init(void *dummy)
                kprintf("xpt_init: failed to create rescan thread\n");
        }
        /* Install our software interrupt handlers */
-       register_swi(SWI_CAMBIO, swi_cambio, NULL, "swi_cambio", NULL);
+       register_swi(SWI_CAMBIO, swi_cambio, NULL, "swi_cambio", NULL, -1);
 
        return (0);
 }

diff --git a/sys/dev/serial/cy/cy.c b/sys/dev/serial/cy/cy.c
index 709c766..1da54b0 100644 (file)
--- a/sys/dev/serial/cy/cy.c
+++ b/sys/dev/serial/cy/cy.c
@@ -617,7 +617,7 @@ cyattach_common(cy_addr cy_iobase, int cy_align)
 
        if (!sio_registered) {
                callout_init_mp(&sio_timeout_handle);
-               register_swi_mp(SWI_TTY, siopoll, NULL, "cy", NULL);
+               register_swi_mp(SWI_TTY, siopoll, NULL, "cy", NULL, -1);
                sio_registered = TRUE;
        }
        minorbase = UNIT_TO_MINOR(unit);

diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c
index 901a05c..250bdeb 100644 (file)
--- a/sys/dev/serial/sio/sio.c
+++ b/sys/dev/serial/sio/sio.c
@@ -1192,7 +1192,7 @@ determined_type: ;
        kprintf("\n");
 
        if (!sio_registered) {
-               register_swi(SWI_TTY, siopoll, NULL ,"swi_siopoll", NULL);
+               register_swi(SWI_TTY, siopoll, NULL ,"swi_siopoll", NULL, -1);
                sio_registered = TRUE;
        }
        minorbase = UNIT_TO_MINOR(unit);

diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index e0ad8fa..286f05f 100644 (file)
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -202,20 +202,27 @@ sysctl_emergency_freq(SYSCTL_HANDLER_ARGS)
  */
 void *
 register_swi(int intr, inthand2_t *handler, void *arg, const char *name,
-               struct lwkt_serialize *serializer)
+               struct lwkt_serialize *serializer, int cpuid)
 {
     if (intr < FIRST_SOFTINT || intr >= MAX_INTS)
        panic("register_swi: bad intr %d", intr);
-    return(register_int(intr, handler, arg, name, serializer, 0, 0));
+
+    if (cpuid < 0)
+       cpuid = intr % ncpus;
+    return(register_int(intr, handler, arg, name, serializer, 0, cpuid));
 }
 
 void *
 register_swi_mp(int intr, inthand2_t *handler, void *arg, const char *name,
-               struct lwkt_serialize *serializer)
+               struct lwkt_serialize *serializer, int cpuid)
 {
     if (intr < FIRST_SOFTINT || intr >= MAX_INTS)
        panic("register_swi: bad intr %d", intr);
-    return(register_int(intr, handler, arg, name, serializer, INTR_MPSAFE, 0));
+
+    if (cpuid < 0)
+       cpuid = intr % ncpus;
+    return(register_int(intr, handler, arg, name, serializer,
+        INTR_MPSAFE, cpuid));
 }
 
 void *
@@ -335,9 +342,12 @@ register_int(int intr, inthand2_t *handler, void *arg, const char *name,
 }
 
 void
-unregister_swi(void *id)
+unregister_swi(void *id, int intr, int cpuid)
 {
-    unregister_int(id, 0);
+    if (cpuid < 0)
+       cpuid = intr % ncpus;
+
+    unregister_int(id, cpuid);
 }
 
 void

diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c
index 66ff9ee..33a30f2 100644 (file)
--- a/sys/kern/subr_taskqueue.c
+++ b/sys/kern/subr_taskqueue.c
@@ -394,14 +394,14 @@ taskqueue_thread_enqueue(void *context)
 }
 
 TASKQUEUE_DEFINE(swi, taskqueue_swi_enqueue, 0,
-        register_swi(SWI_TQ, taskqueue_swi_run, NULL, "swi_taskq", NULL));
+        register_swi(SWI_TQ, taskqueue_swi_run, NULL, "swi_taskq", NULL, -1));
 /*
  * XXX: possibly use a different SWI_TQ_MP or so.
  * related: sys/interrupt.h
  * related: platform/XXX/isa/ipl_funcs.c
  */
 TASKQUEUE_DEFINE(swi_mp, taskqueue_swi_enqueue, 0,
-        register_swi(SWI_TQ, taskqueue_swi_mp_run, NULL, "swi_mp_taskq", NULL));
+    register_swi(SWI_TQ, taskqueue_swi_mp_run, NULL, "swi_mp_taskq", NULL, -1));
 
 struct taskqueue *taskqueue_thread[MAXCPU];
 

diff --git a/sys/platform/pc32/i386/vm_machdep.c b/sys/platform/pc32/i386/vm_machdep.c
index a2a4ab4..13ace21 100644 (file)
--- a/sys/platform/pc32/i386/vm_machdep.c
+++ b/sys/platform/pc32/i386/vm_machdep.c
@@ -480,7 +480,7 @@ swi_vm(void *arg, void *frame)
 static void
 swi_vm_setup(void *arg)
 {
-       register_swi(SWI_VM, swi_vm, NULL, "swi_vm", NULL);
+       register_swi(SWI_VM, swi_vm, NULL, "swi_vm", NULL, 0);
 }
 
 SYSINIT(vm_setup, SI_BOOT2_MACHDEP, SI_ORDER_ANY, swi_vm_setup, NULL);

diff --git a/sys/platform/pc64/x86_64/vm_machdep.c b/sys/platform/pc64/x86_64/vm_machdep.c
index 772f567..4927e1c 100644 (file)
--- a/sys/platform/pc64/x86_64/vm_machdep.c
+++ b/sys/platform/pc64/x86_64/vm_machdep.c
@@ -361,7 +361,7 @@ swi_vm(void *arg, void *frame)
 static void
 swi_vm_setup(void *arg)
 {
-       register_swi(SWI_VM, swi_vm, NULL, "swi_vm", NULL);
+       register_swi(SWI_VM, swi_vm, NULL, "swi_vm", NULL, 0);
 }
 
 SYSINIT(vm_setup, SI_BOOT2_MACHDEP, SI_ORDER_ANY, swi_vm_setup, NULL);

diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
index 9157649..7232151 100644 (file)
--- a/sys/sys/interrupt.h
+++ b/sys/sys/interrupt.h
@@ -108,10 +108,10 @@ struct thread;
 struct lwkt_serialize;
 void *register_swi(int intr, inthand2_t *handler, void *arg,
                            const char *name,
-                           struct lwkt_serialize *serializer);
+                           struct lwkt_serialize *serializer, int cpuid);
 void *register_swi_mp(int intr, inthand2_t *handler, void *arg,
                            const char *name,
-                           struct lwkt_serialize *serializer);
+                           struct lwkt_serialize *serializer, int cpuid);
 void *register_int(int intr, inthand2_t *handler, void *arg,
                            const char *name,
                            struct lwkt_serialize *serializer, int flags,
@@ -121,7 +121,7 @@ int count_registered_ints(int intr);
 const char *get_registered_name(int intr);
 
 void swi_setpriority(int intr, int pri);
-void unregister_swi(void *id);
+void unregister_swi(void *id, int intr, int cpuid);
 void unregister_int(void *id, int cpuid);
 void register_randintr(int intr);
 void unregister_randintr(int intr);