regulator: Fix lockdep warning resolving supplies
Mark Brown
maintainerPATCH 1/1 regulator: Fix lockdep warning resolving supplies
With commit eaa7995c529b54 (regulator: core: avoid regulator_resolve_supply() race condition) we started holding the rdev lock while resolving supplies, an operation that requires holding the regulator_list_mutex. This results in lockdep warnings since in other places we take the list mutex then the mutex on an individual rdev.
Since the goal is to make sure that we don't call set_supply() twice rather than a concern about the cost of resolution pull the rdev lock and check for duplicate resolution down to immediately before we do the set_supply() and drop it again once the allocation is done.
--- drivers/regulator/core.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
drivers/regulator/core.c +17 -12
@@ -1823,17 +1823,6 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)if (rdev->supply)return 0 ; -/* -* Recheck rdev->supply with rdev->mutex lock held to avoid a race -* between rdev->supply null check and setting rdev->supply in -* set_supply() from concurrent tasks. -*/ -regulator_lock (rdev); - -/* Supply just resolved by a concurrent task? */ -if (rdev->supply) - goto out; - r =regulator_dev_lookup (dev, rdev->supply_name);if (IS_ERR (r)) { ret =PTR_ERR (r);
@@ -1885,12 +1874,29 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) goto out; } +/* +* Recheck rdev->supply with rdev->mutex lock held to avoid a race +* between rdev->supply null check and setting rdev->supply in +* set_supply() from concurrent tasks. +*/ +regulator_lock (rdev); + +/* Supply just resolved by a concurrent task? */ +if (rdev->supply) { +regulator_unlock (rdev); +put_device (&r->dev); + goto out; + } + ret =set_supply (rdev, r);if (ret <0 ) { +regulator_unlock (rdev);put_device (&r->dev); goto out; } +regulator_unlock (rdev); +/* * In set_machine_constraints() we may have turned this regulator on * but we couldn't propagate to the supply if it hadn't been resolved
@@ -1906,7 +1912,6 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) } out: -regulator_unlock (rdev);return ret; }
Signature · 1 line
2.20.1
Mark Brown
maintainerQuoted 10 lines · Mark Brown
With commit
eaa7995c529b54(regulator: core: avoidregulator_resolve_supply()race condition) we started holding the rdev lock while resolving supplies, an operation that requires holding theregulator_list_mutex. This results in lockdep warnings since in other places we take the list mutex then the mutex on an individual rdev.Since the goal is to make sure that we don't call
set_supply()twice rather than a concern about the cost of resolution pull the rdev lock and check for duplicate resolution down to immediately before we do theset_supply()and drop it again once the allocation is done.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next
Thanks!
[1/1] regulator: Fix lockdep warning resolving supplies
commit: 14a71d509ac809dcf56d7e3ca376b15d17bd0ddd
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark