Skip to content

Commit

Permalink
xen: implement apic ipi interface
Browse files Browse the repository at this point in the history
Map native ipi vector to xen vector.
Implement apic ipi interface with xen_send_IPI_one.

Tested-by: Steven Noonan <steven@uplinklabs.net>
Signed-off-by: Ben Guthro <ben@guthro.net>
Signed-off-by: Lin Ming <mlin@ss.pku.edu.cn>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  • Loading branch information
Ben Guthro authored and Konrad Rzeszutek Wilk committed May 7, 2012
1 parent 569ca5b commit f447d56
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 4 deletions.
9 changes: 9 additions & 0 deletions arch/x86/xen/enlighten.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@

#include "xen-ops.h"
#include "mmu.h"
#include "smp.h"
#include "multicalls.h"

EXPORT_SYMBOL_GPL(hypercall_page);
Expand Down Expand Up @@ -849,6 +850,14 @@ static void set_xen_basic_apic_ops(void)
apic->icr_write = xen_apic_icr_write;
apic->wait_icr_idle = xen_apic_wait_icr_idle;
apic->safe_wait_icr_idle = xen_safe_apic_wait_icr_idle;

#ifdef CONFIG_SMP
apic->send_IPI_allbutself = xen_send_IPI_allbutself;
apic->send_IPI_mask_allbutself = xen_send_IPI_mask_allbutself;
apic->send_IPI_mask = xen_send_IPI_mask;
apic->send_IPI_all = xen_send_IPI_all;
apic->send_IPI_self = xen_send_IPI_self;
#endif
}

#endif
Expand Down
81 changes: 77 additions & 4 deletions arch/x86/xen/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,8 @@ static void xen_smp_send_reschedule(int cpu)
xen_send_IPI_one(cpu, XEN_RESCHEDULE_VECTOR);
}

static void xen_send_IPI_mask(const struct cpumask *mask,
enum ipi_vector vector)
static void __xen_send_IPI_mask(const struct cpumask *mask,
int vector)
{
unsigned cpu;

Expand All @@ -478,7 +478,7 @@ static void xen_smp_send_call_function_ipi(const struct cpumask *mask)
{
int cpu;

xen_send_IPI_mask(mask, XEN_CALL_FUNCTION_VECTOR);
__xen_send_IPI_mask(mask, XEN_CALL_FUNCTION_VECTOR);

/* Make sure other vcpus get a chance to run if they need to. */
for_each_cpu(cpu, mask) {
Expand All @@ -491,10 +491,83 @@ static void xen_smp_send_call_function_ipi(const struct cpumask *mask)

static void xen_smp_send_call_function_single_ipi(int cpu)
{
xen_send_IPI_mask(cpumask_of(cpu),
__xen_send_IPI_mask(cpumask_of(cpu),
XEN_CALL_FUNCTION_SINGLE_VECTOR);
}

static inline int xen_map_vector(int vector)
{
int xen_vector;

switch (vector) {
case RESCHEDULE_VECTOR:
xen_vector = XEN_RESCHEDULE_VECTOR;
break;
case CALL_FUNCTION_VECTOR:
xen_vector = XEN_CALL_FUNCTION_VECTOR;
break;
case CALL_FUNCTION_SINGLE_VECTOR:
xen_vector = XEN_CALL_FUNCTION_SINGLE_VECTOR;
break;
default:
xen_vector = -1;
printk(KERN_ERR "xen: vector 0x%x is not implemented\n",
vector);
}

return xen_vector;
}

void xen_send_IPI_mask(const struct cpumask *mask,
int vector)
{
int xen_vector = xen_map_vector(vector);

if (xen_vector >= 0)
__xen_send_IPI_mask(mask, xen_vector);
}

void xen_send_IPI_all(int vector)
{
int xen_vector = xen_map_vector(vector);

if (xen_vector >= 0)
__xen_send_IPI_mask(cpu_online_mask, xen_vector);
}

void xen_send_IPI_self(int vector)
{
int xen_vector = xen_map_vector(vector);

if (xen_vector >= 0)
xen_send_IPI_one(smp_processor_id(), xen_vector);
}

void xen_send_IPI_mask_allbutself(const struct cpumask *mask,
int vector)
{
unsigned cpu;
unsigned int this_cpu = smp_processor_id();

if (!(num_online_cpus() > 1))
return;

for_each_cpu_and(cpu, mask, cpu_online_mask) {
if (this_cpu == cpu)
continue;

xen_smp_send_call_function_single_ipi(cpu);
}
}

void xen_send_IPI_allbutself(int vector)
{
int xen_vector = xen_map_vector(vector);

if (xen_vector >= 0)
xen_send_IPI_mask_allbutself(cpu_online_mask, xen_vector);
}

static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id)
{
irq_enter();
Expand Down
12 changes: 12 additions & 0 deletions arch/x86/xen/smp.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#ifndef _XEN_SMP_H

extern void xen_send_IPI_mask(const struct cpumask *mask,
int vector);
extern void xen_send_IPI_mask_allbutself(const struct cpumask *mask,
int vector);
extern void xen_send_IPI_allbutself(int vector);
extern void physflat_send_IPI_allbutself(int vector);
extern void xen_send_IPI_all(int vector);
extern void xen_send_IPI_self(int vector);

#endif

0 comments on commit f447d56

Please sign in to comment.