| Message ID | 20240711102436.4432-9-Dhananjay.Ugwekar@amd.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add per-core RAPL energy counter support for AMD CPUs | expand |
On Thu, 2024-07-11 at 10:24 +0000, Dhananjay Ugwekar wrote: > Prep for addition of power_per_core PMU to handle core scope energy > consumption for AMD CPUs. > > Replace the generic names with *_pkg*, to differentiate between the > scopes of the two different PMUs and their variables. > > No functional change. > > Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com> Reviewed-by: Zhang Rui <rui.zhang@intel.com> -rui > --- > Changes in v4: > * Move some renaming code from patch 10 to here (Rui) > --- > arch/x86/events/rapl.c | 113 +++++++++++++++++++++------------------ > -- > 1 file changed, 57 insertions(+), 56 deletions(-) > > diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c > index 362e82284ccb..9beded3d4a14 100644 > --- a/arch/x86/events/rapl.c > +++ b/arch/x86/events/rapl.c > @@ -70,18 +70,18 @@ MODULE_LICENSE("GPL"); > /* > * RAPL energy status counters > */ > -enum perf_rapl_events { > +enum perf_rapl_pkg_events { > PERF_RAPL_PP0 = 0, /* all cores */ > PERF_RAPL_PKG, /* entire package */ > PERF_RAPL_RAM, /* DRAM */ > PERF_RAPL_PP1, /* gpu */ > PERF_RAPL_PSYS, /* psys */ > > - PERF_RAPL_MAX, > - NR_RAPL_DOMAINS = PERF_RAPL_MAX, > + PERF_RAPL_PKG_EVENTS_MAX, > + NR_RAPL_PKG_DOMAINS = PERF_RAPL_PKG_EVENTS_MAX, > }; > > -static const char *const rapl_domain_names[NR_RAPL_DOMAINS] > __initconst = { > +static const char *const rapl_pkg_domain_names[NR_RAPL_PKG_DOMAINS] > __initconst = { > "pp0-core", > "package", > "dram", > @@ -134,16 +134,16 @@ enum rapl_unit_quirk { > }; > > struct rapl_model { > - struct perf_msr *rapl_msrs; > - unsigned long events; > + struct perf_msr *rapl_pkg_msrs; > + unsigned long pkg_events; > unsigned int msr_power_unit; > enum rapl_unit_quirk unit_quirk; > }; > > /* 1/2^hw_unit Joule */ > -static int rapl_hw_unit[NR_RAPL_DOMAINS] __read_mostly; > -static struct rapl_pmus *rapl_pmus; > -static unsigned int rapl_cntr_mask; > +static int rapl_pkg_hw_unit[NR_RAPL_PKG_DOMAINS] __read_mostly; > +static struct rapl_pmus *rapl_pmus_pkg; > +static unsigned int rapl_pkg_cntr_mask; > static u64 rapl_timer_ms; > static struct perf_msr *rapl_msrs; > static struct rapl_model *rapl_model; > @@ -172,7 +172,8 @@ static inline struct rapl_pmu > *cpu_to_rapl_pmu(unsigned int cpu) > * The unsigned check also catches the '-1' return value for > non > * existent mappings in the topology map. > */ > - return rapl_pmu_idx < rapl_pmus->nr_rapl_pmu ? rapl_pmus- > >rapl_pmu[rapl_pmu_idx] : NULL; > + return rapl_pmu_idx < rapl_pmus_pkg->nr_rapl_pmu ? > + rapl_pmus_pkg->rapl_pmu[rapl_pmu_idx] : NULL; > } > > static inline u64 rapl_read_counter(struct perf_event *event) > @@ -184,7 +185,7 @@ static inline u64 rapl_read_counter(struct > perf_event *event) > > static inline u64 rapl_scale(u64 v, int cfg) > { > - if (cfg > NR_RAPL_DOMAINS) { > + if (cfg > NR_RAPL_PKG_DOMAINS) { > pr_warn("Invalid domain %d, failed to scale data\n", > cfg); > return v; > } > @@ -194,7 +195,7 @@ static inline u64 rapl_scale(u64 v, int cfg) > * or use ldexp(count, -32). > * Watts = Joules/Time delta > */ > - return v << (32 - rapl_hw_unit[cfg - 1]); > + return v << (32 - rapl_pkg_hw_unit[cfg - 1]); > } > > static u64 rapl_event_update(struct perf_event *event) > @@ -354,7 +355,7 @@ static int rapl_pmu_event_init(struct perf_event > *event) > struct rapl_pmu *rapl_pmu; > > /* only look at RAPL events */ > - if (event->attr.type != rapl_pmus->pmu.type) > + if (event->attr.type != rapl_pmus_pkg->pmu.type) > return -ENOENT; > > /* check only supported bits are set */ > @@ -366,14 +367,14 @@ static int rapl_pmu_event_init(struct > perf_event *event) > > event->event_caps |= PERF_EV_CAP_READ_ACTIVE_PKG; > > - if (!cfg || cfg >= NR_RAPL_DOMAINS + 1) > + if (!cfg || cfg >= NR_RAPL_PKG_DOMAINS + 1) > return -EINVAL; > > - cfg = array_index_nospec((long)cfg, NR_RAPL_DOMAINS + 1); > + cfg = array_index_nospec((long)cfg, NR_RAPL_PKG_DOMAINS + 1); > bit = cfg - 1; > > /* check event supported */ > - if (!(rapl_cntr_mask & (1 << bit))) > + if (!(rapl_pkg_cntr_mask & (1 << bit))) > return -EINVAL; > > /* unsupported modes and filters */ > @@ -401,7 +402,7 @@ static void rapl_pmu_event_read(struct perf_event > *event) > static ssize_t rapl_get_attr_cpumask(struct device *dev, > struct device_attribute *attr, char > *buf) > { > - return cpumap_print_to_pagebuf(true, buf, rapl_pmus- > >cpumask); > + return cpumap_print_to_pagebuf(true, buf, rapl_pmus_pkg- > >cpumask); > } > > static DEVICE_ATTR(cpumask, S_IRUGO, rapl_get_attr_cpumask, NULL); > @@ -553,11 +554,11 @@ static struct perf_msr intel_rapl_spr_msrs[] = > { > }; > > /* > - * Force to PERF_RAPL_MAX size due to: > - * - perf_msr_probe(PERF_RAPL_MAX) > + * Force to PERF_RAPL_PKG_EVENTS_MAX size due to: > + * - perf_msr_probe(PERF_RAPL_PKG_EVENTS_MAX) > * - want to use same event codes across both architectures > */ > -static struct perf_msr amd_rapl_msrs[] = { > +static struct perf_msr amd_rapl_pkg_msrs[] = { > [PERF_RAPL_PP0] = { 0, &rapl_events_cores_group, NULL, > false, 0 }, > [PERF_RAPL_PKG] = { MSR_AMD_PKG_ENERGY_STATUS, > &rapl_events_pkg_group, test_msr, false, RAPL_MSR_MASK }, > [PERF_RAPL_RAM] = { 0, &rapl_events_ram_group, NULL, > false, 0 }, > @@ -590,7 +591,7 @@ static int __rapl_cpu_offline(struct rapl_pmus > *rapl_pmus, unsigned int rapl_pmu > > static int rapl_cpu_offline(unsigned int cpu) > { > - return __rapl_cpu_offline(rapl_pmus, get_rapl_pmu_idx(cpu), > + return __rapl_cpu_offline(rapl_pmus_pkg, > get_rapl_pmu_idx(cpu), > get_rapl_pmu_cpumask(cpu), cpu); > } > > @@ -629,7 +630,7 @@ static int __rapl_cpu_online(struct rapl_pmus > *rapl_pmus, unsigned int rapl_pmu_ > > static int rapl_cpu_online(unsigned int cpu) > { > - return __rapl_cpu_online(rapl_pmus, get_rapl_pmu_idx(cpu), > + return __rapl_cpu_online(rapl_pmus_pkg, > get_rapl_pmu_idx(cpu), > get_rapl_pmu_cpumask(cpu), cpu); > } > > @@ -642,8 +643,8 @@ static int rapl_check_hw_unit(void) > /* protect rdmsrl() to handle virtualization */ > if (rdmsrl_safe(rapl_model->msr_power_unit, > &msr_rapl_power_unit_bits)) > return -1; > - for (i = 0; i < NR_RAPL_DOMAINS; i++) > - rapl_hw_unit[i] = (msr_rapl_power_unit_bits >> 8) & > 0x1FULL; > + for (i = 0; i < NR_RAPL_PKG_DOMAINS; i++) > + rapl_pkg_hw_unit[i] = (msr_rapl_power_unit_bits >> 8) > & 0x1FULL; > > switch (rapl_model->unit_quirk) { > /* > @@ -653,11 +654,11 @@ static int rapl_check_hw_unit(void) > * of 2. Datasheet, September 2014, Reference Number: 330784- > 001 " > */ > case RAPL_UNIT_QUIRK_INTEL_HSW: > - rapl_hw_unit[PERF_RAPL_RAM] = 16; > + rapl_pkg_hw_unit[PERF_RAPL_RAM] = 16; > break; > /* SPR uses a fixed energy unit for Psys domain. */ > case RAPL_UNIT_QUIRK_INTEL_SPR: > - rapl_hw_unit[PERF_RAPL_PSYS] = 0; > + rapl_pkg_hw_unit[PERF_RAPL_PSYS] = 0; > break; > default: > break; > @@ -672,9 +673,9 @@ static int rapl_check_hw_unit(void) > * if hw unit is 32, then we use 2 ms 1/200/2 > */ > rapl_timer_ms = 2; > - if (rapl_hw_unit[0] < 32) { > + if (rapl_pkg_hw_unit[0] < 32) { > rapl_timer_ms = (1000 / (2 * 100)); > - rapl_timer_ms *= (1ULL << (32 - rapl_hw_unit[0] - > 1)); > + rapl_timer_ms *= (1ULL << (32 - rapl_pkg_hw_unit[0] - > 1)); > } > return 0; > } > @@ -684,12 +685,12 @@ static void __init rapl_advertise(void) > int i; > > pr_info("API unit is 2^-32 Joules, %d fixed counters, %llu ms > ovfl timer\n", > - hweight32(rapl_cntr_mask), rapl_timer_ms); > + hweight32(rapl_pkg_cntr_mask), rapl_timer_ms); > > - for (i = 0; i < NR_RAPL_DOMAINS; i++) { > - if (rapl_cntr_mask & (1 << i)) { > + for (i = 0; i < NR_RAPL_PKG_DOMAINS; i++) { > + if (rapl_pkg_cntr_mask & (1 << i)) { > pr_info("hw unit of domain %s 2^-%d > Joules\n", > - rapl_domain_names[i], > rapl_hw_unit[i]); > + rapl_pkg_domain_names[i], > rapl_pkg_hw_unit[i]); > } > } > } > @@ -746,71 +747,71 @@ static int __init init_rapl_pmus(struct > rapl_pmus **rapl_pmus_ptr) > } > > static struct rapl_model model_snb = { > - .events = BIT(PERF_RAPL_PP0) | > + .pkg_events = BIT(PERF_RAPL_PP0) | > BIT(PERF_RAPL_PKG) | > BIT(PERF_RAPL_PP1), > .msr_power_unit = MSR_RAPL_POWER_UNIT, > - .rapl_msrs = intel_rapl_msrs, > + .rapl_pkg_msrs = intel_rapl_msrs, > }; > > static struct rapl_model model_snbep = { > - .events = BIT(PERF_RAPL_PP0) | > + .pkg_events = BIT(PERF_RAPL_PP0) | > BIT(PERF_RAPL_PKG) | > BIT(PERF_RAPL_RAM), > .msr_power_unit = MSR_RAPL_POWER_UNIT, > - .rapl_msrs = intel_rapl_msrs, > + .rapl_pkg_msrs = intel_rapl_msrs, > }; > > static struct rapl_model model_hsw = { > - .events = BIT(PERF_RAPL_PP0) | > + .pkg_events = BIT(PERF_RAPL_PP0) | > BIT(PERF_RAPL_PKG) | > BIT(PERF_RAPL_RAM) | > BIT(PERF_RAPL_PP1), > .msr_power_unit = MSR_RAPL_POWER_UNIT, > - .rapl_msrs = intel_rapl_msrs, > + .rapl_pkg_msrs = intel_rapl_msrs, > }; > > static struct rapl_model model_hsx = { > - .events = BIT(PERF_RAPL_PP0) | > + .pkg_events = BIT(PERF_RAPL_PP0) | > BIT(PERF_RAPL_PKG) | > BIT(PERF_RAPL_RAM), > .unit_quirk = RAPL_UNIT_QUIRK_INTEL_HSW, > .msr_power_unit = MSR_RAPL_POWER_UNIT, > - .rapl_msrs = intel_rapl_msrs, > + .rapl_pkg_msrs = intel_rapl_msrs, > }; > > static struct rapl_model model_knl = { > - .events = BIT(PERF_RAPL_PKG) | > + .pkg_events = BIT(PERF_RAPL_PKG) | > BIT(PERF_RAPL_RAM), > .unit_quirk = RAPL_UNIT_QUIRK_INTEL_HSW, > .msr_power_unit = MSR_RAPL_POWER_UNIT, > - .rapl_msrs = intel_rapl_msrs, > + .rapl_pkg_msrs = intel_rapl_msrs, > }; > > static struct rapl_model model_skl = { > - .events = BIT(PERF_RAPL_PP0) | > + .pkg_events = BIT(PERF_RAPL_PP0) | > BIT(PERF_RAPL_PKG) | > BIT(PERF_RAPL_RAM) | > BIT(PERF_RAPL_PP1) | > BIT(PERF_RAPL_PSYS), > .msr_power_unit = MSR_RAPL_POWER_UNIT, > - .rapl_msrs = intel_rapl_msrs, > + .rapl_pkg_msrs = intel_rapl_msrs, > }; > > static struct rapl_model model_spr = { > - .events = BIT(PERF_RAPL_PP0) | > + .pkg_events = BIT(PERF_RAPL_PP0) | > BIT(PERF_RAPL_PKG) | > BIT(PERF_RAPL_RAM) | > BIT(PERF_RAPL_PSYS), > .unit_quirk = RAPL_UNIT_QUIRK_INTEL_SPR, > .msr_power_unit = MSR_RAPL_POWER_UNIT, > - .rapl_msrs = intel_rapl_spr_msrs, > + .rapl_pkg_msrs = intel_rapl_spr_msrs, > }; > > static struct rapl_model model_amd_hygon = { > - .events = BIT(PERF_RAPL_PKG), > + .pkg_events = BIT(PERF_RAPL_PKG), > .msr_power_unit = MSR_AMD_RAPL_POWER_UNIT, > - .rapl_msrs = amd_rapl_msrs, > + .rapl_pkg_msrs = amd_rapl_pkg_msrs, > }; > > static const struct x86_cpu_id rapl_model_match[] __initconst = { > @@ -874,16 +875,16 @@ static int __init rapl_pmu_init(void) > > rapl_model = (struct rapl_model *) id->driver_data; > > - rapl_msrs = rapl_model->rapl_msrs; > + rapl_msrs = rapl_model->rapl_pkg_msrs; > > - rapl_cntr_mask = perf_msr_probe(rapl_msrs, PERF_RAPL_MAX, > - false, (void *) &rapl_model- > >events); > + rapl_pkg_cntr_mask = perf_msr_probe(rapl_msrs, > PERF_RAPL_PKG_EVENTS_MAX, > + false, (void *) &rapl_model- > >pkg_events); > > ret = rapl_check_hw_unit(); > if (ret) > return ret; > > - ret = init_rapl_pmus(&rapl_pmus); > + ret = init_rapl_pmus(&rapl_pmus_pkg); > if (ret) > return ret; > > @@ -896,7 +897,7 @@ static int __init rapl_pmu_init(void) > if (ret) > goto out; > > - ret = perf_pmu_register(&rapl_pmus->pmu, "power", -1); > + ret = perf_pmu_register(&rapl_pmus_pkg->pmu, "power", -1); > if (ret) > goto out1; > > @@ -907,7 +908,7 @@ static int __init rapl_pmu_init(void) > cpuhp_remove_state(CPUHP_AP_PERF_X86_RAPL_ONLINE); > out: > pr_warn("Initialization failed (%d), disabled\n", ret); > - cleanup_rapl_pmus(rapl_pmus); > + cleanup_rapl_pmus(rapl_pmus_pkg); > return ret; > } > module_init(rapl_pmu_init); > @@ -915,7 +916,7 @@ module_init(rapl_pmu_init); > static void __exit intel_rapl_exit(void) > { > cpuhp_remove_state_nocalls(CPUHP_AP_PERF_X86_RAPL_ONLINE); > - perf_pmu_unregister(&rapl_pmus->pmu); > - cleanup_rapl_pmus(rapl_pmus); > + perf_pmu_unregister(&rapl_pmus_pkg->pmu); > + cleanup_rapl_pmus(rapl_pmus_pkg); > } > module_exit(intel_rapl_exit);
diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c index 362e82284ccb..9beded3d4a14 100644 --- a/arch/x86/events/rapl.c +++ b/arch/x86/events/rapl.c @@ -70,18 +70,18 @@ MODULE_LICENSE("GPL"); /* * RAPL energy status counters */ -enum perf_rapl_events { +enum perf_rapl_pkg_events { PERF_RAPL_PP0 = 0, /* all cores */ PERF_RAPL_PKG, /* entire package */ PERF_RAPL_RAM, /* DRAM */ PERF_RAPL_PP1, /* gpu */ PERF_RAPL_PSYS, /* psys */ - PERF_RAPL_MAX, - NR_RAPL_DOMAINS = PERF_RAPL_MAX, + PERF_RAPL_PKG_EVENTS_MAX, + NR_RAPL_PKG_DOMAINS = PERF_RAPL_PKG_EVENTS_MAX, }; -static const char *const rapl_domain_names[NR_RAPL_DOMAINS] __initconst = { +static const char *const rapl_pkg_domain_names[NR_RAPL_PKG_DOMAINS] __initconst = { "pp0-core", "package", "dram", @@ -134,16 +134,16 @@ enum rapl_unit_quirk { }; struct rapl_model { - struct perf_msr *rapl_msrs; - unsigned long events; + struct perf_msr *rapl_pkg_msrs; + unsigned long pkg_events; unsigned int msr_power_unit; enum rapl_unit_quirk unit_quirk; }; /* 1/2^hw_unit Joule */ -static int rapl_hw_unit[NR_RAPL_DOMAINS] __read_mostly; -static struct rapl_pmus *rapl_pmus; -static unsigned int rapl_cntr_mask; +static int rapl_pkg_hw_unit[NR_RAPL_PKG_DOMAINS] __read_mostly; +static struct rapl_pmus *rapl_pmus_pkg; +static unsigned int rapl_pkg_cntr_mask; static u64 rapl_timer_ms; static struct perf_msr *rapl_msrs; static struct rapl_model *rapl_model; @@ -172,7 +172,8 @@ static inline struct rapl_pmu *cpu_to_rapl_pmu(unsigned int cpu) * The unsigned check also catches the '-1' return value for non * existent mappings in the topology map. */ - return rapl_pmu_idx < rapl_pmus->nr_rapl_pmu ? rapl_pmus->rapl_pmu[rapl_pmu_idx] : NULL; + return rapl_pmu_idx < rapl_pmus_pkg->nr_rapl_pmu ? + rapl_pmus_pkg->rapl_pmu[rapl_pmu_idx] : NULL; } static inline u64 rapl_read_counter(struct perf_event *event) @@ -184,7 +185,7 @@ static inline u64 rapl_read_counter(struct perf_event *event) static inline u64 rapl_scale(u64 v, int cfg) { - if (cfg > NR_RAPL_DOMAINS) { + if (cfg > NR_RAPL_PKG_DOMAINS) { pr_warn("Invalid domain %d, failed to scale data\n", cfg); return v; } @@ -194,7 +195,7 @@ static inline u64 rapl_scale(u64 v, int cfg) * or use ldexp(count, -32). * Watts = Joules/Time delta */ - return v << (32 - rapl_hw_unit[cfg - 1]); + return v << (32 - rapl_pkg_hw_unit[cfg - 1]); } static u64 rapl_event_update(struct perf_event *event) @@ -354,7 +355,7 @@ static int rapl_pmu_event_init(struct perf_event *event) struct rapl_pmu *rapl_pmu; /* only look at RAPL events */ - if (event->attr.type != rapl_pmus->pmu.type) + if (event->attr.type != rapl_pmus_pkg->pmu.type) return -ENOENT; /* check only supported bits are set */ @@ -366,14 +367,14 @@ static int rapl_pmu_event_init(struct perf_event *event) event->event_caps |= PERF_EV_CAP_READ_ACTIVE_PKG; - if (!cfg || cfg >= NR_RAPL_DOMAINS + 1) + if (!cfg || cfg >= NR_RAPL_PKG_DOMAINS + 1) return -EINVAL; - cfg = array_index_nospec((long)cfg, NR_RAPL_DOMAINS + 1); + cfg = array_index_nospec((long)cfg, NR_RAPL_PKG_DOMAINS + 1); bit = cfg - 1; /* check event supported */ - if (!(rapl_cntr_mask & (1 << bit))) + if (!(rapl_pkg_cntr_mask & (1 << bit))) return -EINVAL; /* unsupported modes and filters */ @@ -401,7 +402,7 @@ static void rapl_pmu_event_read(struct perf_event *event) static ssize_t rapl_get_attr_cpumask(struct device *dev, struct device_attribute *attr, char *buf) { - return cpumap_print_to_pagebuf(true, buf, rapl_pmus->cpumask); + return cpumap_print_to_pagebuf(true, buf, rapl_pmus_pkg->cpumask); } static DEVICE_ATTR(cpumask, S_IRUGO, rapl_get_attr_cpumask, NULL); @@ -553,11 +554,11 @@ static struct perf_msr intel_rapl_spr_msrs[] = { }; /* - * Force to PERF_RAPL_MAX size due to: - * - perf_msr_probe(PERF_RAPL_MAX) + * Force to PERF_RAPL_PKG_EVENTS_MAX size due to: + * - perf_msr_probe(PERF_RAPL_PKG_EVENTS_MAX) * - want to use same event codes across both architectures */ -static struct perf_msr amd_rapl_msrs[] = { +static struct perf_msr amd_rapl_pkg_msrs[] = { [PERF_RAPL_PP0] = { 0, &rapl_events_cores_group, NULL, false, 0 }, [PERF_RAPL_PKG] = { MSR_AMD_PKG_ENERGY_STATUS, &rapl_events_pkg_group, test_msr, false, RAPL_MSR_MASK }, [PERF_RAPL_RAM] = { 0, &rapl_events_ram_group, NULL, false, 0 }, @@ -590,7 +591,7 @@ static int __rapl_cpu_offline(struct rapl_pmus *rapl_pmus, unsigned int rapl_pmu static int rapl_cpu_offline(unsigned int cpu) { - return __rapl_cpu_offline(rapl_pmus, get_rapl_pmu_idx(cpu), + return __rapl_cpu_offline(rapl_pmus_pkg, get_rapl_pmu_idx(cpu), get_rapl_pmu_cpumask(cpu), cpu); } @@ -629,7 +630,7 @@ static int __rapl_cpu_online(struct rapl_pmus *rapl_pmus, unsigned int rapl_pmu_ static int rapl_cpu_online(unsigned int cpu) { - return __rapl_cpu_online(rapl_pmus, get_rapl_pmu_idx(cpu), + return __rapl_cpu_online(rapl_pmus_pkg, get_rapl_pmu_idx(cpu), get_rapl_pmu_cpumask(cpu), cpu); } @@ -642,8 +643,8 @@ static int rapl_check_hw_unit(void) /* protect rdmsrl() to handle virtualization */ if (rdmsrl_safe(rapl_model->msr_power_unit, &msr_rapl_power_unit_bits)) return -1; - for (i = 0; i < NR_RAPL_DOMAINS; i++) - rapl_hw_unit[i] = (msr_rapl_power_unit_bits >> 8) & 0x1FULL; + for (i = 0; i < NR_RAPL_PKG_DOMAINS; i++) + rapl_pkg_hw_unit[i] = (msr_rapl_power_unit_bits >> 8) & 0x1FULL; switch (rapl_model->unit_quirk) { /* @@ -653,11 +654,11 @@ static int rapl_check_hw_unit(void) * of 2. Datasheet, September 2014, Reference Number: 330784-001 " */ case RAPL_UNIT_QUIRK_INTEL_HSW: - rapl_hw_unit[PERF_RAPL_RAM] = 16; + rapl_pkg_hw_unit[PERF_RAPL_RAM] = 16; break; /* SPR uses a fixed energy unit for Psys domain. */ case RAPL_UNIT_QUIRK_INTEL_SPR: - rapl_hw_unit[PERF_RAPL_PSYS] = 0; + rapl_pkg_hw_unit[PERF_RAPL_PSYS] = 0; break; default: break; @@ -672,9 +673,9 @@ static int rapl_check_hw_unit(void) * if hw unit is 32, then we use 2 ms 1/200/2 */ rapl_timer_ms = 2; - if (rapl_hw_unit[0] < 32) { + if (rapl_pkg_hw_unit[0] < 32) { rapl_timer_ms = (1000 / (2 * 100)); - rapl_timer_ms *= (1ULL << (32 - rapl_hw_unit[0] - 1)); + rapl_timer_ms *= (1ULL << (32 - rapl_pkg_hw_unit[0] - 1)); } return 0; } @@ -684,12 +685,12 @@ static void __init rapl_advertise(void) int i; pr_info("API unit is 2^-32 Joules, %d fixed counters, %llu ms ovfl timer\n", - hweight32(rapl_cntr_mask), rapl_timer_ms); + hweight32(rapl_pkg_cntr_mask), rapl_timer_ms); - for (i = 0; i < NR_RAPL_DOMAINS; i++) { - if (rapl_cntr_mask & (1 << i)) { + for (i = 0; i < NR_RAPL_PKG_DOMAINS; i++) { + if (rapl_pkg_cntr_mask & (1 << i)) { pr_info("hw unit of domain %s 2^-%d Joules\n", - rapl_domain_names[i], rapl_hw_unit[i]); + rapl_pkg_domain_names[i], rapl_pkg_hw_unit[i]); } } } @@ -746,71 +747,71 @@ static int __init init_rapl_pmus(struct rapl_pmus **rapl_pmus_ptr) } static struct rapl_model model_snb = { - .events = BIT(PERF_RAPL_PP0) | + .pkg_events = BIT(PERF_RAPL_PP0) | BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_PP1), .msr_power_unit = MSR_RAPL_POWER_UNIT, - .rapl_msrs = intel_rapl_msrs, + .rapl_pkg_msrs = intel_rapl_msrs, }; static struct rapl_model model_snbep = { - .events = BIT(PERF_RAPL_PP0) | + .pkg_events = BIT(PERF_RAPL_PP0) | BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_RAM), .msr_power_unit = MSR_RAPL_POWER_UNIT, - .rapl_msrs = intel_rapl_msrs, + .rapl_pkg_msrs = intel_rapl_msrs, }; static struct rapl_model model_hsw = { - .events = BIT(PERF_RAPL_PP0) | + .pkg_events = BIT(PERF_RAPL_PP0) | BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_RAM) | BIT(PERF_RAPL_PP1), .msr_power_unit = MSR_RAPL_POWER_UNIT, - .rapl_msrs = intel_rapl_msrs, + .rapl_pkg_msrs = intel_rapl_msrs, }; static struct rapl_model model_hsx = { - .events = BIT(PERF_RAPL_PP0) | + .pkg_events = BIT(PERF_RAPL_PP0) | BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_RAM), .unit_quirk = RAPL_UNIT_QUIRK_INTEL_HSW, .msr_power_unit = MSR_RAPL_POWER_UNIT, - .rapl_msrs = intel_rapl_msrs, + .rapl_pkg_msrs = intel_rapl_msrs, }; static struct rapl_model model_knl = { - .events = BIT(PERF_RAPL_PKG) | + .pkg_events = BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_RAM), .unit_quirk = RAPL_UNIT_QUIRK_INTEL_HSW, .msr_power_unit = MSR_RAPL_POWER_UNIT, - .rapl_msrs = intel_rapl_msrs, + .rapl_pkg_msrs = intel_rapl_msrs, }; static struct rapl_model model_skl = { - .events = BIT(PERF_RAPL_PP0) | + .pkg_events = BIT(PERF_RAPL_PP0) | BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_RAM) | BIT(PERF_RAPL_PP1) | BIT(PERF_RAPL_PSYS), .msr_power_unit = MSR_RAPL_POWER_UNIT, - .rapl_msrs = intel_rapl_msrs, + .rapl_pkg_msrs = intel_rapl_msrs, }; static struct rapl_model model_spr = { - .events = BIT(PERF_RAPL_PP0) | + .pkg_events = BIT(PERF_RAPL_PP0) | BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_RAM) | BIT(PERF_RAPL_PSYS), .unit_quirk = RAPL_UNIT_QUIRK_INTEL_SPR, .msr_power_unit = MSR_RAPL_POWER_UNIT, - .rapl_msrs = intel_rapl_spr_msrs, + .rapl_pkg_msrs = intel_rapl_spr_msrs, }; static struct rapl_model model_amd_hygon = { - .events = BIT(PERF_RAPL_PKG), + .pkg_events = BIT(PERF_RAPL_PKG), .msr_power_unit = MSR_AMD_RAPL_POWER_UNIT, - .rapl_msrs = amd_rapl_msrs, + .rapl_pkg_msrs = amd_rapl_pkg_msrs, }; static const struct x86_cpu_id rapl_model_match[] __initconst = { @@ -874,16 +875,16 @@ static int __init rapl_pmu_init(void) rapl_model = (struct rapl_model *) id->driver_data; - rapl_msrs = rapl_model->rapl_msrs; + rapl_msrs = rapl_model->rapl_pkg_msrs; - rapl_cntr_mask = perf_msr_probe(rapl_msrs, PERF_RAPL_MAX, - false, (void *) &rapl_model->events); + rapl_pkg_cntr_mask = perf_msr_probe(rapl_msrs, PERF_RAPL_PKG_EVENTS_MAX, + false, (void *) &rapl_model->pkg_events); ret = rapl_check_hw_unit(); if (ret) return ret; - ret = init_rapl_pmus(&rapl_pmus); + ret = init_rapl_pmus(&rapl_pmus_pkg); if (ret) return ret; @@ -896,7 +897,7 @@ static int __init rapl_pmu_init(void) if (ret) goto out; - ret = perf_pmu_register(&rapl_pmus->pmu, "power", -1); + ret = perf_pmu_register(&rapl_pmus_pkg->pmu, "power", -1); if (ret) goto out1; @@ -907,7 +908,7 @@ static int __init rapl_pmu_init(void) cpuhp_remove_state(CPUHP_AP_PERF_X86_RAPL_ONLINE); out: pr_warn("Initialization failed (%d), disabled\n", ret); - cleanup_rapl_pmus(rapl_pmus); + cleanup_rapl_pmus(rapl_pmus_pkg); return ret; } module_init(rapl_pmu_init); @@ -915,7 +916,7 @@ module_init(rapl_pmu_init); static void __exit intel_rapl_exit(void) { cpuhp_remove_state_nocalls(CPUHP_AP_PERF_X86_RAPL_ONLINE); - perf_pmu_unregister(&rapl_pmus->pmu); - cleanup_rapl_pmus(rapl_pmus); + perf_pmu_unregister(&rapl_pmus_pkg->pmu); + cleanup_rapl_pmus(rapl_pmus_pkg); } module_exit(intel_rapl_exit);
Prep for addition of power_per_core PMU to handle core scope energy consumption for AMD CPUs. Replace the generic names with *_pkg*, to differentiate between the scopes of the two different PMUs and their variables. No functional change. Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com> --- Changes in v4: * Move some renaming code from patch 10 to here (Rui) --- arch/x86/events/rapl.c | 113 +++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 56 deletions(-)