Skip to contentSkip to conversation

x86: cpu_debug support read-write opertaions for PMC

git-pull -tip Jaswinder Singh Rajput 2 participants 4 messages Mar 11, 2009 – Mar 13, 2009 x86

lore
Share & tools
lore
#0 lore raw

Currently I added read-write operations for PMC MSRs for cpu_debug:

[root@ht]# cat /sys/kernel/debug/x86/cpu/cpu1/pmc/0x300/value
0x0
[root@ht]# cat /sys/kernel/debug/x86/cpu/cpu1/pmc/0x300/value
0x0
[root@ht]# echo 1234 > /sys/kernel/debug/x86/cpu/cpu1/pmc/0x300/value
[root@ht]# cat /sys/kernel/debug/x86/cpu/cpu1/pmc/0x300/value
0x4d2
[root@ht]# echo 0x1234 > /sys/kernel/debug/x86/cpu/cpu1/pmc/0x300/value
[root@ht]# cat /sys/kernel/debug/x86/cpu/cpu1/pmc/0x300/value
0x1234

Should I also add write operations for other registers.

The following changes since commit 8851485ba842e892adfa343463ce6b74550bb8b1:
Ingo Molnar (1):
Merge branch 'x86/urgent'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-cpu.git master

Jaswinder Singh Rajput (1):
x86: cpu_debug support read-write opertaions for PMC

 arch/x86/kernel/cpu/cpu_debug.c |   45 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

Complete diff:

arch/x86/kernel/cpu/cpu_debug.c +45 -0
index 9abbcbd..032ab9b 100755
@@ -11,6 +11,7 @@
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
 #include <linux/kprobes.h>
+#include <linux/uaccess.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/percpu.h>
@@ -608,9 +609,53 @@ static int cpu_seq_open(struct inode *inode, struct file *file)
 	return err;
 }
 
+static int write_msr(struct cpu_private *priv, const char *buf)
+{
+	u32 low, high;
+	int ret;
+	u64 val;
+
+	ret = strict_strtoull(buf, 0, &val);
+	if (ret < 0)
+		return ret;
+
+	high = (val >> 32) & 0xffffffff;
+	low = val & 0xffffffff;
+
+	if (!wrmsr_safe_on_cpu(priv->cpu, priv->reg, low, high))
+		return 0;
+
+	return -EPERM;
+}
+
+static ssize_t cpu_seq_write(struct file *file, const char __user *ubuf,
+			     size_t count, loff_t *off)
+{
+	struct seq_file *seq = file->private_data;
+	struct cpu_private *priv = seq->private;
+	char buf[19];
+
+	if ((priv == NULL) || (count >= sizeof(buf)))
+		return -EINVAL;
+
+	if (copy_from_user(&buf, ubuf, count))
+		return -EFAULT;
+
+	buf[count] = 0;
+
+	/* Supporting only PMC */
+	if ((cpu_base[priv->type].flag == CPU_PMC) && (priv->file))
+		if (!write_msr(priv, buf))
+			return count;
+
+	return -EACCES;
+}
+
 static const struct file_operations cpu_fops = {
+	.owner		= THIS_MODULE,
 	.open		= cpu_seq_open,
 	.read		= seq_read,
+	.write		= cpu_seq_write,
 	.llseek		= seq_lseek,
 	.release	= seq_release,
 };
#1 lore raw
Quoted 1 line · Jaswinder Singh Rajput

Currently I added read-write operations for PMC MSRs for cpu_debug:

Now I made generic write support by adding write flag for registers. currently write is enabled only for PMC MSR but we can also support another MSRs just changing the write flag.

So here is new pull request:

The following changes since commit 8851485ba842e892adfa343463ce6b74550bb8b1:
Ingo Molnar (1):
Merge branch 'x86/urgent'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-cpu.git master

Jaswinder Singh Rajput (1):
x86: cpu_debug add write support for MSRs

 arch/x86/include/asm/cpu_debug.h |   12 ++--
 arch/x86/kernel/cpu/cpu_debug.c  |  117 +++++++++++++++++++++++++++----------
 2 files changed, 92 insertions(+), 37 deletions(-)

Complete diff:

