linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Nicholas Piggin <npiggin@gmail.com>
To: kvm-ppc@vger.kernel.org
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>,
	linuxppc-dev@lists.ozlabs.org,
	Nicholas Piggin <npiggin@gmail.com>,
	Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Subject: [PATCH v2 20/60] powerpc/64s: Implement PMU override command line option
Date: Thu, 12 Aug 2021 02:00:54 +1000	[thread overview]
Message-ID: <20210811160134.904987-21-npiggin@gmail.com> (raw)
In-Reply-To: <20210811160134.904987-1-npiggin@gmail.com>

It can be useful in simulators (with very constrained environments)
to allow some PMCs to run from boot so they can be sampled directly
by a test harness, rather than having to run perf.

A previous change freezes counters at boot by default, so provide
a boot time option to un-freeze (plus a bit more flexibility).

Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 .../admin-guide/kernel-parameters.txt         |  8 +++++
 arch/powerpc/perf/core-book3s.c               | 35 +++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index bdb22006f713..f8ef1fc2ee9e 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4089,6 +4089,14 @@
 			Override pmtimer IOPort with a hex value.
 			e.g. pmtmr=0x508
 
+	pmu_override=	[PPC] Override the PMU.
+			This option takes over the PMU facility, so it is no
+			longer usable by perf. Setting this option starts the
+			PMU counters by setting MMCR0 to 0 (the FC bit is
+			cleared). If a number is given, then MMCR1 is set to
+			that number, otherwise (e.g., 'pmu_override=on'), MMCR1
+			remains 0.
+
 	pm_debug_messages	[SUSPEND,KNL]
 			Enable suspend/resume debug messages during boot up.
 
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index 65795cadb475..45d894d85966 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -2428,8 +2428,24 @@ int register_power_pmu(struct power_pmu *pmu)
 }
 
 #ifdef CONFIG_PPC64
+static bool pmu_override = false;
+static unsigned long pmu_override_val;
+static void do_pmu_override(void *data)
+{
+	ppc_set_pmu_inuse(1);
+	if (pmu_override_val)
+		mtspr(SPRN_MMCR1, pmu_override_val);
+	mtspr(SPRN_MMCR0, mfspr(SPRN_MMCR0) & ~MMCR0_FC);
+}
+
 static int __init init_ppc64_pmu(void)
 {
+	if (cpu_has_feature(CPU_FTR_HVMODE) && pmu_override) {
+		printk(KERN_WARNING "perf: disabling perf due to pmu_override= command line option.\n");
+		on_each_cpu(do_pmu_override, NULL, 1);
+		return 0;
+	}
+
 	/* run through all the pmu drivers one at a time */
 	if (!init_power5_pmu())
 		return 0;
@@ -2451,4 +2467,23 @@ static int __init init_ppc64_pmu(void)
 		return init_generic_compat_pmu();
 }
 early_initcall(init_ppc64_pmu);
+
+static int __init pmu_setup(char *str)
+{
+	unsigned long val;
+
+	if (!early_cpu_has_feature(CPU_FTR_HVMODE))
+		return 0;
+
+	pmu_override = true;
+
+	if (kstrtoul(str, 0, &val))
+		val = 0;
+
+	pmu_override_val = val;
+
+	return 1;
+}
+__setup("pmu_override=", pmu_setup);
+
 #endif
-- 
2.23.0


  parent reply	other threads:[~2021-08-11 16:15 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-11 16:00 [PATCH v2 00/60] KVM: PPC: Book3S HV P9: entry/exit optimisations Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 01/60] KVM: PPC: Book3S HV: Initialise vcpu MSR with MSR_ME Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 02/60] KVM: PPC: Book3S HV: Remove TM emulation from POWER7/8 path Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 03/60] KVM: PPC: Book3S HV P9: Fixes for TM softpatch interrupt NIP Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 04/60] KVM: PPC: Book3S HV Nested: Fix TM softpatch HFAC interrupt emulation Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 05/60] KVM: PPC: Book3S HV Nested: Sanitise vcpu registers Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 06/60] KVM: PPC: Book3S HV Nested: Make nested HFSCR state accessible Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 07/60] KVM: PPC: Book3S HV Nested: Stop forwarding all HFUs to L1 Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 08/60] KVM: PPC: Book3S HV Nested: save_hv_return_state does not require trap argument Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 09/60] KVM: PPC: Book3S HV Nested: Reflect guest PMU in-use to L0 when guest SPRs are live Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 10/60] powerpc/64s: Remove WORT SPR from POWER9/10 Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 11/60] KMV: PPC: Book3S HV P9: Use set_dec to set decrementer to host Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 12/60] KVM: PPC: Book3S HV P9: Use host timer accounting to avoid decrementer read Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 13/60] KVM: PPC: Book3S HV P9: Use large decrementer for HDEC Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 14/60] KVM: PPC: Book3S HV P9: Reduce mftb per guest entry/exit Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 15/60] powerpc/time: add API for KVM to re-arm the host timer/decrementer Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 16/60] KVM: PPC: Book3S HV: POWER10 enable HAIL when running radix guests Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 17/60] powerpc/64s: Keep AMOR SPR a constant ~0 at runtime Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 18/60] KVM: PPC: Book3S HV: Don't always save PMU for guest capable of nesting Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 19/60] powerpc/64s: Always set PMU control registers to frozen/disabled when not in use Nicholas Piggin
