From: "Luis Claudio R. Goncalves" <lgoncalv@redhat.com>
To: linux-rt-users <linux-rt-users@vger.kernel.org>,
stable-rt <stable-rt@vger.kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Daniel Wagner <daniel.wagner@suse.com>,
Tom Zanussi <tom.zanussi@linux.intel.com>,
Clark Williams <williams@redhat.com>,
Mark Gross <markgross@kernel.org>,
Jeff Brady <jeffreyjbrady@gmail.com>,
Wang Yong <wang.yong12@zte.com.cn>,
Xuexin Jiang <jiang.xuexin@zte.com.cn>,
Yang Yang <yang.yang29@zte.com.cn>,
Xiaokai Ran <ran.xiaokai@zte.com.cn>,
Luis Goncalves <lgoncalv@redhat.com>
Subject: [PATCH RT 1/2] arm64: signal: Use ARCH_RT_DELAYS_SIGNAL_SEND
Date: Thu, 14 Sep 2023 23:31:34 -0300 [thread overview]
Message-ID: <20230915023135.201399-2-lgoncalv@redhat.com> (raw)
In-Reply-To: <20230915023135.201399-1-lgoncalv@redhat.com>
From: Wang Yong <wang.yong12@zte.com.cn>
v5.10.194-rt95-rc1 stable review patch.
If anyone has any objections, please let me know.
-----------
The ltp test prompts the following bug information under the 5.10 kernel:
BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:969
in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 796, name: cat
Preemption disabled at:
[<ffffffe40f433980>] do_debug_exception+0x60/0x180
CPU: 3 PID: 796 Comm: cat Not tainted 5.10.59-rt52-KERNEL_VERSION #38
Hardware name: linux,dummy-virt (DT)
Call trace:
dump_backtrace+0x0/0x198
show_stack+0x20/0x30
dump_stack+0xf0/0x13c
___might_sleep+0x140/0x178
rt_spin_lock+0x30/0x90
force_sig_info_to_task+0x30/0xe0
force_sig_fault_to_task+0x54/0x78
force_sig_fault+0x1c/0x28
arm64_force_sig_fault+0x48/0x78
send_user_sigtrap+0x4c/0x80
brk_handler+0x3c/0x68
do_debug_exception+0xac/0x180
el0_dbg+0x34/0x58
el0_sync_handler+0x50/0xb8
el0_sync+0x180/0x1c0
It has been fixed by
0c34700de5e7 ("arm64: signal: Use ARCH_RT_DELAYS_SIGNAL_SEND.") in
higher versions of the kernel. This patch needs to be compatible with 5.10.
5.10 kernel does not have signal.h file, so adding signal.h file to
define ARCH_RT_DELAYS_SIGNAL_SEND.
Link: https://lore.kernel.org/r/202309121514283793475@zte.com.cn
Signed-off-by: Wang Yong <wang.yong12@zte.com.cn>
Cc: Xuexin Jiang <jiang.xuexin@zte.com.cn>
Cc: Yang Yang <yang.yang29@zte.com.cn>
Cc: Xiaokai Ran <ran.xiaokai@zte.com.cn>
Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
---
arch/arm64/include/asm/signal.h | 12 ++++++++++++
arch/arm64/kernel/signal.c | 9 +++++++++
2 files changed, 21 insertions(+)
create mode 100644 arch/arm64/include/asm/signal.h
diff --git a/arch/arm64/include/asm/signal.h b/arch/arm64/include/asm/signal.h
new file mode 100644
index 000000000000..0fb418cf4c17
--- /dev/null
+++ b/arch/arm64/include/asm/signal.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __ARM64_ASM_SIGNAL_H
+#define __ARM64_ASM_SIGNAL_H
+
+#include <uapi/asm/signal.h>
+#include <uapi/asm/siginfo.h>
+
+#if defined(CONFIG_PREEMPT_RT)
+#define ARCH_RT_DELAYS_SIGNAL_SEND
+#endif
+
+#endif
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index 94eed0dc3afc..5b08f55ec85d 100644
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -929,6 +929,15 @@ asmlinkage void do_notify_resume(struct pt_regs *regs,
} else {
local_daif_restore(DAIF_PROCCTX);
+#ifdef ARCH_RT_DELAYS_SIGNAL_SEND
+ if (unlikely(current->forced_info.si_signo)) {
+ struct task_struct *t = current;
+
+ force_sig_info(&t->forced_info);
+ t->forced_info.si_signo = 0;
+ }
+#endif
+
if (thread_flags & _TIF_UPROBE)
uprobe_notify_resume(regs);
--
2.41.0
next prev parent reply other threads:[~2023-09-15 2:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-15 2:31 [PATCH RT 0/2] Linux v5.10.194-rt95-rc1 Luis Claudio R. Goncalves
2023-09-15 2:31 ` Luis Claudio R. Goncalves [this message]
2023-09-15 2:31 ` [PATCH RT 2/2] Linux 5.10.194-rt95-rc1 Luis Claudio R. Goncalves
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=20230915023135.201399-2-lgoncalv@redhat.com \
--to=lgoncalv@redhat.com \
--cc=C.Emde@osadl.org \
--cc=bigeasy@linutronix.de \
--cc=daniel.wagner@suse.com \
--cc=jeffreyjbrady@gmail.com \
--cc=jiang.xuexin@zte.com.cn \
--cc=linux-rt-users@vger.kernel.org \
--cc=markgross@kernel.org \
--cc=ran.xiaokai@zte.com.cn \
--cc=rostedt@goodmis.org \
--cc=stable-rt@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tom.zanussi@linux.intel.com \
--cc=wang.yong12@zte.com.cn \
--cc=williams@redhat.com \
--cc=yang.yang29@zte.com.cn \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).