Module Name: src
Committed By: martin
Date: Fri Dec 23 08:09:48 UTC 2022
Modified Files:
src/sys/arch/aarch64/aarch64 [netbsd-10]: cpu.c
src/sys/arch/arm/arm [netbsd-10]: cpufunc.c
src/sys/arch/arm/arm32 [netbsd-10]: arm32_boot.c
src/sys/dev/tprof [netbsd-10]: tprof.c tprof_armv7.c tprof_armv8.c
Log Message:
Pull up following revision(s) (requested by ryo in ticket #20):
sys/arch/arm/arm/cpufunc.c: revision 1.185
sys/dev/tprof/tprof.c: revision 1.22
sys/arch/arm/arm32/arm32_boot.c: revision 1.45
sys/dev/tprof/tprof_armv8.c: revision 1.19
sys/dev/tprof/tprof_armv7.c: revision 1.12
sys/arch/aarch64/aarch64/cpu.c: revision 1.71
sys/arch/aarch64/aarch64/cpu.c: revision 1.72
tprof_lock is not a spin mutex. use mutex_{enter,exit}(). oops
Explicitly disable overflow interrupts before enabling the cycle counter.
PMCR_EL0.LC should be set. ARM deprecates use of PMCR_EL0.LC=0
Even if an overflow interrupt is occured for a counter outside tprof management,
the bit of onverflow status register must be cleared to prevent an interrupt
storm.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.70.4.1 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.184 -r1.184.4.1 src/sys/arch/arm/arm/cpufunc.c
cvs rdiff -u -r1.44 -r1.44.4.1 src/sys/arch/arm/arm32/arm32_boot.c
cvs rdiff -u -r1.21 -r1.21.2.1 src/sys/dev/tprof/tprof.c
cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/dev/tprof/tprof_armv7.c
cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/dev/tprof/tprof_armv8.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.70 src/sys/arch/aarch64/aarch64/cpu.c:1.70.4.1
--- src/sys/arch/aarch64/aarch64/cpu.c:1.70 Sun May 29 16:14:41 2022
+++ src/sys/arch/aarch64/aarch64/cpu.c Fri Dec 23 08:09:48 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.70 2022/05/29 16:14:41 ryo Exp $ */
+/* $NetBSD: cpu.c,v 1.70.4.1 2022/12/23 08:09:48 martin Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.70 2022/05/29 16:14:41 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.70.4.1 2022/12/23 08:09:48 martin Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -498,7 +498,8 @@ cpu_init_counter(struct cpu_info *ci)
return;
}
- reg_pmcr_el0_write(PMCR_E | PMCR_C);
+ reg_pmcr_el0_write(PMCR_E | PMCR_C | PMCR_LC);
+ reg_pmintenclr_el1_write(PMINTEN_C | PMINTEN_P);
reg_pmcntenset_el0_write(PMCNTEN_C);
const uint32_t prev = cpu_counter32();
Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.184 src/sys/arch/arm/arm/cpufunc.c:1.184.4.1
--- src/sys/arch/arm/arm/cpufunc.c:1.184 Mon May 16 07:07:17 2022
+++ src/sys/arch/arm/arm/cpufunc.c Fri Dec 23 08:09:48 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.184 2022/05/16 07:07:17 skrll Exp $ */
+/* $NetBSD: cpufunc.c,v 1.184.4.1 2022/12/23 08:09:48 martin Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.184 2022/05/16 07:07:17 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.184.4.1 2022/12/23 08:09:48 martin Exp $");
#include "opt_arm_start.h"
#include "opt_compat_netbsd.h"
@@ -1964,6 +1964,7 @@ set_cpufuncs(void)
* Start and reset the PMC Cycle Counter.
*/
armreg_pmcr_write(ARM11_PMCCTL_E | ARM11_PMCCTL_P | ARM11_PMCCTL_C);
+ armreg_pmintenclr_write(PMINTEN_C | PMINTEN_P);
armreg_pmcntenset_write(CORTEX_CNTENS_C);
return 0;
}
Index: src/sys/arch/arm/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.44 src/sys/arch/arm/arm32/arm32_boot.c:1.44.4.1
--- src/sys/arch/arm/arm32/arm32_boot.c:1.44 Sun Oct 31 16:23:47 2021
+++ src/sys/arch/arm/arm32/arm32_boot.c Fri Dec 23 08:09:48 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.44 2021/10/31 16:23:47 skrll Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.44.4.1 2022/12/23 08:09:48 martin Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.44 2021/10/31 16:23:47 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.44.4.1 2022/12/23 08:09:48 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_cputypes.h"
@@ -407,6 +407,7 @@ cpu_hatch(struct cpu_info *ci, u_int cpu
* Start and reset the PMC Cycle Counter.
*/
armreg_pmcr_write(ARM11_PMCCTL_E|ARM11_PMCCTL_P|ARM11_PMCCTL_C);
+ armreg_pmintenclr_write(PMINTEN_C | PMINTEN_P);
armreg_pmcntenset_write(CORTEX_CNTENS_C);
}
#endif
Index: src/sys/dev/tprof/tprof.c
diff -u src/sys/dev/tprof/tprof.c:1.21 src/sys/dev/tprof/tprof.c:1.21.2.1
--- src/sys/dev/tprof/tprof.c:1.21 Fri Dec 16 07:59:42 2022
+++ src/sys/dev/tprof/tprof.c Fri Dec 23 08:09:48 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof.c,v 1.21 2022/12/16 07:59:42 ryo Exp $ */
+/* $NetBSD: tprof.c,v 1.21.2.1 2022/12/23 08:09:48 martin Exp $ */
/*-
* Copyright (c)2008,2009,2010 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.21 2022/12/16 07:59:42 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.21.2.1 2022/12/23 08:09:48 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -885,9 +885,9 @@ tprof_poll(dev_t dev, int events, struct
static void
filt_tprof_read_detach(struct knote *kn)
{
- mutex_spin_enter(&tprof_lock);
+ mutex_enter(&tprof_lock);
selremove_knote(&tprof_selp, kn);
- mutex_spin_exit(&tprof_lock);
+ mutex_exit(&tprof_lock);
}
static int
@@ -896,7 +896,7 @@ filt_tprof_read_event(struct knote *kn,
int rv = 0;
if ((hint & NOTE_SUBMIT) == 0)
- mutex_spin_enter(&tprof_lock);
+ mutex_enter(&tprof_lock);
if (!STAILQ_EMPTY(&tprof_list)) {
tprof_buf_t *buf;
@@ -911,7 +911,7 @@ filt_tprof_read_event(struct knote *kn,
}
if ((hint & NOTE_SUBMIT) == 0)
- mutex_spin_exit(&tprof_lock);
+ mutex_exit(&tprof_lock);
return rv;
}
@@ -929,9 +929,9 @@ tprof_kqfilter(dev_t dev, struct knote *
switch (kn->kn_filter) {
case EVFILT_READ:
kn->kn_fop = &tprof_read_filtops;
- mutex_spin_enter(&tprof_lock);
+ mutex_enter(&tprof_lock);
selrecord_knote(&tprof_selp, kn);
- mutex_spin_exit(&tprof_lock);
+ mutex_exit(&tprof_lock);
break;
default:
return EINVAL;
Index: src/sys/dev/tprof/tprof_armv7.c
diff -u src/sys/dev/tprof/tprof_armv7.c:1.11 src/sys/dev/tprof/tprof_armv7.c:1.11.2.1
--- src/sys/dev/tprof/tprof_armv7.c:1.11 Sat Dec 3 20:24:21 2022
+++ src/sys/dev/tprof/tprof_armv7.c Fri Dec 23 08:09:48 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof_armv7.c,v 1.11 2022/12/03 20:24:21 ryo Exp $ */
+/* $NetBSD: tprof_armv7.c,v 1.11.2.1 2022/12/23 08:09:48 martin Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tprof_armv7.c,v 1.11 2022/12/03 20:24:21 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tprof_armv7.c,v 1.11.2.1 2022/12/23 08:09:48 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -225,7 +225,7 @@ armv7_pmu_intr(void *priv)
tprof_backend_softc_t *sc = pmu_intr_arg;
tprof_frame_info_t tfi;
int bit;
- const uint32_t pmovs = armreg_pmovsr_read() & PMOVS_P;
+ const uint32_t pmovs = armreg_pmovsr_read();
uint64_t *counters_offset =
percpu_getptr_remote(sc->sc_ctr_offset_percpu, curcpu());
@@ -248,7 +248,7 @@ armv7_pmu_intr(void *priv)
tfi.tfi_pc >= VM_MIN_KERNEL_ADDRESS &&
tfi.tfi_pc < VM_MAX_KERNEL_ADDRESS;
tprof_sample(NULL, &tfi);
- } else {
+ } else if (ISSET(sc->sc_ctr_ovf_mask, __BIT(bit))) {
/* counter has overflowed */
counters_offset[bit] += __BIT(32);
}
Index: src/sys/dev/tprof/tprof_armv8.c
diff -u src/sys/dev/tprof/tprof_armv8.c:1.18 src/sys/dev/tprof/tprof_armv8.c:1.18.2.1
--- src/sys/dev/tprof/tprof_armv8.c:1.18 Thu Dec 1 00:32:52 2022
+++ src/sys/dev/tprof/tprof_armv8.c Fri Dec 23 08:09:48 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof_armv8.c,v 1.18 2022/12/01 00:32:52 ryo Exp $ */
+/* $NetBSD: tprof_armv8.c,v 1.18.2.1 2022/12/23 08:09:48 martin Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tprof_armv8.c,v 1.18 2022/12/01 00:32:52 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tprof_armv8.c,v 1.18.2.1 2022/12/23 08:09:48 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -197,7 +197,7 @@ armv8_pmu_intr(void *priv)
tprof_backend_softc_t *sc = pmu_intr_arg;
tprof_frame_info_t tfi;
int bit;
- const uint32_t pmovs = reg_pmovsset_el0_read() & PMOVS_P;
+ const uint32_t pmovs = reg_pmovsset_el0_read();
uint64_t *counters_offset =
percpu_getptr_remote(sc->sc_ctr_offset_percpu, curcpu());
@@ -220,7 +220,7 @@ armv8_pmu_intr(void *priv)
tfi.tfi_pc >= VM_MIN_KERNEL_ADDRESS &&
tfi.tfi_pc < VM_MAX_KERNEL_ADDRESS;
tprof_sample(NULL, &tfi);
- } else {
+ } else if (ISSET(sc->sc_ctr_ovf_mask, __BIT(bit))) {
/* counter has overflowed */
counters_offset[bit] += __BIT(32);
}
