regcache: Avoid accessing non-initialised cache
Subsystems (2)
v3 cover regcache: Avoid accessing non-initialised cache
Refactor regcache flow that populates cache on initialisation phase based on the values in HW. This makes code robust against any possible accesses to not-fully initialised caches.
Changelog v3:
- dropped unneeded churn in patch 3 (Mark)
- fixed code to pass kunit test cases (Mark)
Changelog v2:
- rebased on top of the latest regmap changes (Mark)
- added two more little cleanups (patches 4 & 5)
Andy Shevchenko (3):
regcache: Move HW readback after cache initialisation
regcache: Define iterator inside for-loop and align their types
regcache: Amend printf() specifiers when printing registers
drivers/base/regmap/internal.h | 2 +- drivers/base/regmap/regcache.c | 42 ++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 18 deletions(-)
Signature · 1 line
2.50.1
PATCH v3 1/3 regcache: Move HW readback after cache initialisation
Make sure that cache is initialised before calling any IO using regmap, this makes sure that we won't access NULL or invalid pointers in the cache which hasn't been initialised.
--- drivers/base/regmap/regcache.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/base/regmap/regcache.c +17 -8
@@ -67,6 +67,14 @@ static int regcache_hw_init(struct regmap *map, int count)unsigned int reg, val;void *tmp_buf; +/* +* When num_reg_defaults_raw is unset, it means there is nothing +* to read back from HW to set up defaults in the cache, so skip +* this phase without an error code returned. +*/ +if (!map->num_reg_defaults_raw) +return 0 ; + map->num_reg_defaults = count; map->reg_defaults = kmalloc_objs(struct reg_default, count);if (!map->reg_defaults)
@@ -202,14 +210,6 @@ int regcache_init(struct regmap *map, const struct regmap_config *config) count =regcache_count_cacheable_registers (map);if (map->cache_bypass)return 0 ; - -/* Some devices such as PMICs don't have cache defaults, -* we cope with this by reading back the HW registers and -* crafting the cache defaults by hand. -*/ - ret =regcache_hw_init (map, count); -if (ret <0 ) -return ret; }if (!map->max_register_is_set && map->num_reg_defaults_raw) {
@@ -227,6 +227,15 @@ int regcache_init(struct regmap *map, const struct regmap_config *config) goto err_free; } +/* +* Some devices such as PMICs don't have cache defaults, +* we cope with this by reading back the HW registers and +* crafting the cache defaults by hand. +*/ + ret =regcache_hw_init (map, count); +if (ret) + goto err_exit; +if (map->cache_ops->populate && (map->num_reg_defaults || map->reg_default_cb)) {dev_dbg (map->dev,"Populating %s cache\n" , map->cache_ops->name);
Signature · 1 line
2.50.1
Mark Brown
maintainerRe: [PATCH v3 1/3] regcache: Move HW readback after cache initialisation
drivers/base/regmap/regcache.c int regcache_init(struct regmap *map, const struct regmap_config *config) · line 212
Quoted 8 lines · Andy Shevchenko
Make sure that cache is initialised before calling any IO using regmap, this makes sure that we won't access NULL or invalid pointers in the cache which hasn't been initialised.
drivers/base/regmap/regcache.c +0
-0@@ -202,14 +210,6 @@ int regcache_init(struct regmap *map, const struct regmap_config *config) count =regcache_count_cacheable_registers (map);if (map->cache_bypass)return 0 ;
This is in the case where num_reg_defaults_raw != 0 (and we didn't have any explicit defaults!), it's the only place where count gets set...
drivers/base/regmap/regcache.c int regcache_init(struct regmap *map, const struct regmap_config *config) · line 238
Quoted 10 lines
drivers/base/regmap/regcache.c +9
-0+/* +* Some devices such as PMICs don't have cache defaults, +* we cope with this by reading back the HW registers and +* crafting the cache defaults by hand. +*/ + ret =regcache_hw_init (map, count); +if (ret) + goto err_exit; +
...and we now pass count off to regcache_hw_init() which will attempt to allocate a zero length array and presumably faceplant if that happens. I don't *think* we should ever hit that case (at least not for a sensible regmap), but I'm having to think far too hard about the whole thing to convince myself it's safe. I think we should keep the counting of registers to allocate and the decision to call regcache_hw_init() more joined up.
Re: [PATCH v3 1/3] regcache: Move HW readback after cache initialisation
Quoted 4 lines · Mark Brown
Quoted 3 lines · Andy Shevchenko
Make sure that cache is initialised before calling any IO using regmap, this makes sure that we won't access NULL or invalid pointers in the cache which hasn't been initialised.
...
Quoted 7 lines
drivers/base/regmap/regcache.c int regcache_init(struct regmap *map, const struct regmap_config *config) · line 212
Quoted 4 lines
drivers/base/regmap/regcache.c +0
-0@@ -202,14 +210,6 @@ int regcache_init(struct regmap *map, const struct regmap_config *config) count =regcache_count_cacheable_registers (map);if (map->cache_bypass)return 0 ;This is in the case where
num_reg_defaults_raw!= 0 (and we didn't have any explicit defaults!), it's the only place where count gets set...
Actually the check in the regmap_hw_init() should be done against count, indeed.
Quoted 9 lines
drivers/base/regmap/regcache.c int regcache_init(struct regmap *map, const struct regmap_config *config) · line 237
Quoted 8 lines
drivers/base/regmap/regcache.c +8
-0+/* +* Some devices such as PMICs don't have cache defaults, +* we cope with this by reading back the HW registers and +* crafting the cache defaults by hand. +*/ + ret =regcache_hw_init (map, count); +if (ret) + goto err_exit;
Quoted 7 lines
...and we now pass count off to
regcache_hw_init()which will attempt to allocate a zero length array and presumably faceplant if that happens. I don't *think* we should ever hit that case (at least not for a sensible regmap), but I'm having to think far too hard about the whole thing to convince myself it's safe. I think we should keep the counting of registers to allocate and the decision to callregcache_hw_init()more joined up.
Is it possible to allocate something, then count, then reallocate in the existing caches and in the potential future ones?
I think it's the patter that we first count the size of the allocation, do the allocation, and only then fill up the allocated area with data.
Otherwise we came back to the chicken-egg issue this patch tries to solve.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Mark Brown
maintainerRe: [PATCH v3 1/3] regcache: Move HW readback after cache initialisation
Quoted 7 lines · Andy Shevchenko
Is it possible to allocate something, then count, then reallocate in the existing caches and in the potential future ones?
I think it's the patter that we first count the size of the allocation, do the allocation, and only then fill up the allocated area with data.
Otherwise we came back to the chicken-egg issue this patch tries to solve.
The main worry there would be transiently consuming huge amounts of memory if there's a very sparse regsiter map, though we'd also be burning lots of CPU time checking all those registers so perhaps it's not a real concern, and the whole thing is kind of an edge case anyway. Though now I look again we are careful to bypass the cache during the hw_init() so we should be safe anyway I think.
Re: [PATCH v3 1/3] regcache: Move HW readback after cache initialisation
Quoted 8 lines · Mark Brown
Quoted 5 lines · Andy Shevchenko
Is it possible to allocate something, then count, then reallocate in the existing caches and in the potential future ones?
I think it's the patter that we first count the size of the allocation, do the allocation, and only then fill up the allocated area with data.
Quoted 8 lines
Quoted 1 line
Otherwise we came back to the chicken-egg issue this patch tries to solve.
The main worry there would be transiently consuming huge amounts of memory if there's a very sparse regsiter map, though we'd also be burning lots of CPU time checking all those registers so perhaps it's not a real concern, and the whole thing is kind of an edge case anyway. Though now I look again we are careful to bypass the cache during the
hw_init()so we should be safe anyway I think.
Yes, but amending check to be against 'count' needs to be done for clarity. 'count' represent the amount of cacheable registers, it is independent number on how sparse the map is.
I will send a v4 shortly with the above amendment.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH v3 2/3 regcache: Define iterator inside for-loop and align their types
In reply to Andy ShevchenkoSome of the iterators may be defined inside the respective for-loop reducing the scope and potential risk of their misuse. While at it, align their types based on the type of the upper or lower limits.
--- drivers/base/regmap/internal.h | 2 +- drivers/base/regmap/regcache.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-)
drivers/base/regmap/internal.h +1 -1
@@ -162,7 +162,7 @@ struct regmap {bool no_sync_defaults;struct reg_sequence *patch; -int patch_regs; +unsigned int patch_regs;/* if set, the regmap core can sleep */ bool can_sleep;
drivers/base/regmap/regcache.c +6 -7
@@ -44,11 +44,11 @@ EXPORT_SYMBOL_GPL(regcache_sort_defaults);static int regcache_count_cacheable_registers (struct regmap *map) { -int count; -int i; +unsigned int count;/* calculate the size of reg_defaults */ -for (count =0 , i =0 ; i < map->num_reg_defaults_raw; i++) + count =0 ; +for (unsigned int i =0 ; i < map->num_reg_defaults_raw; i++)if (regmap_readable (map, i * map->reg_stride) && !regmap_volatile (map, i * map->reg_stride)) count++;
@@ -62,7 +62,6 @@ static int regcache_count_cacheable_registers(struct regmap *map)static int regcache_hw_init (struct regmap *map,int count) { -int i, j;int ret;unsigned int reg, val;void *tmp_buf;
@@ -103,7 +102,7 @@ static int regcache_hw_init(struct regmap *map, int count) }/* fill the reg_defaults */ -for (i =0 , j =0 ; i < map->num_reg_defaults_raw; i++) { +for (unsigned int i =0 , j =0 ; i < map->num_reg_defaults_raw; i++) { reg = i * map->reg_stride;if (!regmap_readable (map, reg))
@@ -849,13 +848,13 @@ static int regcache_sync_block_raw(struct regmap *map, void *block, unsigned int block_base, unsigned int start, unsigned int end) { - unsigned int i, val; unsigned int regtmp = 0;unsigned int base =0 ;const void *data =NULL ; +unsigned int val;int ret; -for (i = start; i < end; i++) { +for (unsigned int i = start; i < end; i++) { regtmp = block_base + (i * map->reg_stride); if (!regcache_reg_present(cache_present, i) ||
Signature · 1 line
2.50.1
PATCH v3 3/3 regcache: Amend printf() specifiers when printing registers
In reply to Andy ShevchenkoIn one case the 0x is provided in the formatting string, while the rest use # for that.
In a couple of more cases a decimal signed value specifier is used.
Amend them to use %#x when register is printed. Note, for the case, when it's related to the read/write, use %x to be in align with the similar messages in regmap core.
--- drivers/base/regmap/regcache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/regmap/regcache.c +2 -2
@@ -120,7 +120,7 @@ static int regcache_hw_init(struct regmap *map, int count) ret =regmap_read (map, reg, &val); map->cache_bypass = cache_bypass;if (ret !=0 ) { -dev_err (map->dev,"Failed to read %d: %d\n" , +dev_err (map->dev,"Failed to read %x: %d\n" , reg, ret); goto err_free; }
@@ -517,7 +517,7 @@ int regcache_sync_region(struct regmap *map, unsigned int min, bypass = map->cache_bypass; name = map->cache_ops->name; -dev_dbg (map->dev,"Syncing %s cache from %d-%d\n" , name, min, max); +dev_dbg (map->dev,"Syncing %s cache from %#x-%#x\n" , name, min, max);trace_regcache_sync (map, name,"start region" );
Signature · 1 line
2.50.1
Mark Brown
maintainerQuoted 9 lines · Andy Shevchenko
Refactor regcache flow that populates cache on initialisation phase based on the values in HW. This makes code robust against any possible accesses to not-fully initialised caches.
Changelog v3:
- dropped unneeded churn in patch 3 (Mark)
- fixed code to pass kunit test cases (Mark)[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git for-next
Thanks!
[1/3] regcache: Move HW readback after cache initialisation
(no commit info)
[2/3] regcache: Define iterator inside for-loop and align their types
commit: 8e29bc88e11928926fd97fc9acd58b8afa38de9d
[3/3] regcache: Amend printf() specifiers when printing registers
commit: 9ab637ac5d3826606947f4e861107da958eda324All 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