2008-06-26 09:21:34 +00:00
|
|
|
/*
|
|
|
|
* Generic helpers for smp ipi calls
|
|
|
|
*
|
|
|
|
* (C) Jens Axboe <jens.axboe@oracle.com> 2008
|
|
|
|
*/
|
|
|
|
#include <linux/rcupdate.h>
|
2008-07-15 21:02:33 +00:00
|
|
|
#include <linux/rculist.h>
|
2009-03-13 09:47:34 +00:00
|
|
|
#include <linux/kernel.h>
|
2011-05-23 18:51:41 +00:00
|
|
|
#include <linux/export.h>
|
2009-02-25 15:52:11 +00:00
|
|
|
#include <linux/percpu.h>
|
|
|
|
#include <linux/init.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/gfp.h>
|
2008-06-26 09:21:34 +00:00
|
|
|
#include <linux/smp.h>
|
2009-02-25 12:59:47 +00:00
|
|
|
#include <linux/cpu.h>
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2012-04-21 00:08:50 +00:00
|
|
|
#include "smpboot.h"
|
|
|
|
|
2011-01-13 00:59:39 +00:00
|
|
|
#ifdef CONFIG_USE_GENERIC_SMP_HELPERS
|
2009-02-25 12:59:47 +00:00
|
|
|
static struct {
|
|
|
|
struct list_head queue;
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spinlock_t lock;
|
2009-02-25 15:52:11 +00:00
|
|
|
} call_function __cacheline_aligned_in_smp =
|
|
|
|
{
|
|
|
|
.queue = LIST_HEAD_INIT(call_function.queue),
|
2009-11-17 14:40:01 +00:00
|
|
|
.lock = __RAW_SPIN_LOCK_UNLOCKED(call_function.lock),
|
2009-02-25 15:52:11 +00:00
|
|
|
};
|
2008-06-26 09:21:34 +00:00
|
|
|
|
|
|
|
enum {
|
2009-02-25 12:59:48 +00:00
|
|
|
CSD_FLAG_LOCK = 0x01,
|
2008-06-26 09:21:34 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct call_function_data {
|
2009-02-25 15:52:11 +00:00
|
|
|
struct call_single_data csd;
|
generic-ipi: make struct call_function_data lockless
This patch can remove spinlock from struct call_function_data, the
reasons are below:
1: add a new interface for cpumask named cpumask_test_and_clear_cpu(),
it can atomically test and clear specific cpu, we can use it instead
of cpumask_test_cpu() and cpumask_clear_cpu() and no need data->lock
to protect those in generic_smp_call_function_interrupt().
2: in smp_call_function_many(), after csd_lock() return, the current's
cfd_data is deleted from call_function list, so it not have race
between other cpus, then cfs_data is only used in
smp_call_function_many() that must disable preemption and not from
a hardware interrupthandler or from a bottom half handler to call,
only the correspond cpu can use it, so it not have race in current
cpu, no need cfs_data->lock to protect it.
3: after 1 and 2, cfs_data->lock is only use to protect cfs_data->refs in
generic_smp_call_function_interrupt(), so we can define cfs_data->refs
to atomic_t, and no need cfs_data->lock any more.
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
[akpm@linux-foundation.org: use atomic_dec_return()]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-09-22 23:43:39 +00:00
|
|
|
atomic_t refs;
|
2009-02-25 15:52:11 +00:00
|
|
|
cpumask_var_t cpumask;
|
2008-06-26 09:21:34 +00:00
|
|
|
};
|
|
|
|
|
2010-01-18 02:00:51 +00:00
|
|
|
static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_function_data, cfd_data);
|
|
|
|
|
2008-06-26 09:21:34 +00:00
|
|
|
struct call_single_queue {
|
2009-02-25 15:52:11 +00:00
|
|
|
struct list_head list;
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spinlock_t lock;
|
2008-06-26 09:21:34 +00:00
|
|
|
};
|
|
|
|
|
2010-01-18 02:00:51 +00:00
|
|
|
static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_single_queue, call_single_queue);
|
2009-02-25 12:59:47 +00:00
|
|
|
|
|
|
|
static int
|
|
|
|
hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
|
|
|
|
{
|
|
|
|
long cpu = (long)hcpu;
|
|
|
|
struct call_function_data *cfd = &per_cpu(cfd_data, cpu);
|
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case CPU_UP_PREPARE:
|
|
|
|
case CPU_UP_PREPARE_FROZEN:
|
2009-06-06 21:51:36 +00:00
|
|
|
if (!zalloc_cpumask_var_node(&cfd->cpumask, GFP_KERNEL,
|
2009-02-25 12:59:47 +00:00
|
|
|
cpu_to_node(cpu)))
|
2010-05-26 21:43:32 +00:00
|
|
|
return notifier_from_errno(-ENOMEM);
|
2009-02-25 12:59:47 +00:00
|
|
|
break;
|
|
|
|
|
2009-08-06 22:07:29 +00:00
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
2009-02-25 12:59:47 +00:00
|
|
|
case CPU_UP_CANCELED:
|
|
|
|
case CPU_UP_CANCELED_FROZEN:
|
|
|
|
|
|
|
|
case CPU_DEAD:
|
|
|
|
case CPU_DEAD_FROZEN:
|
|
|
|
free_cpumask_var(cfd->cpumask);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
|
|
|
return NOTIFY_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct notifier_block __cpuinitdata hotplug_cfd_notifier = {
|
2009-02-25 15:52:11 +00:00
|
|
|
.notifier_call = hotplug_cfd,
|
2009-02-25 12:59:47 +00:00
|
|
|
};
|
|
|
|
|
2011-03-29 16:35:04 +00:00
|
|
|
void __init call_function_init(void)
|
2008-06-26 09:21:34 +00:00
|
|
|
{
|
2009-02-25 12:59:47 +00:00
|
|
|
void *cpu = (void *)(long)smp_processor_id();
|
2008-06-26 09:21:34 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for_each_possible_cpu(i) {
|
|
|
|
struct call_single_queue *q = &per_cpu(call_single_queue, i);
|
|
|
|
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spin_lock_init(&q->lock);
|
2008-06-26 09:21:34 +00:00
|
|
|
INIT_LIST_HEAD(&q->list);
|
|
|
|
}
|
2009-02-25 12:59:47 +00:00
|
|
|
|
|
|
|
hotplug_cfd(&hotplug_cfd_notifier, CPU_UP_PREPARE, cpu);
|
|
|
|
register_cpu_notifier(&hotplug_cfd_notifier);
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
|
2009-02-25 12:59:47 +00:00
|
|
|
/*
|
|
|
|
* csd_lock/csd_unlock used to serialize access to per-cpu csd resources
|
|
|
|
*
|
2009-02-25 15:52:11 +00:00
|
|
|
* For non-synchronous ipi calls the csd can still be in use by the
|
|
|
|
* previous function call. For multi-cpu calls its even more interesting
|
|
|
|
* as we'll have to ensure no other cpu is observing our csd.
|
2009-02-25 12:59:47 +00:00
|
|
|
*/
|
2009-02-25 12:59:48 +00:00
|
|
|
static void csd_lock_wait(struct call_single_data *data)
|
2009-02-25 12:59:47 +00:00
|
|
|
{
|
|
|
|
while (data->flags & CSD_FLAG_LOCK)
|
|
|
|
cpu_relax();
|
2009-02-25 12:59:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void csd_lock(struct call_single_data *data)
|
|
|
|
{
|
|
|
|
csd_lock_wait(data);
|
2009-02-25 12:59:47 +00:00
|
|
|
data->flags = CSD_FLAG_LOCK;
|
|
|
|
|
|
|
|
/*
|
2009-02-25 15:52:11 +00:00
|
|
|
* prevent CPU from reordering the above assignment
|
|
|
|
* to ->flags with any subsequent assignments to other
|
|
|
|
* fields of the specified call_single_data structure:
|
2009-02-25 12:59:47 +00:00
|
|
|
*/
|
|
|
|
smp_mb();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void csd_unlock(struct call_single_data *data)
|
|
|
|
{
|
|
|
|
WARN_ON(!(data->flags & CSD_FLAG_LOCK));
|
2009-02-25 15:52:11 +00:00
|
|
|
|
2009-02-25 12:59:47 +00:00
|
|
|
/*
|
2009-02-25 15:52:11 +00:00
|
|
|
* ensure we're all done before releasing data:
|
2009-02-25 12:59:47 +00:00
|
|
|
*/
|
|
|
|
smp_mb();
|
2009-02-25 15:52:11 +00:00
|
|
|
|
2009-02-25 12:59:47 +00:00
|
|
|
data->flags &= ~CSD_FLAG_LOCK;
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2009-02-25 15:52:11 +00:00
|
|
|
* Insert a previously allocated call_single_data element
|
|
|
|
* for execution on the given CPU. data must already have
|
|
|
|
* ->func, ->info, and ->flags set.
|
2008-06-26 09:21:34 +00:00
|
|
|
*/
|
2009-02-25 12:59:48 +00:00
|
|
|
static
|
|
|
|
void generic_exec_single(int cpu, struct call_single_data *data, int wait)
|
2008-06-26 09:21:34 +00:00
|
|
|
{
|
|
|
|
struct call_single_queue *dst = &per_cpu(call_single_queue, cpu);
|
|
|
|
unsigned long flags;
|
2009-02-25 12:59:48 +00:00
|
|
|
int ipi;
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spin_lock_irqsave(&dst->lock, flags);
|
2008-06-26 09:21:34 +00:00
|
|
|
ipi = list_empty(&dst->list);
|
|
|
|
list_add_tail(&data->list, &dst->list);
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spin_unlock_irqrestore(&dst->lock, flags);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2008-10-30 17:28:41 +00:00
|
|
|
/*
|
generic IPI: simplify barriers and locking
Simplify the barriers in generic remote function call interrupt
code.
Firstly, just unconditionally take the lock and check the list
in the generic_call_function_single_interrupt IPI handler. As
we've just taken an IPI here, the chances are fairly high that
there will be work on the list for us, so do the locking
unconditionally. This removes the tricky lockless list_empty
check and dubious barriers. The change looks bigger than it is
because it is just removing an outer loop.
Secondly, clarify architecture specific IPI locking rules.
Generic code has no tools to impose any sane ordering on IPIs if
they go outside normal cache coherency, ergo the arch code must
make them appear to obey cache coherency as a "memory operation"
to initiate an IPI, and a "memory operation" to receive one.
This way at least they can be reasoned about in generic code,
and smp_mb used to provide ordering.
The combination of these two changes means that explict barriers
can be taken out of queue handling for the single case -- shared
data is explicitly locked, and ipi ordering must conform to
that, so no barriers needed. An extra barrier is needed in the
many handler, so as to ensure we load the list element after the
IPI is received.
Does any architecture actually *need* these barriers? For the
initiator I could see it, but for the handler I would be
surprised. So the other thing we could do for simplicity is just
to require that, rather than just matching with cache coherency,
we just require a full barrier before generating an IPI, and
after receiving an IPI. In which case, the smp_mb()s can go
away. But just for now, we'll be on the safe side and use the
barriers (they're in the slow case anyway).
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: linux-arch@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-02-25 05:22:45 +00:00
|
|
|
* The list addition should be visible before sending the IPI
|
|
|
|
* handler locks the list to pull the entry off it because of
|
|
|
|
* normal cache coherency rules implied by spinlocks.
|
|
|
|
*
|
|
|
|
* If IPIs can go out of order to the cache coherency protocol
|
|
|
|
* in an architecture, sufficient synchronisation should be added
|
|
|
|
* to arch code to make it appear to obey cache coherency WRT
|
2009-02-25 15:52:11 +00:00
|
|
|
* locking and barrier primitives. Generic code isn't really
|
|
|
|
* equipped to do the right thing...
|
2008-10-30 17:28:41 +00:00
|
|
|
*/
|
2008-06-26 09:21:34 +00:00
|
|
|
if (ipi)
|
|
|
|
arch_send_call_function_single_ipi(cpu);
|
|
|
|
|
|
|
|
if (wait)
|
2009-02-25 12:59:48 +00:00
|
|
|
csd_lock_wait(data);
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Invoked by arch to handle an IPI for call function. Must be called with
|
|
|
|
* interrupts disabled.
|
|
|
|
*/
|
|
|
|
void generic_smp_call_function_interrupt(void)
|
|
|
|
{
|
|
|
|
struct call_function_data *data;
|
2009-12-15 02:00:16 +00:00
|
|
|
int cpu = smp_processor_id();
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2009-08-20 01:05:35 +00:00
|
|
|
/*
|
|
|
|
* Shouldn't receive this interrupt on a cpu that is not yet online.
|
|
|
|
*/
|
|
|
|
WARN_ON_ONCE(!cpu_online(cpu));
|
|
|
|
|
generic IPI: simplify barriers and locking
Simplify the barriers in generic remote function call interrupt
code.
Firstly, just unconditionally take the lock and check the list
in the generic_call_function_single_interrupt IPI handler. As
we've just taken an IPI here, the chances are fairly high that
there will be work on the list for us, so do the locking
unconditionally. This removes the tricky lockless list_empty
check and dubious barriers. The change looks bigger than it is
because it is just removing an outer loop.
Secondly, clarify architecture specific IPI locking rules.
Generic code has no tools to impose any sane ordering on IPIs if
they go outside normal cache coherency, ergo the arch code must
make them appear to obey cache coherency as a "memory operation"
to initiate an IPI, and a "memory operation" to receive one.
This way at least they can be reasoned about in generic code,
and smp_mb used to provide ordering.
The combination of these two changes means that explict barriers
can be taken out of queue handling for the single case -- shared
data is explicitly locked, and ipi ordering must conform to
that, so no barriers needed. An extra barrier is needed in the
many handler, so as to ensure we load the list element after the
IPI is received.
Does any architecture actually *need* these barriers? For the
initiator I could see it, but for the handler I would be
surprised. So the other thing we could do for simplicity is just
to require that, rather than just matching with cache coherency,
we just require a full barrier before generating an IPI, and
after receiving an IPI. In which case, the smp_mb()s can go
away. But just for now, we'll be on the safe side and use the
barriers (they're in the slow case anyway).
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: linux-arch@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-02-25 05:22:45 +00:00
|
|
|
/*
|
|
|
|
* Ensure entry is visible on call_function_queue after we have
|
|
|
|
* entered the IPI. See comment in smp_call_function_many.
|
|
|
|
* If we don't have this, then we may miss an entry on the list
|
|
|
|
* and never get another IPI to process it.
|
|
|
|
*/
|
|
|
|
smp_mb();
|
|
|
|
|
2008-06-26 09:21:34 +00:00
|
|
|
/*
|
2009-02-25 15:52:11 +00:00
|
|
|
* It's ok to use list_for_each_rcu() here even though we may
|
|
|
|
* delete 'pos', since list_del_rcu() doesn't clear ->next
|
2008-06-26 09:21:34 +00:00
|
|
|
*/
|
2009-02-25 12:59:47 +00:00
|
|
|
list_for_each_entry_rcu(data, &call_function.queue, csd.list) {
|
2008-06-26 09:21:34 +00:00
|
|
|
int refs;
|
2011-03-15 19:27:17 +00:00
|
|
|
smp_call_func_t func;
|
2008-06-26 09:21:34 +00:00
|
|
|
|
kernel/smp.c: fix smp_call_function_many() SMP race
I noticed a failure where we hit the following WARN_ON in
generic_smp_call_function_interrupt:
if (!cpumask_test_and_clear_cpu(cpu, data->cpumask))
continue;
data->csd.func(data->csd.info);
refs = atomic_dec_return(&data->refs);
WARN_ON(refs < 0); <-------------------------
We atomically tested and cleared our bit in the cpumask, and yet the
number of cpus left (ie refs) was 0. How can this be?
It turns out commit 54fdade1c3332391948ec43530c02c4794a38172
("generic-ipi: make struct call_function_data lockless") is at fault. It
removes locking from smp_call_function_many and in doing so creates a
rather complicated race.
The problem comes about because:
- The smp_call_function_many interrupt handler walks call_function.queue
without any locking.
- We reuse a percpu data structure in smp_call_function_many.
- We do not wait for any RCU grace period before starting the next
smp_call_function_many.
Imagine a scenario where CPU A does two smp_call_functions back to back,
and CPU B does an smp_call_function in between. We concentrate on how CPU
C handles the calls:
CPU A CPU B CPU C CPU D
smp_call_function
smp_call_function_interrupt
walks
call_function.queue sees
data from CPU A on list
smp_call_function
smp_call_function_interrupt
walks
call_function.queue sees
(stale) CPU A on list
smp_call_function int
clears last ref on A
list_del_rcu, unlock
smp_call_function reuses
percpu *data A
data->cpumask sees and
clears bit in cpumask
might be using old or new fn!
decrements refs below 0
set data->refs (too late!)
The important thing to note is since the interrupt handler walks a
potentially stale call_function.queue without any locking, then another
cpu can view the percpu *data structure at any time, even when the owner
is in the process of initialising it.
The following test case hits the WARN_ON 100% of the time on my PowerPC
box (having 128 threads does help :)
#include <linux/module.h>
#include <linux/init.h>
#define ITERATIONS 100
static void do_nothing_ipi(void *dummy)
{
}
static void do_ipis(struct work_struct *dummy)
{
int i;
for (i = 0; i < ITERATIONS; i++)
smp_call_function(do_nothing_ipi, NULL, 1);
printk(KERN_DEBUG "cpu %d finished\n", smp_processor_id());
}
static struct work_struct work[NR_CPUS];
static int __init testcase_init(void)
{
int cpu;
for_each_online_cpu(cpu) {
INIT_WORK(&work[cpu], do_ipis);
schedule_work_on(cpu, &work[cpu]);
}
return 0;
}
static void __exit testcase_exit(void)
{
}
module_init(testcase_init)
module_exit(testcase_exit)
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Anton Blanchard");
I tried to fix it by ordering the read and the write of ->cpumask and
->refs. In doing so I missed a critical case but Paul McKenney was able
to spot my bug thankfully :) To ensure we arent viewing previous
iterations the interrupt handler needs to read ->refs then ->cpumask then
->refs _again_.
Thanks to Milton Miller and Paul McKenney for helping to debug this issue.
[miltonm@bga.com: add WARN_ON and BUG_ON, remove extra read of refs before initial read of mask that doesn't help (also noted by Peter Zijlstra), adjust comments, hopefully clarify scenario ]
[miltonm@bga.com: remove excess tests]
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Milton Miller <miltonm@bga.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: <stable@kernel.org> [2.6.32+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-20 22:44:33 +00:00
|
|
|
/*
|
|
|
|
* Since we walk the list without any locks, we might
|
|
|
|
* see an entry that was completed, removed from the
|
|
|
|
* list and is in the process of being reused.
|
|
|
|
*
|
|
|
|
* We must check that the cpu is in the cpumask before
|
|
|
|
* checking the refs, and both must be set before
|
|
|
|
* executing the callback on this cpu.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (!cpumask_test_cpu(cpu, data->cpumask))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
smp_rmb();
|
|
|
|
|
|
|
|
if (atomic_read(&data->refs) == 0)
|
|
|
|
continue;
|
|
|
|
|
2011-03-15 19:27:17 +00:00
|
|
|
func = data->csd.func; /* save for later warn */
|
|
|
|
func(data->csd.info);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
kernel/smp.c: consolidate writes in smp_call_function_interrupt()
We have to test the cpu mask in the interrupt handler before checking the
refs, otherwise we can start to follow an entry before its deleted and
find it partially initailzed for the next trip. Presently we also clear
the cpumask bit before executing the called function, which implies
getting write access to the line. After the function is called we then
decrement refs, and if they go to zero we then unlock the structure.
However, this implies getting write access to the call function data
before and after another the function is called. If we can assert that no
smp_call_function execution function is allowed to enable interrupts, then
we can move both writes to after the function is called, hopfully allowing
both writes with one cache line bounce.
On a 256 thread system with a kernel compiled for 1024 threads, the time
to execute testcase in the "smp_call_function_many race" changelog was
reduced by about 30-40ms out of about 545 ms.
I decided to keep this as WARN because its now a buggy function, even
though the stack trace is of no value -- a simple printk would give us the
information needed.
Raw data:
Without patch:
ipi_test startup took 1219366ns complete 539819014ns total 541038380ns
ipi_test startup took 1695754ns complete 543439872ns total 545135626ns
ipi_test startup took 7513568ns complete 539606362ns total 547119930ns
ipi_test startup took 13304064ns complete 533898562ns total 547202626ns
ipi_test startup took 8668192ns complete 544264074ns total 552932266ns
ipi_test startup took 4977626ns complete 548862684ns total 553840310ns
ipi_test startup took 2144486ns complete 541292318ns total 543436804ns
ipi_test startup took 21245824ns complete 530280180ns total 551526004ns
With patch:
ipi_test startup took 5961748ns complete 500859628ns total 506821376ns
ipi_test startup took 8975996ns complete 495098924ns total 504074920ns
ipi_test startup took 19797750ns complete 492204740ns total 512002490ns
ipi_test startup took 14824796ns complete 487495878ns total 502320674ns
ipi_test startup took 11514882ns complete 494439372ns total 505954254ns
ipi_test startup took 8288084ns complete 502570774ns total 510858858ns
ipi_test startup took 6789954ns complete 493388112ns total 500178066ns
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sched.h> /* sched clock */
#define ITERATIONS 100
static void do_nothing_ipi(void *dummy)
{
}
static void do_ipis(struct work_struct *dummy)
{
int i;
for (i = 0; i < ITERATIONS; i++)
smp_call_function(do_nothing_ipi, NULL, 1);
printk(KERN_DEBUG "cpu %d finished\n", smp_processor_id());
}
static struct work_struct work[NR_CPUS];
static int __init testcase_init(void)
{
int cpu;
u64 start, started, done;
start = local_clock();
for_each_online_cpu(cpu) {
INIT_WORK(&work[cpu], do_ipis);
schedule_work_on(cpu, &work[cpu]);
}
started = local_clock();
for_each_online_cpu(cpu)
flush_work(&work[cpu]);
done = local_clock();
pr_info("ipi_test startup took %lldns complete %lldns total %lldns\n",
started-start, done-started, done-start);
return 0;
}
static void __exit testcase_exit(void)
{
}
module_init(testcase_init)
module_exit(testcase_exit)
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Anton Blanchard");
Signed-off-by: Milton Miller <miltonm@bga.com>
Cc: Anton Blanchard <anton@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-20 22:44:34 +00:00
|
|
|
/*
|
2011-03-15 19:27:17 +00:00
|
|
|
* If the cpu mask is not still set then func enabled
|
|
|
|
* interrupts (BUG), and this cpu took another smp call
|
|
|
|
* function interrupt and executed func(info) twice
|
|
|
|
* on this cpu. That nested execution decremented refs.
|
kernel/smp.c: consolidate writes in smp_call_function_interrupt()
We have to test the cpu mask in the interrupt handler before checking the
refs, otherwise we can start to follow an entry before its deleted and
find it partially initailzed for the next trip. Presently we also clear
the cpumask bit before executing the called function, which implies
getting write access to the line. After the function is called we then
decrement refs, and if they go to zero we then unlock the structure.
However, this implies getting write access to the call function data
before and after another the function is called. If we can assert that no
smp_call_function execution function is allowed to enable interrupts, then
we can move both writes to after the function is called, hopfully allowing
both writes with one cache line bounce.
On a 256 thread system with a kernel compiled for 1024 threads, the time
to execute testcase in the "smp_call_function_many race" changelog was
reduced by about 30-40ms out of about 545 ms.
I decided to keep this as WARN because its now a buggy function, even
though the stack trace is of no value -- a simple printk would give us the
information needed.
Raw data:
Without patch:
ipi_test startup took 1219366ns complete 539819014ns total 541038380ns
ipi_test startup took 1695754ns complete 543439872ns total 545135626ns
ipi_test startup took 7513568ns complete 539606362ns total 547119930ns
ipi_test startup took 13304064ns complete 533898562ns total 547202626ns
ipi_test startup took 8668192ns complete 544264074ns total 552932266ns
ipi_test startup took 4977626ns complete 548862684ns total 553840310ns
ipi_test startup took 2144486ns complete 541292318ns total 543436804ns
ipi_test startup took 21245824ns complete 530280180ns total 551526004ns
With patch:
ipi_test startup took 5961748ns complete 500859628ns total 506821376ns
ipi_test startup took 8975996ns complete 495098924ns total 504074920ns
ipi_test startup took 19797750ns complete 492204740ns total 512002490ns
ipi_test startup took 14824796ns complete 487495878ns total 502320674ns
ipi_test startup took 11514882ns complete 494439372ns total 505954254ns
ipi_test startup took 8288084ns complete 502570774ns total 510858858ns
ipi_test startup took 6789954ns complete 493388112ns total 500178066ns
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sched.h> /* sched clock */
#define ITERATIONS 100
static void do_nothing_ipi(void *dummy)
{
}
static void do_ipis(struct work_struct *dummy)
{
int i;
for (i = 0; i < ITERATIONS; i++)
smp_call_function(do_nothing_ipi, NULL, 1);
printk(KERN_DEBUG "cpu %d finished\n", smp_processor_id());
}
static struct work_struct work[NR_CPUS];
static int __init testcase_init(void)
{
int cpu;
u64 start, started, done;
start = local_clock();
for_each_online_cpu(cpu) {
INIT_WORK(&work[cpu], do_ipis);
schedule_work_on(cpu, &work[cpu]);
}
started = local_clock();
for_each_online_cpu(cpu)
flush_work(&work[cpu]);
done = local_clock();
pr_info("ipi_test startup took %lldns complete %lldns total %lldns\n",
started-start, done-started, done-start);
return 0;
}
static void __exit testcase_exit(void)
{
}
module_init(testcase_init)
module_exit(testcase_exit)
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Anton Blanchard");
Signed-off-by: Milton Miller <miltonm@bga.com>
Cc: Anton Blanchard <anton@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-20 22:44:34 +00:00
|
|
|
*/
|
|
|
|
if (!cpumask_test_and_clear_cpu(cpu, data->cpumask)) {
|
2011-03-15 19:27:17 +00:00
|
|
|
WARN(1, "%pf enabled interrupts and double executed\n", func);
|
kernel/smp.c: consolidate writes in smp_call_function_interrupt()
We have to test the cpu mask in the interrupt handler before checking the
refs, otherwise we can start to follow an entry before its deleted and
find it partially initailzed for the next trip. Presently we also clear
the cpumask bit before executing the called function, which implies
getting write access to the line. After the function is called we then
decrement refs, and if they go to zero we then unlock the structure.
However, this implies getting write access to the call function data
before and after another the function is called. If we can assert that no
smp_call_function execution function is allowed to enable interrupts, then
we can move both writes to after the function is called, hopfully allowing
both writes with one cache line bounce.
On a 256 thread system with a kernel compiled for 1024 threads, the time
to execute testcase in the "smp_call_function_many race" changelog was
reduced by about 30-40ms out of about 545 ms.
I decided to keep this as WARN because its now a buggy function, even
though the stack trace is of no value -- a simple printk would give us the
information needed.
Raw data:
Without patch:
ipi_test startup took 1219366ns complete 539819014ns total 541038380ns
ipi_test startup took 1695754ns complete 543439872ns total 545135626ns
ipi_test startup took 7513568ns complete 539606362ns total 547119930ns
ipi_test startup took 13304064ns complete 533898562ns total 547202626ns
ipi_test startup took 8668192ns complete 544264074ns total 552932266ns
ipi_test startup took 4977626ns complete 548862684ns total 553840310ns
ipi_test startup took 2144486ns complete 541292318ns total 543436804ns
ipi_test startup took 21245824ns complete 530280180ns total 551526004ns
With patch:
ipi_test startup took 5961748ns complete 500859628ns total 506821376ns
ipi_test startup took 8975996ns complete 495098924ns total 504074920ns
ipi_test startup took 19797750ns complete 492204740ns total 512002490ns
ipi_test startup took 14824796ns complete 487495878ns total 502320674ns
ipi_test startup took 11514882ns complete 494439372ns total 505954254ns
ipi_test startup took 8288084ns complete 502570774ns total 510858858ns
ipi_test startup took 6789954ns complete 493388112ns total 500178066ns
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sched.h> /* sched clock */
#define ITERATIONS 100
static void do_nothing_ipi(void *dummy)
{
}
static void do_ipis(struct work_struct *dummy)
{
int i;
for (i = 0; i < ITERATIONS; i++)
smp_call_function(do_nothing_ipi, NULL, 1);
printk(KERN_DEBUG "cpu %d finished\n", smp_processor_id());
}
static struct work_struct work[NR_CPUS];
static int __init testcase_init(void)
{
int cpu;
u64 start, started, done;
start = local_clock();
for_each_online_cpu(cpu) {
INIT_WORK(&work[cpu], do_ipis);
schedule_work_on(cpu, &work[cpu]);
}
started = local_clock();
for_each_online_cpu(cpu)
flush_work(&work[cpu]);
done = local_clock();
pr_info("ipi_test startup took %lldns complete %lldns total %lldns\n",
started-start, done-started, done-start);
return 0;
}
static void __exit testcase_exit(void)
{
}
module_init(testcase_init)
module_exit(testcase_exit)
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Anton Blanchard");
Signed-off-by: Milton Miller <miltonm@bga.com>
Cc: Anton Blanchard <anton@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-20 22:44:34 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
generic-ipi: make struct call_function_data lockless
This patch can remove spinlock from struct call_function_data, the
reasons are below:
1: add a new interface for cpumask named cpumask_test_and_clear_cpu(),
it can atomically test and clear specific cpu, we can use it instead
of cpumask_test_cpu() and cpumask_clear_cpu() and no need data->lock
to protect those in generic_smp_call_function_interrupt().
2: in smp_call_function_many(), after csd_lock() return, the current's
cfd_data is deleted from call_function list, so it not have race
between other cpus, then cfs_data is only used in
smp_call_function_many() that must disable preemption and not from
a hardware interrupthandler or from a bottom half handler to call,
only the correspond cpu can use it, so it not have race in current
cpu, no need cfs_data->lock to protect it.
3: after 1 and 2, cfs_data->lock is only use to protect cfs_data->refs in
generic_smp_call_function_interrupt(), so we can define cfs_data->refs
to atomic_t, and no need cfs_data->lock any more.
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
[akpm@linux-foundation.org: use atomic_dec_return()]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-09-22 23:43:39 +00:00
|
|
|
refs = atomic_dec_return(&data->refs);
|
|
|
|
WARN_ON(refs < 0);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
|
|
|
if (refs)
|
|
|
|
continue;
|
|
|
|
|
kernel/smp.c: consolidate writes in smp_call_function_interrupt()
We have to test the cpu mask in the interrupt handler before checking the
refs, otherwise we can start to follow an entry before its deleted and
find it partially initailzed for the next trip. Presently we also clear
the cpumask bit before executing the called function, which implies
getting write access to the line. After the function is called we then
decrement refs, and if they go to zero we then unlock the structure.
However, this implies getting write access to the call function data
before and after another the function is called. If we can assert that no
smp_call_function execution function is allowed to enable interrupts, then
we can move both writes to after the function is called, hopfully allowing
both writes with one cache line bounce.
On a 256 thread system with a kernel compiled for 1024 threads, the time
to execute testcase in the "smp_call_function_many race" changelog was
reduced by about 30-40ms out of about 545 ms.
I decided to keep this as WARN because its now a buggy function, even
though the stack trace is of no value -- a simple printk would give us the
information needed.
Raw data:
Without patch:
ipi_test startup took 1219366ns complete 539819014ns total 541038380ns
ipi_test startup took 1695754ns complete 543439872ns total 545135626ns
ipi_test startup took 7513568ns complete 539606362ns total 547119930ns
ipi_test startup took 13304064ns complete 533898562ns total 547202626ns
ipi_test startup took 8668192ns complete 544264074ns total 552932266ns
ipi_test startup took 4977626ns complete 548862684ns total 553840310ns
ipi_test startup took 2144486ns complete 541292318ns total 543436804ns
ipi_test startup took 21245824ns complete 530280180ns total 551526004ns
With patch:
ipi_test startup took 5961748ns complete 500859628ns total 506821376ns
ipi_test startup took 8975996ns complete 495098924ns total 504074920ns
ipi_test startup took 19797750ns complete 492204740ns total 512002490ns
ipi_test startup took 14824796ns complete 487495878ns total 502320674ns
ipi_test startup took 11514882ns complete 494439372ns total 505954254ns
ipi_test startup took 8288084ns complete 502570774ns total 510858858ns
ipi_test startup took 6789954ns complete 493388112ns total 500178066ns
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sched.h> /* sched clock */
#define ITERATIONS 100
static void do_nothing_ipi(void *dummy)
{
}
static void do_ipis(struct work_struct *dummy)
{
int i;
for (i = 0; i < ITERATIONS; i++)
smp_call_function(do_nothing_ipi, NULL, 1);
printk(KERN_DEBUG "cpu %d finished\n", smp_processor_id());
}
static struct work_struct work[NR_CPUS];
static int __init testcase_init(void)
{
int cpu;
u64 start, started, done;
start = local_clock();
for_each_online_cpu(cpu) {
INIT_WORK(&work[cpu], do_ipis);
schedule_work_on(cpu, &work[cpu]);
}
started = local_clock();
for_each_online_cpu(cpu)
flush_work(&work[cpu]);
done = local_clock();
pr_info("ipi_test startup took %lldns complete %lldns total %lldns\n",
started-start, done-started, done-start);
return 0;
}
static void __exit testcase_exit(void)
{
}
module_init(testcase_init)
module_exit(testcase_exit)
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Anton Blanchard");
Signed-off-by: Milton Miller <miltonm@bga.com>
Cc: Anton Blanchard <anton@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-20 22:44:34 +00:00
|
|
|
WARN_ON(!cpumask_empty(data->cpumask));
|
|
|
|
|
|
|
|
raw_spin_lock(&call_function.lock);
|
|
|
|
list_del_rcu(&data->csd.list);
|
|
|
|
raw_spin_unlock(&call_function.lock);
|
|
|
|
|
2009-02-25 12:59:47 +00:00
|
|
|
csd_unlock(&data->csd);
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2009-02-25 15:52:11 +00:00
|
|
|
* Invoked by arch to handle an IPI for call function single. Must be
|
|
|
|
* called from the arch with interrupts disabled.
|
2008-06-26 09:21:34 +00:00
|
|
|
*/
|
|
|
|
void generic_smp_call_function_single_interrupt(void)
|
|
|
|
{
|
|
|
|
struct call_single_queue *q = &__get_cpu_var(call_single_queue);
|
generic IPI: simplify barriers and locking
Simplify the barriers in generic remote function call interrupt
code.
Firstly, just unconditionally take the lock and check the list
in the generic_call_function_single_interrupt IPI handler. As
we've just taken an IPI here, the chances are fairly high that
there will be work on the list for us, so do the locking
unconditionally. This removes the tricky lockless list_empty
check and dubious barriers. The change looks bigger than it is
because it is just removing an outer loop.
Secondly, clarify architecture specific IPI locking rules.
Generic code has no tools to impose any sane ordering on IPIs if
they go outside normal cache coherency, ergo the arch code must
make them appear to obey cache coherency as a "memory operation"
to initiate an IPI, and a "memory operation" to receive one.
This way at least they can be reasoned about in generic code,
and smp_mb used to provide ordering.
The combination of these two changes means that explict barriers
can be taken out of queue handling for the single case -- shared
data is explicitly locked, and ipi ordering must conform to
that, so no barriers needed. An extra barrier is needed in the
many handler, so as to ensure we load the list element after the
IPI is received.
Does any architecture actually *need* these barriers? For the
initiator I could see it, but for the handler I would be
surprised. So the other thing we could do for simplicity is just
to require that, rather than just matching with cache coherency,
we just require a full barrier before generating an IPI, and
after receiving an IPI. In which case, the smp_mb()s can go
away. But just for now, we'll be on the safe side and use the
barriers (they're in the slow case anyway).
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: linux-arch@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-02-25 05:22:45 +00:00
|
|
|
unsigned int data_flags;
|
2009-02-25 15:52:11 +00:00
|
|
|
LIST_HEAD(list);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2009-08-20 01:05:35 +00:00
|
|
|
/*
|
|
|
|
* Shouldn't receive this interrupt on a cpu that is not yet online.
|
|
|
|
*/
|
|
|
|
WARN_ON_ONCE(!cpu_online(smp_processor_id()));
|
|
|
|
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spin_lock(&q->lock);
|
generic IPI: simplify barriers and locking
Simplify the barriers in generic remote function call interrupt
code.
Firstly, just unconditionally take the lock and check the list
in the generic_call_function_single_interrupt IPI handler. As
we've just taken an IPI here, the chances are fairly high that
there will be work on the list for us, so do the locking
unconditionally. This removes the tricky lockless list_empty
check and dubious barriers. The change looks bigger than it is
because it is just removing an outer loop.
Secondly, clarify architecture specific IPI locking rules.
Generic code has no tools to impose any sane ordering on IPIs if
they go outside normal cache coherency, ergo the arch code must
make them appear to obey cache coherency as a "memory operation"
to initiate an IPI, and a "memory operation" to receive one.
This way at least they can be reasoned about in generic code,
and smp_mb used to provide ordering.
The combination of these two changes means that explict barriers
can be taken out of queue handling for the single case -- shared
data is explicitly locked, and ipi ordering must conform to
that, so no barriers needed. An extra barrier is needed in the
many handler, so as to ensure we load the list element after the
IPI is received.
Does any architecture actually *need* these barriers? For the
initiator I could see it, but for the handler I would be
surprised. So the other thing we could do for simplicity is just
to require that, rather than just matching with cache coherency,
we just require a full barrier before generating an IPI, and
after receiving an IPI. In which case, the smp_mb()s can go
away. But just for now, we'll be on the safe side and use the
barriers (they're in the slow case anyway).
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: linux-arch@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-02-25 05:22:45 +00:00
|
|
|
list_replace_init(&q->list, &list);
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spin_unlock(&q->lock);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
generic IPI: simplify barriers and locking
Simplify the barriers in generic remote function call interrupt
code.
Firstly, just unconditionally take the lock and check the list
in the generic_call_function_single_interrupt IPI handler. As
we've just taken an IPI here, the chances are fairly high that
there will be work on the list for us, so do the locking
unconditionally. This removes the tricky lockless list_empty
check and dubious barriers. The change looks bigger than it is
because it is just removing an outer loop.
Secondly, clarify architecture specific IPI locking rules.
Generic code has no tools to impose any sane ordering on IPIs if
they go outside normal cache coherency, ergo the arch code must
make them appear to obey cache coherency as a "memory operation"
to initiate an IPI, and a "memory operation" to receive one.
This way at least they can be reasoned about in generic code,
and smp_mb used to provide ordering.
The combination of these two changes means that explict barriers
can be taken out of queue handling for the single case -- shared
data is explicitly locked, and ipi ordering must conform to
that, so no barriers needed. An extra barrier is needed in the
many handler, so as to ensure we load the list element after the
IPI is received.
Does any architecture actually *need* these barriers? For the
initiator I could see it, but for the handler I would be
surprised. So the other thing we could do for simplicity is just
to require that, rather than just matching with cache coherency,
we just require a full barrier before generating an IPI, and
after receiving an IPI. In which case, the smp_mb()s can go
away. But just for now, we'll be on the safe side and use the
barriers (they're in the slow case anyway).
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: linux-arch@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-02-25 05:22:45 +00:00
|
|
|
while (!list_empty(&list)) {
|
|
|
|
struct call_single_data *data;
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2009-02-25 15:52:11 +00:00
|
|
|
data = list_entry(list.next, struct call_single_data, list);
|
generic IPI: simplify barriers and locking
Simplify the barriers in generic remote function call interrupt
code.
Firstly, just unconditionally take the lock and check the list
in the generic_call_function_single_interrupt IPI handler. As
we've just taken an IPI here, the chances are fairly high that
there will be work on the list for us, so do the locking
unconditionally. This removes the tricky lockless list_empty
check and dubious barriers. The change looks bigger than it is
because it is just removing an outer loop.
Secondly, clarify architecture specific IPI locking rules.
Generic code has no tools to impose any sane ordering on IPIs if
they go outside normal cache coherency, ergo the arch code must
make them appear to obey cache coherency as a "memory operation"
to initiate an IPI, and a "memory operation" to receive one.
This way at least they can be reasoned about in generic code,
and smp_mb used to provide ordering.
The combination of these two changes means that explict barriers
can be taken out of queue handling for the single case -- shared
data is explicitly locked, and ipi ordering must conform to
that, so no barriers needed. An extra barrier is needed in the
many handler, so as to ensure we load the list element after the
IPI is received.
Does any architecture actually *need* these barriers? For the
initiator I could see it, but for the handler I would be
surprised. So the other thing we could do for simplicity is just
to require that, rather than just matching with cache coherency,
we just require a full barrier before generating an IPI, and
after receiving an IPI. In which case, the smp_mb()s can go
away. But just for now, we'll be on the safe side and use the
barriers (they're in the slow case anyway).
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: linux-arch@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-02-25 05:22:45 +00:00
|
|
|
list_del(&data->list);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
|
|
|
/*
|
2009-02-25 15:52:11 +00:00
|
|
|
* 'data' can be invalid after this call if flags == 0
|
|
|
|
* (when called through generic_exec_single()),
|
|
|
|
* so save them away before making the call:
|
2008-06-26 09:21:34 +00:00
|
|
|
*/
|
generic IPI: simplify barriers and locking
Simplify the barriers in generic remote function call interrupt
code.
Firstly, just unconditionally take the lock and check the list
in the generic_call_function_single_interrupt IPI handler. As
we've just taken an IPI here, the chances are fairly high that
there will be work on the list for us, so do the locking
unconditionally. This removes the tricky lockless list_empty
check and dubious barriers. The change looks bigger than it is
because it is just removing an outer loop.
Secondly, clarify architecture specific IPI locking rules.
Generic code has no tools to impose any sane ordering on IPIs if
they go outside normal cache coherency, ergo the arch code must
make them appear to obey cache coherency as a "memory operation"
to initiate an IPI, and a "memory operation" to receive one.
This way at least they can be reasoned about in generic code,
and smp_mb used to provide ordering.
The combination of these two changes means that explict barriers
can be taken out of queue handling for the single case -- shared
data is explicitly locked, and ipi ordering must conform to
that, so no barriers needed. An extra barrier is needed in the
many handler, so as to ensure we load the list element after the
IPI is received.
Does any architecture actually *need* these barriers? For the
initiator I could see it, but for the handler I would be
surprised. So the other thing we could do for simplicity is just
to require that, rather than just matching with cache coherency,
we just require a full barrier before generating an IPI, and
after receiving an IPI. In which case, the smp_mb()s can go
away. But just for now, we'll be on the safe side and use the
barriers (they're in the slow case anyway).
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: linux-arch@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-02-25 05:22:45 +00:00
|
|
|
data_flags = data->flags;
|
|
|
|
|
|
|
|
data->func(data->info);
|
|
|
|
|
2009-02-25 12:59:47 +00:00
|
|
|
/*
|
2009-02-25 15:52:11 +00:00
|
|
|
* Unlocked CSDs are valid through generic_exec_single():
|
2009-02-25 12:59:47 +00:00
|
|
|
*/
|
|
|
|
if (data_flags & CSD_FLAG_LOCK)
|
|
|
|
csd_unlock(data);
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-01-18 02:00:51 +00:00
|
|
|
static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_single_data, csd_data);
|
2009-01-29 15:08:01 +00:00
|
|
|
|
2008-06-26 09:21:34 +00:00
|
|
|
/*
|
|
|
|
* smp_call_function_single - Run a function on a specific CPU
|
|
|
|
* @func: The function to run. This must be fast and non-blocking.
|
|
|
|
* @info: An arbitrary pointer to pass to the function.
|
|
|
|
* @wait: If true, wait until function has completed on other CPUs.
|
|
|
|
*
|
2009-10-22 11:19:34 +00:00
|
|
|
* Returns 0 on success, else a negative status code.
|
2008-06-26 09:21:34 +00:00
|
|
|
*/
|
2010-10-27 16:28:36 +00:00
|
|
|
int smp_call_function_single(int cpu, smp_call_func_t func, void *info,
|
2008-06-06 09:18:06 +00:00
|
|
|
int wait)
|
2008-06-26 09:21:34 +00:00
|
|
|
{
|
2009-02-25 12:59:47 +00:00
|
|
|
struct call_single_data d = {
|
|
|
|
.flags = 0,
|
|
|
|
};
|
2008-06-26 09:21:34 +00:00
|
|
|
unsigned long flags;
|
2009-02-25 15:52:11 +00:00
|
|
|
int this_cpu;
|
2008-08-26 00:07:14 +00:00
|
|
|
int err = 0;
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2009-02-25 15:52:11 +00:00
|
|
|
/*
|
|
|
|
* prevent preemption and reschedule on another processor,
|
|
|
|
* as well as CPU removal
|
|
|
|
*/
|
|
|
|
this_cpu = get_cpu();
|
|
|
|
|
2009-08-20 01:05:35 +00:00
|
|
|
/*
|
|
|
|
* Can deadlock when called with interrupts disabled.
|
|
|
|
* We allow cpu's that are not yet online though, as no one else can
|
|
|
|
* send smp call function interrupt to this cpu and as such deadlocks
|
|
|
|
* can't happen.
|
|
|
|
*/
|
|
|
|
WARN_ON_ONCE(cpu_online(this_cpu) && irqs_disabled()
|
|
|
|
&& !oops_in_progress);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2009-02-25 15:52:11 +00:00
|
|
|
if (cpu == this_cpu) {
|
2008-06-26 09:21:34 +00:00
|
|
|
local_irq_save(flags);
|
|
|
|
func(info);
|
|
|
|
local_irq_restore(flags);
|
2009-02-25 15:52:11 +00:00
|
|
|
} else {
|
|
|
|
if ((unsigned)cpu < nr_cpu_ids && cpu_online(cpu)) {
|
|
|
|
struct call_single_data *data = &d;
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2009-02-25 15:52:11 +00:00
|
|
|
if (!wait)
|
|
|
|
data = &__get_cpu_var(csd_data);
|
2009-02-25 12:59:48 +00:00
|
|
|
|
2009-02-25 15:52:11 +00:00
|
|
|
csd_lock(data);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2009-02-25 15:52:11 +00:00
|
|
|
data->func = func;
|
|
|
|
data->info = info;
|
|
|
|
generic_exec_single(cpu, data, wait);
|
|
|
|
} else {
|
|
|
|
err = -ENXIO; /* CPU not online */
|
|
|
|
}
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
put_cpu();
|
2009-02-25 15:52:11 +00:00
|
|
|
|
2008-08-26 00:07:14 +00:00
|
|
|
return err;
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(smp_call_function_single);
|
|
|
|
|
2009-11-17 22:27:27 +00:00
|
|
|
/*
|
|
|
|
* smp_call_function_any - Run a function on any of the given cpus
|
|
|
|
* @mask: The mask of cpus it can run on.
|
|
|
|
* @func: The function to run. This must be fast and non-blocking.
|
|
|
|
* @info: An arbitrary pointer to pass to the function.
|
|
|
|
* @wait: If true, wait until function has completed.
|
|
|
|
*
|
|
|
|
* Returns 0 on success, else a negative status code (if no cpus were online).
|
|
|
|
* Note that @wait will be implicitly turned on in case of allocation failures,
|
|
|
|
* since we fall back to on-stack allocation.
|
|
|
|
*
|
|
|
|
* Selection preference:
|
|
|
|
* 1) current cpu if in @mask
|
|
|
|
* 2) any cpu of current node if in @mask
|
|
|
|
* 3) any other online cpu in @mask
|
|
|
|
*/
|
|
|
|
int smp_call_function_any(const struct cpumask *mask,
|
2010-10-27 16:28:36 +00:00
|
|
|
smp_call_func_t func, void *info, int wait)
|
2009-11-17 22:27:27 +00:00
|
|
|
{
|
|
|
|
unsigned int cpu;
|
|
|
|
const struct cpumask *nodemask;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* Try for same CPU (cheapest) */
|
|
|
|
cpu = get_cpu();
|
|
|
|
if (cpumask_test_cpu(cpu, mask))
|
|
|
|
goto call;
|
|
|
|
|
|
|
|
/* Try for same node. */
|
2010-01-16 01:01:23 +00:00
|
|
|
nodemask = cpumask_of_node(cpu_to_node(cpu));
|
2009-11-17 22:27:27 +00:00
|
|
|
for (cpu = cpumask_first_and(nodemask, mask); cpu < nr_cpu_ids;
|
|
|
|
cpu = cpumask_next_and(cpu, nodemask, mask)) {
|
|
|
|
if (cpu_online(cpu))
|
|
|
|
goto call;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Any online will do: smp_call_function_single handles nr_cpu_ids. */
|
|
|
|
cpu = cpumask_any_and(mask, cpu_online_mask);
|
|
|
|
call:
|
|
|
|
ret = smp_call_function_single(cpu, func, info, wait);
|
|
|
|
put_cpu();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(smp_call_function_any);
|
|
|
|
|
2008-06-26 09:21:34 +00:00
|
|
|
/**
|
2010-09-10 11:47:29 +00:00
|
|
|
* __smp_call_function_single(): Run a function on a specific CPU
|
2008-06-26 09:21:34 +00:00
|
|
|
* @cpu: The CPU to run on.
|
|
|
|
* @data: Pre-allocated and setup data structure
|
2010-09-10 11:47:29 +00:00
|
|
|
* @wait: If true, wait until function has completed on specified CPU.
|
2008-06-26 09:21:34 +00:00
|
|
|
*
|
2009-02-25 15:52:11 +00:00
|
|
|
* Like smp_call_function_single(), but allow caller to pass in a
|
|
|
|
* pre-allocated data structure. Useful for embedding @data inside
|
|
|
|
* other structures, for instance.
|
2008-06-26 09:21:34 +00:00
|
|
|
*/
|
2009-02-25 12:59:48 +00:00
|
|
|
void __smp_call_function_single(int cpu, struct call_single_data *data,
|
|
|
|
int wait)
|
2008-06-26 09:21:34 +00:00
|
|
|
{
|
2010-09-10 11:47:29 +00:00
|
|
|
unsigned int this_cpu;
|
|
|
|
unsigned long flags;
|
2009-02-25 12:59:48 +00:00
|
|
|
|
2010-09-10 11:47:29 +00:00
|
|
|
this_cpu = get_cpu();
|
2009-08-20 01:05:35 +00:00
|
|
|
/*
|
|
|
|
* Can deadlock when called with interrupts disabled.
|
|
|
|
* We allow cpu's that are not yet online though, as no one else can
|
|
|
|
* send smp call function interrupt to this cpu and as such deadlocks
|
|
|
|
* can't happen.
|
|
|
|
*/
|
|
|
|
WARN_ON_ONCE(cpu_online(smp_processor_id()) && wait && irqs_disabled()
|
|
|
|
&& !oops_in_progress);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2010-09-10 11:47:29 +00:00
|
|
|
if (cpu == this_cpu) {
|
|
|
|
local_irq_save(flags);
|
|
|
|
data->func(data->info);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
} else {
|
|
|
|
csd_lock(data);
|
|
|
|
generic_exec_single(cpu, data, wait);
|
|
|
|
}
|
|
|
|
put_cpu();
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2008-12-29 22:35:16 +00:00
|
|
|
* smp_call_function_many(): Run a function on a set of other CPUs.
|
|
|
|
* @mask: The set of cpus to run on (only runs on online subset).
|
2008-06-26 09:21:34 +00:00
|
|
|
* @func: The function to run. This must be fast and non-blocking.
|
|
|
|
* @info: An arbitrary pointer to pass to the function.
|
2009-02-25 15:52:11 +00:00
|
|
|
* @wait: If true, wait (atomically) until function has completed
|
|
|
|
* on other CPUs.
|
2008-06-26 09:21:34 +00:00
|
|
|
*
|
2009-10-22 11:19:34 +00:00
|
|
|
* If @wait is true, then returns once @func has returned.
|
2008-06-26 09:21:34 +00:00
|
|
|
*
|
|
|
|
* You must not call this function with disabled interrupts or from a
|
|
|
|
* hardware interrupt handler or from a bottom half handler. Preemption
|
|
|
|
* must be disabled when calling this function.
|
|
|
|
*/
|
2008-12-29 22:35:16 +00:00
|
|
|
void smp_call_function_many(const struct cpumask *mask,
|
2010-10-27 16:28:36 +00:00
|
|
|
smp_call_func_t func, void *info, bool wait)
|
2008-06-26 09:21:34 +00:00
|
|
|
{
|
2008-12-29 22:35:16 +00:00
|
|
|
struct call_function_data *data;
|
2008-06-26 09:21:34 +00:00
|
|
|
unsigned long flags;
|
2011-03-15 19:27:17 +00:00
|
|
|
int refs, cpu, next_cpu, this_cpu = smp_processor_id();
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2009-08-20 01:05:35 +00:00
|
|
|
/*
|
|
|
|
* Can deadlock when called with interrupts disabled.
|
|
|
|
* We allow cpu's that are not yet online though, as no one else can
|
|
|
|
* send smp call function interrupt to this cpu and as such deadlocks
|
|
|
|
* can't happen.
|
|
|
|
*/
|
|
|
|
WARN_ON_ONCE(cpu_online(this_cpu) && irqs_disabled()
|
2011-01-20 11:07:13 +00:00
|
|
|
&& !oops_in_progress && !early_boot_irqs_disabled);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2011-03-15 19:27:17 +00:00
|
|
|
/* Try to fastpath. So, what's a CPU they want? Ignoring this one. */
|
2008-12-29 22:35:16 +00:00
|
|
|
cpu = cpumask_first_and(mask, cpu_online_mask);
|
2009-02-25 15:52:11 +00:00
|
|
|
if (cpu == this_cpu)
|
2008-12-29 22:35:16 +00:00
|
|
|
cpu = cpumask_next_and(cpu, mask, cpu_online_mask);
|
2009-02-25 15:52:11 +00:00
|
|
|
|
2008-12-29 22:35:16 +00:00
|
|
|
/* No online cpus? We're done. */
|
|
|
|
if (cpu >= nr_cpu_ids)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Do we have another CPU which isn't us? */
|
|
|
|
next_cpu = cpumask_next_and(cpu, mask, cpu_online_mask);
|
2009-02-25 15:52:11 +00:00
|
|
|
if (next_cpu == this_cpu)
|
2008-12-29 22:35:16 +00:00
|
|
|
next_cpu = cpumask_next_and(next_cpu, mask, cpu_online_mask);
|
|
|
|
|
|
|
|
/* Fastpath: do that cpu by itself. */
|
|
|
|
if (next_cpu >= nr_cpu_ids) {
|
|
|
|
smp_call_function_single(cpu, func, info, wait);
|
|
|
|
return;
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
|
2009-02-25 12:59:47 +00:00
|
|
|
data = &__get_cpu_var(cfd_data);
|
|
|
|
csd_lock(&data->csd);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2011-03-15 19:27:16 +00:00
|
|
|
/* This BUG_ON verifies our reuse assertions and can be removed */
|
|
|
|
BUG_ON(atomic_read(&data->refs) || !cpumask_empty(data->cpumask));
|
kernel/smp.c: fix smp_call_function_many() SMP race
I noticed a failure where we hit the following WARN_ON in
generic_smp_call_function_interrupt:
if (!cpumask_test_and_clear_cpu(cpu, data->cpumask))
continue;
data->csd.func(data->csd.info);
refs = atomic_dec_return(&data->refs);
WARN_ON(refs < 0); <-------------------------
We atomically tested and cleared our bit in the cpumask, and yet the
number of cpus left (ie refs) was 0. How can this be?
It turns out commit 54fdade1c3332391948ec43530c02c4794a38172
("generic-ipi: make struct call_function_data lockless") is at fault. It
removes locking from smp_call_function_many and in doing so creates a
rather complicated race.
The problem comes about because:
- The smp_call_function_many interrupt handler walks call_function.queue
without any locking.
- We reuse a percpu data structure in smp_call_function_many.
- We do not wait for any RCU grace period before starting the next
smp_call_function_many.
Imagine a scenario where CPU A does two smp_call_functions back to back,
and CPU B does an smp_call_function in between. We concentrate on how CPU
C handles the calls:
CPU A CPU B CPU C CPU D
smp_call_function
smp_call_function_interrupt
walks
call_function.queue sees
data from CPU A on list
smp_call_function
smp_call_function_interrupt
walks
call_function.queue sees
(stale) CPU A on list
smp_call_function int
clears last ref on A
list_del_rcu, unlock
smp_call_function reuses
percpu *data A
data->cpumask sees and
clears bit in cpumask
might be using old or new fn!
decrements refs below 0
set data->refs (too late!)
The important thing to note is since the interrupt handler walks a
potentially stale call_function.queue without any locking, then another
cpu can view the percpu *data structure at any time, even when the owner
is in the process of initialising it.
The following test case hits the WARN_ON 100% of the time on my PowerPC
box (having 128 threads does help :)
#include <linux/module.h>
#include <linux/init.h>
#define ITERATIONS 100
static void do_nothing_ipi(void *dummy)
{
}
static void do_ipis(struct work_struct *dummy)
{
int i;
for (i = 0; i < ITERATIONS; i++)
smp_call_function(do_nothing_ipi, NULL, 1);
printk(KERN_DEBUG "cpu %d finished\n", smp_processor_id());
}
static struct work_struct work[NR_CPUS];
static int __init testcase_init(void)
{
int cpu;
for_each_online_cpu(cpu) {
INIT_WORK(&work[cpu], do_ipis);
schedule_work_on(cpu, &work[cpu]);
}
return 0;
}
static void __exit testcase_exit(void)
{
}
module_init(testcase_init)
module_exit(testcase_exit)
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Anton Blanchard");
I tried to fix it by ordering the read and the write of ->cpumask and
->refs. In doing so I missed a critical case but Paul McKenney was able
to spot my bug thankfully :) To ensure we arent viewing previous
iterations the interrupt handler needs to read ->refs then ->cpumask then
->refs _again_.
Thanks to Milton Miller and Paul McKenney for helping to debug this issue.
[miltonm@bga.com: add WARN_ON and BUG_ON, remove extra read of refs before initial read of mask that doesn't help (also noted by Peter Zijlstra), adjust comments, hopefully clarify scenario ]
[miltonm@bga.com: remove excess tests]
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Milton Miller <miltonm@bga.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: <stable@kernel.org> [2.6.32+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-20 22:44:33 +00:00
|
|
|
|
|
|
|
/*
|
2011-03-15 19:27:16 +00:00
|
|
|
* The global call function queue list add and delete are protected
|
|
|
|
* by a lock, but the list is traversed without any lock, relying
|
|
|
|
* on the rcu list add and delete to allow safe concurrent traversal.
|
2011-03-15 19:27:16 +00:00
|
|
|
* We reuse the call function data without waiting for any grace
|
|
|
|
* period after some other cpu removes it from the global queue.
|
2011-03-15 19:27:16 +00:00
|
|
|
* This means a cpu might find our data block as it is being
|
|
|
|
* filled out.
|
|
|
|
*
|
|
|
|
* We hold off the interrupt handler on the other cpu by
|
|
|
|
* ordering our writes to the cpu mask vs our setting of the
|
|
|
|
* refs counter. We assert only the cpu owning the data block
|
|
|
|
* will set a bit in cpumask, and each bit will only be cleared
|
|
|
|
* by the subject cpu. Each cpu must first find its bit is
|
|
|
|
* set and then check that refs is set indicating the element is
|
|
|
|
* ready to be processed, otherwise it must skip the entry.
|
|
|
|
*
|
|
|
|
* On the previous iteration refs was set to 0 by another cpu.
|
|
|
|
* To avoid the use of transitivity, set the counter to 0 here
|
|
|
|
* so the wmb will pair with the rmb in the interrupt handler.
|
kernel/smp.c: fix smp_call_function_many() SMP race
I noticed a failure where we hit the following WARN_ON in
generic_smp_call_function_interrupt:
if (!cpumask_test_and_clear_cpu(cpu, data->cpumask))
continue;
data->csd.func(data->csd.info);
refs = atomic_dec_return(&data->refs);
WARN_ON(refs < 0); <-------------------------
We atomically tested and cleared our bit in the cpumask, and yet the
number of cpus left (ie refs) was 0. How can this be?
It turns out commit 54fdade1c3332391948ec43530c02c4794a38172
("generic-ipi: make struct call_function_data lockless") is at fault. It
removes locking from smp_call_function_many and in doing so creates a
rather complicated race.
The problem comes about because:
- The smp_call_function_many interrupt handler walks call_function.queue
without any locking.
- We reuse a percpu data structure in smp_call_function_many.
- We do not wait for any RCU grace period before starting the next
smp_call_function_many.
Imagine a scenario where CPU A does two smp_call_functions back to back,
and CPU B does an smp_call_function in between. We concentrate on how CPU
C handles the calls:
CPU A CPU B CPU C CPU D
smp_call_function
smp_call_function_interrupt
walks
call_function.queue sees
data from CPU A on list
smp_call_function
smp_call_function_interrupt
walks
call_function.queue sees
(stale) CPU A on list
smp_call_function int
clears last ref on A
list_del_rcu, unlock
smp_call_function reuses
percpu *data A
data->cpumask sees and
clears bit in cpumask
might be using old or new fn!
decrements refs below 0
set data->refs (too late!)
The important thing to note is since the interrupt handler walks a
potentially stale call_function.queue without any locking, then another
cpu can view the percpu *data structure at any time, even when the owner
is in the process of initialising it.
The following test case hits the WARN_ON 100% of the time on my PowerPC
box (having 128 threads does help :)
#include <linux/module.h>
#include <linux/init.h>
#define ITERATIONS 100
static void do_nothing_ipi(void *dummy)
{
}
static void do_ipis(struct work_struct *dummy)
{
int i;
for (i = 0; i < ITERATIONS; i++)
smp_call_function(do_nothing_ipi, NULL, 1);
printk(KERN_DEBUG "cpu %d finished\n", smp_processor_id());
}
static struct work_struct work[NR_CPUS];
static int __init testcase_init(void)
{
int cpu;
for_each_online_cpu(cpu) {
INIT_WORK(&work[cpu], do_ipis);
schedule_work_on(cpu, &work[cpu]);
}
return 0;
}
static void __exit testcase_exit(void)
{
}
module_init(testcase_init)
module_exit(testcase_exit)
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Anton Blanchard");
I tried to fix it by ordering the read and the write of ->cpumask and
->refs. In doing so I missed a critical case but Paul McKenney was able
to spot my bug thankfully :) To ensure we arent viewing previous
iterations the interrupt handler needs to read ->refs then ->cpumask then
->refs _again_.
Thanks to Milton Miller and Paul McKenney for helping to debug this issue.
[miltonm@bga.com: add WARN_ON and BUG_ON, remove extra read of refs before initial read of mask that doesn't help (also noted by Peter Zijlstra), adjust comments, hopefully clarify scenario ]
[miltonm@bga.com: remove excess tests]
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Milton Miller <miltonm@bga.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: <stable@kernel.org> [2.6.32+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-20 22:44:33 +00:00
|
|
|
*/
|
2011-03-15 19:27:16 +00:00
|
|
|
atomic_set(&data->refs, 0); /* convert 3rd to 1st party write */
|
|
|
|
|
|
|
|
data->csd.func = func;
|
|
|
|
data->csd.info = info;
|
|
|
|
|
|
|
|
/* Ensure 0 refs is visible before mask. Also orders func and info */
|
|
|
|
smp_wmb();
|
|
|
|
|
|
|
|
/* We rely on the "and" being processed before the store */
|
|
|
|
cpumask_and(data->cpumask, mask, cpu_online_mask);
|
|
|
|
cpumask_clear_cpu(this_cpu, data->cpumask);
|
2011-03-15 19:27:17 +00:00
|
|
|
refs = cpumask_weight(data->cpumask);
|
|
|
|
|
|
|
|
/* Some callers race with other cpus changing the passed mask */
|
|
|
|
if (unlikely(!refs)) {
|
|
|
|
csd_unlock(&data->csd);
|
|
|
|
return;
|
|
|
|
}
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spin_lock_irqsave(&call_function.lock, flags);
|
2009-02-25 12:59:47 +00:00
|
|
|
/*
|
|
|
|
* Place entry at the _HEAD_ of the list, so that any cpu still
|
2009-02-25 15:52:11 +00:00
|
|
|
* observing the entry in generic_smp_call_function_interrupt()
|
|
|
|
* will not miss any other list entries:
|
2009-02-25 12:59:47 +00:00
|
|
|
*/
|
|
|
|
list_add_rcu(&data->csd.list, &call_function.queue);
|
2011-03-15 19:27:16 +00:00
|
|
|
/*
|
2011-03-15 19:27:16 +00:00
|
|
|
* We rely on the wmb() in list_add_rcu to complete our writes
|
|
|
|
* to the cpumask before this write to refs, which indicates
|
|
|
|
* data is on the list and is ready to be processed.
|
2011-03-15 19:27:16 +00:00
|
|
|
*/
|
2011-03-15 19:27:17 +00:00
|
|
|
atomic_set(&data->refs, refs);
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spin_unlock_irqrestore(&call_function.lock, flags);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2008-10-30 17:28:41 +00:00
|
|
|
/*
|
|
|
|
* Make the list addition visible before sending the ipi.
|
2009-02-25 15:52:11 +00:00
|
|
|
* (IPIs must obey or appear to obey normal Linux cache
|
|
|
|
* coherency rules -- see comment in generic_exec_single).
|
2008-10-30 17:28:41 +00:00
|
|
|
*/
|
|
|
|
smp_mb();
|
|
|
|
|
2008-06-26 09:21:34 +00:00
|
|
|
/* Send a message to all CPUs in the map */
|
2009-02-25 12:59:47 +00:00
|
|
|
arch_send_call_function_ipi_mask(data->cpumask);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
2009-02-25 15:52:11 +00:00
|
|
|
/* Optionally wait for the CPUs to complete */
|
2008-12-29 22:35:16 +00:00
|
|
|
if (wait)
|
2009-02-25 12:59:48 +00:00
|
|
|
csd_lock_wait(&data->csd);
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
2008-12-29 22:35:16 +00:00
|
|
|
EXPORT_SYMBOL(smp_call_function_many);
|
2008-06-26 09:21:34 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* smp_call_function(): Run a function on all other CPUs.
|
|
|
|
* @func: The function to run. This must be fast and non-blocking.
|
|
|
|
* @info: An arbitrary pointer to pass to the function.
|
2009-02-25 15:52:11 +00:00
|
|
|
* @wait: If true, wait (atomically) until function has completed
|
|
|
|
* on other CPUs.
|
2008-06-26 09:21:34 +00:00
|
|
|
*
|
2008-12-29 22:35:16 +00:00
|
|
|
* Returns 0.
|
2008-06-26 09:21:34 +00:00
|
|
|
*
|
|
|
|
* If @wait is true, then returns once @func has returned; otherwise
|
2009-10-22 11:19:34 +00:00
|
|
|
* it returns just before the target cpu calls @func.
|
2008-06-26 09:21:34 +00:00
|
|
|
*
|
|
|
|
* You must not call this function with disabled interrupts or from a
|
|
|
|
* hardware interrupt handler or from a bottom half handler.
|
|
|
|
*/
|
2010-10-27 16:28:36 +00:00
|
|
|
int smp_call_function(smp_call_func_t func, void *info, int wait)
|
2008-06-26 09:21:34 +00:00
|
|
|
{
|
|
|
|
preempt_disable();
|
2008-12-29 22:35:16 +00:00
|
|
|
smp_call_function_many(cpu_online_mask, func, info, wait);
|
2008-06-26 09:21:34 +00:00
|
|
|
preempt_enable();
|
2009-02-25 15:52:11 +00:00
|
|
|
|
2008-12-29 22:35:16 +00:00
|
|
|
return 0;
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(smp_call_function);
|
|
|
|
|
|
|
|
void ipi_call_lock(void)
|
|
|
|
{
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spin_lock(&call_function.lock);
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void ipi_call_unlock(void)
|
|
|
|
{
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spin_unlock(&call_function.lock);
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void ipi_call_lock_irq(void)
|
|
|
|
{
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spin_lock_irq(&call_function.lock);
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void ipi_call_unlock_irq(void)
|
|
|
|
{
|
2009-11-17 14:40:01 +00:00
|
|
|
raw_spin_unlock_irq(&call_function.lock);
|
2008-06-26 09:21:34 +00:00
|
|
|
}
|
2011-01-13 00:59:39 +00:00
|
|
|
#endif /* USE_GENERIC_SMP_HELPERS */
|
|
|
|
|
2011-03-22 23:34:06 +00:00
|
|
|
/* Setup configured maximum number of CPUs to activate */
|
|
|
|
unsigned int setup_max_cpus = NR_CPUS;
|
|
|
|
EXPORT_SYMBOL(setup_max_cpus);
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Setup routine for controlling SMP activation
|
|
|
|
*
|
|
|
|
* Command-line option of "nosmp" or "maxcpus=0" will disable SMP
|
|
|
|
* activation entirely (the MPS table probe still happens, though).
|
|
|
|
*
|
|
|
|
* Command-line option of "maxcpus=<NUM>", where <NUM> is an integer
|
|
|
|
* greater than 0, limits the maximum number of CPUs activated in
|
|
|
|
* SMP mode to <NUM>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void __weak arch_disable_smp_support(void) { }
|
|
|
|
|
|
|
|
static int __init nosmp(char *str)
|
|
|
|
{
|
|
|
|
setup_max_cpus = 0;
|
|
|
|
arch_disable_smp_support();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
early_param("nosmp", nosmp);
|
|
|
|
|
|
|
|
/* this is hard limit */
|
|
|
|
static int __init nrcpus(char *str)
|
|
|
|
{
|
|
|
|
int nr_cpus;
|
|
|
|
|
|
|
|
get_option(&str, &nr_cpus);
|
|
|
|
if (nr_cpus > 0 && nr_cpus < nr_cpu_ids)
|
|
|
|
nr_cpu_ids = nr_cpus;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
early_param("nr_cpus", nrcpus);
|
|
|
|
|
|
|
|
static int __init maxcpus(char *str)
|
|
|
|
{
|
|
|
|
get_option(&str, &setup_max_cpus);
|
|
|
|
if (setup_max_cpus == 0)
|
|
|
|
arch_disable_smp_support();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
early_param("maxcpus", maxcpus);
|
|
|
|
|
|
|
|
/* Setup number of possible processor ids */
|
|
|
|
int nr_cpu_ids __read_mostly = NR_CPUS;
|
|
|
|
EXPORT_SYMBOL(nr_cpu_ids);
|
|
|
|
|
|
|
|
/* An arch may set nr_cpu_ids earlier if needed, so this would be redundant */
|
|
|
|
void __init setup_nr_cpu_ids(void)
|
|
|
|
{
|
|
|
|
nr_cpu_ids = find_last_bit(cpumask_bits(cpu_possible_mask),NR_CPUS) + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Called by boot processor to activate the rest. */
|
|
|
|
void __init smp_init(void)
|
|
|
|
{
|
|
|
|
unsigned int cpu;
|
|
|
|
|
2012-04-21 00:08:50 +00:00
|
|
|
idle_threads_init();
|
|
|
|
|
2011-03-22 23:34:06 +00:00
|
|
|
/* FIXME: This should be done in userspace --RR */
|
|
|
|
for_each_present_cpu(cpu) {
|
|
|
|
if (num_online_cpus() >= setup_max_cpus)
|
|
|
|
break;
|
|
|
|
if (!cpu_online(cpu))
|
|
|
|
cpu_up(cpu);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Any cleanup work */
|
|
|
|
printk(KERN_INFO "Brought up %ld CPUs\n", (long)num_online_cpus());
|
|
|
|
smp_cpus_done(setup_max_cpus);
|
|
|
|
}
|
|
|
|
|
2011-01-13 00:59:39 +00:00
|
|
|
/*
|
2011-01-20 11:07:13 +00:00
|
|
|
* Call a function on all processors. May be used during early boot while
|
|
|
|
* early_boot_irqs_disabled is set. Use local_irq_save/restore() instead
|
|
|
|
* of local_irq_disable/enable().
|
2011-01-13 00:59:39 +00:00
|
|
|
*/
|
|
|
|
int on_each_cpu(void (*func) (void *info), void *info, int wait)
|
|
|
|
{
|
2011-01-20 11:07:13 +00:00
|
|
|
unsigned long flags;
|
2011-01-13 00:59:39 +00:00
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
preempt_disable();
|
|
|
|
ret = smp_call_function(func, info, wait);
|
2011-01-20 11:07:13 +00:00
|
|
|
local_irq_save(flags);
|
2011-01-13 00:59:39 +00:00
|
|
|
func(info);
|
2011-01-20 11:07:13 +00:00
|
|
|
local_irq_restore(flags);
|
2011-01-13 00:59:39 +00:00
|
|
|
preempt_enable();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(on_each_cpu);
|
smp: introduce a generic on_each_cpu_mask() function
We have lots of infrastructure in place to partition multi-core systems
such that we have a group of CPUs that are dedicated to specific task:
cgroups, scheduler and interrupt affinity, and cpuisol= boot parameter.
Still, kernel code will at times interrupt all CPUs in the system via IPIs
for various needs. These IPIs are useful and cannot be avoided
altogether, but in certain cases it is possible to interrupt only specific
CPUs that have useful work to do and not the entire system.
This patch set, inspired by discussions with Peter Zijlstra and Frederic
Weisbecker when testing the nohz task patch set, is a first stab at trying
to explore doing this by locating the places where such global IPI calls
are being made and turning the global IPI into an IPI for a specific group
of CPUs. The purpose of the patch set is to get feedback if this is the
right way to go for dealing with this issue and indeed, if the issue is
even worth dealing with at all. Based on the feedback from this patch set
I plan to offer further patches that address similar issue in other code
paths.
This patch creates an on_each_cpu_mask() and on_each_cpu_cond()
infrastructure API (the former derived from existing arch specific
versions in Tile and Arm) and uses them to turn several global IPI
invocation to per CPU group invocations.
Core kernel:
on_each_cpu_mask() calls a function on processors specified by cpumask,
which may or may not include the local processor.
You must not call this function with disabled interrupts or from a
hardware interrupt handler or from a bottom half handler.
arch/arm:
Note that the generic version is a little different then the Arm one:
1. It has the mask as first parameter
2. It calls the function on the calling CPU with interrupts disabled,
but this should be OK since the function is called on the other CPUs
with interrupts disabled anyway.
arch/tile:
The API is the same as the tile private one, but the generic version
also calls the function on the with interrupts disabled in UP case
This is OK since the function is called on the other CPUs
with interrupts disabled.
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Reviewed-by: Christoph Lameter <cl@linux.com>
Acked-by: Chris Metcalf <cmetcalf@tilera.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Sasha Levin <levinsasha928@gmail.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Avi Kivity <avi@redhat.com>
Acked-by: Michal Nazarewicz <mina86@mina86.org>
Cc: Kosaki Motohiro <kosaki.motohiro@gmail.com>
Cc: Milton Miller <miltonm@bga.com>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-03-28 21:42:43 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* on_each_cpu_mask(): Run a function on processors specified by
|
|
|
|
* cpumask, which may include the local processor.
|
|
|
|
* @mask: The set of cpus to run on (only runs on online subset).
|
|
|
|
* @func: The function to run. This must be fast and non-blocking.
|
|
|
|
* @info: An arbitrary pointer to pass to the function.
|
|
|
|
* @wait: If true, wait (atomically) until function has completed
|
|
|
|
* on other CPUs.
|
|
|
|
*
|
|
|
|
* If @wait is true, then returns once @func has returned.
|
|
|
|
*
|
|
|
|
* You must not call this function with disabled interrupts or
|
|
|
|
* from a hardware interrupt handler or from a bottom half handler.
|
|
|
|
*/
|
|
|
|
void on_each_cpu_mask(const struct cpumask *mask, smp_call_func_t func,
|
|
|
|
void *info, bool wait)
|
|
|
|
{
|
|
|
|
int cpu = get_cpu();
|
|
|
|
|
|
|
|
smp_call_function_many(mask, func, info, wait);
|
|
|
|
if (cpumask_test_cpu(cpu, mask)) {
|
|
|
|
local_irq_disable();
|
|
|
|
func(info);
|
|
|
|
local_irq_enable();
|
|
|
|
}
|
|
|
|
put_cpu();
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(on_each_cpu_mask);
|
2012-03-28 21:42:43 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* on_each_cpu_cond(): Call a function on each processor for which
|
|
|
|
* the supplied function cond_func returns true, optionally waiting
|
|
|
|
* for all the required CPUs to finish. This may include the local
|
|
|
|
* processor.
|
|
|
|
* @cond_func: A callback function that is passed a cpu id and
|
|
|
|
* the the info parameter. The function is called
|
|
|
|
* with preemption disabled. The function should
|
|
|
|
* return a blooean value indicating whether to IPI
|
|
|
|
* the specified CPU.
|
|
|
|
* @func: The function to run on all applicable CPUs.
|
|
|
|
* This must be fast and non-blocking.
|
|
|
|
* @info: An arbitrary pointer to pass to both functions.
|
|
|
|
* @wait: If true, wait (atomically) until function has
|
|
|
|
* completed on other CPUs.
|
|
|
|
* @gfp_flags: GFP flags to use when allocating the cpumask
|
|
|
|
* used internally by the function.
|
|
|
|
*
|
|
|
|
* The function might sleep if the GFP flags indicates a non
|
|
|
|
* atomic allocation is allowed.
|
|
|
|
*
|
|
|
|
* Preemption is disabled to protect against CPUs going offline but not online.
|
|
|
|
* CPUs going online during the call will not be seen or sent an IPI.
|
|
|
|
*
|
|
|
|
* You must not call this function with disabled interrupts or
|
|
|
|
* from a hardware interrupt handler or from a bottom half handler.
|
|
|
|
*/
|
|
|
|
void on_each_cpu_cond(bool (*cond_func)(int cpu, void *info),
|
|
|
|
smp_call_func_t func, void *info, bool wait,
|
|
|
|
gfp_t gfp_flags)
|
|
|
|
{
|
|
|
|
cpumask_var_t cpus;
|
|
|
|
int cpu, ret;
|
|
|
|
|
|
|
|
might_sleep_if(gfp_flags & __GFP_WAIT);
|
|
|
|
|
|
|
|
if (likely(zalloc_cpumask_var(&cpus, (gfp_flags|__GFP_NOWARN)))) {
|
|
|
|
preempt_disable();
|
|
|
|
for_each_online_cpu(cpu)
|
|
|
|
if (cond_func(cpu, info))
|
|
|
|
cpumask_set_cpu(cpu, cpus);
|
|
|
|
on_each_cpu_mask(cpus, func, info, wait);
|
|
|
|
preempt_enable();
|
|
|
|
free_cpumask_var(cpus);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* No free cpumask, bother. No matter, we'll
|
|
|
|
* just have to IPI them one by one.
|
|
|
|
*/
|
|
|
|
preempt_disable();
|
|
|
|
for_each_online_cpu(cpu)
|
|
|
|
if (cond_func(cpu, info)) {
|
|
|
|
ret = smp_call_function_single(cpu, func,
|
|
|
|
info, wait);
|
|
|
|
WARN_ON_ONCE(!ret);
|
|
|
|
}
|
|
|
|
preempt_enable();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(on_each_cpu_cond);
|