Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dca: redesign locks to fix deadlocks

Browse source 
Change spin_locks to irqsave to prevent dead-locks.
Protect adding and deleting to/from dca_providers list.
Drop the lock during dca_sysfs_add_req() and dca_sysfs_remove_req() calls
as they might sleep (use GFP_KERNEL allocation).

Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Maciej Sosnowski 2009-02-02 23:26:57 -08:00 committed by David S. Miller
parent ff01b91636
commit eb4400e3a0
1 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
drivers/dca/dca-core.c
View file

@ -28,7 +28,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/dca.h> #include <linux/dca.h>
#define DCA_VERSION "1.4" #define DCA_VERSION "1.8"
MODULE_VERSION(DCA_VERSION); MODULE_VERSION(DCA_VERSION);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
@ -60,16 +60,17 @@ int dca_add_requester(struct device *dev)
{ {
struct dca_provider *dca; struct dca_provider *dca;
int err, slot = -ENODEV; int err, slot = -ENODEV;
unsigned long flags;
if (!dev) if (!dev)
return -EFAULT; return -EFAULT;
spin_lock(&dca_lock); spin_lock_irqsave(&dca_lock, flags);
/* check if the requester has not been added already */ /* check if the requester has not been added already */
dca = dca_find_provider_by_dev(dev); dca = dca_find_provider_by_dev(dev);
if (dca) { if (dca) {
spin_unlock(&dca_lock); spin_unlock_irqrestore(&dca_lock, flags);
return -EEXIST; return -EEXIST;
} }
@ -78,19 +79,21 @@ int dca_add_requester(struct device *dev)
if (slot >= 0) if (slot >= 0)
break; break;
} }
if (slot < 0) {
spin_unlock(&dca_lock); spin_unlock_irqrestore(&dca_lock, flags);
if (slot < 0)
return slot; return slot;
}
err = dca_sysfs_add_req(dca, dev, slot); err = dca_sysfs_add_req(dca, dev, slot);
if (err) { if (err) {
dca->ops->remove_requester(dca, dev); spin_lock_irqsave(&dca_lock, flags);
spin_unlock(&dca_lock); if (dca == dca_find_provider_by_dev(dev))
dca->ops->remove_requester(dca, dev);
spin_unlock_irqrestore(&dca_lock, flags);
return err; return err;
} }
spin_unlock(&dca_lock);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(dca_add_requester); EXPORT_SYMBOL_GPL(dca_add_requester);
@ -103,25 +106,25 @@ int dca_remove_requester(struct device *dev)
{ {
struct dca_provider *dca; struct dca_provider *dca;
int slot; int slot;
unsigned long flags;
if (!dev) if (!dev)
return -EFAULT; return -EFAULT;
spin_lock(&dca_lock); spin_lock_irqsave(&dca_lock, flags);
dca = dca_find_provider_by_dev(dev); dca = dca_find_provider_by_dev(dev);
if (!dca) { if (!dca) {
spin_unlock(&dca_lock); spin_unlock_irqrestore(&dca_lock, flags);
return -ENODEV; return -ENODEV;
} }
slot = dca->ops->remove_requester(dca, dev); slot = dca->ops->remove_requester(dca, dev);
if (slot < 0) { spin_unlock_irqrestore(&dca_lock, flags);
spin_unlock(&dca_lock);
if (slot < 0)
return slot; return slot;
}
dca_sysfs_remove_req(dca, slot); dca_sysfs_remove_req(dca, slot);
spin_unlock(&dca_lock);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(dca_remove_requester); EXPORT_SYMBOL_GPL(dca_remove_requester);
@ -135,17 +138,18 @@ u8 dca_common_get_tag(struct device *dev, int cpu)
{ {
struct dca_provider *dca; struct dca_provider *dca;
u8 tag; u8 tag;
unsigned long flags;
spin_lock(&dca_lock); spin_lock_irqsave(&dca_lock, flags);
dca = dca_find_provider_by_dev(dev); dca = dca_find_provider_by_dev(dev);
if (!dca) { if (!dca) {
spin_unlock(&dca_lock); spin_unlock_irqrestore(&dca_lock, flags);
return -ENODEV; return -ENODEV;
} }
tag = dca->ops->get_tag(dca, dev, cpu); tag = dca->ops->get_tag(dca, dev, cpu);
spin_unlock(&dca_lock); spin_unlock_irqrestore(&dca_lock, flags);
return tag; return tag;
} }
@ -217,11 +221,16 @@ static BLOCKING_NOTIFIER_HEAD(dca_provider_chain);
int register_dca_provider(struct dca_provider *dca, struct device *dev) int register_dca_provider(struct dca_provider *dca, struct device *dev)
{ {
int err; int err;
unsigned long flags;
err = dca_sysfs_add_provider(dca, dev); err = dca_sysfs_add_provider(dca, dev);
if (err) if (err)
return err; return err;
spin_lock_irqsave(&dca_lock, flags);
list_add(&dca->node, &dca_providers); list_add(&dca->node, &dca_providers);
spin_unlock_irqrestore(&dca_lock, flags);
blocking_notifier_call_chain(&dca_provider_chain, blocking_notifier_call_chain(&dca_provider_chain,
DCA_PROVIDER_ADD, NULL); DCA_PROVIDER_ADD, NULL);
return 0; return 0;
@ -234,9 +243,15 @@ EXPORT_SYMBOL_GPL(register_dca_provider);
*/ */
void unregister_dca_provider(struct dca_provider *dca) void unregister_dca_provider(struct dca_provider *dca)
{ {
unsigned long flags;
blocking_notifier_call_chain(&dca_provider_chain, blocking_notifier_call_chain(&dca_provider_chain,
DCA_PROVIDER_REMOVE, NULL); DCA_PROVIDER_REMOVE, NULL);
spin_lock_irqsave(&dca_lock, flags);
list_del(&dca->node); list_del(&dca->node);
spin_unlock_irqrestore(&dca_lock, flags);
dca_sysfs_remove_provider(dca); dca_sysfs_remove_provider(dca);
} }
EXPORT_SYMBOL_GPL(unregister_dca_provider); EXPORT_SYMBOL_GPL(unregister_dca_provider);