On Wed, Jan 20, 2021 at 08:57:57PM +0100, Sebastian Andrzej Siewior wrote: > On 2021-01-20 17:21:46 [+0100], Uladzislau Rezki (Sony) wrote: > > For a single argument we can directly request a page from a caller > > context when a "carry page block" is run out of free spots. Instead > > of hitting a slow path we can request an extra page by demand and > > proceed with a fast path. > > > > A single-argument kvfree_rcu() must be invoked in sleepable contexts, > > and that its fallback is the relatively high latency synchronize_rcu(). > > Single-argument kvfree_rcu() therefore uses GFP_KERNEL|__GFP_RETRY_MAYFAIL > > to allow limited sleeping within the memory allocator. > > > > [ paulmck: Add add_ptr_to_bulk_krc_lock header comment per Michal Hocko. ] > > Signed-off-by: Uladzislau Rezki (Sony) <urezki@xxxxxxxxx> > > Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx> > > --- > > kernel/rcu/tree.c | 42 ++++++++++++++++++++++++++---------------- > > 1 file changed, 26 insertions(+), 16 deletions(-) > > > > diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c > > index e04e336bee42..2014fb22644d 100644 > > --- a/kernel/rcu/tree.c > > +++ b/kernel/rcu/tree.c > > @@ -3465,37 +3465,50 @@ run_page_cache_worker(struct kfree_rcu_cpu *krcp) > > } > > } > > > > +// Record ptr in a page managed by krcp, with the pre-krc_this_cpu_lock() > > +// state specified by flags. If can_alloc is true, the caller must > > +// be schedulable and not be holding any locks or mutexes that might be > > +// acquired by the memory allocator or anything that it might invoke. > > +// Returns true if ptr was successfully recorded, else the caller must > > +// use a fallback. > > The whole RCU department is getting swamped by the // comments. Can't we > have proper kernel doc and /* */ style comments like the remaining part > of the kernel? Because // comments are easier to type and take up less horizontal space. Also, this kvfree_call_rcu_add_ptr_to_bulk() function is local to kvfree_rcu(), and we don't normally docbook-ify such functions. > > static inline bool > > -kvfree_call_rcu_add_ptr_to_bulk(struct kfree_rcu_cpu *krcp, void *ptr) > > +add_ptr_to_bulk_krc_lock(struct kfree_rcu_cpu **krcp, > > + unsigned long *flags, void *ptr, bool can_alloc) > > { > > struct kvfree_rcu_bulk_data *bnode; > > int idx; > > > > - if (unlikely(!krcp->initialized)) > > + *krcp = krc_this_cpu_lock(flags); > > + if (unlikely(!(*krcp)->initialized)) > > return false; > > > > - lockdep_assert_held(&krcp->lock); > > idx = !!is_vmalloc_addr(ptr); > > > > /* Check if a new block is required. */ > > - if (!krcp->bkvhead[idx] || > > - krcp->bkvhead[idx]->nr_records == KVFREE_BULK_MAX_ENTR) { > > - bnode = get_cached_bnode(krcp); > > - /* Switch to emergency path. */ > > + if (!(*krcp)->bkvhead[idx] || > > + (*krcp)->bkvhead[idx]->nr_records == KVFREE_BULK_MAX_ENTR) { > > + bnode = get_cached_bnode(*krcp); > > + if (!bnode && can_alloc) { > > + krc_this_cpu_unlock(*krcp, *flags); > > + bnode = (struct kvfree_rcu_bulk_data *) > > There is no need for this cast. Without it, gcc version 7.5.0 says: warning: assignment makes pointer from integer without a cast > > + __get_free_page(GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN); > > + *krcp = krc_this_cpu_lock(flags); > > so if bnode is NULL you could retry get_cached_bnode() since it might > have been filled (given preemption or CPU migration changed something). > Judging from patch #3 you think that a CPU migration is a bad thing. But > why? So that the later "(*krcp)->bkvhead[idx] = bnode" assignment associates it with the correct CPU. Though now that you mention it, couldn't the following happen? o Task A on CPU 0 notices that allocation is needed, so it drops the lock disables migration, and sleeps while allocating. o Task B on CPU 0 does the same. o The two tasks wake up in some order, and the second one causes trouble at the "(*krcp)->bkvhead[idx] = bnode" assignment. Uladzislau, do we need to recheck "!(*krcp)->bkvhead[idx]" just after the migrate_enable()? Along with the KVFREE_BULK_MAX_ENTR check? Thanx, Paul