From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030568AbbJ3KEK (ORCPT ); Fri, 30 Oct 2015 06:04:10 -0400 Received: from mail-bn1bon0066.outbound.protection.outlook.com ([157.56.111.66]:3232 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1030450AbbJ3KEI (ORCPT ); Fri, 30 Oct 2015 06:04:08 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.221) 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: 0NX12MQ-07-F3D-02 X-M-MSG: From: Huang Rui To: Borislav Petkov , Guenter Roeck , "Peter Zijlstra" , Jean Delvare , "Andy Lutomirski" , Andreas Herrmann , Thomas Gleixner , "Ingo Molnar" , "Rafael J. Wysocki" , "Len Brown" , John Stultz , =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Weisbecker?= CC: , , , Andreas Herrmann , Aravind Gopalakrishnan , Borislav Petkov , Fengguang Wu , Aaron Lu , SPG_Linux_Kernel , Huang Rui Subject: [PATCH v3 06/10] hwmon: (fam15h_power) Add compute unit accumulated power Date: Fri, 30 Oct 2015 17:57:00 +0800 Message-ID: <1446199024-1896-7-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446199024-1896-1-git-send-email-ray.huang@amd.com> References: <1446199024-1896-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.221;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(199003)(189002)(47776003)(101416001)(105586002)(76176999)(5008740100001)(77096005)(87936001)(5003600100002)(50986999)(5007970100001)(2950100001)(86362001)(189998001)(229853001)(106466001)(53416004)(92566002)(5003940100001)(36756003)(11100500001)(48376002)(5001770100001)(19580405001)(19580395003)(97736004)(50226001)(33646002)(50466002)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0863;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0863;2:FZxdYX8fXKk6wGrr2ihIvtxYW/Y7aOhk+kYcjPUjI85lsRRBO8L1ETNj6CF95bKbbmKoMvqdytkHz0Wkdpsh5ldokQZRwuFQpf5OZfxsb3PnmKBqFCZN4lzAZ0yTy9O7Ss0fdv9Z7zaQ5lsSFEB0SbvCVS6c9AQnbgOAHSbcEws=;3:tKqHe6lT2sY7H1bclTIcf4XSzA2Lx30fZ/zlQvAXKSCUIMpcWYLBqf4QajLt63HxZPhHb/YUdvSm8fjTtSgnLD9J25cOiuAKsi4grRpANKjCnnP38D+/5sfnn/CjM91ngK+DxpjIIonpfSkOOB+7+Oh+o44nVnnDgbNCZ+dF25D0hqkPLfGuGn1nVAgpG3E5LON6rA02ayTRWqBRh+SKohLc7DtwZr7WM4Of8183Nx0IrTr5k5Dc8Ryl2T+gdo3e;25:IAi0tpzreRDhldTkab2ycmCV8B1lRBfEEhTqLev0vBCpOLlrMerrdlEVTN3QaHlMFQM4kgHvSlBklJlmbpGUnL60gfltPGbgwrzIUw39XV1ncda4533B83TrAaqxoXgmWIaYz/53auNB52o9VoVA5p6C7Lj7DWeOsr1cT7crqZWamVIuHaNty6uiZ/A8e82O4784LDoHReU0/Eow2lK5NtMdU2qoST0x9fF1nzVY0OZxtjhvnDyhNwN+fdDapppF X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0863; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0863;20:3Hz2cr0GqB7l6rtuiWRmjLa576JlBZCm57nu3qUgO2yc5RHWw5b3XjRYxPZcW3Br1PZTFnSqHwWz/uv4xvD1bNlTjllzBDaQ+oCIcX5p5X5GdWBdKamq0u1PCZFW2NrX/NnKeywdenjY0y420yRlcPR4Ns+hnKimR1cTGVmITBz2RPqr7IHE7aszicTns1A/S7x2sGBSz2eu8iCwtgMn2QCmbETrHS4bCE9Q12J6NXfP+MTjWXq7TVvvAXTsZtmgQCLZ5lSnm7Fvtx56YUADsqO5hlixxO5lsCpLx0LfQkl1/Jdg9ER0AgDtYRsbXDMhqkklbgKTQ8p2rl1PhK3pk13opsxZQj/RQDJD7tIixv9s6GinjHvWI9sUTVsyV+uf7zN1PwEiRxqciROmPVslJYTkfgJD66ZACzyImTxY3234s8jSGbO6AliAjWUtD10HWrVJ5IPTAo1OFoKIHMcbR78rPTgztOPtENJOZUKHKmzxipfO8EkAjVQ9HoU1lTwK;4:OEa3DemOfrtQcIBAj6yxVlzCXn6hpOaGq1dyBauCg9WjTLfV10UHqbNnh6jKQBKjOqlWTieWquSXDROOVEZtFbp6jK+D9mmzNX+QzU3wD4Iq8GClTgDIRXOZLo9Tc8xVQ0cO7tklOA5N2v5XxMoQUfjN1WMDIOVBJQBvnVLob5X0MSXzp6kvEgIlT46Lv4zJcn/tvRIRudsRp37sfOiB4MtDlMxDICBMXY12Un9fawpkwP6S4DjYahK0ba/7Dkcwfm5oZrFxGVbmjp080uFyELrs1ChnTDXY3GzLXg5h1ylEkCQ+GVZSekKeqhNInPsgxE7bTWr5SRTlhG4Irg29sQsvGLELT3ve2P4PXyvfcv46tVqgi+7/Y4Fm/UaQovVr7wB6qM8enG8gSrreldMZLQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001)(10201501046)(102215026);SRVR:SN1PR12MB0863;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0863; X-Forefront-PRVS: 07459438AA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0863;23:DPzY4yKM1NFAO0n/RjNOKYgxGqwggY67GWKjIWXnI?= =?us-ascii?Q?DemkBrHsqUovoYgSjeWp0x4zJ/ZqICifkAdj+fxOcjLG0wzV/SXDA9mul8Xq?= =?us-ascii?Q?y/YqFxh+7PxML4qJNzXGQk/lRYCNsSusFUOWfpxGm59ZStgRfLmEHgc3dQSg?= =?us-ascii?Q?ypeqcIfwuzfiKfUh1kqD1OaZiQwVPYAi9HnhmKC1WEiA/B69HUZinektp4PZ?= =?us-ascii?Q?kohiHQXQVqm3o4b9tTMZBVRKaVDUv38Bazsyo8hvCom/CTEbuPv9MQFWDwje?= =?us-ascii?Q?FN0YO6l07xx64eJoVRG4BYHK9i4eUYkD9QNMChO9ewEQtzdq5+8pWsYCXSZf?= =?us-ascii?Q?y4MbAE5O/H3zb0aTPwut1n/sLxBJICrbDiko1P0lR6LB63PCWjyzvtKJNZSa?= =?us-ascii?Q?F7BH5vNoCMA4+nXEY+1xxA1ibNTiSSo56uTLFqvDfJpDkY/DMjtD3uQzujyt?= =?us-ascii?Q?BrvdiGTWwkPiv7TngzXQafejkMlLQRkMn8Cjko4B3jiI36PmKh3FO53tStnk?= =?us-ascii?Q?rMTsdf+K00APD5VkHN3ymXuOOQxK+KVTgqDTFaqGYVVpTUpc8s59EwqDSW7D?= =?us-ascii?Q?1aDbOQUYquXlXSKfA9CWz0aW+Ycd3JFfK99fzKyxtakDwo6xhC16Rlw7Bs91?= =?us-ascii?Q?ihm4OBQG0SRL8+vVDhkRjTIQAFXkpIiC8T2szMRSoOymAir8jNOp0UUWtIz7?= =?us-ascii?Q?2npqzROQpkVPVG0aMELZpVq91I9cBVpzBBlhcWKRiEsvo3fZjDm8hJmSpSeN?= =?us-ascii?Q?pgU22sGKj9dlFOwxesqTJ5eXLQEcJIOQJBIwz5+v1dIQaG04fXT0dDR+1LF/?= =?us-ascii?Q?nGf5PEsCty1Hb05AfFxAFhO/jivBCh18K1kNHf9lR96j8co8X+igsCU++zsn?= =?us-ascii?Q?cljUx8z+jsBMa27MJrI66/XZtzP0R3EOFvhJaFTf7fh2ncIL9fvKtVjFU6BE?= =?us-ascii?Q?qb5owUyG37uv05gDAhNbNluWoe/4aJoY2gstZbVmw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0863;5:2P3+HQqbTIF8XFJho+BjfD5ow/rvQp4OFcN3zMaHC5VWjcrrUaqHtiThfRw1oFSFTrd+5rf/bdN7bUF5Vj9cELKo5jnOjmGV3tsB5ts15R4j4f8eP0Q0vdIbVypYWjTD6RVq+C8aE3ZXtLGdzzZT6Q==;24:H/R2ItA7syjGIuPDPHro3CJTehQ33dy7peiYX31hdJGkNhE7sPjs95YAq2FFr/u0+cfXT77oebaaR7qc1CUxLjpwhj+FS5p9Kx6M2hVjoTI=;20:VE14x7N1b0f69zkBjX7ZazypnPbeyYuEt1/obXrmFAmHJIz58TYk7WWSpEPz8iLu0Yj6pvt6V9u8JqnrEQu+Rge+sukKRHoipxXA3iiWSoXt8B7ys+1AEKJTelZqKpxTITXembBhlu39y7CTXDzx+JjlG1MO5eYgWuBsuyHk/47lH7zB88euI+CQUC+Wu2m3/t82m5ebfRxy9V2dO2UBEnNKFHj11akaChRVZOMuQiahaHaUBwNhrzWTF+0mCBqZ SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2015 10:04:03.2135 (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.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0863 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds a member in fam15h_power_data which specifies the compute unit accumulated power. It adds do_read_registers_on_cu to do all the read to all MSRs and run it on one of the online cores on each compute unit with smp_call_function_many(). This behavior can decrease IPI numbers. Suggested-by: Borislav Petkov Signed-off-by: Huang Rui Cc: Guenter Roeck Cc: Peter Zijlstra Cc: Ingo Molnar --- drivers/hwmon/fam15h_power.c | 77 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index 5f7067d..5bbcb55 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include @@ -44,7 +46,9 @@ MODULE_LICENSE("GPL"); #define FAM15H_MIN_NUM_ATTRS 2 #define FAM15H_NUM_GROUPS 2 +#define MAX_CUS 8 +#define MSR_F15H_CU_PWR_ACCUMULATOR 0xc001007a #define MSR_F15H_CU_MAX_PWR_ACCUMULATOR 0xc001007b struct fam15h_power_data { @@ -57,6 +61,8 @@ struct fam15h_power_data { struct attribute_group group; /* maximum accumulated power of a compute unit */ u64 max_cu_acc_power; + /* accumulated power of the compute units */ + u64 cu_acc_power[MAX_CUS]; }; static ssize_t show_power(struct device *dev, @@ -115,6 +121,75 @@ static ssize_t show_power_crit(struct device *dev, } static DEVICE_ATTR(power1_crit, S_IRUGO, show_power_crit, NULL); +static void do_read_registers_on_cu(void *_data) +{ + struct fam15h_power_data *data = _data; + int cpu, cu, cores_per_cu; + + cpu = smp_processor_id(); + + cores_per_cu = amd_get_cores_per_cu(); + cu = cpu / cores_per_cu; + + rdmsrl_safe(MSR_F15H_CU_PWR_ACCUMULATOR, &data->cu_acc_power[cu]); +} + +/* + * this function is only able to be called when CPUID + * Fn8000_0007:EDX[12] is set + */ +static int read_registers(struct fam15h_power_data *data) +{ + int this_cpu, ret, i; + int cu_num, cores_per_cu; + cpumask_var_t mask, tmp_mask, res_mask; + + cores_per_cu = amd_get_cores_per_cu(); + cu_num = boot_cpu_data.x86_max_cores / cores_per_cu; + + WARN_ON_ONCE(cu_num > MAX_CUS); + + ret = zalloc_cpumask_var(&mask, GFP_KERNEL); + if (!ret) + return -ENOMEM; + + ret = zalloc_cpumask_var(&tmp_mask, GFP_KERNEL); + if (!ret) + return -ENOMEM; + + get_online_cpus(); + this_cpu = get_cpu(); + + /* prepare CU temp mask */ + for (i = 0; i < cores_per_cu; i++) + cpumask_set_cpu(i, tmp_mask); + + /* + * Choose the first online core of each compute unit, and then + * read their MSR value of power and ptsc in a single IPI, + * because the MSR value of CPU core represent the compute + * unit's. + */ + for (i = 0; i < cu_num; i++) { + /* WARN_ON for empty CU masks */ + WARN_ON(!cpumask_and(res_mask, tmp_mask, cpu_online_mask)); + cpumask_set_cpu(cpumask_any(res_mask), mask); + cpumask_shift_left(tmp_mask, tmp_mask, cores_per_cu); + } + + if (cpumask_test_cpu(this_cpu, mask)) + do_read_registers_on_cu(data); + + smp_call_function_many(mask, do_read_registers_on_cu, data, true); + put_cpu(); + put_online_cpus(); + + free_cpumask_var(tmp_mask); + free_cpumask_var(mask); + + return 0; +} + static int fam15h_power_init_attrs(struct pci_dev *pdev, struct fam15h_power_data *data) { @@ -253,7 +328,7 @@ static int fam15h_power_init_data(struct pci_dev *f4, data->max_cu_acc_power = tmp; - return 0; + return read_registers(data); } static int fam15h_power_probe(struct pci_dev *pdev, -- 1.9.1