Received-SPF: pass (google.com: domain of linux-kernel+bounces-155956-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 23 Apr 2024 15:28:51 -0700
From: "Paul E. McKenney" <paulmck@kernel.org>
To: Z qiang <qiang.zhang1211@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
	syzbot <syzbot+dce04ed6d1438ad69656@syzkaller.appspotmail.com>,
	linux-kernel@vger.kernel.org, peterz@infradead.org,
	syzkaller-bugs@googlegroups.com
Subject: Re: [syzbot] [kernel?] WARNING: suspicious RCU usage in __do_softirq
Message-ID: <b735d174-8ad9-4ace-86ee-75dc09852537@paulmck-laptop>
Reply-To: paulmck@kernel.org
References: <CALm+0cWx1kYtftE4nj7Jjgx2_bmNmSrBAgd36ksSvxJtNVhxHg@mail.gmail.com>
 <CALm+0cWRC1kqLJvmEqda4O97PZ-n0R0UQ35=fi6oA3rLsPoUSQ@mail.gmail.com>
 <8f281a10-b85a-4586-9586-5bbc12dc784f@paulmck-laptop>
 <CALm+0cWN0+cCsYddBUefya3aUw9c9Xn89GVV=Ys1_UPjS19WrQ@mail.gmail.com>
 <4c09abb6-4f6e-42d7-9944-c5da995649cb@paulmck-laptop>
 <CALm+0cVaLfE2ieK9aqh9yHkPDyO7zWbMe9K6WjTUgm4t9SnSFQ@mail.gmail.com>
 <ac7bf2c3-c752-46db-a5c8-0c55a1af8561@paulmck-laptop>
 <CALm+0cXGBPWxiNOkAoQG4hdnKCeVVR-APbfBPk9OGeU2RW+bKA@mail.gmail.com>
 <87o7a1umj3.ffs@tglx>
 <CALm+0cUesD9KaWyfsRUyGdErbrU11sAfRgRR=Qjyz7Boq9Vt=g@mail.gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CALm+0cUesD9KaWyfsRUyGdErbrU11sAfRgRR=Qjyz7Boq9Vt=g@mail.gmail.com>

On Tue, Apr 23, 2024 at 10:20:49AM +0800, Z qiang wrote:
> >
> > On Fri, Apr 19 2024 at 13:50, Z qiang wrote:
> > >> On Thu, Apr 18, 2024 at 05:49:38PM +0800, Z qiang wrote:
> > >  static __init int spawn_ksoftirqd(void)
> > >  {
> > > +       int cpu;
> > > +
> > > +       for_each_possible_cpu(cpu)
> > > +               per_cpu(ksoftirqd_work, cpu) = false;
> >
> > First of all that initialization is pointless, but why making all of
> > this complex as hell?
> >
> > Thanks,
> >
> >         tglx
> > ---
> > diff --git a/kernel/softirq.c b/kernel/softirq.c
> > index b315b21fb28c..e991d735be0d 100644
> > --- a/kernel/softirq.c
> > +++ b/kernel/softirq.c
> > @@ -508,7 +508,7 @@ static inline bool lockdep_softirq_start(void) { return false; }
> >  static inline void lockdep_softirq_end(bool in_hardirq) { }
> >  #endif
> >
> > -asmlinkage __visible void __softirq_entry __do_softirq(void)
> > +static void handle_softirqs(bool kirqd)
> >  {
> >         unsigned long end = jiffies + MAX_SOFTIRQ_TIME;
> >         unsigned long old_flags = current->flags;
> > @@ -563,8 +563,7 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
> >                 pending >>= softirq_bit;
> >         }
> >
> > -       if (!IS_ENABLED(CONFIG_PREEMPT_RT) &&
> > -           __this_cpu_read(ksoftirqd) == current)
> > +       if (!IS_ENABLED(CONFIG_PREEMPT_RT) && kirqd)
> >                 rcu_softirq_qs();
> >
> >         local_irq_disable();
> > @@ -584,6 +583,11 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
> >         current_restore_flags(old_flags, PF_MEMALLOC);
> >  }
> >
> > +asmlinkage __visible void __softirq_entry __do_softirq(void)
> > +{
> > +       handle_softirqs(false);
> > +}
> > +
> >  /**
> >   * irq_enter_rcu - Enter an interrupt context with RCU watching
> >   */
> > @@ -921,7 +925,7 @@ static void run_ksoftirqd(unsigned int cpu)
> >                  * We can safely run softirq on inline stack, as we are not deep
> >                  * in the task stack here.
> >                  */
> > -               __do_softirq();
> > +               handle_softirqs(true);
> 
> Thanks, this is good for me :),
> Paul, what do you think?

This looks quite nice to me, especially given that it avoids changing
all the other calls to __do_softirq().  Some architectures might want
to directly call handle_softirqs(), but if so, they can send the patches.

							Thanx, Paul

> Thanks
> Zqiang
> 
> >                 ksoftirqd_run_end();
> >                 cond_resched();
> >                 return;