2021-08-11 16:00 ` Nicholas Piggin [this message]
2021-08-11 16:00 ` [PATCH v2 21/60] KVM: PPC: Book3S HV P9: Implement PMU save/restore in C Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 22/60] KVM: PPC: Book3S HV P9: Factor PMU save/load into context switch functions Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 23/60] KVM: PPC: Book3S HV P9: Demand fault PMU SPRs when marked not inuse Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 24/60] KVM: PPC: Book3S HV P9: Factor out yield_count increment Nicholas Piggin
2021-08-11 16:00 ` [PATCH v2 25/60] KVM: PPC: Book3S HV: CTRL SPR does not require read-modify-write Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 26/60] KVM: PPC: Book3S HV P9: Move SPRG restore to restore_p9_host_os_sprs Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 27/60] KVM: PPC: Book3S HV P9: Reduce mtmsrd instructions required to save host SPRs Nicholas Piggin
2021-08-11 19:18   ` kernel test robot
2021-08-11 19:49   ` kernel test robot
2021-08-11 16:01 ` [PATCH v2 28/60] KVM: PPC: Book3S HV P9: Improve mtmsrd scheduling by delaying MSR[EE] disable Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 29/60] KVM: PPC: Book3S HV P9: Add kvmppc_stop_thread to match kvmppc_start_thread Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 30/60] KVM: PPC: Book3S HV: Change dec_expires to be relative to guest timebase Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 31/60] KVM: PPC: Book3S HV P9: Move TB updates Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 32/60] KVM: PPC: Book3S HV P9: Optimise timebase reads Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 33/60] KVM: PPC: Book3S HV P9: Avoid SPR scoreboard stalls Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 34/60] KVM: PPC: Book3S HV P9: Only execute mtSPR if the value changed Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 35/60] KVM: PPC: Book3S HV P9: Juggle SPR switching around Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 36/60] KVM: PPC: Book3S HV P9: Move vcpu register save/restore into functions Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 37/60] KVM: PPC: Book3S HV P9: Move host OS save/restore functions to built-in Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 38/60] KVM: PPC: Book3S HV P9: Move nested guest entry into its own function Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 39/60] KVM: PPC: Book3S HV P9: Move remaining SPR and MSR access into low level entry Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 40/60] KVM: PPC: Book3S HV P9: Implement TM fastpath for guest entry/exit Nicholas Piggin
2021-08-11 20:40   ` kernel test robot
2021-08-11 16:01 ` [PATCH v2 41/60] KVM: PPC: Book3S HV P9: Switch PMU to guest as late as possible Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 42/60] KVM: PPC: Book3S HV P9: Restrict DSISR canary workaround to processors that require it Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 43/60] KVM: PPC: Book3S HV P9: More SPR speed improvements Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 44/60] KVM: PPC: Book3S HV P9: Demand fault EBB facility registers Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 45/60] KVM: PPC: Book3S HV P9: Demand fault TM " Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 46/60] KVM: PPC: Book3S HV P9: Use Linux SPR save/restore to manage some host SPRs Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 47/60] KVM: PPC: Book3S HV P9: Comment and fix MMU context switching code Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 48/60] KVM: PPC: Book3S HV P9: Test dawr_enabled() before saving host DAWR SPRs Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 49/60] KVM: PPC: Book3S HV P9: Don't restore PSSCR if not needed Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 50/60] KVM: PPC: Book3S HV P9: Avoid tlbsync sequence on radix guest exit Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 51/60] KVM: PPC: Book3S HV Nested: Avoid extra mftb() in nested entry Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 52/60] KVM: PPC: Book3S HV P9: Improve mfmsr performance on entry Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 53/60] KVM: PPC: Book3S HV P9: Optimise hash guest SLB saving Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 54/60] KVM: PPC: Book3S HV P9: Avoid changing MSR[RI] in entry and exit Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 55/60] KVM: PPC: Book3S HV P9: Add unlikely annotation for !mmu_ready Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 56/60] KVM: PPC: Book3S HV P9: Avoid cpu_in_guest atomics on entry and exit Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 57/60] KVM: PPC: Book3S HV P9: Remove most of the vcore logic Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 58/60] KVM: PPC: Book3S HV P9: Tidy kvmppc_create_dtl_entry Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 59/60] KVM: PPC: Book3S HV P9: Stop using vc->dpdes Nicholas Piggin
2021-08-11 16:01 ` [PATCH v2 60/60] KVM: PPC: Book3S HV P9: Remove subcore HMI handling Nicholas Piggin
2021-08-16  8:41 ` [PATCH v2 00/60] KVM: PPC: Book3S HV P9: entry/exit optimisations Athira Rajeev
2021-08-27 13:16 ` (subset) " Michael Ellerman

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=20210811160134.904987-21-npiggin@gmail.com \
    --to=npiggin@gmail.com \
    --cc=atrajeev@linux.vnet.ibm.com \
    --cc=kvm-ppc@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=maddy@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).