Paths

Table of Contentst

-
sys/
-
dev/hwpmc/
-
hwpmc/
-
hwpmc_amd.c
-
hwpmc_arm64.c
-
hwpmc_core.c
-
hwpmc_mod.c
-
hwpmc_soft.c
-
hwpmc_tsc.c
-
hwpmc_uncore.c
-
sys/
-
pmc.h

hwpmc: pass pmc pointer to more class methods
ClosedPublic
Actions

Authored by mhorne on May 1 2023, 7:40 PM.

Details

Reviewers

jkoshy
gnn
luporl

Group Reviewers

pmc

Commits

rG1b7d148ed773: hwpmc: pass pmc pointer to more class methods
rG39f92a76a99a: hwpmc: pass pmc pointer to more class methods

Summary

In many cases this avoids an extra lookup, since the callers always have
pm at hand. We can also eliminate several assertions, mostly for pm !=
NULL. The class methods are an internal interface, and the callers
already handle such a scenario. No functional change intended.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 51290
Build 48181: arc lint + arc unit

Event Timeline

mhorne created this revision.May 1 2023, 7:40 PM

Herald added a reviewer: gnn. · View Herald TranscriptMay 1 2023, 7:40 PM

Herald added subscribers: andrew, imp. · View Herald Transcript

mhorne requested review of this revision.May 1 2023, 7:40 PM

mhorne added a parent revision: D39914: hwpmc: unused/diagused annotations in tsc class.

Harbormaster completed remote builds in B51290: Diff 121334.May 1 2023, 7:40 PM

Tinderbox points out that I didn't finish the change for a few platforms.

Update other classes; it now passes tinderbox.

Harbormaster completed remote builds in B51317: Diff 121404.May 2 2023, 5:54 PM

mhorne added a reviewer: luporl.May 2 2023, 5:55 PM

FYI, the pm_id field in a struct pmc contains the CPU and 'row index' for the PMC, so we could potentially drop the cpu and ri fields in a future change.

This revision is now accepted and ready to land.May 3 2023, 9:48 AM

Closed by commit rG39f92a76a99a: hwpmc: pass pmc pointer to more class methods (authored by mhorne). · Explain WhyMay 6 2023, 5:51 PM

This revision was automatically updated to reflect the committed changes.

mhorne added a commit: rG39f92a76a99a: hwpmc: pass pmc pointer to more class methods.

mhorne added a commit: rG1b7d148ed773: hwpmc: pass pmc pointer to more class methods.Jun 9 2023, 7:59 PM

Revision Contents
Changeset List

Path

Size

sys/

dev/

hwpmc/

39 lines

18 lines

62 lines

34 lines

41 lines

17 lines

62 lines

sys/

pmc.h

12 lines

Diff 121334

View Options

sys/dev/hwpmc/hwpmc_amd.c

Show First 20 Lines • Show All 391 Lines • ▼ Show 20 Lines

static struct amd_cpu **amd_pcpu;		static struct amd_cpu **amd_pcpu;

/*		/*
* read a pmc register		* read a pmc register
*/		*/

static int		static int
amd_read_pmc(int cpu, int ri, pmc_value_t *v)		amd_read_pmc(int cpu, int ri, struct pmc pm, pmc_value_t v)
{		{
enum pmc_mode mode;		enum pmc_mode mode;
const struct amd_descr *pd;		const struct amd_descr *pd;
struct pmc *pm;
pmc_value_t tmp;		pmc_value_t tmp;

KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),		KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[amd,%d] illegal CPU value %d", __LINE__, cpu));		("[amd,%d] illegal CPU value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < AMD_NPMCS,		KASSERT(ri >= 0 && ri < AMD_NPMCS,
("[amd,%d] illegal row-index %d", __LINE__, ri));		("[amd,%d] illegal row-index %d", __LINE__, ri));
KASSERT(amd_pcpu[cpu],		KASSERT(amd_pcpu[cpu],
("[amd,%d] null per-cpu, cpu %d", __LINE__, cpu));		("[amd,%d] null per-cpu, cpu %d", __LINE__, cpu));

