From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>,
Ganesh Goudar <ganeshgr@linux.ibm.com>,
Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH v2 11/12] powerpc/64s: machine check do not trace real-mode handler
Date: Wed, 25 Mar 2020 20:34:09 +1000 [thread overview]
Message-ID: <20200325103410.157573-12-npiggin@gmail.com> (raw)
In-Reply-To: <20200325103410.157573-1-npiggin@gmail.com>
Rather than notrace annotations throughout a significant part of the
machine check code across kernel/ pseries/ and powernv/ which can
easily be broken and is infrequently tested, use paca->ftrace_enabled
to blanket-disable tracing of the real-mode non-maskable handler.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/kernel/mce.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/mce.c b/arch/powerpc/kernel/mce.c
index c1684be0d8b7..36e99adb8710 100644
--- a/arch/powerpc/kernel/mce.c
+++ b/arch/powerpc/kernel/mce.c
@@ -557,10 +557,13 @@ EXPORT_SYMBOL_GPL(machine_check_print_event_info);
*
* regs->nip and regs->msr contains srr0 and ssr1.
*/
-long machine_check_early(struct pt_regs *regs)
+long notrace machine_check_early(struct pt_regs *regs)
{
long handled = 0;
bool nested = in_nmi();
+ u8 ftrace_enabled = local_paca->ftrace_enabled;
+
+ local_paca->ftrace_enabled = 0;
if (!nested)
nmi_enter();
@@ -574,6 +577,7 @@ long machine_check_early(struct pt_regs *regs)
if (!nested)
nmi_exit();
+ local_paca->ftrace_enabled = ftrace_enabled;
return handled;
}
--
2.23.0
next prev parent reply other threads:[~2020-03-25 10:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 10:33 [PATCH v2 00/12] powerpc/64: machine check and system reset fixes Nicholas Piggin
2020-03-25 10:33 ` [PATCH v2 01/12] powerpc/64s/exceptions: Fix in_mce accounting in unrecoverable path Nicholas Piggin
2020-03-27 3:43 ` Mahesh J Salgaonkar
2020-03-25 10:34 ` [PATCH v2 02/12] powerpc/64s/exceptions: Change irq reconcile for NMIs from reusing _DAR to RESULT Nicholas Piggin
2020-03-25 10:34 ` [PATCH v2 03/12] powerpc/64s/exceptions: machine check reconcile irq state Nicholas Piggin
2020-03-25 10:34 ` [PATCH v2 04/12] powerpc/pseries/ras: avoid calling rtas_token in NMI paths Nicholas Piggin
2020-03-27 3:50 ` Mahesh J Salgaonkar
2020-03-25 10:34 ` [PATCH v2 05/12] powerpc/pseries/ras: FWNMI_VALID off by one Nicholas Piggin
2020-03-27 3:51 ` Mahesh J Salgaonkar
2020-03-25 10:34 ` [PATCH v2 06/12] powerpc/pseries/ras: fwnmi avoid modifying r3 in error case Nicholas Piggin
2020-03-25 10:34 ` [PATCH v2 07/12] powerpc/pseries/ras: fwnmi sreset should not interlock Nicholas Piggin
2020-03-25 10:34 ` [PATCH v2 08/12] powerpc/pseries: limit machine check stack to 4GB Nicholas Piggin
2020-03-27 5:24 ` Mahesh J Salgaonkar
2020-04-03 10:24 ` Nicholas Piggin
2020-03-25 10:34 ` [PATCH v2 09/12] powerpc/pseries: machine check use rtas_call_unlocked with args on stack Nicholas Piggin
2020-03-25 10:34 ` [PATCH v2 10/12] powerpc/64s: machine check interrupt update NMI accounting Nicholas Piggin
2020-03-25 10:34 ` Nicholas Piggin [this message]
2020-03-25 10:34 ` [PATCH v2 12/12] powerpc/64s: system reset do not trace Nicholas Piggin
2020-03-26 17:23 ` Naveen N. Rao
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=20200325103410.157573-12-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=ganeshgr@linux.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mahesh@linux.vnet.ibm.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).