redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

regulator: push allocation in set_consumer_device_supply() out of lock 

Pull regulator_list_mutex into set_consumer_device_supply() and keep
allocations outside of it. Fourth of the fs_reclaim deadlock case.

Fixes: 45389c4752 ("regulator: core: Add early supply resolution for regulators")
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/f0380bdb3d60aeefa9693c4e234d2dcda7e56747.1597195321.git.mirq-linux@rere.qmqm.pl
Signed-off-by: Mark Brown <broonie@kernel.org>
zero-sugar-mainline-defconfig
Michał Mirosław 2020-08-12 03:31:36 +02:00 committed by Mark Brown
parent 87fe29b61f
commit 5c06540165
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/regulator/core.c
View File

@ -1461,7 +1461,7 @@ static int set_consumer_device_supply(struct regulator_dev *rdev,
const char *consumer_dev_name, const char *consumer_dev_name,
const char *supply) const char *supply)
{ {
struct regulator_map *node; struct regulator_map *node, *new_node;
int has_dev; int has_dev;
if (supply == NULL) if (supply == NULL)
@ -1472,6 +1472,22 @@ static int set_consumer_device_supply(struct regulator_dev *rdev,
else else
has_dev = 0; has_dev = 0;
new_node = kzalloc(sizeof(struct regulator_map), GFP_KERNEL);
if (new_node == NULL)
return -ENOMEM;
new_node->regulator = rdev;
new_node->supply = supply;
if (has_dev) {
new_node->dev_name = kstrdup(consumer_dev_name, GFP_KERNEL);
if (new_node->dev_name == NULL) {
kfree(new_node);
return -ENOMEM;
}
}
mutex_lock(&regulator_list_mutex);
list_for_each_entry(node, &regulator_map_list, list) { list_for_each_entry(node, &regulator_map_list, list) {
if (node->dev_name && consumer_dev_name) { if (node->dev_name && consumer_dev_name) {
if (strcmp(node->dev_name, consumer_dev_name) != 0) if (strcmp(node->dev_name, consumer_dev_name) != 0)
@ -1489,26 +1505,19 @@ static int set_consumer_device_supply(struct regulator_dev *rdev,
node->regulator->desc->name, node->regulator->desc->name,
supply, supply,
dev_name(&rdev->dev), rdev_get_name(rdev)); dev_name(&rdev->dev), rdev_get_name(rdev));
return -EBUSY; goto fail;
} }
node = kzalloc(sizeof(struct regulator_map), GFP_KERNEL); list_add(&new_node->list, &regulator_map_list);
if (node == NULL) mutex_unlock(&regulator_list_mutex);
return -ENOMEM;
node->regulator = rdev;
node->supply = supply;
if (has_dev) {
node->dev_name = kstrdup(consumer_dev_name, GFP_KERNEL);
if (node->dev_name == NULL) {
kfree(node);
return -ENOMEM;
}
}
list_add(&node->list, &regulator_map_list);
return 0; return 0;
fail:
mutex_unlock(&regulator_list_mutex);
kfree(new_node->dev_name);
kfree(new_node);
return -EBUSY;
} }
static void unset_regulator_supplies(struct regulator_dev *rdev) static void unset_regulator_supplies(struct regulator_dev *rdev)
@ -5269,19 +5278,16 @@ regulator_register(const struct regulator_desc *regulator_desc,
/* add consumers devices */ /* add consumers devices */
if (init_data) { if (init_data) {
mutex_lock(&regulator_list_mutex);
for (i = 0; i < init_data->num_consumer_supplies; i++) { for (i = 0; i < init_data->num_consumer_supplies; i++) {
ret = set_consumer_device_supply(rdev, ret = set_consumer_device_supply(rdev,
init_data->consumer_supplies[i].dev_name, init_data->consumer_supplies[i].dev_name,
init_data->consumer_supplies[i].supply); init_data->consumer_supplies[i].supply);
if (ret < 0) { if (ret < 0) {
mutex_unlock(&regulator_list_mutex);
dev_err(dev, "Failed to set supply %s\n", dev_err(dev, "Failed to set supply %s\n",
init_data->consumer_supplies[i].supply); init_data->consumer_supplies[i].supply);
goto unset_supplies; goto unset_supplies;
} }
} }
mutex_unlock(&regulator_list_mutex);
} }
if (!rdev->desc->ops->get_voltage && if (!rdev->desc->ops->get_voltage &&