From: Luis Henriques <luis.henriques@canonical.com>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
kernel-team@lists.ubuntu.com
Cc: Michael Bohan <mbohan@codeaurora.org>,
Thomas Gleixner <tglx@linutronix.de>,
Luis Henriques <luis.henriques@canonical.com>
Subject: [PATCH 68/72] hrtimer: Don't reinitialize a cpu_base lock on CPU_UP
Date: Thu, 18 Apr 2013 10:16:53 +0100 [thread overview]
Message-ID: <1366276617-3553-69-git-send-email-luis.henriques@canonical.com> (raw)
In-Reply-To: <1366276617-3553-1-git-send-email-luis.henriques@canonical.com>
3.5.7.11 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bohan <mbohan@codeaurora.org>
commit 84cc8fd2fe65866e49d70b38b3fdf7219dd92fe0 upstream.
The current code makes the assumption that a cpu_base lock won't be
held if the CPU corresponding to that cpu_base is offline, which isn't
always true.
If a hrtimer is not queued, then it will not be migrated by
migrate_hrtimers() when a CPU is offlined. Therefore, the hrtimer's
cpu_base may still point to a CPU which has subsequently gone offline
if the timer wasn't enqueued at the time the CPU went down.
Normally this wouldn't be a problem, but a cpu_base's lock is blindly
reinitialized each time a CPU is brought up. If a CPU is brought
online during the period that another thread is performing a hrtimer
operation on a stale hrtimer, then the lock will be reinitialized
under its feet, and a SPIN_BUG() like the following will be observed:
<0>[ 28.082085] BUG: spinlock already unlocked on CPU#0, swapper/0/0
<0>[ 28.087078] lock: 0xc4780b40, value 0x0 .magic: dead4ead, .owner: <none>/-1, .owner_cpu: -1
<4>[ 42.451150] [<c0014398>] (unwind_backtrace+0x0/0x120) from [<c0269220>] (do_raw_spin_unlock+0x44/0xdc)
<4>[ 42.460430] [<c0269220>] (do_raw_spin_unlock+0x44/0xdc) from [<c071b5bc>] (_raw_spin_unlock+0x8/0x30)
<4>[ 42.469632] [<c071b5bc>] (_raw_spin_unlock+0x8/0x30) from [<c00a9ce0>] (__hrtimer_start_range_ns+0x1e4/0x4f8)
<4>[ 42.479521] [<c00a9ce0>] (__hrtimer_start_range_ns+0x1e4/0x4f8) from [<c00aa014>] (hrtimer_start+0x20/0x28)
<4>[ 42.489247] [<c00aa014>] (hrtimer_start+0x20/0x28) from [<c00e6190>] (rcu_idle_enter_common+0x1ac/0x320)
<4>[ 42.498709] [<c00e6190>] (rcu_idle_enter_common+0x1ac/0x320) from [<c00e6440>] (rcu_idle_enter+0xa0/0xb8)
<4>[ 42.508259] [<c00e6440>] (rcu_idle_enter+0xa0/0xb8) from [<c000f268>] (cpu_idle+0x24/0xf0)
<4>[ 42.516503] [<c000f268>] (cpu_idle+0x24/0xf0) from [<c06ed3c0>] (rest_init+0x88/0xa0)
<4>[ 42.524319] [<c06ed3c0>] (rest_init+0x88/0xa0) from [<c0c00978>] (start_kernel+0x3d0/0x434)
As an example, this particular crash occurred when hrtimer_start() was
executed on CPU #0. The code locked the hrtimer's current cpu_base
corresponding to CPU #1. CPU #0 then tried to switch the hrtimer's
cpu_base to an optimal CPU which was online. In this case, it selected
the cpu_base corresponding to CPU #3.
Before it could proceed, CPU #1 came online and reinitialized the
spinlock corresponding to its cpu_base. Thus now CPU #0 held a lock
which was reinitialized. When CPU #0 finally ended up unlocking the
old cpu_base corresponding to CPU #1 so that it could switch to CPU
#3, we hit this SPIN_BUG() above while in switch_hrtimer_base().
CPU #0 CPU #1
---- ----
... <offline>
hrtimer_start()
lock_hrtimer_base(base #1)
... init_hrtimers_cpu()
switch_hrtimer_base() ...
... raw_spin_lock_init(&cpu_base->lock)
raw_spin_unlock(&cpu_base->lock) ...
<spin_bug>
Solve this by statically initializing the lock.
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
Link: http://lkml.kernel.org/r/1363745965-23475-1-git-send-email-mbohan@codeaurora.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
kernel/hrtimer.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index cdd5607..e4cee8d 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -61,6 +61,7 @@
DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) =
{
+ .lock = __RAW_SPIN_LOCK_UNLOCKED(hrtimer_bases.lock),
.clock_base =
{
{
@@ -1640,8 +1641,6 @@ static void __cpuinit init_hrtimers_cpu(int cpu)
struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
int i;
- raw_spin_lock_init(&cpu_base->lock);
-
for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
cpu_base->clock_base[i].cpu_base = cpu_base;
timerqueue_init_head(&cpu_base->clock_base[i].active);
--
1.8.1.2
next prev parent reply other threads:[~2013-04-18 9:18 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-18 9:15 [ 3.5.y.z extended stable ] Linux 3.5.7.11 stable review Luis Henriques
2013-04-18 9:15 ` [PATCH 01/72] ASoC: imx-ssi: Fix occasional AC97 reset failure Luis Henriques
2013-04-18 9:15 ` [PATCH 02/72] ASoC: dma-sh7760: Fix compile error Luis Henriques
2013-04-18 9:15 ` [PATCH 03/72] spi/s3c64xx: modified error interrupt handling and init Luis Henriques
2013-04-18 9:15 ` [PATCH 04/72] spi/mpc512x-psc: optionally keep PSC SS asserted across xfer segmensts Luis Henriques
2013-04-18 9:15 ` [PATCH 05/72] EISA/PCI: Fix bus res reference Luis Henriques
2013-04-18 9:15 ` [PATCH 06/72] EISA/PCI: Init EISA early, before PNP Luis Henriques
2013-04-18 9:15 ` [PATCH 07/72] mwifiex: limit channel number not to overflow memory Luis Henriques
2013-04-18 9:15 ` [PATCH 08/72] ALSA: hda - bug fix on return value when getting HDMI ELD info Luis Henriques
2013-04-18 9:15 ` [PATCH 09/72] x86: remove the x32 syscall bitmask from syscall_get_nr() Luis Henriques
2013-04-18 9:15 ` [PATCH 10/72] ixgbe: fix registration order of driver and DCA nofitication Luis Henriques
2013-04-18 9:15 ` [PATCH 11/72] Revert "drivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR" Luis Henriques
2013-04-18 9:15 ` [PATCH 12/72] alpha: Add irongate_io to PCI bus resources Luis Henriques
2013-04-18 9:15 ` [PATCH 13/72] crypto: gcm - fix assumption that assoc has one segment Luis Henriques
2013-04-18 9:15 ` [PATCH 14/72] libata: Use integer return value for atapi_command_packet_set Luis Henriques
2013-04-18 9:16 ` [PATCH 15/72] libata: Set max sector to 65535 for Slimtype DVD A DS8A8SH drive Luis Henriques
2013-04-18 9:16 ` [PATCH 16/72] ata_piix: Fix DVD not dectected at some Haswell platforms Luis Henriques
2013-04-18 9:16 ` [PATCH 17/72] remoteproc: fix error path of handle_vdev Luis Henriques
2013-04-18 9:16 ` [PATCH 18/72] hwspinlock: fix __hwspin_lock_request error path Luis Henriques
2013-04-18 9:16 ` [PATCH 19/72] remoteproc: fix FW_CONFIG typo Luis Henriques
2013-04-18 9:16 ` [PATCH 20/72] powerpc: pSeries_lpar_hpte_remove fails from Adjunct partition being performed before the ANDCOND test Luis Henriques
2013-04-18 9:16 ` [PATCH 21/72] ftrace: Consistently restore trace function on sysctl enabling Luis Henriques
2013-04-18 9:16 ` [PATCH 22/72] spinlocks and preemption points need to be at least compiler barriers Luis Henriques
2013-04-18 9:16 ` [PATCH 23/72] drm/mgag200: Index 24 in extended CRTC registers is 24 in hex, not decimal Luis Henriques
2013-04-18 9:16 ` [PATCH 24/72] panic: fix a possible deadlock in panic() Luis Henriques
2013-04-18 9:16 ` [PATCH 25/72] Bluetooth: Add support for IMC Networks [13d3:3393] Luis Henriques
2013-04-18 9:16 ` [PATCH 26/72] Bluetooth: Add support for GC-WB300D PCIe [04ca:3006] to ath3k Luis Henriques
2013-04-18 9:16 ` [PATCH 27/72] Bluetooth: Add support for Foxconn / Hon Hai [0489:e04e] Luis Henriques
2013-04-18 9:16 ` [PATCH 28/72] Bluetooth: Add support for Foxconn / Hon Hai [0489:e056] Luis Henriques
2013-04-18 9:16 ` [PATCH 29/72] Bluetooth device 04ca:3008 should use ath3k Luis Henriques
2013-04-18 9:16 ` [PATCH 30/72] Bluetooth: Add support for atheros 04ca:3004 device to ath3k Luis Henriques
2013-04-18 9:16 ` [PATCH 31/72] Bluetooth: Device 0cf3:3008 should map AR 3012 Luis Henriques
2013-04-18 9:16 ` [PATCH 32/72] ALSA: hda - Enabling Realtek ALC 671 codec Luis Henriques
2013-04-18 9:16 ` [PATCH 33/72] ALSA: hda - fix typo in proc output Luis Henriques
2013-04-18 9:16 ` [PATCH 34/72] KVM: x86: fix for buffer overflow in handling of MSR_KVM_SYSTEM_TIME (CVE-2013-1796) Luis Henriques
2013-04-18 9:16 ` [PATCH 35/72] KVM: x86: Convert MSR_KVM_SYSTEM_TIME to use gfn_to_hva_cache functions (CVE-2013-1797) Luis Henriques
2013-04-22 3:54 ` Ben Hutchings
2013-04-22 8:55 ` Luis Henriques
2013-04-18 9:16 ` [PATCH 36/72] KVM: Fix bounds checking in ioapic indirect register reads (CVE-2013-1798) Luis Henriques
2013-04-18 9:16 ` [PATCH 37/72] rt2x00: rt2x00pci_regbusy_read() - only print register access failure once Luis Henriques
2013-04-18 9:16 ` [PATCH 38/72] can: gw: use kmem_cache_free() instead of kfree() Luis Henriques
2013-04-18 9:16 ` [PATCH 39/72] tracing: Fix double free when function profile init failed Luis Henriques
2013-04-18 9:16 ` [PATCH 40/72] r8169: fix auto speed down issue Luis Henriques
2013-04-18 9:16 ` [PATCH 41/72] x86: Fix rebuild with EFI_STUB enabled Luis Henriques
2013-04-18 9:16 ` [PATCH 42/72] msi-wmi: Fix memory leak Luis Henriques
2013-04-18 9:16 ` [PATCH 43/72] DRM/i915: Add QUIRK_INVERT_BRIGHTNESS for NCR machines Luis Henriques
2013-04-18 9:16 ` [PATCH 44/72] drm/i915: add quirk to invert brightness on eMachines G725 Luis Henriques
2013-04-18 9:16 ` [PATCH 45/72] drm/i915: add quirk to invert brightness on eMachines e725 Luis Henriques
2013-04-18 9:16 ` [PATCH 46/72] drm/i915: add quirk to invert brightness on Packard Bell NCL20 Luis Henriques
2013-04-18 9:16 ` [PATCH 47/72] block: avoid using uninitialized value in from queue_var_store Luis Henriques
2013-04-18 9:16 ` [PATCH 48/72] ALSA: usb-audio: fix endianness bug in snd_nativeinstruments_* Luis Henriques
2013-04-18 9:16 ` [PATCH 49/72] PM / reboot: call syscore_shutdown() after disable_nonboot_cpus() Luis Henriques
2013-04-18 9:16 ` [PATCH 50/72] ASoC: wm8903: Fix the bypass to HP/LINEOUT when no DAC or ADC is running Luis Henriques
2013-04-18 9:16 ` [PATCH 51/72] drm/i915: Use the correct size of the GTT for placing the per-process entries Luis Henriques
2013-04-18 9:16 ` [PATCH 52/72] GFS2: Fix unlock of fcntl locks during withdrawn state Luis Henriques
2013-04-18 9:16 ` [PATCH 53/72] libsas: fix handling vacant phy in sas_set_ex_phy() Luis Henriques
2013-04-18 9:16 ` [PATCH 54/72] sched_clock: Prevent 64bit inatomicity on 32bit systems Luis Henriques
2013-04-18 9:16 ` [PATCH 55/72] x86, mm, paravirt: Fix vmalloc_fault oops during lazy MMU updates Luis Henriques
2013-04-18 9:16 ` [PATCH 56/72] x86, mm: Patch out arch_flush_lazy_mmu_mode() when running on bare metal Luis Henriques
2013-04-18 9:16 ` [PATCH 57/72] cifs: Allow passwords which begin with a delimitor Luis Henriques
2013-04-18 9:16 ` [PATCH 58/72] target: Fix incorrect fallthrough of ALUA Standby/Offline/Transition CDBs Luis Henriques
2013-04-18 9:16 ` [PATCH 59/72] udl: handle EDID failure properly Luis Henriques
2013-04-18 9:16 ` [PATCH 60/72] tracing: Fix possible NULL pointer dereferences Luis Henriques
2013-04-18 9:16 ` [PATCH 61/72] ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section Luis Henriques
2013-04-18 9:16 ` [PATCH 62/72] Btrfs: make sure nbytes are right after log replay Luis Henriques
2013-04-18 9:16 ` [PATCH 63/72] kobject: fix kset_find_obj() race with concurrent last kobject_put() Luis Henriques
2013-04-18 9:16 ` [PATCH 64/72] vfs: Revert spurious fix to spinning prevention in prune_icache_sb Luis Henriques
2013-04-18 9:16 ` [PATCH 65/72] kref: Implement kref_get_unless_zero v3 Luis Henriques
2013-04-18 9:16 ` [PATCH 66/72] mtdchar: fix offset overflow detection Luis Henriques
2013-04-22 3:56 ` Ben Hutchings
2013-04-22 8:51 ` Luis Henriques
2013-04-18 9:16 ` [PATCH 67/72] fbcon: fix locking harder Luis Henriques
2013-04-18 9:16 ` Luis Henriques [this message]
2013-04-18 9:16 ` [PATCH 69/72] ARM: Do 15e0d9e37c (ARM: pm: let platforms select cpu_suspend support) properly Luis Henriques
2013-04-18 9:16 ` [PATCH 70/72] efivars: Allow disabling use as a pstore backend Luis Henriques
2013-04-18 9:16 ` [PATCH 71/72] efivars: Add module parameter to disable " Luis Henriques
2013-04-18 9:16 ` [PATCH 72/72] efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE Luis Henriques
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=1366276617-3553-69-git-send-email-luis.henriques@canonical.com \
--to=luis.henriques@canonical.com \
--cc=kernel-team@lists.ubuntu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbohan@codeaurora.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/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®