d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the MP IPI code to differentiate between bitmapped IPIs and function IPIs.

Browse Source 
This attempts to fix the IPI handling code to correctly differentiate
between bitmapped IPIs and function IPIs. The Xen IPIs were on low numbers
which clashed with the bitmapped IPIs.

This commit bumps those IPI numbers up to 240 and above (just like in the i386
code) and fiddles with the ipi_vectors[] logic to call the correct function.

This still isn't "right". Specifically, the IPI code may work fine for TLB
shootdown events but the rendezvous/lazypmap IPIs are thrown by calling ipi_*()
routines which don't set the call_func stuff (function id, addr1, addr2) that
the TLB shootdown events are. So the Xen SMP support is still broken.

PR:		135069
This commit is contained in:
Adrian Chadd 2009-05-31 08:11:39 +00:00
parent 23ca223bfa
commit c22ca7f04f
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/i386/include/apicvar.h
View File

@ -114,14 +114,14 @@
#define APIC_IPI_INTS (APIC_LOCAL_INTS + 2)
#ifdef XEN
#define IPI_RENDEZVOUS (2) /* Inter-CPU rendezvous. */
#define IPI_INVLTLB (3) /* TLB Shootdown IPIs */
#define IPI_INVLPG (4)
#define IPI_INVLRNG (5)
#define IPI_INVLCACHE (6)
#define IPI_LAZYPMAP (7) /* Lazy pmap release. */
#define IPI_RENDEZVOUS (APIC_IPI_INTS) /* Inter-CPU rendezvous. */
#define IPI_INVLTLB (APIC_IPI_INTS + 1) /* TLB Shootdown IPIs */
#define IPI_INVLPG (APIC_IPI_INTS + 2)
#define IPI_INVLRNG (APIC_IPI_INTS + 3)
#define IPI_INVLCACHE (APIC_IPI_INTS + 4)
#define IPI_LAZYPMAP (APIC_IPI_INTS + 5) /* Lazy pmap release. */
/* Vector to handle bitmap based IPIs */
#define IPI_BITMAP_VECTOR (8)
#define IPI_BITMAP_VECTOR (APIC_IPI_INTS + 6)
#else
#define IPI_RENDEZVOUS (APIC_IPI_INTS) /* Inter-CPU rendezvous. */

19
sys/i386/xen/mp_machdep.c
View File

@ -350,17 +350,11 @@ iv_lazypmap(uintptr_t a, uintptr_t b)
atomic_add_int(&smp_tlb_wait, 1);
}
static void
iv_noop(uintptr_t a, uintptr_t b)
/*
* These start from "IPI offset" APIC_IPI_INTS
*/
static call_data_func_t *ipi_vectors[6] =
{
atomic_add_int(&smp_tlb_wait, 1);
}
static call_data_func_t *ipi_vectors[IPI_BITMAP_VECTOR] =
{
iv_noop,
iv_noop,
iv_rendezvous,
iv_invltlb,
iv_invlpg,
@ -419,10 +413,11 @@ smp_call_function_interrupt(void *unused)
atomic_t *started = &call_data->started;
atomic_t *finished = &call_data->finished;
if (call_data->func_id > IPI_BITMAP_VECTOR)
/* We only handle function IPIs, not bitmap IPIs */
if (call_data->func_id < APIC_IPI_INTS || call_data->func_id > IPI_BITMAP_VECTOR)
panic("invalid function id %u", call_data->func_id);
func = ipi_vectors[call_data->func_id];
func = ipi_vectors[call_data->func_id - APIC_IPI_INTS];
/*
* Notify initiating CPU that I've grabbed the data and am
* about to execute the function