From: "Paul E. McKenney" <paulmck@linux.ibm.com>
To: "Joel Fernandes (Google)" <joel@joelfernandes.org>
Cc: linux-kernel@vger.kernel.org, rcu@vger.kernel.org, frederic@kernel.org
Subject: Re: [PATCH -rcu dev 1/3] rcu/tree: tick_dep_set/clear_cpu should accept bits instead of masks
Date: Fri, 16 Aug 2019 10:25:29 -0700 [thread overview]
Message-ID: <20190816172529.GU28441@linux.ibm.com> (raw)
In-Reply-To: <20190816025311.241257-1-joel@joelfernandes.org>
On Thu, Aug 15, 2019 at 10:53:09PM -0400, Joel Fernandes (Google) wrote:
> This commit fixes the issue.
>
> Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
And I am squashing these into their respective commits with attribution.
Good eyes, thank you very much!!!
Thanx, Paul
> ---
> kernel/rcu/tree.c | 29 +++++++++++++++++------------
> 1 file changed, 17 insertions(+), 12 deletions(-)
>
> diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
> index 0512de9ead20..322b1b57967c 100644
> --- a/kernel/rcu/tree.c
> +++ b/kernel/rcu/tree.c
> @@ -829,7 +829,7 @@ static __always_inline void rcu_nmi_enter_common(bool irq)
> !rdp->dynticks_nmi_nesting &&
> rdp->rcu_urgent_qs && !rdp->rcu_forced_tick) {
> rdp->rcu_forced_tick = true;
> - tick_dep_set_cpu(rdp->cpu, TICK_DEP_MASK_RCU);
> + tick_dep_set_cpu(rdp->cpu, TICK_DEP_BIT_RCU);
> }
> trace_rcu_dyntick(incby == 1 ? TPS("Endirq") : TPS("++="),
> rdp->dynticks_nmi_nesting,
> @@ -898,7 +898,7 @@ void rcu_irq_enter_irqson(void)
> void rcu_disable_tick_upon_qs(struct rcu_data *rdp)
> {
> if (tick_nohz_full_cpu(rdp->cpu) && rdp->rcu_forced_tick) {
> - tick_dep_clear_cpu(rdp->cpu, TICK_DEP_MASK_RCU);
> + tick_dep_clear_cpu(rdp->cpu, TICK_DEP_BIT_RCU);
> rdp->rcu_forced_tick = false;
> }
> }
> @@ -2123,8 +2123,9 @@ int rcutree_dead_cpu(unsigned int cpu)
> do_nocb_deferred_wakeup(per_cpu_ptr(&rcu_data, cpu));
>
> // Stop-machine done, so allow nohz_full to disable tick.
> - for_each_online_cpu(c)
> - tick_dep_clear_cpu(c, TICK_DEP_MASK_RCU);
> + for_each_online_cpu(c) {
> + tick_dep_clear_cpu(c, TICK_DEP_BIT_RCU);
> + }
> return 0;
> }
>
> @@ -2175,8 +2176,9 @@ static void rcu_do_batch(struct rcu_data *rdp)
> rcu_nocb_unlock_irqrestore(rdp, flags);
>
> /* Invoke callbacks. */
> - if (IS_ENABLED(CONFIG_NO_HZ_FULL))
> - tick_dep_set_task(current, TICK_DEP_MASK_RCU);
> + if (IS_ENABLED(CONFIG_NO_HZ_FULL)) {
> + tick_dep_set_task(current, TICK_DEP_BIT_RCU);
> + }
> rhp = rcu_cblist_dequeue(&rcl);
> for (; rhp; rhp = rcu_cblist_dequeue(&rcl)) {
> debug_rcu_head_unqueue(rhp);
> @@ -2243,8 +2245,9 @@ static void rcu_do_batch(struct rcu_data *rdp)
> /* Re-invoke RCU core processing if there are callbacks remaining. */
> if (!offloaded && rcu_segcblist_ready_cbs(&rdp->cblist))
> invoke_rcu_core();
> - if (IS_ENABLED(CONFIG_NO_HZ_FULL))
> - tick_dep_clear_task(current, TICK_DEP_MASK_RCU);
> + if (IS_ENABLED(CONFIG_NO_HZ_FULL)) {
> + tick_dep_clear_task(current, TICK_DEP_BIT_RCU);
> + }
> }
>
> /*
> @@ -3118,8 +3121,9 @@ int rcutree_online_cpu(unsigned int cpu)
> rcutree_affinity_setting(cpu, -1);
>
> // Stop-machine done, so allow nohz_full to disable tick.
> - for_each_online_cpu(c)
> - tick_dep_clear_cpu(c, TICK_DEP_MASK_RCU);
> + for_each_online_cpu(c) {
> + tick_dep_clear_cpu(c, TICK_DEP_BIT_RCU);
> + }
> return 0;
> }
>
> @@ -3143,8 +3147,9 @@ int rcutree_offline_cpu(unsigned int cpu)
> rcutree_affinity_setting(cpu, cpu);
>
> // nohz_full CPUs need the tick for stop-machine to work quickly
> - for_each_online_cpu(c)
> - tick_dep_set_cpu(c, TICK_DEP_MASK_RCU);
> + for_each_online_cpu(c) {
> + tick_dep_set_cpu(c, TICK_DEP_BIT_RCU);
> + }
> return 0;
> }
>
> --
> 2.23.0.rc1.153.gdeed80330f-goog
>
next prev parent reply other threads:[~2019-08-16 17:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-16 2:53 [PATCH -rcu dev 1/3] rcu/tree: tick_dep_set/clear_cpu should accept bits instead of masks Joel Fernandes (Google)
2019-08-16 2:53 ` [PATCH -rcu dev 2/3] rcu/tree: Fix issue where sometimes rcu_urgent_qs is not set on IPI Joel Fernandes (Google)
2019-08-16 2:57 ` Joel Fernandes
2019-08-16 2:53 ` [PATCH -rcu dev 3/3] RFC: rcu/tree: Read dynticks_nmi_nesting in advance Joel Fernandes (Google)
2019-08-16 16:24 ` Joel Fernandes
2019-08-16 16:52 ` Paul E. McKenney
2019-08-16 17:07 ` Joel Fernandes
2019-08-16 17:30 ` Paul E. McKenney
2019-08-19 12:59 ` Frederic Weisbecker
2019-08-19 14:22 ` Joel Fernandes
2019-08-19 14:41 ` Paul E. McKenney
2019-08-19 15:46 ` Joel Fernandes
2019-08-19 16:17 ` Paul E. McKenney
2019-08-19 14:40 ` Paul E. McKenney
2019-08-16 2:59 ` [PATCH v2 -rcu dev 2/3] rcu/tree: Fix issue where sometimes rcu_urgent_qs is not set on IPI Joel Fernandes (Google)
2019-08-16 17:04 ` Paul E. McKenney
2019-08-16 17:25 ` Paul E. McKenney [this message]
2019-08-16 17:35 ` [PATCH -rcu dev 1/3] rcu/tree: tick_dep_set/clear_cpu should accept bits instead of masks Joel Fernandes
2019-08-19 12:38 ` Frederic Weisbecker
2019-08-19 14:46 ` Paul E. McKenney
2019-08-19 16:32 ` Frederic Weisbecker
2019-08-19 16:44 ` Paul E. McKenney
2019-08-20 12:08 ` Frederic Weisbecker
2019-08-20 14:44 ` 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=20190816172529.GU28441@linux.ibm.com \
--to=paulmck@linux.ibm.com \
--cc=frederic@kernel.org \
--cc=joel@joelfernandes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rcu@vger.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).