| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1446199024-1896-7-git-send-email-ray.huang@amd.com>
Date: Fri, 30 Oct 2015 17:57:00 +0800
From: Huang Rui <ray.huang@....com>
To: Borislav Petkov <bp@...e.de>, Guenter Roeck <linux@...ck-us.net>,
"Peter Zijlstra" <peterz@...radead.org>,
Jean Delvare <jdelvare@...e.de>,
"Andy Lutomirski" <luto@...capital.net>,
Andreas Herrmann <herrmann.der.user@...il.com>,
Thomas Gleixner <tglx@...utronix.de>,
"Ingo Molnar" <mingo@...nel.org>,
"Rafael J. Wysocki" <rjw@...ysocki.net>,
"Len Brown" <lenb@...nel.org>,
John Stultz <john.stultz@...aro.org>,
Frédéric Weisbecker <fweisbec@...il.com>
CC: <lm-sensors@...sensors.org>, <linux-kernel@...r.kernel.org>,
<x86@...nel.org>,
Andreas Herrmann <herrmann.der.user@...glemail.com>,
Aravind Gopalakrishnan <Aravind.Gopalakrishnan@....com>,
Borislav Petkov <bp@...en8.de>,
Fengguang Wu <fengguang.wu@...el.com>,
Aaron Lu <aaron.lu@...el.com>,
SPG_Linux_Kernel <SPG_Linux_Kernel@....com>,
Huang Rui <ray.huang@....com>
Subject: [PATCH v3 06/10] hwmon: (fam15h_power) Add compute unit accumulated power
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 <bp@...en8.de>
Signed-off-by: Huang Rui <ray.huang@....com>
Cc: Guenter Roeck <linux@...ck-us.net>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Ingo Molnar <mingo@...nel.org>
---
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 <linux/module.h>
#include <linux/pci.h>
#include <linux/bitops.h>
+#include <linux/cpu.h>
+#include <linux/cpumask.h>
#include <asm/processor.h>
#include <asm/msr.h>
@@ -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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists