From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753295AbcCLDeF (ORCPT ); Fri, 11 Mar 2016 22:34:05 -0500 Received: from forward.webhostbox.net ([5.100.155.124]:59458 "EHLO forward.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752086AbcCLDeD (ORCPT ); Fri, 11 Mar 2016 22:34:03 -0500 Subject: Re: [PATCH v4 2/6] hwmon: (fam15h_power) Add compute unit accumulated power To: Huang Rui , Jean Delvare References: <1457662670-3354-1-git-send-email-ray.huang@amd.com> <1457662670-3354-3-git-send-email-ray.huang@amd.com> Cc: lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org, spg_linux_kernel@amd.com, Aravind Gopalakrishnan , Borislav Petkov From: Guenter Roeck Message-ID: <56E38E23.1060708@roeck-us.net> Date: Fri, 11 Mar 2016 19:33:55 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1457662670-3354-3-git-send-email-ray.huang@amd.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=NfdGrz34 c=1 sm=1 tr=0 a=QNED+QcLUkoL9qulTODnwA==:117 a=2cfIYNtKkjgZNaOwnGXpGw==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=N659UExz7-8A:10 a=7OsogOcEt9IA:10 a=hKU_ICsU3KnmsNpAbkIA:9 a=oJrNwlNtP1XXsvC5:21 a=UJn8dfe6FCWUpSXW:21 a=pILNOxqGKmIA:10 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/10/2016 06:17 PM, Huang Rui wrote: > 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 > --- > drivers/hwmon/fam15h_power.c | 61 +++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 60 insertions(+), 1 deletion(-) > > diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c > index 4f695d8..c5e2297 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 > > #define PCI_DEVICE_ID_AMD_15H_M70H_NB_F4 0x15b4 > @@ -59,6 +63,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, > @@ -125,6 +131,59 @@ 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; > + > + cpu = smp_processor_id(); > + > + cu = cpu / smp_num_siblings; > + If smp is not configured: drivers/hwmon/fam15h_power.c: In function ‘do_read_registers_on_cu’: drivers/hwmon/fam15h_power.c:144:13: error: ‘smp_num_siblings’ undeclared (first use in this function) Guenter > + 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, cpu; > + int target; > + cpumask_var_t mask; > + > + ret = zalloc_cpumask_var(&mask, GFP_KERNEL); > + if (!ret) > + return -ENOMEM; > + > + get_online_cpus(); > + this_cpu = get_cpu(); > + > + /* > + * 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_each_online_cpu(cpu) { > + target = cpumask_first(topology_sibling_cpumask(cpu)); > + if (!cpumask_test_cpu(target, mask)) > + cpumask_set_cpu(target, mask); > + } > + > + 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(mask); > + > + return 0; > +} > + > static int fam15h_power_init_attrs(struct pci_dev *pdev, > struct fam15h_power_data *data) > { > @@ -263,7 +322,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, >