From: Prarit Bhargava <prarit@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Prarit Bhargava <prarit@redhat.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Radivoje Jovanovic <radivoje.jovanovic@intel.com>,
Seiichi Ikarashi <s.ikarashi@jp.fujitsu.com>,
Mathias Krause <minipli@googlemail.com>,
Ajay Thomas <ajay.thomas.david.rajamanickam@intel.com>
Subject: [PATCH 2/3] powercap, intel_rapl, implement check for minimum time window
Date: Mon, 21 Dec 2015 09:50:02 -0500 [thread overview]
Message-ID: <1450709403-780-3-git-send-email-prarit@redhat.com> (raw)
In-Reply-To: <1450709403-780-1-git-send-email-prarit@redhat.com>
Using an small value for the time window results in a
bogus value for the time window. For example,
[root@intel-chiefriver-03 linux]# echo 950 >
/sys/devices/virtual/powercap/intel-rapl/intel-rapl\:0/constraint_0_time_window_us;
egrep ^ /sys/devices/virtual/powercap/intel-rapl/intel-rapl\:0/constraint_0_time_window_us
-bash: echo: write error: Invalid argument
/sys/devices/virtual/powercap/intel-rapl/intel-rapl:0/constraint_0_time_window_us:1:4501502475370496
The Intel ASDM doesn't explicitly define a minimum time window.
The MSR_RAPL_POWER_UNIT register, read during initialization, does
specify a minimum time window unit so that can be used as a lower
bound for error checking.
After this change the minimum time window is properly clamped:
[root@intel-chiefriver-03 linux]# echo 950 >
/sys/devices/virtual/powercap/intel-rapl/intel-rapl\:0/constraint_0_time_window_us;
egrep ^ /sys/devices/virtual/powercap/intel-rapl/intel-rapl\:0/constraint_0_time_window_us
-bash: echo: write error: Invalid argument
/sys/devices/virtual/powercap/intel-rapl/intel-rapl:0/constraint_0_time_window_us:1:976
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Radivoje Jovanovic <radivoje.jovanovic@intel.com>
Cc: Seiichi Ikarashi <s.ikarashi@jp.fujitsu.com>
Cc: Mathias Krause <minipli@googlemail.com>
Cc: Ajay Thomas <ajay.thomas.david.rajamanickam@intel.com>
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
---
drivers/powercap/intel_rapl.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index f765b2c..14753e5 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -516,6 +516,7 @@ static int set_time_window(struct powercap_zone *power_zone, int id,
u64 window)
{
struct rapl_domain *rd;
+ struct rapl_package *rp;
int ret = 0;
u64 max_window;
@@ -524,12 +525,18 @@ static int set_time_window(struct powercap_zone *power_zone, int id,
if (ret < 0)
goto out;
- if (window > max_window) {
+ rd = power_zone_to_rapl_domain(power_zone);
+ rp = find_package_by_id(rd->package_id);
+ /*
+ * The Intel ASDM doesn't explicitly define a minimum time window.
+ * The MSR_RAPL_POWER_UNIT register, read during initialization,
+ * does contain the smallest unit of time that can be measured.
+ */
+ if ((window > max_window) || (window < rp->time_unit)) {
ret = -EINVAL;
goto out;
}
- rd = power_zone_to_rapl_domain(power_zone);
switch (rd->rpl[id].prim_id) {
case PL1_ENABLE:
rapl_write_data_raw(rd, TIME_WINDOW1, window);
--
1.7.9.3
next prev parent reply other threads:[~2015-12-21 14:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-15 13:02 [PATCH 0/3] powercap, intel_rapl, implement time window checks Prarit Bhargava
2015-12-15 13:02 ` [PATCH 1/3] powercap, intel_rapl, implement get_max_time_window Prarit Bhargava
2015-12-17 5:45 ` Seiichi Ikarashi
2015-12-17 12:26 ` Prarit Bhargava
2015-12-15 13:02 ` [PATCH 2/3] powercap, intel_rapl, implement check for minimum time window Prarit Bhargava
2015-12-15 13:02 ` [PATCH 3/3] powercap, intel_rapl, Add ignore_max_window_check module parameter for broken BIOSes Prarit Bhargava
2015-12-18 5:50 ` Seiichi Ikarashi
2015-12-18 12:23 ` Prarit Bhargava
2015-12-21 14:50 ` [PATCH 0/3 v2] powercap, intel_rapl, implement time window checks Prarit Bhargava
2015-12-21 14:50 ` [PATCH 1/3] powercap, intel_rapl, implement get_max_time_window Prarit Bhargava
2015-12-21 14:50 ` Prarit Bhargava [this message]
2015-12-21 14:50 ` [PATCH 3/3] powercap, intel_rapl, Add ignore_max_time_window_check module parameter for broken BIOSes Prarit Bhargava
2016-01-21 16:15 [PATCH 0/3] powercap, intel_rapl, implement time window checks Prarit Bhargava
2016-01-21 16:15 ` [PATCH 2/3] powercap, intel_rapl, implement check for minimum time window Prarit Bhargava
2016-01-25 0:44 [PATCH 0/3] powercap, intel_rapl, implement time window checks [v3] Prarit Bhargava
2016-01-25 0:44 ` [PATCH 2/3] powercap, intel_rapl, implement check for minimum time window Prarit Bhargava
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450709403-780-3-git-send-email-prarit@redhat.com \
--to=prarit@redhat.com \
--cc=ajay.thomas.david.rajamanickam@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=minipli@googlemail.com \
--cc=radivoje.jovanovic@intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=s.ikarashi@jp.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.