Commit 23d72bfd authored by Milton Miller's avatar Milton Miller Committed by Benjamin Herrenschmidt
Browse files

powerpc: Consolidate ipi message mux and demux 



Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.

The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger).  However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu.  To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops.  Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu.  Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.

This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).

I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.

The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code.  The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number.  While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call.  I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.

The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature.  The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.

Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context.  Add the missing calls.

Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 17f9c8a7

arch/powerpc/include/asm/dbell.h

+1 −2
Original line number Diff line number Diff line
@@ -27,9 +27,8 @@ enum ppc_dbell { 
	PPC_G_DBELL_MC = 4,	/* guest mcheck doorbell */

};



extern void doorbell_message_pass(int cpu, int msg);

extern void doorbell_cause_ipi(int cpu, unsigned long data);

extern void doorbell_exception(struct pt_regs *regs);

extern void doorbell_check_self(void);

extern void doorbell_setup_this_cpu(void);



static inline void ppc_msgsnd(enum ppc_dbell type, u32 flags, u32 tag)

arch/powerpc/include/asm/smp.h

+11 −5
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/threads.h>

#include <linux/cpumask.h>

#include <linux/kernel.h>

#include <linux/irqreturn.h>



#ifndef __ASSEMBLY__
@@ -37,6 +38,7 @@ extern void cpu_die(void); 


struct smp_ops_t {

	void  (*message_pass)(int cpu, int msg);

	void  (*cause_ipi)(int cpu, unsigned long data);

	int   (*probe)(void);

	int   (*kick_cpu)(int nr);

	void  (*setup_cpu)(int nr);
@@ -49,7 +51,6 @@ struct smp_ops_t { 
};



extern void smp_send_debugger_break(void);

extern void smp_message_recv(int);

extern void start_secondary_resume(void);

extern void __devinit smp_generic_give_timebase(void);

extern void __devinit smp_generic_take_timebase(void);
@@ -109,13 +110,16 @@ extern int cpu_to_core_id(int cpu); 
#define PPC_MSG_CALL_FUNC_SINGLE	2

#define PPC_MSG_DEBUGGER_BREAK  3



/*

 * irq controllers that have dedicated ipis per message and don't

 * need additional code in the action handler may use this

 */

/* for irq controllers that have dedicated ipis per message (4) */

extern int smp_request_message_ipi(int virq, int message);

extern const char *smp_ipi_name[];



/* for irq controllers with only a single ipi */

extern void smp_muxed_ipi_set_data(int cpu, unsigned long data);

extern void smp_muxed_ipi_message_pass(int cpu, int msg);

extern void smp_muxed_ipi_resend(void);

extern irqreturn_t smp_ipi_demux(void);



void smp_init_iSeries(void);

void smp_init_pSeries(void);

void smp_init_cell(void);
@@ -185,6 +189,8 @@ extern unsigned long __secondary_hold_spinloop; 
extern unsigned long __secondary_hold_acknowledge;

extern char __secondary_hold;



extern irqreturn_t debug_ipi_action(int irq, void *data);



#endif /* __ASSEMBLY__ */



#endif /* __KERNEL__ */

arch/powerpc/include/asm/xics.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct icp_ops { 
	void (*teardown_cpu)(void);

	void (*flush_ipi)(void);

#ifdef CONFIG_SMP

	void (*message_pass)(int cpu, int msg);

	void (*cause_ipi)(int cpu, unsigned long data);

	irq_handler_t ipi_action;

#endif

};

arch/powerpc/kernel/dbell.c

+8 −38
Original line number Diff line number Diff line
@@ -13,65 +13,35 @@ 
#include <linux/kernel.h>

#include <linux/smp.h>

#include <linux/threads.h>

#include <linux/percpu.h>

#include <linux/hardirq.h>



#include <asm/dbell.h>

#include <asm/irq_regs.h>



#ifdef CONFIG_SMP

struct doorbell_cpu_info {

	unsigned long	messages;	/* current messages bits */

	unsigned int	tag;		/* tag value */

};



static DEFINE_PER_CPU(struct doorbell_cpu_info, doorbell_cpu_info);



void doorbell_setup_this_cpu(void)

{

	struct doorbell_cpu_info *info = &__get_cpu_var(doorbell_cpu_info);

	unsigned long tag = mfspr(SPRN_PIR) & 0x3fff;



	info->messages = 0;

	info->tag = mfspr(SPRN_PIR) & 0x3fff;

	smp_muxed_ipi_set_data(smp_processor_id(), tag);

}



void doorbell_message_pass(int cpu, int msg)

void doorbell_cause_ipi(int cpu, unsigned long data)

{

	struct doorbell_cpu_info *info;



	info = &per_cpu(doorbell_cpu_info, cpu);

	set_bit(msg, &info->messages);

	ppc_msgsnd(PPC_DBELL, 0, info->tag);

	ppc_msgsnd(PPC_DBELL, 0, data);

}



void doorbell_exception(struct pt_regs *regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);

	struct doorbell_cpu_info *info = &__get_cpu_var(doorbell_cpu_info);

	int msg;



	/* Warning: regs can be NULL when called from irq enable */

	irq_enter();



	if (!info->messages || (num_online_cpus() < 2))

		goto out;

	smp_ipi_demux();



	for (msg = 0; msg < 4; msg++)

		if (test_and_clear_bit(msg, &info->messages))

			smp_message_recv(msg);



out:

	irq_exit();

	set_irq_regs(old_regs);

}



void doorbell_check_self(void)

{

	struct doorbell_cpu_info *info = &__get_cpu_var(doorbell_cpu_info);



	if (!info->messages)

		return;



	ppc_msgsnd(PPC_DBELL, 0, info->tag);

}



#else /* CONFIG_SMP */

void doorbell_exception(struct pt_regs *regs)

{

arch/powerpc/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ 
#include <asm/ptrace.h>

#include <asm/machdep.h>

#include <asm/udbg.h>

#include <asm/dbell.h>

#include <asm/smp.h>



#ifdef CONFIG_PPC64
@@ -160,7 +159,8 @@ notrace void arch_local_irq_restore(unsigned long en) 


#if defined(CONFIG_BOOKE) && defined(CONFIG_SMP)

	/* Check for pending doorbell interrupts and resend to ourself */

	doorbell_check_self();

	if (cpu_has_feature(CPU_FTR_DBELL))

		smp_muxed_ipi_resend();

#endif



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE