From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: kvm-ppc@vger.kernel.org, kvm@vger.kernel.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH v3 13/16] powerpc: Use the TRAP macro whenever comparing a trap number
Date: Thu, 11 Jan 2018 15:34:10 +1100 [thread overview]
Message-ID: <20180111043413.22655-13-benh@kernel.crashing.org> (raw)
In-Reply-To: <20180111043413.22655-1-benh@kernel.crashing.org>
Trap numbers can have extra bits at the bottom that need to
be filtered out. There are a few cases where we don't do that.
It's possible that we got lucky but better safe than sorry.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/kernel/process.c | 2 +-
arch/powerpc/kernel/traps.c | 2 +-
arch/powerpc/mm/fault.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 72be0c32e902..397d6e64e3df 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1409,7 +1409,7 @@ void show_regs(struct pt_regs * regs)
print_msr_bits(regs->msr);
pr_cont(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer);
trap = TRAP(regs);
- if ((regs->trap != 0xc00) && cpu_has_feature(CPU_FTR_CFAR))
+ if ((TRAP(regs) != 0xc00) && cpu_has_feature(CPU_FTR_CFAR))
pr_cont("CFAR: "REG" ", regs->orig_gpr3);
if (trap == 0x200 || trap == 0x300 || trap == 0x600)
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index f3eb61be0d30..d61989be28e1 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1564,7 +1564,7 @@ void facility_unavailable_exception(struct pt_regs *regs)
u8 status;
bool hv;
- hv = (regs->trap == 0xf80);
+ hv = (TRAP(regs) == 0xf80);
if (hv)
value = mfspr(SPRN_HFSCR);
else
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 6e1e39035380..7b15fe2ac986 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -576,7 +576,7 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
/* kernel has accessed a bad area */
- switch (regs->trap) {
+ switch (TRAP(regs)) {
case 0x300:
case 0x380:
printk(KERN_ALERT "Unable to handle kernel paging request for "
--
2.14.3
next prev parent reply other threads:[~2018-01-11 4:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-11 4:33 [PATCH v3 01/16] powerpc/xive: Remove incorrect debug code Benjamin Herrenschmidt
2018-01-11 4:33 ` [PATCH v3 02/16] powerpc: Remove DEBUG define in 64-bit early setup code Benjamin Herrenschmidt
2018-01-11 4:34 ` [PATCH v3 03/16] powerpc: Reduce log level of "OPAL detected !" message Benjamin Herrenschmidt
2018-01-11 4:34 ` [PATCH v3 04/16] powerpc/kvm/xive: Add more debugfs queues info Benjamin Herrenschmidt
2018-01-11 4:34 ` [PATCH v3 05/16] powerpc/kvm/xive: Enable use of the new "single escalation" feature Benjamin Herrenschmidt
2018-01-11 4:34 ` [PATCH v3 06/16] powerpc/kvm/xive: Don't use existing "prodded" flag for xive escalations Benjamin Herrenschmidt
2018-01-11 4:34 ` [PATCH v3 07/16] powerpc/kvm/xive: Check DR not IR to chose real vs virt mode MMIOs Benjamin Herrenschmidt
2018-01-11 4:34 ` [PATCH v3 08/16] powerpc/kvm/xive: Make xive_pushed a byte, not a word Benjamin Herrenschmidt
2018-01-11 4:34 ` [PATCH v3 09/16] powerpc/xive: Move definition of ESB bits Benjamin Herrenschmidt
2018-01-11 4:34 ` [PATCH v3 10/16] powerpc/xive: Add interrupt flag to disable automatic EOI Benjamin Herrenschmidt
2018-01-11 4:34 ` [PATCH v3 11/16] powerpc/kvm/xive: Keep escalation interrupt masked unless ceded Benjamin Herrenschmidt
2018-01-11 4:34 ` [PATCH v3 12/16] powerpc/kvm: Make "no_xive:" label local Benjamin Herrenschmidt
2018-01-11 4:34 ` Benjamin Herrenschmidt [this message]
2018-01-11 4:34 ` [PATCH v3 14/16] powerpc: Remove useless EXC_COMMON_HV Benjamin Herrenschmidt
2018-01-11 4:34 ` [PATCH v3 15/16] powerpc/kvm: Store the MMU mode in the PACA on KVM exit Benjamin Herrenschmidt
2018-01-11 4:34 ` [PATCH v3 16/16] powerpc/kvm: Use the PACA virt/real mode info instead of mfmsr Benjamin Herrenschmidt
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=20180111043413.22655-13-benh@kernel.crashing.org \
--to=benh@kernel.crashing.org \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox