Skip to content

Commit beb3c23

Browse files
xairyakpm00
authored andcommitted
lib/stackdepot: annotate racy pool_index accesses
Accesses to pool_index are protected by pool_lock everywhere except in a sanity check in stack_depot_fetch. The read access there can race with the write access in depot_alloc_stack. Use WRITE/READ_ONCE() to annotate the racy accesses. As the sanity check is only used to print a warning in case of a violation of the stack depot interface usage, it does not make a lot of sense to use proper synchronization. [[email protected]: s/pool_index/pool_index_cached/ in stack_depot_fetch()] Link: https://lkml.kernel.org/r/95cf53f0da2c112aa2cc54456cbcd6975c3ff343.1676129911.git.andreyknvl@google.com Link: https://lkml.kernel.org/r/359ac9c13cd0869c56740fb2029f505e41593830.1676063693.git.andreyknvl@google.com Signed-off-by: Andrey Konovalov <[email protected]> Reviewed-by: Alexander Potapenko <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 36aa1e6 commit beb3c23

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

lib/stackdepot.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,12 @@ depot_alloc_stack(unsigned long *entries, int size, u32 hash, void **prealloc)
278278
return NULL;
279279
}
280280

281-
/* Move on to the next pool. */
282-
pool_index++;
281+
/*
282+
* Move on to the next pool.
283+
* WRITE_ONCE pairs with potential concurrent read in
284+
* stack_depot_fetch().
285+
*/
286+
WRITE_ONCE(pool_index, pool_index + 1);
283287
pool_offset = 0;
284288
/*
285289
* If the maximum number of pools is not reached, take note
@@ -502,6 +506,11 @@ unsigned int stack_depot_fetch(depot_stack_handle_t handle,
502506
unsigned long **entries)
503507
{
504508
union handle_parts parts = { .handle = handle };
509+
/*
510+
* READ_ONCE pairs with potential concurrent write in
511+
* depot_alloc_stack.
512+
*/
513+
int pool_index_cached = READ_ONCE(pool_index);
505514
void *pool;
506515
size_t offset = parts.offset << DEPOT_STACK_ALIGN;
507516
struct stack_record *stack;
@@ -510,9 +519,9 @@ unsigned int stack_depot_fetch(depot_stack_handle_t handle,
510519
if (!handle)
511520
return 0;
512521

513-
if (parts.pool_index > pool_index) {
522+
if (parts.pool_index > pool_index_cached) {
514523
WARN(1, "pool index %d out of bounds (%d) for stack id %08x\n",
515-
parts.pool_index, pool_index, handle);
524+
parts.pool_index, pool_index_cached, handle);
516525
return 0;
517526
}
518527
pool = stack_pools[parts.pool_index];

0 commit comments

Comments
 (0)