From: Balbir Singh <bsingharora@gmail.com>
To: mpe@ellerman.id.au, npiggin@gmail.com, mahesh@linux.vnet.ibm.com
Cc: linuxppc-dev@lists.ozlabs.org, Balbir Singh <bsingharora@gmail.com>
Subject: [PATCH v2 4/5] powerpc/mce: Hookup ierror (instruction) UE errors
Date: Wed, 13 Sep 2017 16:10:48 +1000 [thread overview]
Message-ID: <20170913061049.13256-5-bsingharora@gmail.com> (raw)
In-Reply-To: <20170913061049.13256-1-bsingharora@gmail.com>
Hookup instruction errors (UE) for memory offling via memory_failure()
in a manner similar to load/store errors (derror). Since we have access
to the NIP, the conversion is a one step process in this case.
Signed-off-by: Balbir Singh <bsingharora@gmail.com>
---
arch/powerpc/kernel/mce_power.c | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c
index 2dfbbe0..3bc9500 100644
--- a/arch/powerpc/kernel/mce_power.c
+++ b/arch/powerpc/kernel/mce_power.c
@@ -488,7 +488,8 @@ static int mce_find_instr_ea_and_pfn(struct pt_regs *regs, uint64_t *addr,
static int mce_handle_ierror(struct pt_regs *regs,
const struct mce_ierror_table table[],
- struct mce_error_info *mce_err, uint64_t *addr)
+ struct mce_error_info *mce_err, uint64_t *addr,
+ uint64_t *phys_addr)
{
uint64_t srr1 = regs->msr;
int handled = 0;
@@ -540,8 +541,23 @@ static int mce_handle_ierror(struct pt_regs *regs,
}
mce_err->severity = table[i].severity;
mce_err->initiator = table[i].initiator;
- if (table[i].nip_valid)
+ if (table[i].nip_valid) {
*addr = regs->nip;
+ if (mce_err->severity == MCE_SEV_ERROR_SYNC &&
+ table[i].error_type == MCE_ERROR_TYPE_UE) {
+ unsigned long pfn;
+ struct mm_struct *mm;
+
+ if (user_mode(regs))
+ mm = current->mm;
+ else
+ mm = &init_mm;
+
+ pfn = addr_to_pfn(mm, regs->nip);
+ if (pfn != ULONG_MAX)
+ *phys_addr = pfn;
+ }
+ }
return handled;
}
@@ -669,7 +685,8 @@ static long mce_handle_error(struct pt_regs *regs,
handled = mce_handle_derror(regs, dtable, &mce_err, &addr,
&phys_addr);
else
- handled = mce_handle_ierror(regs, itable, &mce_err, &addr);
+ handled = mce_handle_ierror(regs, itable, &mce_err, &addr,
+ &phys_addr);
if (!handled && mce_err.error_type == MCE_ERROR_TYPE_UE)
handled = mce_handle_ue_error(regs);
--
2.9.5
next prev parent reply other threads:[~2017-09-13 6:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-13 6:10 [PATCH v2 0/4] Revisit MCE handling for UE Errors Balbir Singh
2017-09-13 6:10 ` [PATCH v2 1/5] powerpc/mce.c: Remove unused function get_mce_fault_addr() Balbir Singh
2017-09-13 6:10 ` [PATCH v2 2/5] powerpc/mce: align the print of physical address better Balbir Singh
2017-09-13 6:10 ` [PATCH v2 3/5] powerpc/mce: Hookup derror (load/store) UE errors Balbir Singh
2017-09-13 6:21 ` Nicholas Piggin
2017-09-13 6:26 ` Balbir Singh
2017-09-13 8:56 ` Nicholas Piggin
2017-09-13 6:10 ` Balbir Singh [this message]
2017-09-13 6:10 ` [PATCH v2 5/5] powerpc/mce: hookup memory_failure for " Balbir Singh
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=20170913061049.13256-5-bsingharora@gmail.com \
--to=bsingharora@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mahesh@linux.vnet.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
/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 NNTP newsgroup(s).