From: David Arcari <darcari@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: David Arcari <darcari@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Peter Zijlstra <peterz@infradead.org>,
Andi Kleen <ak@linux.intel.com>,
Kan Liang <kan.liang@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Donald Zickus <dzickus@redhat.com>,
Prarit Bhargava <prarit@redhat.com>,
Jerry Hoemann <jerry.hoemann@hpe.com>
Subject: [PATCH] perf/x86: read the FREEZE_WHILE_SMM bit during boot
Date: Sun, 3 Jun 2018 14:23:43 -0400 [thread overview]
Message-ID: <1528050223-144925-1-git-send-email-darcari@redhat.com> (raw)
On some systems pressing the external NMI button is now failing to inject
an NMI 5-10% of the time. This causes confusion for a user that expects
the NMI to dump the system.
Commit 6089327f5424 ("perf/x86: Add sysfs entry to freeze counters on SMI")
does not read the firmware setting of the FREEZE_WHILE_SMM bit and will
always clear it when the PMU is initialized. As a result the performance
counters will always run and that greatly expands the race in which
external NMI will not be processed if a local NMI is already being
processed.
One option is to change default_do_nmi(). The code snippet below shows the
relevant portion of a patch that resolves the issue, but it is problematic
from a performance perspective and was dismissed.
-345,7 +345,17 @@ static void default_do_nmi(struct pt_regs *regs)
*/
if (handled > 1)
__this_cpu_write(swallow_nmi, true);
- return;
+
+ /*
+ * Unfortunately, there is a race condition which can
+ * result in a missing an external NMI. Typically, an
+ * external NMI is processed on cpu 0. Therefore, on
+ * cpu 0 check for an external NMI before returning.
+ */
+ if (smp_processor_id() ||
+ (x86_platform.get_nmi_reason() & NMI_REASON_MASK) == 0) {
+ return;
+ }
}
Ultimately, the issue can be resolved by storing the default firmware
setting of FREEZE_WHILE_SMM before initializing the PMU.
Fixes: 6089327f5424 ("perf/x86: Add sysfs entry to freeze counters on SMI")
Signed-off-by: David Arcari <darcari@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Donald Zickus <dzickus@redhat.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Jerry Hoemann <jerry.hoemann@hpe.com>
---
arch/x86/events/intel/core.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 707b2a9..fce98df 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -3325,6 +3325,18 @@ static void flip_smm_bit(void *data)
}
}
+static int read_smm_bit(void)
+{
+ u64 val;
+
+ if (!rdmsrl_safe(MSR_IA32_DEBUGCTLMSR, &val)) {
+ if (val & DEBUGCTLMSR_FREEZE_IN_SMM)
+ return 1;
+ }
+
+ return 0;
+}
+
static void intel_pmu_cpu_starting(int cpu)
{
struct cpu_hw_events *cpuc = &per_cpu(cpu_hw_events, cpu);
@@ -4423,6 +4435,8 @@ __init int intel_pmu_init(void)
pr_cont("full-width counters, ");
}
+ x86_pmu.attr_freeze_on_smi = read_smm_bit();
+
kfree(to_free);
return 0;
}
--
1.8.3.1
next reply other threads:[~2018-06-03 18:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-03 18:23 David Arcari [this message]
2018-06-04 8:24 ` Peter Zijlstra
2018-06-04 14:12 ` David Arcari
2018-06-11 17:57 ` David Arcari
2018-06-12 16:56 ` Peter Zijlstra
2018-06-18 19:14 ` David Arcari
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=1528050223-144925-1-git-send-email-darcari@redhat.com \
--to=darcari@redhat.com \
--cc=ak@linux.intel.com \
--cc=dzickus@redhat.com \
--cc=hpa@zytor.com \
--cc=jerry.hoemann@hpe.com \
--cc=jolsa@redhat.com \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=prarit@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@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
all inboxes | Powered by JetHome®