From: "Paul E. McKenney" <paulmck@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Tejun Heo <tj@kernel.org>, Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"Joel Fernandes (Google)" <joel@joelfernandes.org>
Subject: Re: linux-next: manual merge of the workqueues tree with the tip tree
Date: Mon, 18 Nov 2019 06:56:07 -0800 [thread overview]
Message-ID: <20191118145607.GI2889@paulmck-ThinkPad-P72> (raw)
In-Reply-To: <20191118125046.GB74767@gmail.com>
On Mon, Nov 18, 2019 at 01:50:46PM +0100, Ingo Molnar wrote:
>
> * Sebastian Andrzej Siewior <bigeasy@linutronix.de> wrote:
>
> > On 2019-11-18 15:08:58 [+1100], Stephen Rothwell wrote:
> > > Hi all,
> > Hi,
> >
> > > Today's linux-next merge of the workqueues tree got a conflict in:
> > >
> > > kernel/workqueue.c
> > >
> > > between commit:
> > >
> > > 5a6446626d7e ("workqueue: Convert for_each_wq to use built-in list check")
> > >
> > > from the tip tree and commit:
> > >
> > > 49e9d1a9faf2 ("workqueue: Add RCU annotation for pwq list walk")
> > >
> > > from the workqueues tree.
> >
> > urgh. So the RCU warning is introduced in commit
> > 28875945ba98d ("rcu: Add support for consolidated-RCU reader checking")
> >
> > which was merged in v5.4-rc1. I enabled it around -rc7 and saw a few
> > warnings including in the workqueue code. I asked about this and posted
> > later a patch which was applied by Tejun. Now I see that the tip tree
> > has a patch for this warning…
> > I would vote for the patch in -tip since it also removes the
> > assert_rcu_or_wq_mutex() macro.
> > It would be nice if this could be part of v5.4 since once the RCU
> > warning is enabled it will yell.
>
> So 5a6446626d7e is currently queued up for v5.5 as part of the RCU tree.
>
> I can cherry pick 5a6446626d7e into tip:core/urgent if Paul and Tejun
> agree.
No objections here.
Thanx, Paul
next prev parent reply other threads:[~2019-11-18 14:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 4:08 linux-next: manual merge of the workqueues tree with the tip tree Stephen Rothwell
2019-11-18 9:00 ` Sebastian Andrzej Siewior
2019-11-18 12:50 ` Ingo Molnar
2019-11-18 14:56 ` Paul E. McKenney [this message]
2019-11-18 15:09 ` Tejun Heo
-- strict thread matches above, loose matches on Subject: below --
2011-12-28 4:37 Stephen Rothwell
2010-12-27 4:38 Stephen Rothwell
2010-08-02 3:26 Stephen Rothwell
2010-07-20 4:46 Stephen Rothwell
2010-07-20 4:46 Stephen Rothwell
2010-07-20 4:46 Stephen Rothwell
2009-11-26 8:00 Stephen Rothwell
2009-11-26 8:12 ` Ingo Molnar
2009-11-26 9:15 ` Tejun Heo
2009-11-26 9:26 ` Ingo Molnar
2009-11-26 9:48 ` Tejun Heo
2009-11-26 9:51 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191118145607.GI2889@paulmck-ThinkPad-P72 \
--to=paulmck@kernel.org \
--cc=bigeasy@linutronix.de \
--cc=hpa@zytor.com \
--cc=joel@joelfernandes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).