Skip to content

Commit adfe1b5

Browse files
leitaoNipaLocal
authored and
NipaLocal
committed
rhashtable: Fix potential deadlock by moving schedule_work outside lock
Move the hash table growth check and work scheduling outside the rht lock to prevent a possible circular locking dependency. The original implementation could trigger a lockdep warning due to a potential deadlock scenario involving nested locks between rhashtable bucket, rq lock, and dsq lock. By relocating the growth check and work scheduling after releasing the rth lock, we break this potential deadlock chain. This change expands the flexibility of rhashtable by removing restrictive locking that previously limited its use in scheduler and workqueue contexts. Import to say that this calls rht_grow_above_75(), which reads from struct rhashtable without holding the lock, if this is a problem, we can move the check to the lock, and schedule the workqueue after the lock. Fixes: f0e1a06 ("sched_ext: Implement BPF extensible scheduler class") Suggested-by: Tejun Heo <[email protected]> Signed-off-by: Breno Leitao <[email protected]> Signed-off-by: NipaLocal <nipa@local>
1 parent acdc6fd commit adfe1b5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/rhashtable.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -585,9 +585,6 @@ static struct bucket_table *rhashtable_insert_one(
585585
rht_assign_locked(bkt, obj);
586586

587587
atomic_inc(&ht->nelems);
588-
if (rht_grow_above_75(ht, tbl))
589-
schedule_work(&ht->run_work);
590-
591588
return NULL;
592589
}
593590

@@ -624,6 +621,9 @@ static void *rhashtable_try_insert(struct rhashtable *ht, const void *key,
624621
data = ERR_CAST(new_tbl);
625622

626623
rht_unlock(tbl, bkt, flags);
624+
if (rht_grow_above_75(ht, tbl))
625+
schedule_work(&ht->run_work);
626+
627627
}
628628
} while (!IS_ERR_OR_NULL(new_tbl));
629629

0 commit comments

Comments
 (0)