pm = amd_pcpu[cpu]->pc_amdpmcs[ri].phw_pmc;
pd = &amd_pmcdesc[ri];		pd = &amd_pmcdesc[ri];

KASSERT(pm != NULL,
("[amd,%d] No owner for HWPMC [cpu%d,pmc%d]", __LINE__,
cpu, ri));

mode = PMC_TO_MODE(pm);		mode = PMC_TO_MODE(pm);

PMCDBG2(MDP,REA,1,"amd-read id=%d class=%d", ri, pd->pm_descr.pd_class);		PMCDBG2(MDP,REA,1,"amd-read id=%d class=%d", ri, pd->pm_descr.pd_class);

#ifdef HWPMC_DEBUG		#ifdef HWPMC_DEBUG
KASSERT(pd->pm_descr.pd_class == amd_pmc_class,		KASSERT(pd->pm_descr.pd_class == amd_pmc_class,
("[amd,%d] unknown PMC class (%d)", __LINE__,		("[amd,%d] unknown PMC class (%d)", __LINE__,
pd->pm_descr.pd_class));		pd->pm_descr.pd_class));
Show All 22 Lines	#endif
return 0;		return 0;
}		}

/*		/*
* Write a PMC MSR.		* Write a PMC MSR.
*/		*/

static int		static int
amd_write_pmc(int cpu, int ri, pmc_value_t v)		amd_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v)
{		{
const struct amd_descr *pd;		const struct amd_descr *pd;
enum pmc_mode mode;		enum pmc_mode mode;
struct pmc *pm;

KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),		KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[amd,%d] illegal CPU value %d", __LINE__, cpu));		("[amd,%d] illegal CPU value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < AMD_NPMCS,		KASSERT(ri >= 0 && ri < AMD_NPMCS,
("[amd,%d] illegal row-index %d", __LINE__, ri));		("[amd,%d] illegal row-index %d", __LINE__, ri));

pm = amd_pcpu[cpu]->pc_amdpmcs[ri].phw_pmc;
pd = &amd_pmcdesc[ri];		pd = &amd_pmcdesc[ri];

KASSERT(pm != NULL,
("[amd,%d] PMC not owned (cpu%d,pmc%d)", __LINE__,
cpu, ri));

mode = PMC_TO_MODE(pm);		mode = PMC_TO_MODE(pm);

#ifdef HWPMC_DEBUG		#ifdef HWPMC_DEBUG
KASSERT(pd->pm_descr.pd_class == amd_pmc_class,		KASSERT(pd->pm_descr.pd_class == amd_pmc_class,
("[amd,%d] unknown PMC class (%d)", __LINE__,		("[amd,%d] unknown PMC class (%d)", __LINE__,
pd->pm_descr.pd_class));		pd->pm_descr.pd_class));
#endif		#endif

▲ Show 20 Lines • Show All 215 Lines • ▼ Show 20 Lines	#endif
return 0;		return 0;
}		}

/*		/*
* start a PMC.		* start a PMC.
*/		*/

static int		static int
amd_start_pmc(int cpu, int ri)		amd_start_pmc(int cpu, int ri, struct pmc *pm)
{		{
uint64_t config;		uint64_t config;
struct pmc *pm;
struct pmc_hw *phw;
const struct amd_descr *pd;		const struct amd_descr *pd;

KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),		KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[amd,%d] illegal CPU value %d", __LINE__, cpu));		("[amd,%d] illegal CPU value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < AMD_NPMCS,		KASSERT(ri >= 0 && ri < AMD_NPMCS,
("[amd,%d] illegal row-index %d", __LINE__, ri));		("[amd,%d] illegal row-index %d", __LINE__, ri));

