From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Yang Shi <yang.shi@linaro.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Russell King <rmk+kernel@armlinux.org.uk>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 4.9 18/21] ARM: 8839/1: kprobe: make patch_lock a raw_spinlock_t
Date: Fri, 29 Mar 2019 21:31:09 -0400 [thread overview]
Message-ID: <20190330013112.784-18-sashal@kernel.org> (raw)
In-Reply-To: <20190330013112.784-1-sashal@kernel.org>
From: Yang Shi <yang.shi@linaro.org>
[ Upstream commit 143c2a89e0e5fda6c6fd08d7bc1126438c19ae90 ]
When running kprobe on -rt kernel, the below bug is caught:
|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:931
|in_atomic(): 1, irqs_disabled(): 128, pid: 14, name: migration/0
|Preemption disabled at:[<802f2b98>] cpu_stopper_thread+0xc0/0x140
|CPU: 0 PID: 14 Comm: migration/0 Tainted: G O 4.8.3-rt2 #1
|Hardware name: Freescale LS1021A
|[<8025a43c>] (___might_sleep)
|[<80b5b324>] (rt_spin_lock)
|[<80b5c31c>] (__patch_text_real)
|[<80b5c3ac>] (patch_text_stop_machine)
|[<802f2920>] (multi_cpu_stop)
Since patch_text_stop_machine() is called in stop_machine() which
disables IRQ, sleepable lock should be not used in this atomic context,
so replace patch_lock to raw lock.
Signed-off-by: Yang Shi <yang.shi@linaro.org>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/kernel/patch.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
index 69bda1a5707e..1f665acaa6a9 100644
--- a/arch/arm/kernel/patch.c
+++ b/arch/arm/kernel/patch.c
@@ -15,7 +15,7 @@ struct patch {
unsigned int insn;
};
-static DEFINE_SPINLOCK(patch_lock);
+static DEFINE_RAW_SPINLOCK(patch_lock);
static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags)
__acquires(&patch_lock)
@@ -32,7 +32,7 @@ static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags)
return addr;
if (flags)
- spin_lock_irqsave(&patch_lock, *flags);
+ raw_spin_lock_irqsave(&patch_lock, *flags);
else
__acquire(&patch_lock);
@@ -47,7 +47,7 @@ static void __kprobes patch_unmap(int fixmap, unsigned long *flags)
clear_fixmap(fixmap);
if (flags)
- spin_unlock_irqrestore(&patch_lock, *flags);
+ raw_spin_unlock_irqrestore(&patch_lock, *flags);
else
__release(&patch_lock);
}
--
2.19.1
next prev parent reply other threads:[~2019-03-30 1:35 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-30 1:30 [PATCH AUTOSEL 4.9 01/21] gpio: pxa: handle corner case of unprobed device Sasha Levin
2019-03-30 1:30 ` [PATCH AUTOSEL 4.9 02/21] rsi: improve kernel thread handling to fix kernel panic Sasha Levin
2019-03-30 1:30 ` [PATCH AUTOSEL 4.9 03/21] 9p: do not trust pdu content for stat item size Sasha Levin
2019-03-30 1:30 ` [PATCH AUTOSEL 4.9 04/21] 9p locks: add mount option for lock retry interval Sasha Levin
2019-03-30 1:30 ` [PATCH AUTOSEL 4.9 05/21] f2fs: fix to do sanity check with current segment number Sasha Levin
2019-03-30 1:30 ` [PATCH AUTOSEL 4.9 06/21] serial: uartps: console_setup() can't be placed to init section Sasha Levin
2019-03-30 1:30 ` [PATCH AUTOSEL 4.9 07/21] HID: i2c-hid: override HID descriptors for certain devices Sasha Levin
2019-03-30 1:30 ` [PATCH AUTOSEL 4.9 08/21] ARM: samsung: Limit SAMSUNG_PM_CHECK config option to non-Exynos platforms Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.9 09/21] ACPI / SBS: Fix GPE storm on recent MacBookPro's Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.9 10/21] cifs: fallback to older infolevels on findfirst queryinfo retry Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.9 11/21] kernel: hung_task.c: disable on suspend Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.9 12/21] crypto: sha256/arm - fix crash bug in Thumb2 build Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.9 13/21] crypto: sha512/arm " Sasha Levin
[not found] ` <20190330013112.784-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2019-03-30 1:31 ` [PATCH AUTOSEL 4.9 14/21] iommu/dmar: Fix buffer overflow during PCI bus notification Sasha Levin
2019-03-30 1:31 ` Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.9 15/21] soc/tegra: pmc: Drop locking from tegra_powergate_is_powered() Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.9 16/21] ext4: prohibit fstrim in norecovery mode Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.9 17/21] lkdtm: Add tests for NULL pointer dereference Sasha Levin
2019-03-30 1:31 ` Sasha Levin [this message]
2019-03-30 1:31 ` [PATCH AUTOSEL 4.9 19/21] appletalk: Fix use-after-free in atalk_proc_exit Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.9 20/21] lib/div64.c: off by one in shift Sasha Levin
2019-03-30 1:31 ` [PATCH AUTOSEL 4.9 21/21] include/linux/swap.h: use offsetof() instead of custom __swapoffset macro Sasha Levin
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=20190330013112.784-18-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=bigeasy@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=stable@vger.kernel.org \
--cc=yang.shi@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.