From: Konstantin Belousov <kostikbel@gmail.com>
To: Intel-gfx <Intel-gfx@lists.freedesktop.org>
Subject: i915_chipset_val()
Date: Fri, 8 Jul 2011 12:26:51 +0300 [thread overview]
Message-ID: <20110708092651.GN48734@deviant.kiev.zoral.com.ua> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 2033 bytes --]
i915_chipset_val saves the jiffies count of the invocation in last_time1.
Then, on the next call, the diff between current jiffies value and
last_time1 is used as divisor.
I have a suspicious that two rapid calls to i915_chipset_val() may result
in division by zero. This looks as user-controllable action, since
debugfs, if configured, would export i915_chipset_val() as emon status.
I did not tested the Linux, but in the (ported) code I am able to get
into the described situation. As a workaround, I cached the previous
return value from i915_chipset_val() and return it instead of doing
the calculation if consequtive calls are close enough.
What do you think ? (patch is not directly applicable to Linux).
diff --git a/sys/dev/drm/i915_dma.c b/sys/dev/drm/i915_dma.c
index a22643f..773a171 100644
--- a/sys/dev/drm/i915_dma.c
+++ b/sys/dev/drm/i915_dma.c
@@ -1588,9 +1588,14 @@ unsigned long i915_chipset_val(struct drm_i915_private *dev_priv)
int i;
diff1 = now - dev_priv->last_time1;
+ /*
+ * sysctl(8) reads the value of sysctl twice in rapid
+ * succession. There is high chance that it happens in the
+ * same timer tick. Use the cached value to not divide by
+ * zero.
+ */
+ if (diff1 == 0)
+ return (dev_priv->last_chipset_val);
count1 = I915_READ(DMIEC);
count2 = I915_READ(DDREC);
@@ -1622,7 +1627,8 @@ unsigned long i915_chipset_val(struct drm_i915_private *dev_priv)
dev_priv->last_count1 = total_count;
dev_priv->last_time1 = now;
- return ret;
+ dev_priv->last_chipset_val = ret;
+ return (ret);
}
unsigned long i915_mch_val(struct drm_i915_private *dev_priv)
diff --git a/sys/dev/drm/i915_drv.h b/sys/dev/drm/i915_drv.h
index 5e6340b..36d066a 100644
--- a/sys/dev/drm/i915_drv.h
+++ b/sys/dev/drm/i915_drv.h
@@ -579,6 +579,7 @@ typedef struct drm_i915_private {
u64 last_count1;
unsigned long last_time1;
+ unsigned long last_chipset_val;
u64 last_count2;
struct timespec last_time2;
unsigned long gfx_power;
[-- Attachment #1.2: Type: application/pgp-signature, Size: 196 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2011-07-08 9:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-08 9:26 Konstantin Belousov [this message]
2011-07-08 9:42 ` i915_chipset_val() Chris Wilson
2011-07-08 12:24 ` i915_chipset_val() Konstantin Belousov
2011-07-08 14:21 ` i915_chipset_val() Jesse Barnes
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=20110708092651.GN48734@deviant.kiev.zoral.com.ua \
--to=kostikbel@gmail.com \
--cc=Intel-gfx@lists.freedesktop.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).