Skip to contentSkip to conversation

pkgtemp: double lock

DISCUSSION Jiri Slaby 2 participants 2 messages Sep 4, 2010 Hardware monitoring

lore
Share & tools
lore

Jiri Slaby

author
#0 lore raw

Hi,

stanse found that you double lock pdev_list_mutex:
-> pkgtemp_device_remove

    -> mutex_lock(&pdev_list_mutex);
    -> pkgtemp_device_add
      -> mutex_lock(&pdev_list_mutex);

Could you fix that?

regards,

Signature · 1 line
js
#1 lore raw
Quoted 4 lines · Jiri Slaby

Hi,

stanse found that you double lock pdev_list_mutex:
-> pkgtemp_device_remove

Quoted 9 lines
    -> mutex_lock(&pdev_list_mutex);
    -> pkgtemp_device_add
      -> mutex_lock(&pdev_list_mutex);

Could you fix that?

regards,

Signature · 1 line
js

I have already sent a patch to lkml to fix the issue. It's not in upstream yet. I'll will push it to Linus.

Quoted 1 line

From [email protected] Wed Aug 18 16:03:04 2010

From: Fenghua Yu <[email protected]>

When a sibling is added to dev_list after a cpu is hot-removed, pdev_list_m= utex
has been locked already. But pkgtemp_device_add() tries to lock pdev_list_m= utex
again. This is incorrect. The patch fixes this issue.

The patch also removes __cpuinit for pkgtemp_device_add() to avoid section mismatch warning.

---
 drivers/hwmon/pkgtemp.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
drivers/hwmon/pkgtemp.c +0 -0
index 74157fc..928a016 100644
@@ -276,7 +276,7 @@ struct pdev_entry {
 static LIST_HEAD(pdev_list);
 static DEFINE_MUTEX(pdev_list_mutex);

=20
-static int __cpuinit pkgtemp_device_add(unsigned int cpu) +static int pkgtemp_device_add(unsigned int cpu)
{
int err;
struct platform_device *pdev;
@@ -341,26 +341,34 @@ static void pkgtemp_device_remove(unsigned int cpu)
{
struct pdev_entry *p, *n;
unsigned int i;
- int err;
=20
- mutex_lock(&pdev_list_mutex);
list_for_each_entry_safe(p, n, &pdev_list, list) {
if (p->cpu !=3D cpu)
continue;
=20
+ mutex_lock(&pdev_list_mutex);
platform_device_unregister(p->pdev); list_del(&p->list);
kfree(p);
+ mutex_unlock(&pdev_list_mutex);
+ /*
+ * Select one of removed cpu's siblings to represent sensor
+ * for this package.
+ * If there is no more running sibling in a package, the
+ * package sensor for this package is not available to user
+ * space any more.
+ */
for_each_cpu(i, cpu_core_mask(cpu)) {
+ int err;
+
if (i !=3D cpu) {
err =3D pkgtemp_device_add(i); if (!err)
break;
}
}
- break;
+ return;
}
- mutex_unlock(&pdev_list_mutex);
}
=20
static int __cpuinit pkgtemp_cpu_callback(struct notifier_block *nfb,
--=20
1.6.0.3