> >>> static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
> >>>@@ -112,17 +110,18 @@ static int __cpuinit topology_cpu_callba
> >>> {
> >>> unsigned int cpu = (unsigned long)hcpu;
> >>> struct sys_device *sys_dev;
> >>>+ int rc = 0;
> >>> sys_dev = get_cpu_sysdev(cpu);
> >>> switch (action) {
> >>> case CPU_ONLINE:
> >>>- topology_add_dev(sys_dev);
> >>>+ rc = topology_add_dev(sys_dev);
> >>> break;
> >>> case CPU_DEAD:
> >>> topology_remove_dev(sys_dev);
> >>> break;
> >>> }
> >>>- return NOTIFY_OK;
> >>>+ return rc ? NOTIFY_BAD : NOTIFY_OK;
> >>> }
> >>Wouldn't that also require that _cpu_up checked the return code when
> >>doing CPU_ONLINE notification (and clean up on error)?
> >After all code that gets a CPU_ONLINE notification is not supposed to fail.
> >For allocating resources while bringing up a cpu CPU_UP_PREPARE is supposed
> >to be used. That one is allowed to fail.
>
> It's a bug no matter how you look at it... I just lessen the impact. :)
>
> If someone wants to provide a better fix, let's see the patch...
If sysfs_remove_group() would also work for non-created (-existent) groups
then the patch below would work. Unfortunately that is not the case. So one
would have to remember if sysfs_create_group() was done and succeeded before
calling sysfs_remove_group()...
There must be an easier way.
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 3ef9d51..d0056c3 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -97,8 +97,7 @@ static struct attribute_group topology_a
/* Add/Remove cpu_topology interface for CPU device */
static int __cpuinit topology_add_dev(struct sys_device * sys_dev)
{
- sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
- return 0;
+ return sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
}
static int __cpuinit topology_remove_dev(struct sys_device * sys_dev)
@@ -112,12 +111,16 @@ static int __cpuinit topology_cpu_callba
{
unsigned int cpu = (unsigned long)hcpu;
struct sys_device *sys_dev;
+ int rc;
sys_dev = get_cpu_sysdev(cpu);
switch (action) {
- case CPU_ONLINE:
- topology_add_dev(sys_dev);
+ case CPU_UP_PREPARE:
+ rc = topology_add_dev(sys_dev);
+ if (rc)
+ return NOTIFY_BAD;
break;
+ case CPU_UP_CANCELED:
case CPU_DEAD:
topology_remove_dev(sys_dev);
break;
@@ -132,11 +135,15 @@ static struct notifier_block __cpuinitda
static int __cpuinit topology_sysfs_init(void)
{
- int i;
-
- for_each_online_cpu(i) {
- topology_cpu_callback(&topology_cpu_notifier, CPU_ONLINE,
- (void *)(long)i);
+ struct sys_device *sys_dev;
+ int cpu;
+ int rc;
+
+ for_each_online_cpu(cpu) {
+ sys_dev = get_cpu_sysdev(cpu);
+ rc = topology_add_dev(sys_dev);
+ if (rc)
+ return rc;
}
register_hotcpu_notifier(&topology_cpu_notifier);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
