From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Anton Blanchard <anton@samba.org>,
Milton Miller <miltonm@bga.com>, Ingo Molnar <mingo@elte.hu>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Subject: [066/115] kernel/smp.c: fix smp_call_function_many() SMP race
Date: Tue, 15 Feb 2011 17:45:32 -0800 [thread overview]
Message-ID: <20110216014700.887019562@clark.kroah.org> (raw)
In-Reply-To: <20110216014741.GA24678@kroah.com>
2.6.32-longterm review patch. If anyone has any objections, please let us know.
------------------
From: Anton Blanchard <anton@samba.org>
commit 6dc19899958e420a931274b94019e267e2396d3e upstream.
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
kernel/smp.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -193,6 +193,24 @@ void generic_smp_call_function_interrupt
list_for_each_entry_rcu(data, &call_function.queue, csd.list) {
int refs;
+ /*
+ * 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;
+
if (!cpumask_test_and_clear_cpu(cpu, data->cpumask))
continue;
@@ -201,6 +219,8 @@ void generic_smp_call_function_interrupt
refs = atomic_dec_return(&data->refs);
WARN_ON(refs < 0);
if (!refs) {
+ WARN_ON(!cpumask_empty(data->cpumask));
+
spin_lock(&call_function.lock);
list_del_rcu(&data->csd.list);
spin_unlock(&call_function.lock);
@@ -401,11 +421,21 @@ void smp_call_function_many(const struct
data = &__get_cpu_var(cfd_data);
csd_lock(&data->csd);
+ BUG_ON(atomic_read(&data->refs) || !cpumask_empty(data->cpumask));
data->csd.func = func;
data->csd.info = info;
cpumask_and(data->cpumask, mask, cpu_online_mask);
cpumask_clear_cpu(this_cpu, data->cpumask);
+
+ /*
+ * To ensure the interrupt handler gets an complete view
+ * we order the cpumask and refs writes and order the read
+ * of them in the interrupt handler. In addition we may
+ * only clear our own cpu bit from the mask.
+ */
+ smp_wmb();
+
atomic_set(&data->refs, cpumask_weight(data->cpumask));
spin_lock_irqsave(&call_function.lock, flags);
next prev parent reply other threads:[~2011-02-16 1:51 UTC|newest]
Thread overview: 137+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-16 1:47 [000/115] 2.6.32.29-longterm review Greg KH
2011-02-16 1:44 ` [001/115] staging: usbip: remove double giveback of URB Greg KH
2011-02-16 1:44 ` [002/115] USB: EHCI: ASPM quirk of ISOC on AMD SB800 Greg KH
2011-02-16 1:44 ` [003/115] rt2x00: add device id for windy31 usb device Greg KH
2011-02-16 1:44 ` [004/115] ALSA: snd-usb-us122l: Fix missing NULL checks Greg KH
2011-02-16 1:44 ` [005/115] hwmon: (via686a) Initialize fan_div values Greg KH
2011-02-16 1:44 ` [006/115] USB: serial: handle Data Carrier Detect changes Greg KH
2011-02-16 1:44 ` [007/115] USB: CP210x Add two device IDs Greg KH
2011-02-16 1:44 ` [008/115] USB: CP210x Removed incorrect device ID Greg KH
2011-02-16 1:44 ` [009/115] USB: usb-storage: unusual_devs update for Cypress ATACB Greg KH
2011-02-16 1:44 ` [010/115] USB: usb-storage: unusual_devs update for TrekStor DataStation maxi g.u external hard drive enclosure Greg KH
2011-02-16 1:44 ` [011/115] USB: usb-storage: unusual_devs entry for CamSport Evo Greg KH
2011-02-16 1:44 ` [012/115] USB: usb-storage: unusual_devs entry for Coby MP3 player Greg KH
2011-02-16 1:44 ` [013/115] USB: serial: Updated support for ICOM devices Greg KH
2011-02-16 1:44 ` [014/115] USB: adding USB support for Cinterions HC2x, EU3 and PH8 products Greg KH
2011-02-16 1:44 ` [015/115] USB: EHCI: ASPM quirk of ISOC on AMD Hudson Greg KH
2011-02-16 1:44 ` [016/115] USB: EHCI: fix DMA deallocation bug Greg KH
2011-02-16 1:44 ` [017/115] USB: g_printer: fix bug in module parameter definitions Greg KH
2011-02-16 1:44 ` [018/115] USB: io_edgeport: fix the reported firmware major and minor Greg KH
2011-02-16 1:44 ` [019/115] USB: ti_usb: fix module removal Greg KH
2011-02-16 1:44 ` [020/115] USB: Storage: Add unusual_devs entry for VTech Kidizoom Greg KH
2011-02-16 1:44 ` [021/115] USB: ftdi_sio: add ST Micro Connect Lite uart support Greg KH
2011-02-16 1:44 ` [022/115] USB: cdc-acm: Adding second ACM channel support for Nokia N8 Greg KH
2011-02-16 1:44 ` [023/115] USB: ftdi_sio: Add VID=0x0647, PID=0x0100 for Acton Research spectrograph Greg KH
2011-02-16 1:44 ` [024/115] USB: prevent buggy hubs from crashing the USB stack Greg KH
2011-02-23 8:06 ` Alexander Holler
2011-02-23 8:40 ` Alexander Holler
2011-02-23 15:26 ` Alan Stern
2011-02-24 8:57 ` Felipe Balbi
2011-02-24 9:15 ` Alexander Holler
2011-02-24 9:16 ` Felipe Balbi
2011-02-24 17:18 ` Greg KH
2011-02-24 17:23 ` Felipe Balbi
2011-02-24 17:57 ` Alan Stern
2011-02-24 18:11 ` Alexander Holler
2011-02-24 18:24 ` Greg KH
2011-02-24 18:12 ` Greg KH
2011-02-24 18:16 ` Greg KH
2011-02-24 9:53 ` Michael Jones
2011-02-16 1:44 ` [025/115] staging: comedi: add support for newer jr3 1-channel pci board Greg KH
2011-02-16 1:44 ` [026/115] staging: comedi: ni_labpc: Use shared IRQ for PCMCIA card Greg KH
2011-02-16 1:44 ` [027/115] Staging: hv: fix sysfs symlink on hv block device Greg KH
2011-02-16 1:44 ` [028/115] staging: hv: Enable sending GARP packet after live migration Greg KH
2011-02-16 1:44 ` [029/115] [S390] hvc_iucv: allocate memory buffers for IUCV in zone DMA Greg KH
2011-02-16 1:44 ` [030/115] iwlagn: enable only rfkill interrupt when device is down Greg KH
2011-02-16 1:44 ` [031/115] ath9k: Fix bug in delimiter padding computation Greg KH
2011-02-16 1:44 ` [032/115] [S390] correct vdso version string Greg KH
2011-02-16 1:44 ` [033/115] [SCSI] fix medium error problems with some arrays which can cause data corruption Greg KH
2011-02-16 1:45 ` [034/115] [SCSI] libsas: fix runaway error handler problem Greg KH
2011-02-16 1:45 ` [035/115] [SCSI] mpt2sas: Fix device removal handshake for zoned devices Greg KH
2011-02-16 1:45 ` [036/115] [SCSI] mpt2sas: Correct resizing calculation for max_queue_depth Greg KH
2011-02-16 1:45 ` [037/115] [SCSI] mpt2sas: Kernel Panic during Large Topology discovery Greg KH
2011-02-16 1:45 ` [038/115] [media] radio-aimslab.c: Fix gcc 4.5+ bug Greg KH
2011-02-16 1:45 ` [039/115] [media] em28xx: Fix audio input for Terratec Grabby Greg KH
2011-02-16 1:45 ` [040/115] ALSA : au88x0 - Limit number of channels to fix Oops via OSS emu Greg KH
2011-02-16 1:45 ` [041/115] ALSA: HDA: Fix dmesg output of HDMI supported bits Greg KH
2011-02-16 1:45 ` [042/115] ALSA: hda - Fix memory leaks in conexant jack arrays Greg KH
2011-02-16 1:45 ` [043/115] Input: i8042 - introduce notimeout blacklist for Dell Vostro V13 Greg KH
2011-02-16 1:45 ` [044/115] input: bcm5974: Add support for MacBookAir3 Greg KH
2011-02-16 1:45 ` [045/115] ALSA: hrtimer: handle delayed timer interrupts Greg KH
2011-02-16 1:45 ` [046/115] ASoC: WM8990: msleep() takes milliseconds not jiffies Greg KH
2011-02-16 1:45 ` [047/115] ASoC: Blackfin AC97: fix build error after multi-component update Greg KH
2011-02-16 1:45 ` [048/115] NFS: Fix "kernel BUG at fs/aio.c:554!" Greg KH
2011-02-16 1:45 ` [049/115] rtc-cmos: fix suspend/resume Greg KH
2011-02-16 1:45 ` [050/115] iwlagn: Re-enable RF_KILL interrupt when down Greg KH
2011-02-16 1:45 ` [051/115] rapidio: fix hang on RapidIO doorbell queue full condition Greg KH
2011-02-16 1:45 ` [052/115] PCI: pci-stub: ignore zero-length id parameters Greg KH
2011-02-16 1:45 ` [053/115] virtio: remove virtio-pci root device Greg KH
2011-02-16 1:45 ` [054/115] ds2760_battery: Fix calculation of time_to_empty_now Greg KH
2011-02-16 1:45 ` [055/115] p54: fix sequence no. accounting off-by-one error Greg KH
2011-02-16 1:45 ` [056/115] i2c: Unregister dummy devices last on adapter removal Greg KH
2011-02-16 1:45 ` [057/115] serial: unbreak billionton CF card Greg KH
2011-02-16 1:45 ` [058/115] ptrace: use safer wake up on ptrace_detach() Greg KH
2011-02-16 1:45 ` [059/115] x86, mtrr: Avoid MTRR reprogramming on BP during boot on UP platforms Greg KH
2011-02-16 1:45 ` [060/115] fix jiffy calculations in calibrate_delay_direct to handle overflow Greg KH
2011-02-16 1:45 ` [061/115] USB: serial: pl2303: Hybrid reader Uniform HCR331 Greg KH
2011-02-16 1:45 ` [062/115] drivers: update to pl2303 usb-serial to support Motorola cables Greg KH
2011-02-16 1:45 ` [063/115] klist: Fix object alignment on 64-bit Greg KH
2011-02-16 1:45 ` [064/115] powerpc: Fix some 6xx/7xxx CPU setup functions Greg KH
2011-02-16 1:45 ` [065/115] parisc : Remove broken line wrapping handling pdc_iodc_print() Greg KH
2011-02-16 1:45 ` Greg KH [this message]
2011-02-16 1:45 ` [067/115] hostap_cs: fix sleeping function called from invalid context Greg KH
2011-02-16 1:45 ` [068/115] md: fix regression with re-adding devices to arrays with no metadata Greg KH
2011-02-16 1:45 ` [069/115] pata_mpc52xx: inherit from ata_bmdma_port_ops Greg KH
2011-02-16 1:45 ` [070/115] TPM: Long default timeout fix Greg KH
2011-02-16 1:45 ` [071/115] tpm_tis: Use timeouts returned from TPM Greg KH
2011-02-16 1:45 ` [072/115] SELinux: define permissions for DCB netlink messages Greg KH
2011-02-16 1:45 ` [073/115] SELinux: do not compute transition labels on mountpoint labeled filesystems Greg KH
2011-02-16 1:45 ` [074/115] ieee80211: correct IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK macro Greg KH
2011-02-16 1:45 ` [075/115] dm: dont take i_mutex to change device size Greg KH
2011-02-16 1:45 ` [076/115] dm mpath: disable blk_abort_queue Greg KH
2011-02-16 1:45 ` [077/115] drm/radeon/kms: add quirk for Mac Radeon HD 2600 card Greg KH
2011-02-16 1:45 ` [078/115] drm/radeon/kms: make the mac rv630 quirk generic Greg KH
2011-02-16 1:45 ` [079/115] drm/radeon/kms: add pll debugging output Greg KH
2011-02-16 1:45 ` [080/115] drm/radeon: remove 0x4243 pci id Greg KH
2011-02-16 1:45 ` [081/115] drm/radeon/kms: fix s/r issues with bios scratch regs Greg KH
2011-02-16 1:45 ` [082/115] drm/i915/lvds: Add AOpen i915GMm-HFS to the list of false-positive LVDS Greg KH
2011-02-16 1:45 ` [083/115] drm/i915: Add dependency on CONFIG_TMPFS Greg KH
2011-02-16 1:45 ` [084/115] x86, mm: avoid possible bogus tlb entries by clearing prev mm_cpumask after switching mm Greg KH
2011-02-16 1:45 ` [085/115] usb: Realloc xHCI structures after a hub is verified Greg KH
2011-02-16 1:45 ` [086/115] sched: Remove USER_SCHED Greg KH
2011-02-16 1:45 ` [087/115] sched: Remove remaining USER_SCHED code Greg KH
2011-02-16 1:45 ` [088/115] sched: Move sched_avg_update() to update_cpu_load() Greg KH
2011-02-16 1:45 ` [089/115] sched: Increment cache_nice_tries only on periodic lb Greg KH
2011-02-16 1:45 ` [090/115] sched: Try not to migrate higher priority RT tasks Greg KH
2011-02-16 1:45 ` [091/115] sched: Give CPU bound RT tasks preference Greg KH
2011-02-16 1:45 ` [092/115] sched: suppress RCU lockdep splat in task_fork_fair Greg KH
2011-02-16 1:45 ` [093/115] sched: fix RCU lockdep splat from task_group() Greg KH
2011-02-16 1:46 ` [094/115] sched: Do not consider SCHED_IDLE tasks to be cache hot Greg KH
2011-02-16 1:46 ` [095/115] sched: Set group_imb only a task can be pulled from the busiest cpu Greg KH
2011-02-16 1:46 ` [096/115] sched: Force balancing on newidle balance if local group has capacity Greg KH
2011-02-16 1:46 ` [097/115] sched: Drop group_capacity to 1 only if local group has extra capacity Greg KH
2011-02-16 1:46 ` [098/115] sched: Fix softirq time accounting Greg KH
2011-02-16 1:46 ` [099/115] sched: Consolidate account_system_vtime extern declaration Greg KH
2011-02-16 1:46 ` [100/115] sched: Remove unused PF_ALIGNWARN flag Greg KH
2011-02-16 1:46 ` [101/115] sched: Add a PF flag for ksoftirqd identification Greg KH
2011-02-16 1:46 ` [102/115] sched: Add IRQ_TIME_ACCOUNTING, finer accounting of irq time Greg KH
2011-02-16 1:46 ` [103/115] x86: Add IRQ_TIME_ACCOUNTING Greg KH
2011-02-16 1:46 ` [104/115] sched: Do not account irq time to current task Greg KH
2011-02-16 1:46 ` [105/115] sched: Remove irq time from available CPU power Greg KH
2011-02-16 1:46 ` [106/115] sched: Call tick_check_idle before __irq_enter Greg KH
2011-02-16 1:46 ` [107/115] sched: Export account_system_vtime() Greg KH
2011-02-16 1:46 ` [108/115] sched, cgroup: Fixup broken cgroup movement Greg KH
2011-02-16 1:46 ` [109/115] sched: Use group weight, idle cpu metrics to fix imbalances during idle Greg KH
2011-02-16 1:46 ` [110/115] sched: Fix cross-sched-class wakeup preemption Greg KH
2011-02-16 1:46 ` [111/115] sched: Fix volanomark performance regression Greg KH
2011-02-16 1:46 ` [112/115] sched: Fix idle balancing Greg KH
2011-02-16 1:46 ` [113/115] sched: Fix wake_affine() vs RT tasks Greg KH
2011-02-16 1:46 ` [114/115] sched: Remove some dead code Greg KH
2011-02-16 7:37 ` Dan Carpenter
2011-02-16 7:56 ` Mike Galbraith
2011-02-16 8:30 ` Ingo Molnar
2011-02-16 9:24 ` [Stable-review] " Willy Tarreau
2011-02-16 1:46 ` [115/115] kernel/user.c: add lock release annotation on free_user() Greg KH
2011-02-16 13:51 ` [000/115] 2.6.32.29-longterm review Ian Campbell
2011-02-17 0:35 ` Greg KH
2011-02-17 9:22 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110216014700.887019562@clark.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=anton@samba.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miltonm@bga.com \
--cc=mingo@elte.hu \
--cc=paulmck@linux.vnet.ibm.com \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®