From: "Paul E. McKenney" <paulmck@linux•ibm.com>
To: "Joel Fernandes (Google)" <joel@joelfernandes•org>
Cc: linux-kernel@vger•kernel.org,
Alexey Kuznetsov <kuznet@ms2•inr.ac.ru>,
Bjorn Helgaas <bhelgaas@google•com>,
Borislav Petkov <bp@alien8•de>,
c0d1n61at3@gmail•com, "David S. Miller" <davem@davemloft•net>,
edumazet@google•com,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6•org>,
"H. Peter Anvin" <hpa@zytor•com>, Ingo Molnar <mingo@redhat•com>,
Jonathan Corbet <corbet@lwn•net>,
Josh Triplett <josh@joshtriplett•org>,
keescook@chromium•org, kernel-hardening@lists•openwall.com,
kernel-team@android•com, Lai Jiangshan <jiangshanlai@gmail•com>,
Len Brown <lenb@kernel•org>,
linux-acpi@vger•kernel.org, linux-doc@vger•kernel.org,
linux-pci@vger•kernel.org, linux-pm@vger•kernel.org,
Mathieu Desnoyers <mathieu.desnoyers@efficios•com>,
neilb@suse•com, netdev@vger•kernel.org,
Oleg Nesterov <oleg@redhat•com>, Pavel Machek <pavel@ucw•cz>,
peterz@infradead•org, "Rafael J. Wysocki" <rjw@rjwysocki•net>,
Rasmus Villemoes <rasmus.villemoes@prevas•dk>,
rcu@vger•kernel.org, Steven Rostedt <rostedt@goodmis•org>,
Tejun Heo <tj@kernel•org>, Thomas Gleixner <tglx@linutronix•de>,
will@kernel•org,
"maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)"
<x86@kernel•org>
Subject: Re: [PATCH 6/9] workqueue: Convert for_each_wq to use built-in list check (v2)
Date: Tue, 16 Jul 2019 11:41:19 -0700 [thread overview]
Message-ID: <20190716184119.GH14271@linux.ibm.com> (raw)
In-Reply-To: <20190715143705.117908-7-joel@joelfernandes.org>
On Mon, Jul 15, 2019 at 10:37:02AM -0400, Joel Fernandes (Google) wrote:
> list_for_each_entry_rcu now has support to check for RCU reader sections
> as well as lock. Just use the support in it, instead of explictly
> checking in the caller.
>
> Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes•org>
We need an ack from one of the subsystem maintainers on this one.
Thanx, Paul
> ---
> kernel/workqueue.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/kernel/workqueue.c b/kernel/workqueue.c
> index 601d61150b65..e882477ebf6e 100644
> --- a/kernel/workqueue.c
> +++ b/kernel/workqueue.c
> @@ -364,11 +364,6 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
> !lockdep_is_held(&wq_pool_mutex), \
> "RCU or wq_pool_mutex should be held")
>
> -#define assert_rcu_or_wq_mutex(wq) \
> - RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \
> - !lockdep_is_held(&wq->mutex), \
> - "RCU or wq->mutex should be held")
> -
> #define assert_rcu_or_wq_mutex_or_pool_mutex(wq) \
> RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \
> !lockdep_is_held(&wq->mutex) && \
> @@ -425,9 +420,8 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
> * ignored.
> */
> #define for_each_pwq(pwq, wq) \
> - list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node) \
> - if (({ assert_rcu_or_wq_mutex(wq); false; })) { } \
> - else
> + list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node, \
> + lock_is_held(&(wq->mutex).dep_map))
>
> #ifdef CONFIG_DEBUG_OBJECTS_WORK
>
> --
> 2.22.0.510.g264f2c817a-goog
>
next prev parent reply other threads:[~2019-07-16 18:43 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-15 14:36 [PATCH 0/9] Harden list_for_each_entry_rcu() and family Joel Fernandes (Google)
2019-07-15 14:36 ` [PATCH 1/9] rcu/update: Remove useless check for debug_locks (v1) Joel Fernandes (Google)
2019-07-15 14:36 ` [PATCH 2/9] rcu: Add support for consolidated-RCU reader checking (v3) Joel Fernandes (Google)
2019-07-16 18:38 ` Paul E. McKenney
2019-07-16 18:46 ` Joel Fernandes
2019-07-16 18:53 ` Paul E. McKenney
2019-07-16 22:02 ` Joel Fernandes
2019-07-17 0:07 ` Paul E. McKenney
2019-07-15 14:36 ` [PATCH 3/9] rcu/sync: Remove custom check for reader-section (v2) Joel Fernandes (Google)
2019-07-16 18:39 ` Paul E. McKenney
2019-07-15 14:37 ` [PATCH 4/9] ipv4: add lockdep condition to fix for_each_entry (v1) Joel Fernandes (Google)
2019-07-16 18:39 ` Paul E. McKenney
2019-07-16 21:12 ` David Miller
2019-07-15 14:37 ` [PATCH 5/9] driver/core: Convert to use built-in RCU list checking (v1) Joel Fernandes (Google)
2019-07-16 18:40 ` Paul E. McKenney
2019-07-15 14:37 ` [PATCH 6/9] workqueue: Convert for_each_wq to use built-in list check (v2) Joel Fernandes (Google)
2019-07-16 18:41 ` Paul E. McKenney [this message]
2019-07-15 14:37 ` [PATCH 7/9] x86/pci: Pass lockdep condition to pcm_mmcfg_list iterator (v1) Joel Fernandes (Google)
2019-07-15 20:02 ` Bjorn Helgaas
2019-07-16 4:03 ` Joel Fernandes
2019-07-16 18:42 ` Paul E. McKenney
2019-07-15 14:37 ` [PATCH 8/9] acpi: Use built-in RCU list checking for acpi_ioremaps list (v1) Joel Fernandes (Google)
2019-07-15 21:44 ` Rafael J. Wysocki
2019-07-16 18:43 ` Paul E. McKenney
2019-07-15 14:37 ` [PATCH 9/9] doc: Update documentation about list_for_each_entry_rcu (v1) Joel Fernandes (Google)
2019-07-16 18:46 ` [PATCH 0/9] Harden list_for_each_entry_rcu() and family Paul E. McKenney
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=20190716184119.GH14271@linux.ibm.com \
--to=paulmck@linux$(echo .)ibm.com \
--cc=bhelgaas@google$(echo .)com \
--cc=bp@alien8$(echo .)de \
--cc=c0d1n61at3@gmail$(echo .)com \
--cc=corbet@lwn$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=jiangshanlai@gmail$(echo .)com \
--cc=joel@joelfernandes$(echo .)org \
--cc=josh@joshtriplett$(echo .)org \
--cc=keescook@chromium$(echo .)org \
--cc=kernel-hardening@lists$(echo .)openwall.com \
--cc=kernel-team@android$(echo .)com \
--cc=kuznet@ms2$(echo .)inr.ac.ru \
--cc=lenb@kernel$(echo .)org \
--cc=linux-acpi@vger$(echo .)kernel.org \
--cc=linux-doc@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-pci@vger$(echo .)kernel.org \
--cc=linux-pm@vger$(echo .)kernel.org \
--cc=mathieu.desnoyers@efficios$(echo .)com \
--cc=mingo@redhat$(echo .)com \
--cc=neilb@suse$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=oleg@redhat$(echo .)com \
--cc=pavel@ucw$(echo .)cz \
--cc=peterz@infradead$(echo .)org \
--cc=rasmus.villemoes@prevas$(echo .)dk \
--cc=rcu@vger$(echo .)kernel.org \
--cc=rjw@rjwysocki$(echo .)net \
--cc=rostedt@goodmis$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=tj@kernel$(echo .)org \
--cc=will@kernel$(echo .)org \
--cc=x86@kernel$(echo .)org \
--cc=yoshfuji@linux-ipv6$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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