From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752028AbcCGC02 (ORCPT ); Sun, 6 Mar 2016 21:26:28 -0500 Received: from mail-by2on0053.outbound.protection.outlook.com ([207.46.100.53]:61423 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751771AbcCGC0Z (ORCPT ); Sun, 6 Mar 2016 21:26:25 -0500 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0O3NDFL-08-LAU-02 X-M-MSG: From: Huang Rui To: Borislav Petkov , Thomas Gleixner , "Peter Zijlstra" , Ingo Molnar , "Andy Lutomirski" , Robert Richter , "Jacob Shin" , Arnaldo Carvalho de Melo , Kan Liang CC: , , , Suravee Suthikulpanit , Aravind Gopalakrishnan , Borislav Petkov , Guenter Roeck , Fengguang Wu , Huang Rui Subject: [PATCH v7 2/2] perf/x86/amd/power: Add AMD accumulated power reporting mechanism Date: Mon, 7 Mar 2016 10:26:42 +0800 Message-ID: <1457317602-2903-3-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1457317602-2903-1-git-send-email-ray.huang@amd.com> References: <1457317602-2903-1-git-send-email-ray.huang@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(77096005)(189998001)(87936001)(5008740100001)(1220700001)(1096002)(47776003)(48376002)(36756003)(76176999)(105586002)(81166005)(551984002)(2906002)(50986999)(575784001)(86362001)(106466001)(50466002)(229853001)(4326007)(33646002)(11100500001)(50226001)(19580405001)(19580395003)(53416004)(5003600100002)(101416001)(5003940100001)(586003)(92566002)(5001770100001)(2950100001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0719;H:atltwp02.amd.com;FPR:;SPF:None;MLV:sfv;MX:1;A:1;LANG:en; X-MS-Office365-Filtering-Correlation-Id: 2944347e-0891-4c77-04c2-08d3462fdd90 X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0719;2:xo4rV4kU5nN6mCl1ZGbiGeuVSbe7CpHM3Bm66nno1LPItK8bcy+c7vXRmEApRbV8jFgLmmnUYFL3fOWp+mVo1gEHOPwSp1qTRYzUOq0vbtRTJcm5HYaD8gYsIP7EE40w8+IMAfm32en68wKSUMFsGzPITlWZ1vbVPuJNHoaIvi6Vesp5noLOv0Swg1OMA/Wl;3:nmHTwo1PnvHAKKNXvWcU9KFCRBbzoyvrBqRj65QzWvtpwwuf7/PMkPMIYqGcsbc5lp1oqkVMRfWEiFQ66EJ5dB+s2vSa9LmFBvO4VEPAYk6AH5J95KZYaz88QPXMOppJD2+Za1IdTmoqY1vSUMtKgR2XKDg0Kpu9OYV4rEH0tXARTkGBXvxsk6leeM93B4T+CYE/lPIobF5Ae+lWLF4l/lgeSh5drz9Pd68u703mDVY=;25:kl/9MK13GomrxwqTOGI3SzWpILkJJasO7vC9T3Ri5yehaB7fAUN8pcUSOhlRIrGhXjVtIOBCVa9CzYFgxuu+e4UGuPmCafdziqguoksRSFzYh1wwLqs/Ty95ll+7r1ykdLl6ydqIgZY9jAXSmDZeOVoRJ/G2Xu9ImFYQ6KjObhiFcHV4k5w9kMEWOXzBiUn0t/k6M6JDwWxN1EY3cwJ9/qQwMQ5GoY/AFSS+m3hdAXIFyPX1p4PTkae/Jqci2R+znPMQSukuPb/5URHO6v3FSLoeEnqzti69anmLW5AtqRS3SJziF7guvEB+K90K3R9RTmXA8SQ1s/b/4lrMMuVPnQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0719; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0719;20:eqws/cji/Ts4KupDhvgV3NdUdN/Z0Z7ELDKaG2StoqB2CeBpiFgTeKbrtAOjCBjreCYnxWncSy6SiYHP6Eh8l0r863Tco7eH5nY+ud0D5JB4b8Dsx5zDSSY47Egsg//RvTZwGuvCOHoukxod3C3ComEFp2APwI8fV7eNQDwjuDE06CjYbMyaijAUlDBV2cP2FeIzaHwoTTGanzBO61CMtwBtOZ7lCh6xnFQO9uJPGJwe/HiitZZzDecSOAdAIziDfyGm/V92BNOYUT1DlE42fg8nvVL9DbHsOk29nH+k/4mmVw2nXo9Yb7XKmu+EJTzepvKObsc1DdVKUC6d/9HrRbV42WptGTMGMTsQiZjNfYWlo2jsPhQ2H2+hdgBWSPvVh+/ugkzxR51K6lXzYlV1PXe3vBVNny/NKIjmFB9jU+bcoev0E1b3FHynndGYkhR0Jv+tU/p7oFNHo/fgDcelB+sNc+E3Jmo3fi2cX4gyfi1GNrjrtXmXTPnOPoW3szrj X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13018025)(13024025)(13015025)(13017025)(5005006)(13023025)(8121501046)(10201501046)(3002001);SRVR:SN1PR12MB0719;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0719; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0719;4:B1BwU/kf61UANvx1uRhqxxHV2IiI+n8dxKusmR5mgH07fpc8kli/f3srxH6IwNcKbYGomXWbp9G4JvxCOzvOwd4ukrGfmVxevMWz0TH6jcFr0tguzLJP5JGbnVLmv4ib/9qmQLMWIs9m7ubj7X3sr35Ch3fAMBJ0TlD0Q2Zp+pGK79u4T7zQ3JY3MpNmmZBzz9ledb5bsX44Y0R46RXS2oAH8dRf43reZx7qPM2ux91enNp216mDK+jmIis75L1gZQB7X5DMUKwJ1waSacUMle4329UeTmOmRVNwwUFPgfkwWEglq2SMC1UYZV2HyOdP7H1nmo5pssk1tKeSMiGQUXeBaXgEwZvxnR8pwsw+PDUtXtpQzs/aakDlNsxOlhM/tT/LQkxvJU/EuxUNftX4+UwASbvFm8ZXB1OyHQeSoSHY1Yff2gc8E5NJNTfW3t1D3n0vimXEOlw5Ei7kjBMuYQ== X-Forefront-PRVS: 087474FBFA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0719;23:GqLPR91cdweGwnoV1PykLb6F0gBuP2FqcDnIn836W?= =?us-ascii?Q?s/PDbWR2yGbB6QUiEjdLggfUGvcy+yMLHN7c3mx3HLGXjCCbhDCVqoV7PoR4?= =?us-ascii?Q?WhQG6qt1DTscPo9SjmvUT14TQm7xxDVrOSczoyFy4dO99vIA59rCjhtKq+fW?= =?us-ascii?Q?crLZXSYBSlqF1JA460ReV9BT+W2fbMBXtlSu0Xo7WHQKlHr59Kn4ET0cXhJS?= =?us-ascii?Q?x5F+fLrHzkLdmE0eOXWaMSofZD9u7wiUt3b7hRox+lcHERl5qgSCQFRLqfJN?= =?us-ascii?Q?m0YiI1/2qZnKKPeewpWquHw6quvUPrnflCviXmqSQ93c8W2qK9bmIDTZ9XhM?= =?us-ascii?Q?DMr5NuRweujX6wbUU70DyHo8Yuv1hzlDSmooyugompew1McyfsOrKZ0KL4yd?= =?us-ascii?Q?AHzf8w/Wi7xy/nhWgKvhXCI0e0tfN+ofMgMnZ3yTCbC/YGVPR8AqfVLDtFPi?= =?us-ascii?Q?c3YLPbfh2mFRzrrYS73G4IfROUe4PrpZ6lJedZz+PUPCgCQyuESzyyn9aMrY?= =?us-ascii?Q?pYW40tZAzLkWdL+uZT5rSUWnaawQ64nGWMKvMsOGb4T6aEi/al6Cs1nt4WOv?= =?us-ascii?Q?5p0XI5Isu2wjWrWA0OP7I6JkdQTfWqX75PFpUaZuYgwsx35dvRIYY54AN7KN?= =?us-ascii?Q?P8Fqo9ki2toh7oupAK3rBTVhweiZNZ2iqlq6oaKvRa/rO/+M4B2ow1kZsvQG?= =?us-ascii?Q?wC/ykrid60ojmzQQ3iTU6CznWWix2ND8jHmnQOgq+9K55pkxgP7NrRJl2ap5?= =?us-ascii?Q?OO92EVtsjCGyQ4+Hx9cyFvwMl5Jx5OeEGN0Dff/KBWos3HHbcqlVA1GDYasC?= =?us-ascii?Q?UrQngR0zVLP0kYZ3MVBsQDakkZd6MCQVo1YnUqxdnCiPzZ6rPFJDooPXtUTO?= =?us-ascii?Q?8PQ+X7jCDd7B6xlmhtNxSWEkt7vuRSXAEVI6+eSzwSWtsii3vW+H/MqASAsD?= =?us-ascii?Q?TDg3704PMSdVRYsxTVOhrwizSZv4HtEkY8DTbPhN8DcaYSJHazA0yoiD89Gy?= =?us-ascii?Q?Y7uc95cr4V4LWoAJn5mMp5G4RBikIf3dsfyjbI5V9lKKCKcw2FhSK5rl9MZ2?= =?us-ascii?Q?t+U560=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0719;5:YWlEOc8zUFAluEF5Xd55QHsXuIM/L95aKZPZdLNvSv1LDJuCtn189CEef08wbQmCWyEjud4tU+LecgegWIJxBtA6F+bD6hCzWn5PsTrXNlHCNQsXqXOOH8T7JaMJ53TmRSz/LXzw8f7qce3HtZhX2g==;24:yIgTtD+Ym8n31S7V5gjtTj6Uz2qxfkhQO5V1E9rEeE2Np7kx1TE5b8J+WCoRpzOqfQNQYvVBD3PzSMOhOEN+9i/voGSQyBPQ8u+vL2PSxts=;20:rQOWDUQCCCdigyhcb9S9d+jBbAuWP0zt1fqcYgs3fcMwZyyfMRw7msEyb7mgf8AR4Q/TSERyOvH8GSIZE69LgATRp7hEaqbscAp0HMgFS4OvQ2kl2YPdYa4I0d6Csd6EzXhS4+CrMPX4c9iE0XRA55ohBVBi/3/sBMljqvAqlVwqDfIHmWqTIQt1O7Hr963eusXiK24v/2IWFZ22RJYD8+lPIN/Pm0LqhdhJe+vsYOQC+I4+3qX3VnmgOWSXJBNu SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2016 02:26:12.5683 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0719 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce an AMD accumlated power reporting mechanism for the Family 15h, Model 60h processor that can be used to calculate the average power consumed by a processor during a measurement interval. The feature support is indicated by CPUID Fn8000_0007_EDX[12]. This feature will be implemented both in hwmon and perf. The current design provides one event to report per package/processor power consumption by counting each compute unit power value. Here the gory details of how the computation is done: --------------------------------------------------------------------- * Tsample: compute unit power accumulator sample period * Tref: the PTSC counter period (PTSC: performance timestamp counter) * N: the ratio of compute unit power accumulator sample period to the PTSC period * Jmax: max compute unit accumulated power which is indicated by MSR_C001007b[MaxCpuSwPwrAcc] * Jx/Jy: compute unit accumulated power which is indicated by MSR_C001007a[CpuSwPwrAcc] * Tx/Ty: the value of performance timestamp counter which is indicated by CU_PTSC MSR_C0010280[PTSC] * PwrCPUave: CPU average power i. Determine the ratio of Tsample to Tref by executing CPUID Fn8000_0007. N = value of CPUID Fn8000_0007_ECX[CpuPwrSampleTimeRatio[15:0]]. ii. Read the full range of the cumulative energy value from the new MSR MaxCpuSwPwrAcc. Jmax = value returned. iii. At time x, software reads CpuSwPwrAcc and samples the PTSC. Jx = value read from CpuSwPwrAcc and Tx = value read from PTSC. iv. At time y, software reads CpuSwPwrAcc and samples the PTSC. Jy = value read from CpuSwPwrAcc and Ty = value read from PTSC. v. Calculate the average power consumption for a compute unit over time period (y-x). Unit of result is uWatt: if (Jy < Jx) // Rollover has occurred Jdelta = (Jy + Jmax) - Jx else Jdelta = Jy - Jx PwrCPUave = N * Jdelta * 1000 / (Ty - Tx) ---------------------------------------------------------------------- Simple example: root@hr-zp:/home/ray/tip# ./tools/perf/perf stat -a -e 'power/power-pkg/' make -j4 CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CHK include/generated/timeconst.h CHK include/generated/bounds.h CHK include/generated/asm-offsets.h CALL scripts/checksyscalls.sh CHK include/generated/compile.h SKIPPED include/generated/compile.h Building modules, stage 2. Kernel: arch/x86/boot/bzImage is ready (#40) MODPOST 4225 modules Performance counter stats for 'system wide': 183.44 mWatts power/power-pkg/ 341.837270111 seconds time elapsed root@hr-zp:/home/ray/tip# ./tools/perf/perf stat -a -e 'power/power-pkg/' sleep 10 Performance counter stats for 'system wide': 0.18 mWatts power/power-pkg/ 10.012551815 seconds time elapsed Suggested-by: Peter Zijlstra Suggested-by: Ingo Molnar Suggested-by: Borislav Petkov Signed-off-by: Huang Rui Cc: Guenter Roeck --- arch/x86/Kconfig | 9 + arch/x86/kernel/cpu/Makefile | 1 + arch/x86/kernel/cpu/perf_event_amd_power.c | 353 +++++++++++++++++++++++++++++ include/linux/perf_event.h | 4 + 4 files changed, 367 insertions(+) create mode 100644 arch/x86/kernel/cpu/perf_event_amd_power.c diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 330e738..a0d3fb0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1202,6 +1202,15 @@ config MICROCODE_OLD_INTERFACE def_bool y depends on MICROCODE +config PERF_EVENTS_AMD_POWER + depends on PERF_EVENTS && CPU_SUP_AMD + tristate "AMD Processor Power Reporting Mechanism" + ---help--- + Provide power reporting mechanism support for AMD processors. + Currently, it leverages X86_FEATURE_ACC_POWER + (CPUID Fn8000_0007_EDX[12]) interface to calculate the + average power consumption on Family 15h processors. + config X86_MSR tristate "/dev/cpu/*/msr - Model-specific register support" ---help--- diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index faa7b52..95d8419 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -34,6 +34,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event.o ifdef CONFIG_PERF_EVENTS obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd.o perf_event_amd_uncore.o +obj-$(CONFIG_PERF_EVENTS_AMD_POWER) += perf_event_amd_power.o ifdef CONFIG_AMD_IOMMU obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd_iommu.o endif diff --git a/arch/x86/kernel/cpu/perf_event_amd_power.c b/arch/x86/kernel/cpu/perf_event_amd_power.c new file mode 100644 index 0000000..196b26d --- /dev/null +++ b/arch/x86/kernel/cpu/perf_event_amd_power.c @@ -0,0 +1,353 @@ +/* + * Performance events - AMD Processor Power Reporting Mechanism + * + * Copyright (C) 2016 Advanced Micro Devices, Inc. + * + * Author: Huang Rui + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include "perf_event.h" + +#define MSR_F15H_CU_PWR_ACCUMULATOR 0xc001007a +#define MSR_F15H_CU_MAX_PWR_ACCUMULATOR 0xc001007b +#define MSR_F15H_PTSC 0xc0010280 + +/* Event code: LSB 8 bits, passed in attr->config any other bit is reserved. */ +#define AMD_POWER_EVENT_MASK 0xFFULL + +/* + * Accumulated power status counters. + */ +#define AMD_POWER_EVENTSEL_PKG 1 + +/* + * The ratio of compute unit power accumulator sample period to the + * PTSC period. + */ +static unsigned int cpu_pwr_sample_ratio; + +/* Maximum accumulated power of a compute unit. */ +static u64 max_cu_acc_power; + +static struct pmu pmu_class; + +/* + * Accumulated power represents the sum of each compute unit's (CU) power + * consumption. On any core of each CU we read the total accumulated power from + * MSR_F15H_CU_PWR_ACCUMULATOR. cpu_mask represents CPU bit map of all cores + * which are picked to measure the power for the CUs they belong to. + */ +static cpumask_t cpu_mask; + +static void event_update(struct perf_event *event) +{ + struct hw_perf_event *hwc = &event->hw; + u64 prev_pwr_acc, new_pwr_acc, prev_ptsc, new_ptsc; + u64 delta, tdelta; + + prev_pwr_acc = hwc->pwr_acc; + prev_ptsc = hwc->ptsc; + rdmsrl(MSR_F15H_CU_PWR_ACCUMULATOR, new_pwr_acc); + rdmsrl(MSR_F15H_PTSC, new_ptsc); + + /* + * Calculate the CU power consumption over a time period, the unit of + * final value (delta) is micro-Watts. Then add it to the event count. + */ + if (new_pwr_acc < prev_pwr_acc) { + delta = max_cu_acc_power + new_pwr_acc; + delta -= prev_pwr_acc; + } else + delta = new_pwr_acc - prev_pwr_acc; + + delta *= cpu_pwr_sample_ratio * 1000; + tdelta = new_ptsc - prev_ptsc; + + do_div(delta, tdelta); + local64_add(delta, &event->count); +} + +static void __pmu_event_start(struct perf_event *event) +{ + if (WARN_ON_ONCE(!(event->hw.state & PERF_HES_STOPPED))) + return; + + event->hw.state = 0; + + rdmsrl(MSR_F15H_PTSC, event->hw.ptsc); + rdmsrl(MSR_F15H_CU_PWR_ACCUMULATOR, event->hw.pwr_acc); +} + +static void pmu_event_start(struct perf_event *event, int mode) +{ + __pmu_event_start(event); +} + +static void pmu_event_stop(struct perf_event *event, int mode) +{ + struct hw_perf_event *hwc = &event->hw; + + /* Mark event as deactivated and stopped. */ + if (!(hwc->state & PERF_HES_STOPPED)) + hwc->state |= PERF_HES_STOPPED; + + /* Check if software counter update is necessary. */ + if ((mode & PERF_EF_UPDATE) && !(hwc->state & PERF_HES_UPTODATE)) { + /* + * Drain the remaining delta count out of an event + * that we are disabling: + */ + event_update(event); + hwc->state |= PERF_HES_UPTODATE; + } +} + +static int pmu_event_add(struct perf_event *event, int mode) +{ + struct hw_perf_event *hwc = &event->hw; + + hwc->state = PERF_HES_UPTODATE | PERF_HES_STOPPED; + + if (mode & PERF_EF_START) + __pmu_event_start(event); + + return 0; +} + +static void pmu_event_del(struct perf_event *event, int flags) +{ + pmu_event_stop(event, PERF_EF_UPDATE); +} + +static int pmu_event_init(struct perf_event *event) +{ + u64 cfg = event->attr.config & AMD_POWER_EVENT_MASK; + + /* Only look at AMD power events. */ + if (event->attr.type != pmu_class.type) + return -ENOENT; + + /* Unsupported modes and filters. */ + if (event->attr.exclude_user || + event->attr.exclude_kernel || + event->attr.exclude_hv || + event->attr.exclude_idle || + event->attr.exclude_host || + event->attr.exclude_guest || + /* no sampling */ + event->attr.sample_period) + return -EINVAL; + + if (cfg != AMD_POWER_EVENTSEL_PKG) + return -EINVAL; + + return 0; +} + +static void pmu_event_read(struct perf_event *event) +{ + event_update(event); +} + +static ssize_t +get_attr_cpumask(struct device *dev, struct device_attribute *attr, char *buf) +{ + return cpumap_print_to_pagebuf(true, buf, &cpu_mask); +} + +static DEVICE_ATTR(cpumask, S_IRUGO, get_attr_cpumask, NULL); + +static struct attribute *pmu_attrs[] = { + &dev_attr_cpumask.attr, + NULL, +}; + +static struct attribute_group pmu_attr_group = { + .attrs = pmu_attrs, +}; + +/* + * Currently it only supports to report the power of each + * processor/package. + */ +EVENT_ATTR_STR(power-pkg, power_pkg, "event=0x01"); + +EVENT_ATTR_STR(power-pkg.unit, power_pkg_unit, "mWatts"); + +/* Convert the count from micro-Watts to milli-Watts. */ +EVENT_ATTR_STR(power-pkg.scale, power_pkg_scale, "1.000000e-3"); + +static struct attribute *events_attr[] = { + EVENT_PTR(power_pkg), + EVENT_PTR(power_pkg_unit), + EVENT_PTR(power_pkg_scale), + NULL, +}; + +static struct attribute_group pmu_events_group = { + .name = "events", + .attrs = events_attr, +}; + +PMU_FORMAT_ATTR(event, "config:0-7"); + +static struct attribute *formats_attr[] = { + &format_attr_event.attr, + NULL, +}; + +static struct attribute_group pmu_format_group = { + .name = "format", + .attrs = formats_attr, +}; + +static const struct attribute_group *attr_groups[] = { + &pmu_attr_group, + &pmu_format_group, + &pmu_events_group, + NULL, +}; + +static struct pmu pmu_class = { + .attr_groups = attr_groups, + /* system-wide only */ + .task_ctx_nr = perf_invalid_context, + .event_init = pmu_event_init, + .add = pmu_event_add, + .del = pmu_event_del, + .start = pmu_event_start, + .stop = pmu_event_stop, + .read = pmu_event_read, +}; + +static void power_cpu_exit(int cpu) +{ + int target; + + if (!cpumask_test_and_clear_cpu(cpu, &cpu_mask)) + return; + + /* + * Find a new CPU on the same compute unit, if was set in cpumask + * and still some CPUs on compute unit. Then migrate event and + * context to new CPU. + */ + target = cpumask_any_but(topology_sibling_cpumask(cpu), cpu); + if (target < nr_cpumask_bits) { + cpumask_set_cpu(target, &cpu_mask); + perf_pmu_migrate_context(&pmu_class, cpu, target); + } +} + +static void power_cpu_init(int cpu) +{ + int target; + + /* + * 1) If any CPU is set at cpu_mask in the same compute unit, do + * nothing. + * 2) If no CPU is set at cpu_mask in the same compute unit, + * set current STARTING CPU. + * + * Note: if there is a CPU aside of the new one already in the + * sibling mask, then it is also in cpu_mask. + */ + target = cpumask_any_but(topology_sibling_cpumask(cpu), cpu); + if (target >= nr_cpumask_bits) + cpumask_set_cpu(cpu, &cpu_mask); +} + +static int +power_cpu_notifier(struct notifier_block *self, unsigned long action, void *hcpu) +{ + unsigned int cpu = (long)hcpu; + + switch (action & ~CPU_TASKS_FROZEN) { + case CPU_DOWN_FAILED: + case CPU_STARTING: + power_cpu_init(cpu); + break; + case CPU_DOWN_PREPARE: + power_cpu_exit(cpu); + break; + default: + break; + } + + return NOTIFY_OK; +} + +static struct notifier_block power_cpu_notifier_nb = { + .notifier_call = power_cpu_notifier, + .priority = CPU_PRI_PERF, +}; + +static const struct x86_cpu_id cpu_match[] = { + { .vendor = X86_VENDOR_AMD, .family = 0x15 }, + {}, +}; + +static int __init amd_power_pmu_init(void) +{ + int cpu, target, ret; + + if (!x86_match_cpu(cpu_match)) + return 0; + + if (!boot_cpu_has(X86_FEATURE_ACC_POWER)) + return -ENODEV; + + cpu_pwr_sample_ratio = cpuid_ecx(0x80000007); + + if (rdmsrl_safe(MSR_F15H_CU_MAX_PWR_ACCUMULATOR, &max_cu_acc_power)) { + pr_err("Failed to read max compute unit power accumulator MSR\n"); + return -ENODEV; + } + + cpu_notifier_register_begin(); + + /* Choose one online core of each compute unit. */ + for_each_online_cpu(cpu) { + target = cpumask_first(topology_sibling_cpumask(cpu)); + if (!cpumask_test_cpu(target, &cpu_mask)) + cpumask_set_cpu(target, &cpu_mask); + } + + ret = perf_pmu_register(&pmu_class, "power", -1); + if (WARN_ON(ret)) { + pr_warn("AMD Power PMU registration failed\n"); + goto out; + } + + __register_cpu_notifier(&power_cpu_notifier_nb); + + pr_info("AMD Power PMU detected\n"); + +out: + cpu_notifier_register_done(); + + return ret; +} +module_init(amd_power_pmu_init); + +static void __exit amd_power_pmu_exit(void) +{ + cpu_notifier_register_begin(); + __unregister_cpu_notifier(&power_cpu_notifier_nb); + cpu_notifier_register_done(); + + perf_pmu_unregister(&pmu_class); +} +module_exit(amd_power_pmu_exit); + +MODULE_AUTHOR("Huang Rui "); +MODULE_DESCRIPTION("AMD Processor Power Reporting Mechanism"); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index f9828a4..01ea21c 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -128,6 +128,10 @@ struct hw_perf_event { struct { /* itrace */ int itrace_started; }; + struct { /* amd_power */ + u64 pwr_acc; + u64 ptsc; + }; #ifdef CONFIG_HAVE_HW_BREAKPOINT struct { /* breakpoint */ /* -- 1.9.1