phw = &amd_pcpu[cpu]->pc_amdpmcs[ri];
pm = phw->phw_pmc;
pd = &amd_pmcdesc[ri];		pd = &amd_pmcdesc[ri];

KASSERT(pm != NULL,
("[amd,%d] starting cpu%d,pmc%d with null pmc record", __LINE__,
cpu, ri));

PMCDBG2(MDP,STA,1,"amd-start cpu=%d ri=%d", cpu, ri);		PMCDBG2(MDP,STA,1,"amd-start cpu=%d ri=%d", cpu, ri);

KASSERT(AMD_PMC_IS_STOPPED(pd->pm_evsel),		KASSERT(AMD_PMC_IS_STOPPED(pd->pm_evsel),
("[amd,%d] pmc%d,cpu%d: Starting active PMC \"%s\"", __LINE__,		("[amd,%d] pmc%d,cpu%d: Starting active PMC \"%s\"", __LINE__,
ri, cpu, pd->pm_descr.pd_name));		ri, cpu, pd->pm_descr.pd_name));

/* turn on the PMC ENABLE bit */		/* turn on the PMC ENABLE bit */
config = pm->pm_md.pm_amd.pm_amd_evsel \| AMD_PMC_ENABLE;		config = pm->pm_md.pm_amd.pm_amd_evsel \| AMD_PMC_ENABLE;

PMCDBG1(MDP,STA,2,"amd-start config=0x%x", config);		PMCDBG1(MDP,STA,2,"amd-start config=0x%x", config);

wrmsr(pd->pm_evsel, config);		wrmsr(pd->pm_evsel, config);
return 0;		return 0;
}		}

/*		/*
* Stop a PMC.		* Stop a PMC.
*/		*/

static int		static int
amd_stop_pmc(int cpu, int ri)		amd_stop_pmc(int cpu, int ri, struct pmc *pm)
{		{
struct pmc *pm;
struct pmc_hw *phw;
const struct amd_descr *pd;		const struct amd_descr *pd;
uint64_t config;		uint64_t config;
int i;		int i;

KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),		KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[amd,%d] illegal CPU value %d", __LINE__, cpu));		("[amd,%d] illegal CPU value %d", __LINE__, cpu));
KASSERT(ri >= 0 && ri < AMD_NPMCS,		KASSERT(ri >= 0 && ri < AMD_NPMCS,
("[amd,%d] illegal row-index %d", __LINE__, ri));		("[amd,%d] illegal row-index %d", __LINE__, ri));

phw = &amd_pcpu[cpu]->pc_amdpmcs[ri];
pm = phw->phw_pmc;
pd = &amd_pmcdesc[ri];		pd = &amd_pmcdesc[ri];

KASSERT(pm != NULL,
("[amd,%d] cpu%d,pmc%d no PMC to stop", __LINE__,
cpu, ri));
KASSERT(!AMD_PMC_IS_STOPPED(pd->pm_evsel),		KASSERT(!AMD_PMC_IS_STOPPED(pd->pm_evsel),
("[amd,%d] PMC%d, CPU%d \"%s\" already stopped",		("[amd,%d] PMC%d, CPU%d \"%s\" already stopped",
__LINE__, ri, cpu, pd->pm_descr.pd_name));		__LINE__, ri, cpu, pd->pm_descr.pd_name));

PMCDBG1(MDP,STO,1,"amd-stop ri=%d", ri);		PMCDBG1(MDP,STO,1,"amd-stop ri=%d", ri);

/* turn off the PMC ENABLE bit */		/* turn off the PMC ENABLE bit */
config = pm->pm_md.pm_amd.pm_amd_evsel & ~AMD_PMC_ENABLE;		config = pm->pm_md.pm_amd.pm_amd_evsel & ~AMD_PMC_ENABLE;
▲ Show 20 Lines • Show All 463 Lines • Show Last 20 Lines