Hi Paul,
On Mon, Sep 26, 2022 at 10:42:40AM -0700, Paul E. McKenney wrote:
[..]
> > > > >> + WRITE_ONCE(rdp->lazy_len, 0);
> > > > >> + } else {
> > > > >> + rcu_cblist_flush_enqueue(&rcl, &rdp->nocb_bypass, rhp);
> > > > >> + WRITE_ONCE(rdp->lazy_len, 0);
> > > > >
> > > > > This WRITE_ONCE() can be dropped out of the "if" statement, correct?
> > > >
> > > > Yes will update.
> > >
> > > Thank you!
> > >
> > > > > If so, this could be an "if" statement with two statements in its "then"
> > > > > clause, no "else" clause, and two statements following the "if" statement.
> > > >
> > > > I don’t think we can get rid of the else part but I’ll see what it looks like.
> > >
> > > In the function header, s/rhp/rhp_in/, then:
> > >
> > > struct rcu_head *rhp = rhp_in;
> > >
> > > And then:
> > >
> > > if (lazy && rhp) {
> > > rcu_cblist_enqueue(&rdp->nocb_bypass, rhp);
> > > rhp = NULL;
> >
> > This enqueues on to the bypass list, where as if lazy && rhp, I want to queue
> > the new rhp on to the main cblist. So the pseudo code in my patch is:
> >
> > if (lazy and rhp) then
> > 1. flush bypass CBs on to main list.
> > 2. queue new CB on to main list.
>
> And the difference is here, correct? I enqueue to the bypass list,
> which is then flushed (in order) to the main list. In contrast, you
> flush the bypass list, then enqueue to the main list. Either way,
> the callback referenced by rhp ends up at the end of ->cblist.
>
> Or am I on the wrong branch of this "if" statement?
But we have to flush first, and then queue the new one. Otherwise wouldn't
the callbacks be invoked out of order? Or did I miss something?
> > else
> > 1. flush bypass CBs on to main list
> > 2. queue new CB on to bypass list.
> >
> > > }
> > > rcu_cblist_flush_enqueue(&rcl, &rdp->nocb_bypass, rhp);
> > > WRITE_ONCE(rdp->lazy_len, 0);
> > >
> > > Or did I mess something up?
> >
> > So the rcu_cblist_flush_enqueue() has to happen before the
> > rcu_cblist_enqueue() to preserve the ordering of flushing into the main list,
> > and queuing on to the main list for the "if". Where as in your snip, the
> > order is reversed.
>
> Did I pick the correct branch of the "if" statement above? Or were you
> instead talking about the "else" clause?
>
> I would have been more worried about getting cblist->len right.
Hmm, I think my concern was more the ordering of callbacks, and moving the
write to length should be Ok.
> > If I consolidate it then, it looks like the following. However, it is a bit
> > more unreadable. I could instead just take the WRITE_ONCE out of both if/else
> > and move it to after the if/else, that would be cleanest. Does that sound
> > good to you? Thanks!
>
> Let's first figure out whether or not we are talking past one another. ;-)
Haha yeah :-)
thanks,
- Joel
>
> Thanx, Paul
>
> > ---8<-----------------------
> >
> > diff --git a/kernel/rcu/tree_nocb.h b/kernel/rcu/tree_nocb.h
> > index 1a182b9c4f6c..bd3f54d314e8 100644
> > --- a/kernel/rcu/tree_nocb.h
> > +++ b/kernel/rcu/tree_nocb.h
> > @@ -327,10 +327,11 @@ static void wake_nocb_gp_defer(struct rcu_data *rdp, int waketype,
> > *
> > * Note that this function always returns true if rhp is NULL.
> > */
> > -static bool rcu_nocb_do_flush_bypass(struct rcu_data *rdp, struct rcu_head *rhp,
> > +static bool rcu_nocb_do_flush_bypass(struct rcu_data *rdp, struct rcu_head *rhp_in,
> > unsigned long j, unsigned long flush_flags)
> > {
> > struct rcu_cblist rcl;
> > + struct rcu_head *rhp = rhp_in;
> > bool lazy = flush_flags & FLUSH_BP_LAZY;
> >
> > WARN_ON_ONCE(!rcu_rdp_is_offloaded(rdp));
> > @@ -348,14 +349,13 @@ static bool rcu_nocb_do_flush_bypass(struct rcu_data *rdp, struct rcu_head *rhp,
> > * If the new CB requested was a lazy one, queue it onto the main
> > * ->cblist so we can take advantage of a sooner grade period.
> > */
> > - if (lazy && rhp) {
> > - rcu_cblist_flush_enqueue(&rcl, &rdp->nocb_bypass, NULL);
> > - rcu_cblist_enqueue(&rcl, rhp);
> > - WRITE_ONCE(rdp->lazy_len, 0);
> > - } else {
> > - rcu_cblist_flush_enqueue(&rcl, &rdp->nocb_bypass, rhp);
> > - WRITE_ONCE(rdp->lazy_len, 0);
> > - }
> > + if (lazy && rhp)
> > + rhp = NULL;
> > + rcu_cblist_flush_enqueue(&rcl, &rdp->nocb_bypass, rhp);
> > + if (lazy && rhp_in)
> > + rcu_cblist_enqueue(&rcl, rhp_in);
> > +
> > + WRITE_ONCE(rdp->lazy_len, 0);
> >
> > rcu_segcblist_insert_pend_cbs(&rdp->cblist, &rcl);
> > WRITE_ONCE(rdp->nocb_bypass_first, j);
