linux-mips
[Top] [All Lists]

[PATCH] smp.h: Use local_irq_{save,restore}() in !SMP version of on_each

To: ralf@linux-mips.org, Andrew Morton <akpm@linux-foundation.org>, Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH] smp.h: Use local_irq_{save,restore}() in !SMP version of on_each_cpu().
From: David Daney <ddaney.cavm@gmail.com>
Date: Thu, 13 Jun 2013 18:07:03 -0700
Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, David Daney <david.daney@cavium.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=lCvWIyPmiZwhIFJP7hdcdwPDybLnJuzP2n1Y0v/1os0=; b=ktZiPsqY2tfuj2iyWapB929I0LHrcX7zNlbFCWHHQ134w5u278FwYfsSPY5AV00OQy YDxmGa6HGlFQmbUaLiUI6BJUBKt9fScC7xsK9NYREo7x7bTgbxgAPIInE+gSd4kjVA8B v7SHafACNLddBNqdK2ndMY+a1UkWMIJZqtCUjqcqleWAiittt0JXqdYh/Fq4Hahyi9Zq 532OU5tVVl12Bm/wNQzA+4nCVdp1UFqoHyKzR+DNmegxBGnxRn5qIadwrh+aOx5xe06o 9mSBkauX/TImcOWE2QAkMS7kJyxloZM/Zc5X6GOA9QpvNUsPdCpUv6slPX7Qpn7+tIWM V9dg==
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
From: David Daney <david.daney@cavium.com>

Thanks to commit f91eb62f71b (init: scream bloody murder if interrupts
are enabled too early), "bloody murder" is now being screamed.

With a MIPS OCTEON config, we use on_each_cpu() in our
irq_chip.irq_bus_sync_unlock() function.  This gets called in early as
a result of the time_init() call.  Because the !SMP version of
on_each_cpu() unconditionally enables irqs, we get:

------------[ cut here ]------------
WARNING: at init/main.c:560 start_kernel+0x250/0x410()
Interrupts were enabled early
Modules linked in:
CPU: 0 PID: 0 Comm: swapper Not tainted 3.10.0-rc5-Cavium-Octeon+ #801
Stack : 0000000000000046 ffffffff808e0000 0000000000000006 0000000000000004
          0000000000000001 0000000000000000 0000000000000046 0000000000000000
          ffffffff80a90000 ffffffff8015c020 0000000000000000 ffffffff8015c020
          ffffffff80a79f70 ffffffff80a80000 ffffffff8072b9c0 ffffffff808a7d77
          ffffffff80a79f70 ffffffff808a8168 0000000000000000 00000004178a9948
          0000000417801230 ffffffff805f7610 0000000010000078 ffffffff805fa01c
          ffffffff8089bd18 ffffffff801595fc ffffffff8089bd28 ffffffff8015d384
          ffffffff808a7e80 ffffffff8089bc30 0000000000000000 ffffffff80159710
          0000000000000000 0000000000000000 0000000000000000 0000000000000000
          0000000000000000 ffffffff80139520 0000000000000000 0000000000000009
          ...
Call Trace:
[<ffffffff80139520>] show_stack+0x68/0x80
[<ffffffff80159710>] warn_slowpath_common+0x78/0xb0
[<ffffffff801597e8>] warn_slowpath_fmt+0x38/0x48
[<ffffffff8092b768>] start_kernel+0x250/0x410

---[ end trace 139ce121c98e96c9 ]---

Suggested fix: Do what we already do in the SMP version of
on_each_cpu(), and use local_irq_save/local_irq_restore.

Signed-off-by: David Daney <david.daney@cavium.com>
---
 include/linux/smp.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/linux/smp.h b/include/linux/smp.h
index e6564c1..d8fb04b 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -141,9 +141,10 @@ static inline int up_smp_call_function(smp_call_func_t 
func, void *info)
                        (up_smp_call_function(func, info))
 #define on_each_cpu(func,info,wait)            \
        ({                                      \
-               local_irq_disable();            \
+               unsigned long flags;            \
+               local_irq_save(flags);          \
                func(info);                     \
-               local_irq_enable();             \
+               local_irq_restore(flags);       \
                0;                              \
        })
 /*
-- 
1.7.11.7


<Prev in Thread] Current Thread [Next in Thread>