* Re: Oops in sched_mc_power_savings_store
2008-07-24 11:51 Oops in sched_mc_power_savings_store Matthew Wilcox
@ 2008-07-24 20:07 ` Andi Kleen
2008-07-25 15:40 ` Matthew Wilcox
0 siblings, 1 reply; 3+ messages in thread
From: Andi Kleen @ 2008-07-24 20:07 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: Andi Kleen, Greg KH, linux-kernel
On Thu, Jul 24, 2008 at 05:51:22AM -0600, Matthew Wilcox wrote:
>
> I have no idea how you guys intended this to work, but here's the
> debugging work I've done so far.
>
> [ 89.210171] Call Trace:
> [ 89.210182] [<c011c0b3>] ? sched_mc_power_savings_store+0x0/0x4a
> [ 89.210198] [<c02908c0>] ? sysdev_class_store+0x38/0x40
> [ 89.210213] [<c01a0b51>] ? sysfs_write_file+0xb9/0xe4
>
> sched_mc_power_savings_store isn't a class attribute, it's a plain
> attribute. So the prototypes are different. This is why we try to load
> from address 2 -- it's actually the length parameter.
>
> I don't know how our typing system let this one through. I don't know if
> you want to fix this by adding an extra argument to the class_attribute
> show and store methods. I don't know if sched_mc_power_savings_store
> was intended to be a class attribute or not.
Seems like a latent problem. The attributes were just declared wrong.
Longer term we should probably add the sysdev attributes to the class
too, but right now here's a minimal fix. Does it solve your problem?
Thanks,
-Andi
---
commit a2ab909933f8c8623282979dfa64f3e358bdb9fc
Author: Andi Kleen <ak@linux.intel.com>
Date: Thu Jul 24 21:57:40 2008 +0200
Make scheduler sysfs attributes sysdev class devices
They are really class devices, but were incorrectly declared. This leads
to crashes with the recent changes that makes non normal sysdevs
use a different prototype.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
diff --git a/kernel/sched.c b/kernel/sched.c
index 6acf749..24358ca 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -7641,34 +7641,34 @@ static ssize_t sched_power_savings_store(const char *buf, size_t count, int smt)
}
#ifdef CONFIG_SCHED_MC
-static ssize_t sched_mc_power_savings_show(struct sys_device *dev,
- struct sysdev_attribute *attr, char *page)
+static ssize_t sched_mc_power_savings_show(struct sysdev_class *class,
+ char *page)
{
return sprintf(page, "%u\n", sched_mc_power_savings);
}
-static ssize_t sched_mc_power_savings_store(struct sys_device *dev,
- struct sysdev_attribute *attr,
+static ssize_t sched_mc_power_savings_store(struct sysdev_class *class,
const char *buf, size_t count)
{
return sched_power_savings_store(buf, count, 0);
}
-static SYSDEV_ATTR(sched_mc_power_savings, 0644, sched_mc_power_savings_show,
- sched_mc_power_savings_store);
+static SYSDEV_CLASS_ATTR(sched_mc_power_savings, 0644,
+ sched_mc_power_savings_show,
+ sched_mc_power_savings_store);
#endif
#ifdef CONFIG_SCHED_SMT
-static ssize_t sched_smt_power_savings_show(struct sys_device *dev,
- struct sysdev_attribute *attr, char *page)
+static ssize_t sched_smt_power_savings_show(struct sysdev_class *dev,
+ char *page)
{
return sprintf(page, "%u\n", sched_smt_power_savings);
}
-static ssize_t sched_smt_power_savings_store(struct sys_device *dev,
- struct sysdev_attribute *attr,
+static ssize_t sched_smt_power_savings_store(struct sysdev_class *dev,
const char *buf, size_t count)
{
return sched_power_savings_store(buf, count, 1);
}
-static SYSDEV_ATTR(sched_smt_power_savings, 0644, sched_smt_power_savings_show,
+static SYSDEV_CLASS_ATTR(sched_smt_power_savings, 0644,
+ sched_smt_power_savings_show,
sched_smt_power_savings_store);
#endif
^ permalink raw reply related [flat|nested] 3+ messages in thread