diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2025-03-06 09:46:34 +0100 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2025-03-20 10:33:38 +0100 |
| commit | dea2d9221e83ea02b45a60ab88284cd3bb4bb2a4 (patch) | |
| tree | 0391b6707ca2cd787f5937f285eb715375bda3c1 /kernel/rcu/tree.c | |
| parent | slub: Handle freelist cycle in on_freelist() (diff) | |
| parent | slab: don't batch kvfree_rcu() with SLUB_TINY (diff) | |
| download | linux-dea2d9221e83ea02b45a60ab88284cd3bb4bb2a4.tar.gz linux-dea2d9221e83ea02b45a60ab88284cd3bb4bb2a4.zip | |
Merge branch 'slab/for-6.15/kfree_rcu_tiny' into slab/for-next
Merge the slab feature branch kfree_rcu_tiny for 6.15:
- Move the TINY_RCU kvfree_rcu() implementation from RCU to SLAB
subsystem and cleanup its integration.
Diffstat (limited to 'kernel/rcu/tree.c')
| -rw-r--r-- | kernel/rcu/tree.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 475f31deed14..5dbc4189037c 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -2931,13 +2931,8 @@ static int __init rcu_spawn_core_kthreads(void) static void rcutree_enqueue(struct rcu_data *rdp, struct rcu_head *head, rcu_callback_t func) { rcu_segcblist_enqueue(&rdp->cblist, head); - if (__is_kvfree_rcu_offset((unsigned long)func)) - trace_rcu_kvfree_callback(rcu_state.name, head, - (unsigned long)func, - rcu_segcblist_n_cbs(&rdp->cblist)); - else - trace_rcu_callback(rcu_state.name, head, - rcu_segcblist_n_cbs(&rdp->cblist)); + trace_rcu_callback(rcu_state.name, head, + rcu_segcblist_n_cbs(&rdp->cblist)); trace_rcu_segcb_stats(&rdp->cblist, TPS("SegCBQueued")); } |