Nicholas Piggin
411b38fe68
powerpc/64s: fix program check interrupt emergency stack path
[ Upstream commit 3e607dc4df180b72a38e75030cb0f94d12808712 ]
Emergency stack path was jumping into a 3: label inside the
__GEN_COMMON_BODY macro for the normal path after it had finished,
rather than jumping over it. By a small miracle this is the correct
place to build up a new interrupt frame with the existing stack
pointer, so things basically worked okay with an added weird looking
700 trap frame on top (which had the wrong ->nip so it didn't decode
bug messages either).
Fix this by avoiding using numeric labels when jumping over non-trivial
macros.
Before:
LE PAGE_SIZE=64K MMU=Radix SMP NR_CPUS=2048 NUMA PowerNV
Modules linked in:
CPU: 0 PID: 88 Comm: sh Not tainted 5.15.0-rc2-00034-ge057cdade6e5 #2637
NIP: 7265677368657265 LR: c00000000006c0c8 CTR: c0000000000097f0
REGS: c0000000fffb3a50 TRAP: 0700 Not tainted
MSR: 9000000000021031 <SF,HV,ME,IR,DR,LE> CR: 00000700 XER: 20040000
CFAR: c0000000000098b0 IRQMASK: 0
GPR00: c00000000006c964 c0000000fffb3cf0 c000000001513800 0000000000000000
GPR04: 0000000048ab0778 0000000042000000 0000000000000000 0000000000001299
GPR08: 000001e447c718ec 0000000022424282 0000000000002710 c00000000006bee8
GPR12: 9000000000009033 c0000000016b0000 00000000000000b0 0000000000000001
GPR16: 0000000000000000 0000000000000002 0000000000000000 0000000000000ff8
GPR20: 0000000000001fff 0000000000000007 0000000000000080 00007fff89d90158
GPR24: 0000000002000000 0000000002000000 0000000000000255 0000000000000300
GPR28: c000000001270000 0000000042000000 0000000048ab0778 c000000080647e80
NIP [7265677368657265] 0x7265677368657265
LR [c00000000006c0c8] ___do_page_fault+0x3f8/0xb10
Call Trace:
[c0000000fffb3cf0] [c00000000000bdac] soft_nmi_common+0x13c/0x1d0 (unreliable)
--- interrupt: 700 at decrementer_common_virt+0xb8/0x230
NIP: c0000000000098b8 LR: c00000000006c0c8 CTR: c0000000000097f0
REGS: c0000000fffb3d60 TRAP: 0700 Not tainted
MSR: 9000000000021031 <SF,HV,ME,IR,DR,LE> CR: 22424282 XER: 20040000
CFAR: c0000000000098b0 IRQMASK: 0
GPR00: c00000000006c964 0000000000002400 c000000001513800 0000000000000000
GPR04: 0000000048ab0778 0000000042000000 0000000000000000 0000000000001299
GPR08: 000001e447c718ec 0000000022424282 0000000000002710 c00000000006bee8
GPR12: 9000000000009033 c0000000016b0000 00000000000000b0 0000000000000001
GPR16: 0000000000000000 0000000000000002 0000000000000000 0000000000000ff8
GPR20: 0000000000001fff 0000000000000007 0000000000000080 00007fff89d90158
GPR24: 0000000002000000 0000000002000000 0000000000000255 0000000000000300
GPR28: c000000001270000 0000000042000000 0000000048ab0778 c000000080647e80
NIP [c0000000000098b8] decrementer_common_virt+0xb8/0x230
LR [c00000000006c0c8] ___do_page_fault+0x3f8/0xb10
--- interrupt: 700
Instruction dump:
XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX
XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX
---[ end trace 6d28218e0cc3c949 ]---
After:
------------[ cut here ]------------
kernel BUG at arch/powerpc/kernel/exceptions-64s.S:491!
Oops: Exception in kernel mode, sig: 5 [#1]
LE PAGE_SIZE=64K MMU=Radix SMP NR_CPUS=2048 NUMA PowerNV
Modules linked in:
CPU: 0 PID: 88 Comm: login Not tainted 5.15.0-rc2-00034-ge057cdade6e5-dirty #2638
NIP: c0000000000098b8 LR: c00000000006bf04 CTR: c0000000000097f0
REGS: c0000000fffb3d60 TRAP: 0700 Not tainted
MSR: 9000000000021031 <SF,HV,ME,IR,DR,LE> CR: 24482227 XER: 00040000
CFAR: c0000000000098b0 IRQMASK: 0
GPR00: c00000000006bf04 0000000000002400 c000000001513800 c000000001271868
GPR04: 00000000100f0d29 0000000042000000 0000000000000007 0000000000000009
GPR08: 00000000100f0d29 0000000024482227 0000000000002710 c000000000181b3c
GPR12: 9000000000009033 c0000000016b0000 00000000100f0d29 c000000005b22f00
GPR16: 00000000ffff0000 0000000000000001 0000000000000009 00000000100eed90
GPR20: 00000000100eed90 0000000010000000 000000001000a49c 00000000100f1430
GPR24: c000000001271868 0000000002000000 0000000000000215 0000000000000300
GPR28: c000000001271800 0000000042000000 00000000100f0d29 c000000080647860
NIP [c0000000000098b8] decrementer_common_virt+0xb8/0x230
LR [c00000000006bf04] ___do_page_fault+0x234/0xb10
Call Trace:
Instruction dump:
4182000c 39400001 48000008 894d0932 714a0001 39400008 408225fc 718a4000
7c2a0b78 3821fcf0 41c20008 e82d0910 <0981fcf0> f92101a0 f9610170 f9810178
---[ end trace a5dbd1f5ea4ccc51 ]---
Fixes: 0a882e2846
("powerpc/64s/exception: remove bad stack branch")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211004145642.1331214-2-npiggin@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
2021-10-13 10:04:30 +02:00
..
2020-09-15 22:13:20 +10:00
2020-10-18 09:27:10 -07:00
2020-07-23 17:41:36 +10:00
2020-10-22 13:13:57 -07:00
2021-02-13 13:55:02 +01:00
2020-03-25 11:50:48 +01:00
2020-07-29 21:09:37 +10:00
2021-03-17 17:06:24 +01:00
2017-11-02 11:10:55 +01:00
2020-10-25 14:51:49 -07:00
2020-07-30 22:53:48 +10:00
2019-06-15 16:52:06 +10:00
2017-11-02 11:10:55 +01:00
2020-06-02 20:59:11 +10:00
2019-05-30 11:26:32 -07:00
2019-11-17 01:56:31 -06:00
2019-06-05 17:37:06 +02:00
2020-07-26 23:34:23 +10:00
2019-05-30 11:26:32 -07:00
2020-10-20 23:33:51 +11:00
2020-05-19 00:10:39 +10:00
2020-07-26 23:34:19 +10:00
2020-07-29 21:02:09 +10:00
2021-10-13 10:04:29 +02:00
2019-02-18 22:41:03 +11:00
2019-05-30 11:26:32 -07:00
2020-10-06 23:22:22 +11:00
2019-11-13 19:27:40 +11:00
2020-11-02 12:54:20 +11:00
2020-08-07 18:48:15 -07:00
2019-09-14 00:01:14 +10:00
2020-10-07 22:34:47 +11:00
2020-07-26 23:34:20 +10:00
2021-05-11 14:47:35 +02:00
2021-03-04 11:38:40 +01:00
2021-01-27 11:55:12 +01:00
2019-05-30 11:26:32 -07:00
2020-05-19 00:10:37 +10:00
2020-10-06 23:22:23 +11:00
2021-10-13 10:04:30 +02:00
2021-05-14 09:50:30 +02:00
2020-07-29 21:02:10 +10:00
2020-10-08 21:17:13 +11:00
2019-11-13 19:27:40 +11:00
2021-03-04 11:38:05 +01:00
2021-05-19 10:12:54 +02:00
2020-11-05 23:34:16 +11:00
2020-06-09 09:39:13 -07:00
2020-12-30 11:53:32 +01:00
2021-03-17 17:06:13 +01:00
2020-10-08 21:17:12 +11:00
2020-06-09 09:39:13 -07:00
2020-09-15 22:13:19 +10:00
2020-09-15 22:13:19 +10:00
2020-06-02 20:59:11 +10:00
2019-05-30 11:26:32 -07:00
2020-01-16 14:59:37 +10:00
2020-06-02 20:59:11 +10:00
2020-11-24 16:47:35 +01:00
2020-05-07 17:25:54 +10:00
2020-06-09 09:39:13 -07:00
2019-05-30 11:26:32 -07:00
2020-08-14 19:56:57 -07:00
2021-05-19 10:12:58 +02:00
2021-03-04 11:38:06 +01:00
2020-06-02 10:59:10 -07:00
2020-05-19 00:10:37 +10:00
2020-06-18 12:10:37 -07:00
2019-05-30 11:26:35 -07:00
2021-08-18 08:59:14 +02:00
2019-09-14 00:04:40 +10:00
2019-09-14 00:04:40 +10:00
2020-10-08 21:17:13 +11:00
2019-12-18 15:04:42 +01:00
2020-12-30 11:53:15 +01:00
2021-07-14 16:56:48 +02:00
2020-10-16 20:13:55 +11:00
2020-09-02 11:00:21 +10:00
2020-10-08 21:17:12 +11:00
2020-06-02 20:59:11 +10:00
2020-05-11 23:15:14 +10:00
2020-06-17 10:57:41 -07:00
2020-07-27 00:01:30 +10:00
2019-05-30 11:26:32 -07:00
2019-08-30 09:40:15 +10:00
2020-06-05 12:39:30 -07:00
2020-07-26 23:34:19 +10:00
2020-05-19 00:10:39 +10:00
2020-05-26 23:36:57 +10:00
2020-12-30 11:53:15 +01:00
2019-08-22 23:11:48 +10:00
2020-06-05 12:39:30 -07:00
2020-07-26 23:34:21 +10:00
2020-01-06 16:25:29 +11:00
2021-03-17 17:06:23 +01:00
2020-05-18 21:58:44 +10:00
2019-05-30 11:26:32 -07:00
2019-05-30 11:26:32 -07:00
2020-04-04 21:40:57 +11:00
2020-02-04 03:05:26 +00:00
2021-07-14 16:56:49 +02:00
2019-10-29 15:12:17 +11:00
2021-03-04 11:38:35 +01:00
2017-11-02 11:10:55 +01:00
2021-05-14 09:50:30 +02:00
2019-05-30 11:26:32 -07:00
2019-05-30 11:26:32 -07:00
2020-02-04 03:05:26 +00:00
2020-06-09 09:39:13 -07:00
2020-02-04 03:05:26 +00:00
2018-06-03 20:43:33 +10:00
2020-12-30 11:54:15 +01:00
2020-07-16 13:12:38 +10:00
2020-07-16 14:49:53 +10:00
2020-10-08 12:50:52 +11:00
2019-11-13 00:33:22 +11:00
2019-11-13 00:33:22 +11:00
2021-05-19 10:12:54 +02:00
2021-05-26 12:06:50 +02:00
2020-12-30 11:53:01 +01:00
2020-12-30 11:53:15 +01:00
2020-07-15 12:04:40 +10:00
2020-07-15 12:04:40 +10:00
2020-10-23 10:06:38 -07:00
2020-04-01 13:42:13 +11:00
2017-11-02 11:10:55 +01:00
2021-09-18 13:40:15 +02:00
2021-09-18 13:40:12 +02:00
2019-06-14 10:48:56 +02:00
2020-06-02 20:59:11 +10:00
2019-06-19 17:11:22 +02:00
2019-06-19 17:11:22 +02:00
2017-11-02 11:10:55 +01:00
2019-05-30 11:26:32 -07:00
2019-05-30 11:26:32 -07:00
2020-11-19 23:47:20 +11:00
2019-11-15 14:38:29 +01:00
2021-08-18 08:59:17 +02:00
2019-05-30 11:26:32 -07:00
2020-04-01 13:42:13 +11:00
2020-09-15 22:13:30 +10:00
2021-03-04 11:38:01 +01:00
2020-10-06 23:22:25 +11:00
2021-03-17 17:06:23 +01:00
2019-08-30 09:40:15 +10:00
2019-05-30 11:26:32 -07:00
2019-10-11 19:33:25 +11:00
2020-05-26 23:36:51 +10:00
2021-02-13 13:55:02 +01:00
2020-05-19 00:10:37 +10:00
2020-07-16 13:00:24 +10:00
2021-01-27 11:55:12 +01:00
2019-04-30 11:31:02 +10:00