arch/x86/include/asm/cpu_debug.h +7 -5
index d24d64f..146d9e0 100755
@@ -171,16 +171,18 @@ struct cpu_private {
 struct cpu_debug_base {
 	char			*name;		/* Register name	*/
 	unsigned		flag;		/* Register flag	*/
-};
-
-struct cpu_cpuX_base {
-	struct dentry		*dentry;	/* Register dentry	*/
-	int			init;		/* Register index file	*/
+	unsigned		write;		/* Register write flag	*/
 };
 
 struct cpu_file_base {
 	char			*name;		/* Register file name	*/
 	unsigned		flag;		/* Register file flag	*/
+	unsigned		write;		/* Register write flag	*/
+};
+
+struct cpu_cpuX_base {
+	struct dentry		*dentry;	/* Register dentry	*/
+	int			init;		/* Register index file	*/
 };
 
 struct cpu_debug_range {
arch/x86/kernel/cpu/cpu_debug.c +85 -32

141 lines not on this page · raw message

#2 lore raw
Quoted 6 lines · Jaswinder Singh Rajput
Quoted 1 line · Jaswinder Singh Rajput

Currently I added read-write operations for PMC MSRs for cpu_debug:

Now I made generic write support by adding write flag for registers. currently write is enabled only for PMC MSR but we can also support another MSRs just changing the write flag.

Here some more cleanups and comment to avoid confusions, and then new request pull:

Log is available at:
http://git.kernel.org/?p=linux/kernel/git/jaswinder/linux-2.6-cpu.git;a=commit;h=1fdb3c7038d8bde067f56d43705ea24e866c9673

The following changes since commit 8851485ba842e892adfa343463ce6b74550bb8b1:
Ingo Molnar (1):
Merge branch 'x86/urgent'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-cpu.git master

Jaswinder Singh Rajput (1):
x86: cpu_debug add write support for MSRs

 arch/x86/include/asm/cpu_debug.h |   16 ++++--
 arch/x86/kernel/cpu/cpu_debug.c  |  118 +++++++++++++++++++++++++++----------
 2 files changed, 97 insertions(+), 37 deletions(-)

Complete diff:

arch/x86/include/asm/cpu_debug.h +11 -5
index d24d64f..56f1635 100755
@@ -171,16 +171,22 @@ struct cpu_private {
 struct cpu_debug_base {
 	char			*name;		/* Register name	*/
 	unsigned		flag;		/* Register flag	*/
+	unsigned		write;		/* Register write flag	*/
 };
 
-struct cpu_cpuX_base {
-	struct dentry		*dentry;	/* Register dentry	*/
-	int			init;		/* Register index file	*/
-};
-
+/*
+ * Currently it looks similar to cpu_debug_base but once we add more files
+ * cpu_file_base will go in different direction
+ */
 struct cpu_file_base {
 	char			*name;		/* Register file name	*/
 	unsigned		flag;		/* Register file flag	*/
+	unsigned		write;		/* Register write flag	*/
+};
+
+struct cpu_cpuX_base {
+	struct dentry		*dentry;	/* Register dentry	*/
+	int			init;		/* Register index file	*/
 };
 
 struct cpu_debug_range {
arch/x86/kernel/cpu/cpu_debug.c +86 -32

142 lines not on this page · raw message

#3 lore raw
Quoted 14 lines · Jaswinder Singh Rajput
Quoted 6 lines · Jaswinder Singh Rajput
Quoted 1 line · Jaswinder Singh Rajput

Currently I added read-write operations for PMC MSRs for cpu_debug:

Now I made generic write support by adding write flag for registers. currently write is enabled only for PMC MSR but we can also support another MSRs just changing the write flag.

Here some more cleanups and comment to avoid confusions, and then new request pull:

Log is available at:
http://git.kernel.org/?p=linux/kernel/git/jaswinder/linux-2.6-cpu.git;a=commit;h=1fdb3c7038d8bde067f56d43705ea24e866c9673

Quoted 7 lines

The following changes since commit 8851485ba842e892adfa343463ce6b74550bb8b1:
Ingo Molnar (1):
Merge branch 'x86/urgent'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-cpu.git master

Pulled, thanks!

Ingo