rcu/nocb: De-offload and re-offload support v2
Subsystems (4)
Frederic Weisbecker
maintainercover rcu/nocb: De-offload and re-offload support v2
Hi,
This is the second attempt to make rcu-nocb mutable at runtime. See v1 there: https://lwn.net/Articles/820544/
This time a new approach, as per Paul's suggestion, is to ensure that callbacks are still served locally until nocb kthreads are fully ready or fully asleep. This is using a state machine implemented with a mask (see patch 3/12 for details).
There is still some small polishing to do, as can be seen in the last patches, to make sure that local callbacks processing is correctly handled outside of strict softirq (or rcuc) mode.
Thanks.
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git
rcu/nocb
HEAD: 6abe8408307eaeb03b4a0470945943c1decbc4b3
Thanks,
Frederic
---
Frederic Weisbecker (12):
rcu: Implement rcu_segcblist_is_offloaded() config dependent
rcu: Turn enabled/offload states into a common flag
rcu: Provide basic callback offloading state machine bits
rcu: De-offloading CB kthread
rcu: De-offloading GP kthread
rcu: Re-offload support
rcu: Shutdown nocb timer on de-offloading
rcu: Flush bypass before setting SEGCBLIST_SOFTIRQ_ONLY
rcu: Set SEGCBLIST_SOFTIRQ_ONLY at the very last stage of de-offloading
rcu: Process batch locally as long as offloading isn't complete
rcu: Locally accelerate callbacks as long as offloading isn't complete
rcu: Nocb (de)activate through sysfs
include/linux/rcu_segcblist.h | 119 ++++++++++++++++- include/linux/rcupdate.h | 4 + kernel/cpu.c | 23 ++++ kernel/rcu/rcu_segcblist.c | 13 +- kernel/rcu/rcu_segcblist.h | 45 ++++++- kernel/rcu/tree.c | 32 ++--- kernel/rcu/tree.h | 2 + kernel/rcu/tree_plugin.h | 297 +++++++++++++++++++++++++++++++++++++++--- 8 files changed, 491 insertions(+), 44 deletions(-)
Frederic Weisbecker
maintainerRFC PATCH 1/12 rcu: Implement rcu_segcblist_is_offloaded() config dependent
This simplify the usage of this API and avoid checking the kernel config from the callers.
--- kernel/rcu/rcu_segcblist.h | 2 +- kernel/rcu/tree.c | 21 +++++++-------------- 2 files changed, 8 insertions(+), 15 deletions(-)
kernel/rcu/rcu_segcblist.h +1 -1
@@ -62,7 +62,7 @@ static inline bool rcu_segcblist_is_enabled(struct rcu_segcblist *rsclp)/* Is the specified rcu_segcblist offloaded? */ static inline bool rcu_segcblist_is_offloaded (struct rcu_segcblist *rsclp) { -return rsclp->offloaded; +return IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && rsclp->offloaded; }/*
kernel/rcu/tree.c +7 -14
@@ -1583,8 +1583,7 @@ static bool __note_gp_changes(struct rcu_node *rnp, struct rcu_data *rdp) {bool ret = false;bool need_qs; -const bool offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); +const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);raw_lockdep_assert_held_rcu_node (rnp);
@@ -2011,8 +2010,7 @@ static void rcu_gp_cleanup(void) needgp = true; }/* Advance CBs to reduce false positives below. */ - offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); + offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);if ((offloaded || !rcu_accelerate_cbs (rnp, rdp)) && needgp) {WRITE_ONCE (rcu_state.gp_flags,RCU_GP_FLAG_INIT );WRITE_ONCE (rcu_state.gp_req_activity, jiffies);
@@ -2207,8 +2205,7 @@ rcu_report_qs_rdp(int cpu, struct rcu_data *rdp)unsigned long flags;unsigned long mask;bool needwake = false; -const bool offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); +const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);struct rcu_node *rnp; rnp = rdp->mynode;
@@ -2375,8 +2372,7 @@ int rcutree_dead_cpu(unsigned int cpu)static void rcu_do_batch (struct rcu_data *rdp) {unsigned long flags; -const bool offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); +const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);struct rcu_head *rhp;struct rcu_cblist rcl =RCU_CBLIST_INITIALIZER (rcl);long bl, count;
@@ -2620,8 +2616,7 @@ static __latent_entropy void rcu_core(void)unsigned long flags;struct rcu_data *rdp =raw_cpu_ptr (&rcu_data);struct rcu_node *rnp = rdp->mynode; -const bool offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); +const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);if (cpu_is_offline (smp_processor_id ()))return ;
@@ -2919,8 +2914,7 @@ __call_rcu(struct rcu_head *head, rcu_callback_t func) rcu_segcblist_n_cbs(&rdp->cblist));/* Go handle any RCU core processing required. */ -if (IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -unlikely (rcu_segcblist_is_offloaded (&rdp->cblist))) { +if (unlikely (rcu_segcblist_is_offloaded (&rdp->cblist))) {__call_rcu_nocb_wake (rdp, was_alldone, flags);/* unlocks */ }else {__call_rcu_core (rdp, head, flags);
@@ -3655,8 +3649,7 @@ static int rcu_pending(int user)/* Has RCU gone idle with this CPU needing another grace period? */ if (!gp_in_progress &&rcu_segcblist_is_enabled (&rdp->cblist) && - (!IS_ENABLED (CONFIG_RCU_NOCB_CPU ) || - !rcu_segcblist_is_offloaded (&rdp->cblist)) && + !rcu_segcblist_is_offloaded (&rdp->cblist) && !rcu_segcblist_restempty (&rdp->cblist,RCU_NEXT_READY_TAIL ))return 1 ;
Signature · 1 line
2.28.0
Paul E. McKenney
maintainerRe: [RFC PATCH 01/12] rcu: Implement rcu_segcblist_is_offloaded() config dependent
Quoted 11 lines · Frederic Weisbecker
This simplify the usage of this API and avoid checking the kernel config from the callers.
Suggested-by Paul E. McKenney <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>
Nice cleanup! I clearly should have done it this way to start with.
Any reason I shouldn't pull this into -rcu right now?
Thanx, Paul
Quoted 95 lines
--- kernel/rcu/rcu_segcblist.h | 2 +- kernel/rcu/tree.c | 21 +++++++-------------- 2 files changed, 8 insertions(+), 15 deletions(-)kernel/rcu/rcu_segcblist.h +1
-1@@ -62,7 +62,7 @@ static inline bool rcu_segcblist_is_enabled(struct rcu_segcblist *rsclp)/* Is the specified rcu_segcblist offloaded? */ static inline bool rcu_segcblist_is_offloaded (struct rcu_segcblist *rsclp) { -return rsclp->offloaded; +return IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && rsclp->offloaded; }/* kernel/rcu/tree.c +7
-14@@ -1583,8 +1583,7 @@ static bool __note_gp_changes(struct rcu_node *rnp, struct rcu_data *rdp) {bool ret = false;bool need_qs; -const bool offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); +const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);raw_lockdep_assert_held_rcu_node (rnp);@@ -2011,8 +2010,7 @@ static void rcu_gp_cleanup(void) needgp = true; }/* Advance CBs to reduce false positives below. */ - offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); + offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);if ((offloaded || !rcu_accelerate_cbs (rnp, rdp)) && needgp) {WRITE_ONCE (rcu_state.gp_flags,RCU_GP_FLAG_INIT );WRITE_ONCE (rcu_state.gp_req_activity, jiffies);@@ -2207,8 +2205,7 @@ rcu_report_qs_rdp(int cpu, struct rcu_data *rdp)unsigned long flags;unsigned long mask;bool needwake = false; -const bool offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); +const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);struct rcu_node *rnp; rnp = rdp->mynode;@@ -2375,8 +2372,7 @@ int rcutree_dead_cpu(unsigned int cpu)static void rcu_do_batch (struct rcu_data *rdp) {unsigned long flags; -const bool offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); +const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);struct rcu_head *rhp;struct rcu_cblist rcl =RCU_CBLIST_INITIALIZER (rcl);long bl, count;@@ -2620,8 +2616,7 @@ static __latent_entropy void rcu_core(void)unsigned long flags;struct rcu_data *rdp =raw_cpu_ptr (&rcu_data);struct rcu_node *rnp = rdp->mynode; -const bool offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); +const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);if (cpu_is_offline (smp_processor_id ()))return ;@@ -2919,8 +2914,7 @@ __call_rcu(struct rcu_head *head, rcu_callback_t func) rcu_segcblist_n_cbs(&rdp->cblist));/* Go handle any RCU core processing required. */ -if (IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -unlikely (rcu_segcblist_is_offloaded (&rdp->cblist))) { +if (unlikely (rcu_segcblist_is_offloaded (&rdp->cblist))) {__call_rcu_nocb_wake (rdp, was_alldone, flags);/* unlocks */ }else {__call_rcu_core (rdp, head, flags);@@ -3655,8 +3649,7 @@ static int rcu_pending(int user)/* Has RCU gone idle with this CPU needing another grace period? */ if (!gp_in_progress &&rcu_segcblist_is_enabled (&rdp->cblist) && - (!IS_ENABLED (CONFIG_RCU_NOCB_CPU ) || - !rcu_segcblist_is_offloaded (&rdp->cblist)) && + !rcu_segcblist_is_offloaded (&rdp->cblist) && !rcu_segcblist_restempty (&rdp->cblist,RCU_NEXT_READY_TAIL ))return 1 ;Signature · 1 line
2.28.0
Frederic Weisbecker
maintainerRe: [RFC PATCH 01/12] rcu: Implement rcu_segcblist_is_offloaded() config dependent
Quoted 13 lines · Paul E. McKenney
Quoted 11 lines · Frederic Weisbecker
This simplify the usage of this API and avoid checking the kernel config from the callers.
Suggested-by Paul E. McKenney <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>
Quoted 3 lines
Nice cleanup! I clearly should have done it this way to start with.
Any reason I shouldn't pull this into -rcu right now?
I think that very one can be applied indeed.
Thanks!
Paul E. McKenney
maintainerRe: [RFC PATCH 01/12] rcu: Implement rcu_segcblist_is_offloaded() config dependent
Quoted 14 lines · Frederic Weisbecker
Quoted 13 lines · Paul E. McKenney
Quoted 11 lines · Frederic Weisbecker
This simplify the usage of this API and avoid checking the kernel config from the callers.
Suggested-by Paul E. McKenney <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>
Quoted 5 lines
Quoted 3 lines
Nice cleanup! I clearly should have done it this way to start with.
Any reason I shouldn't pull this into -rcu right now?
I think that very one can be applied indeed.
Very well! I had to hand-apply it due to recent -rcu thrash, and as usual I could not resist wordsmithing the commit log. Please let me know if I messed anything up.
Thanx, Paul
------------------------------------------------------------------------
commit 99a2a9b00b1f44019e5667cdbd44b8eb82e9f0a9
Author: Frederic Weisbecker <[email protected]> Date: Mon Sep 21 14:43:40 2020 +0200
rcu: Implement rcu_segcblist_is_offloaded() config dependent
This commit simplifies the use of the rcu_segcblist_is_offloaded() API so that its callers no longer need to check the RCU_NOCB_CPU Kconfig option. Note that rcu_segcblist_is_offloaded() is defined in the header file, which means that the generated code should be just as efficient as before.
kernel/rcu/rcu_segcblist.h +1 -1
@@ -62,7 +62,7 @@ static inline bool rcu_segcblist_is_enabled(struct rcu_segcblist *rsclp)/* Is the specified rcu_segcblist offloaded? */ static inline bool rcu_segcblist_is_offloaded (struct rcu_segcblist *rsclp) { -return rsclp->offloaded; +return IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && rsclp->offloaded; }/*
kernel/rcu/tree.c +7 -14
@@ -1609,8 +1609,7 @@ static bool __note_gp_changes(struct rcu_node *rnp, struct rcu_data *rdp) {bool ret = false;bool need_qs; -const bool offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); +const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);raw_lockdep_assert_held_rcu_node (rnp);
@@ -2054,8 +2053,7 @@ static void rcu_gp_cleanup(void) needgp = true; }/* Advance CBs to reduce false positives below. */ - offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); + offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);if ((offloaded || !rcu_accelerate_cbs (rnp, rdp)) && needgp) {WRITE_ONCE (rcu_state.gp_flags,RCU_GP_FLAG_INIT );WRITE_ONCE (rcu_state.gp_req_activity, jiffies);
@@ -2254,8 +2252,7 @@ rcu_report_qs_rdp(struct rcu_data *rdp)unsigned long flags;unsigned long mask;bool needwake = false; -const bool offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); +const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);struct rcu_node *rnp;WARN_ON_ONCE (rdp->cpu !=smp_processor_id ());
@@ -2423,8 +2420,7 @@ static void rcu_do_batch(struct rcu_data *rdp) {int div;unsigned long flags; -const bool offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); +const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);struct rcu_head *rhp;struct rcu_cblist rcl =RCU_CBLIST_INITIALIZER (rcl);long bl, count;
@@ -2681,8 +2677,7 @@ static __latent_entropy void rcu_core(void)unsigned long flags;struct rcu_data *rdp =raw_cpu_ptr (&rcu_data);struct rcu_node *rnp = rdp->mynode; -const bool offloaded =IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_is_offloaded (&rdp->cblist); +const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);if (cpu_is_offline (smp_processor_id ()))return ;
@@ -2984,8 +2979,7 @@ __call_rcu(struct rcu_head *head, rcu_callback_t func) rcu_segcblist_n_cbs(&rdp->cblist));/* Go handle any RCU core processing required. */ -if (IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -unlikely (rcu_segcblist_is_offloaded (&rdp->cblist))) { +if (unlikely (rcu_segcblist_is_offloaded (&rdp->cblist))) {__call_rcu_nocb_wake (rdp, was_alldone, flags);/* unlocks */ }else {__call_rcu_core (rdp, head, flags);
@@ -3739,8 +3733,7 @@ static int rcu_pending(int user)/* Has RCU gone idle with this CPU needing another grace period? */ if (!gp_in_progress &&rcu_segcblist_is_enabled (&rdp->cblist) && - (!IS_ENABLED (CONFIG_RCU_NOCB_CPU ) || - !rcu_segcblist_is_offloaded (&rdp->cblist)) && + !rcu_segcblist_is_offloaded (&rdp->cblist) && !rcu_segcblist_restempty (&rdp->cblist,RCU_NEXT_READY_TAIL ))return 1 ;
Frederic Weisbecker
maintainerRe: [RFC PATCH 01/12] rcu: Implement rcu_segcblist_is_offloaded() config dependent
Quoted 17 lines · Paul E. McKenney
Quoted 16 lines · Frederic Weisbecker
Quoted 15 lines · Paul E. McKenney
Quoted 11 lines · Frederic Weisbecker
This simplify the usage of this API and avoid checking the kernel config from the callers.
Suggested-by Paul E. McKenney <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>Nice cleanup! I clearly should have done it this way to start with.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Any reason I shouldn't pull this into -rcu right now?
I think that very one can be applied indeed.
Very well! I had to hand-apply it due to recent -rcu thrash, and as usual I could not resist wordsmithing the commit log. Please let me know if I messed anything up.
Looks very good, thanks!
Frederic Weisbecker
maintainerRFC PATCH 2/12 rcu: Turn enabled/offload states into a common flag
In reply to Frederic WeisbeckerGather the segcblist properties in a common map to avoid spreading booleans in the structure. And this prepares for the offloaded state to be mutable on runtime.
--- include/linux/rcu_segcblist.h | 6 ++++-- kernel/rcu/rcu_segcblist.c | 6 +++--- kernel/rcu/rcu_segcblist.h | 23 +++++++++++++++++++++-- 3 files changed, 28 insertions(+), 7 deletions(-)
include/linux/rcu_segcblist.h +4 -2
@@ -63,6 +63,9 @@ struct rcu_cblist {#define RCU_NEXT_TAIL 3#define RCU_CBLIST_NSEGS 4 +#define SEGCBLIST_ENABLED BIT(0) +#define SEGCBLIST_OFFLOADED BIT(1) +struct rcu_segcblist {struct rcu_head *head;struct rcu_head **tails[RCU_CBLIST_NSEGS ];
@@ -72,8 +75,7 @@ struct rcu_segcblist {#else long len;#endif -u8 enabled; -u8 offloaded; +u8 flags; };#define RCU_SEGCBLIST_INITIALIZER (n) \
kernel/rcu/rcu_segcblist.c +3 -3
@@ -152,7 +152,7 @@ void rcu_segcblist_init(struct rcu_segcblist *rsclp)for (i =0 ; i <RCU_CBLIST_NSEGS ; i++) rsclp->tails[i] = &rsclp->head;rcu_segcblist_set_len (rsclp,0 ); - rsclp->enabled =1 ; +rcu_segcblist_set_flags (rsclp,SEGCBLIST_ENABLED ); }/*
@@ -163,7 +163,7 @@ void rcu_segcblist_disable(struct rcu_segcblist *rsclp) {WARN_ON_ONCE (!rcu_segcblist_empty (rsclp));WARN_ON_ONCE (rcu_segcblist_n_cbs (rsclp)); - rsclp->enabled =0 ; +rcu_segcblist_clear_flags (rsclp,SEGCBLIST_ENABLED ); }/*
@@ -172,7 +172,7 @@ void rcu_segcblist_disable(struct rcu_segcblist *rsclp)*/ void rcu_segcblist_offload (struct rcu_segcblist *rsclp) { - rsclp->offloaded =1 ; +rcu_segcblist_set_flags (rsclp,SEGCBLIST_OFFLOADED ); }/*
kernel/rcu/rcu_segcblist.h +21 -2
@@ -50,19 +50,38 @@ static inline long rcu_segcblist_n_cbs(struct rcu_segcblist *rsclp)#endif } +static inline void rcu_segcblist_set_flags (struct rcu_segcblist *rsclp, +int flags) +{ + rsclp->flags |= flags; +} + +static inline void rcu_segcblist_clear_flags (struct rcu_segcblist *rsclp, +int flags) +{ + rsclp->flags &= ~flags; +} + +static inline bool rcu_segcblist_test_flags (struct rcu_segcblist *rsclp, +int flags) +{ +return READ_ONCE (rsclp->flags) & flags; +} +/* * Is the specified rcu_segcblist enabled, for example, not corresponding * to an offline CPU? */ static inline bool rcu_segcblist_is_enabled (struct rcu_segcblist *rsclp) { -return rsclp->enabled; +return rcu_segcblist_test_flags (rsclp,SEGCBLIST_ENABLED ); }/* Is the specified rcu_segcblist offloaded? */ static inline bool rcu_segcblist_is_offloaded (struct rcu_segcblist *rsclp) { -return IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && rsclp->offloaded; +return IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && +rcu_segcblist_test_flags (rsclp,SEGCBLIST_OFFLOADED ); }/*
Signature · 1 line
2.28.0
Frederic Weisbecker
maintainerRFC PATCH 3/12 rcu: Provide basic callback offloading state machine bits
In reply to Frederic WeisbeckerWe'll need to be able to runtime offload and de-offload the processing of callback for a given CPU. In order to support a smooth transition from unlocked local processing (softirq/rcuc) to locked offloaded processing (rcuop/rcuog) and the reverse, provide the necessary bits and documentation for the state machine that will carry up all the steps to enforce correctness while serving callbacks processing all along.
--- include/linux/rcu_segcblist.h | 115 +++++++++++++++++++++++++++++++++- kernel/rcu/rcu_segcblist.c | 1 + kernel/rcu/rcu_segcblist.h | 12 +++- kernel/rcu/tree.c | 3 + 4 files changed, 128 insertions(+), 3 deletions(-)
include/linux/rcu_segcblist.h +114 -1
@@ -63,8 +63,121 @@ struct rcu_cblist {#define RCU_NEXT_TAIL 3#define RCU_CBLIST_NSEGS 4 + +/* +* ==NOCB Offloading state machine== +* +* +* ---------------------------------------------------------------------------- +* | SEGCBLIST_SOFTIRQ_ONLY | +* | | +* | Callbacks processed by rcu_core() from softirqs or local | +* | rcuc kthread, without holding nocb_lock. | +* ---------------------------------------------------------------------------- +* | +* v +* ---------------------------------------------------------------------------- +* | SEGCBLIST_OFFLOADED | +* | | +* | Callbacks processed by rcu_core() from softirqs or local | +* | rcuc kthread, while holding nocb_lock. Waking up CB and GP kthreads, | +* | allowing nocb_timer to be armed. | +* ---------------------------------------------------------------------------- +* | +* v +* ----------------------------------- +* | | +* v v +* --------------------------------------- ----------------------------------| +* | SEGCBLIST_OFFLOADED | | | SEGCBLIST_OFFLOADED | | +* | SEGCBLIST_KTHREAD_CB | | SEGCBLIST_KTHREAD_GP | +* | | | | +* | | | | +* | CB kthread woke up and | | GP kthread woke up and | +* | acknowledged SEGCBLIST_OFFLOADED. | | acknowledged SEGCBLIST_OFFLOADED| +* | Processes callbacks concurrently | | | +* | with rcu_core(), holding | | | +* | nocb_lock. | | | +* --------------------------------------- ----------------------------------- +* | | +* ----------------------------------- +* | +* v +* |--------------------------------------------------------------------------| +* | SEGCBLIST_OFFLOADED | | +* | SEGCBLIST_KTHREAD_CB | | +* | SEGCBLIST_KTHREAD_GP | +* | | +* | Kthreads handle callbacks holding nocb_lock, local rcu_core() stops | +* | handling callbacks. | +* ---------------------------------------------------------------------------- +*/ + + + +/* +* ==NOCB De-Offloading state machine== +* +* +* |--------------------------------------------------------------------------| +* | SEGCBLIST_OFFLOADED | | +* | SEGCBLIST_KTHREAD_CB | | +* | SEGCBLIST_KTHREAD_GP | +* | | +* | CB/GP kthreads handle callbacks holding nocb_lock, local rcu_core() | +* | ignores callbacks. | +* ---------------------------------------------------------------------------- +* | +* v +* |--------------------------------------------------------------------------| +* | SEGCBLIST_KTHREAD_CB | | +* | SEGCBLIST_KTHREAD_GP | +* | | +* | CB/GP kthreads and local rcu_core() handle callbacks concurrently | +* | holding nocb_lock. Wake up CB and GP kthreads if necessary. | +* ---------------------------------------------------------------------------- +* | +* v +* ----------------------------------- +* | | +* v v +* ---------------------------------------------------------------------------| +* | | +* | SEGCBLIST_KTHREAD_CB | SEGCBLIST_KTHREAD_GP | +* | | | +* | GP kthread woke up and | CB kthread woke up and | +* | acknowledged the fact that | acknowledged the fact that | +* | SEGCBLIST_OFFLOADED got cleared. | SEGCBLIST_OFFLOADED got cleared. | +* | | The CB kthread goes to sleep | +* | The callbacks from the target CPU | until it ever gets re-offloaded. | +* | will be ignored from the GP kthread | | +* | loop. | | +* ---------------------------------------------------------------------------- +* | | +* ----------------------------------- +* | +* v +* ---------------------------------------------------------------------------- +* | 0 | +* | | +* | Callbacks processed by rcu_core() from softirqs or local | +* | rcuc kthread, while holding nocb_lock. Forbid nocb_timer to be armed. | +* | Flush pending nocb_timer. Flush nocb bypass callbacks. | +* ---------------------------------------------------------------------------- +* | +* v +* ---------------------------------------------------------------------------- +* | SEGCBLIST_SOFTIRQ_ONLY | +* | | +* | Callbacks processed by rcu_core() from softirqs or local | +* | rcuc kthread, without holding nocb_lock. | +* ---------------------------------------------------------------------------- +*/ #define SEGCBLIST_ENABLED BIT(0) -#define SEGCBLIST_OFFLOADED BIT(1) +#define SEGCBLIST_SOFTIRQ_ONLY BIT(1) +#define SEGCBLIST_KTHREAD_CB BIT(2) +#define SEGCBLIST_KTHREAD_GP BIT(3) +#define SEGCBLIST_OFFLOADED BIT(4)struct rcu_segcblist {struct rcu_head *head;
kernel/rcu/rcu_segcblist.c +1 -0
@@ -172,6 +172,7 @@ void rcu_segcblist_disable(struct rcu_segcblist *rsclp)*/ void rcu_segcblist_offload (struct rcu_segcblist *rsclp) { +rcu_segcblist_clear_flags (rsclp,SEGCBLIST_SOFTIRQ_ONLY );rcu_segcblist_set_flags (rsclp,SEGCBLIST_OFFLOADED ); }
kernel/rcu/rcu_segcblist.h +10 -2
@@ -80,8 +80,16 @@ static inline bool rcu_segcblist_is_enabled(struct rcu_segcblist *rsclp)/* Is the specified rcu_segcblist offloaded? */ static inline bool rcu_segcblist_is_offloaded (struct rcu_segcblist *rsclp) { -return IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_test_flags (rsclp,SEGCBLIST_OFFLOADED ); +if (IS_ENABLED (CONFIG_RCU_NOCB_CPU )) { +/* +* Complete de-offloading happens only when SEGCBLIST_SOFTIRQ_ONLY +* is set. +*/ +if (!rcu_segcblist_test_flags (rsclp,SEGCBLIST_SOFTIRQ_ONLY )) +return true; + } + +return false; }/*
kernel/rcu/tree.c +3 -0
@@ -96,6 +96,9 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct rcu_data, rcu_data) = { .dynticks_nesting = 1, .dynticks_nmi_nesting = DYNTICK_IRQ_NONIDLE, .dynticks = ATOMIC_INIT(RCU_DYNTICK_CTRL_CTR), +#ifdef CONFIG_RCU_NOCB_CPU + .cblist.flags = SEGCBLIST_SOFTIRQ_ONLY, +#endif };static struct rcu_state rcu_state = { .level = { &rcu_state.node[0 ] },
Signature · 1 line
2.28.0
Paul E. McKenney
maintainerRe: [RFC PATCH 03/12] rcu: Provide basic callback offloading state machine bits
Quoted 39 lines · Frederic Weisbecker
We'll need to be able to runtime offload and de-offload the processing of callback for a given CPU. In order to support a smooth transition from unlocked local processing (softirq/rcuc) to locked offloaded processing (rcuop/rcuog) and the reverse, provide the necessary bits and documentation for the state machine that will carry up all the steps to enforce correctness while serving callbacks processing all along.
Inspired-by Paul E. McKenney <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>--- include/linux/rcu_segcblist.h | 115 +++++++++++++++++++++++++++++++++- kernel/rcu/rcu_segcblist.c | 1 + kernel/rcu/rcu_segcblist.h | 12 +++- kernel/rcu/tree.c | 3 + 4 files changed, 128 insertions(+), 3 deletions(-)include/linux/rcu_segcblist.h +9
-0@@ -63,8 +63,121 @@ struct rcu_cblist {#define RCU_NEXT_TAIL 3#define RCU_CBLIST_NSEGS 4 + +/* +* ==NOCB Offloading state machine== +* +* +* ---------------------------------------------------------------------------- +* | SEGCBLIST_SOFTIRQ_ONLY | +* | | +* | Callbacks processed by rcu_core() from softirqs or local |
include/linux/rcu_segcblist.h struct rcu_cblist { · line 84
Quoted 10 lines
include/linux/rcu_segcblist.h +10
-0+* | rcuc kthread, without holding nocb_lock. | +* ---------------------------------------------------------------------------- +* | +* v +* ---------------------------------------------------------------------------- +* | SEGCBLIST_OFFLOADED | +* | | +* | Callbacks processed by rcu_core() from softirqs or local | +* | rcuc kthread, while holding nocb_lock. Waking up CB and GP kthreads, | +* | allowing nocb_timer to be armed. |
Whitespace nit before "allowing", just to show that I am paying attention. ;-)
Don't we need to acquire rcu_state.barrier_mutex at this point? Otherwise rcu_barrier() could fail at this point.
Quoted 18 lines
include/linux/rcu_segcblist.h +18
-0+* ---------------------------------------------------------------------------- +* | +* v +* ----------------------------------- +* | | +* v v +* --------------------------------------- ----------------------------------| +* | SEGCBLIST_OFFLOADED | | | SEGCBLIST_OFFLOADED | | +* | SEGCBLIST_KTHREAD_CB | | SEGCBLIST_KTHREAD_GP | +* | | | | +* | | | | +* | CB kthread woke up and | | GP kthread woke up and | +* | acknowledged SEGCBLIST_OFFLOADED. | | acknowledged SEGCBLIST_OFFLOADED| +* | Processes callbacks concurrently | | | +* | with rcu_core(), holding | | | +* | nocb_lock. | | | +* --------------------------------------- ----------------------------------- +* | |
include/linux/rcu_segcblist.h struct rcu_cblist { · line 112
Quoted 10 lines
include/linux/rcu_segcblist.h +10
-0+* ----------------------------------- +* | +* v +* |--------------------------------------------------------------------------| +* | SEGCBLIST_OFFLOADED | | +* | SEGCBLIST_KTHREAD_CB | | +* | SEGCBLIST_KTHREAD_GP | +* | | +* | Kthreads handle callbacks holding nocb_lock, local rcu_core() stops | +* | handling callbacks. |
And rcu_state.barrier_mutex is dropped here.
Or am I missing a trick here? I guess I will look at the later patches to get an initial estimate of an answer to this question.
Quoted 6 lines
include/linux/rcu_segcblist.h +6
-0+* ---------------------------------------------------------------------------- +*/ + + + +/*
include/linux/rcu_segcblist.h struct rcu_cblist { · line 128
Quoted 10 lines
include/linux/rcu_segcblist.h +10
-0+* ==NOCB De-Offloading state machine== +* +* +* |--------------------------------------------------------------------------| +* | SEGCBLIST_OFFLOADED | | +* | SEGCBLIST_KTHREAD_CB | | +* | SEGCBLIST_KTHREAD_GP | +* | | +* | CB/GP kthreads handle callbacks holding nocb_lock, local rcu_core() | +* | ignores callbacks. |
And don't we also need to acquire rcu_state.barrier_mutex here?
Quoted 27 lines
include/linux/rcu_segcblist.h +27
-0+* ---------------------------------------------------------------------------- +* | +* v +* |--------------------------------------------------------------------------| +* | SEGCBLIST_KTHREAD_CB | | +* | SEGCBLIST_KTHREAD_GP | +* | | +* | CB/GP kthreads and local rcu_core() handle callbacks concurrently | +* | holding nocb_lock. Wake up CB and GP kthreads if necessary. | +* ---------------------------------------------------------------------------- +* | +* v +* ----------------------------------- +* | | +* v v +* ---------------------------------------------------------------------------| +* | | +* | SEGCBLIST_KTHREAD_CB | SEGCBLIST_KTHREAD_GP | +* | | | +* | GP kthread woke up and | CB kthread woke up and | +* | acknowledged the fact that | acknowledged the fact that | +* | SEGCBLIST_OFFLOADED got cleared. | SEGCBLIST_OFFLOADED got cleared. | +* | | The CB kthread goes to sleep | +* | The callbacks from the target CPU | until it ever gets re-offloaded. | +* | will be ignored from the GP kthread | | +* | loop. | | +* ----------------------------------------------------------------------------
include/linux/rcu_segcblist.h struct rcu_cblist { · line 165
Quoted 10 lines
include/linux/rcu_segcblist.h +10
-0+* | | +* ----------------------------------- +* | +* v +* ---------------------------------------------------------------------------- +* | 0 | +* | | +* | Callbacks processed by rcu_core() from softirqs or local | +* | rcuc kthread, while holding nocb_lock. Forbid nocb_timer to be armed. | +* | Flush pending nocb_timer. Flush nocb bypass callbacks. |
And release rcu_state.barrier_mutex here?
Thanx, Paul
Quoted 71 lines
include/linux/rcu_segcblist.h +14
-1+* ---------------------------------------------------------------------------- +* | +* v +* ---------------------------------------------------------------------------- +* | SEGCBLIST_SOFTIRQ_ONLY | +* | | +* | Callbacks processed by rcu_core() from softirqs or local | +* | rcuc kthread, without holding nocb_lock. | +* ---------------------------------------------------------------------------- +*/ #define SEGCBLIST_ENABLED BIT(0) -#define SEGCBLIST_OFFLOADED BIT(1) +#define SEGCBLIST_SOFTIRQ_ONLY BIT(1) +#define SEGCBLIST_KTHREAD_CB BIT(2) +#define SEGCBLIST_KTHREAD_GP BIT(3) +#define SEGCBLIST_OFFLOADED BIT(4)struct rcu_segcblist {struct rcu_head *head;kernel/rcu/rcu_segcblist.c +1
-0@@ -172,6 +172,7 @@ void rcu_segcblist_disable(struct rcu_segcblist *rsclp)*/ void rcu_segcblist_offload (struct rcu_segcblist *rsclp) { +rcu_segcblist_clear_flags (rsclp,SEGCBLIST_SOFTIRQ_ONLY );rcu_segcblist_set_flags (rsclp,SEGCBLIST_OFFLOADED ); }kernel/rcu/rcu_segcblist.h +10
-2@@ -80,8 +80,16 @@ static inline bool rcu_segcblist_is_enabled(struct rcu_segcblist *rsclp)/* Is the specified rcu_segcblist offloaded? */ static inline bool rcu_segcblist_is_offloaded (struct rcu_segcblist *rsclp) { -return IS_ENABLED (CONFIG_RCU_NOCB_CPU ) && -rcu_segcblist_test_flags (rsclp,SEGCBLIST_OFFLOADED ); +if (IS_ENABLED (CONFIG_RCU_NOCB_CPU )) { +/* +* Complete de-offloading happens only when SEGCBLIST_SOFTIRQ_ONLY +* is set. +*/ +if (!rcu_segcblist_test_flags (rsclp,SEGCBLIST_SOFTIRQ_ONLY )) +return true; + } + +return false; }/* kernel/rcu/tree.c +3
-0@@ -96,6 +96,9 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct rcu_data, rcu_data) = { .dynticks_nesting = 1, .dynticks_nmi_nesting = DYNTICK_IRQ_NONIDLE, .dynticks = ATOMIC_INIT(RCU_DYNTICK_CTRL_CTR), +#ifdef CONFIG_RCU_NOCB_CPU + .cblist.flags = SEGCBLIST_SOFTIRQ_ONLY, +#endif };static struct rcu_state rcu_state = { .level = { &rcu_state.node[0 ] },Signature · 1 line
2.28.0
Frederic Weisbecker
maintainerRFC PATCH 4/12 rcu: De-offloading CB kthread
In reply to Frederic WeisbeckerIn order to de-offload the callbacks processing of an rdp, we must clear SEGCBLIST_OFFLOAD and notify the CB kthread so that it clears its own bit flag and goes to sleep to stop handling callbacks. The GP kthread will also be notified the same way. Whoever acknowledges and clears its own bit last must notify the de-offloading worker so that it can resume the de-offloading while being sure that callbacks won't be handled remotely anymore.
--- include/linux/rcupdate.h | 2 + kernel/rcu/rcu_segcblist.c | 10 ++- kernel/rcu/rcu_segcblist.h | 2 +- kernel/rcu/tree.h | 1 + kernel/rcu/tree_plugin.h | 124 ++++++++++++++++++++++++++++++++----- 5 files changed, 119 insertions(+), 20 deletions(-)
include/linux/rcupdate.h +2 -0
@@ -97,8 +97,10 @@ static inline void rcu_user_exit(void) { }#ifdef CONFIG_RCU_NOCB_CPU void rcu_init_nohz (void ); +void rcu_nocb_cpu_deoffload (int cpu);#else /* #ifdef CONFIG_RCU_NOCB_CPU */ static inline void rcu_init_nohz (void ) { } +static inline void rcu_nocb_cpu_deoffload (int cpu) { }#endif /* #else #ifdef CONFIG_RCU_NOCB_CPU */ /**
kernel/rcu/rcu_segcblist.c +7 -3
@@ -170,10 +170,14 @@ void rcu_segcblist_disable(struct rcu_segcblist *rsclp)* Mark the specified rcu_segcblist structure as offloaded. This * structure must be empty. */ -void rcu_segcblist_offload (struct rcu_segcblist *rsclp) +void rcu_segcblist_offload (struct rcu_segcblist *rsclp,bool offload) { -rcu_segcblist_clear_flags (rsclp,SEGCBLIST_SOFTIRQ_ONLY ); -rcu_segcblist_set_flags (rsclp,SEGCBLIST_OFFLOADED ); +if (offload) { +rcu_segcblist_clear_flags (rsclp,SEGCBLIST_SOFTIRQ_ONLY ); +rcu_segcblist_set_flags (rsclp,SEGCBLIST_OFFLOADED ); + }else { +rcu_segcblist_clear_flags (rsclp,SEGCBLIST_OFFLOADED ); + } }/*
kernel/rcu/rcu_segcblist.h +1 -1
@@ -105,7 +105,7 @@ static inline bool rcu_segcblist_restempty(struct rcu_segcblist *rsclp, int seg)void rcu_segcblist_inc_len (struct rcu_segcblist *rsclp);void rcu_segcblist_init (struct rcu_segcblist *rsclp);void rcu_segcblist_disable (struct rcu_segcblist *rsclp); -void rcu_segcblist_offload (struct rcu_segcblist *rsclp); +void rcu_segcblist_offload (struct rcu_segcblist *rsclp,bool offload);bool rcu_segcblist_ready_cbs (struct rcu_segcblist *rsclp);bool rcu_segcblist_pend_cbs (struct rcu_segcblist *rsclp);struct rcu_head *rcu_segcblist_first_cb (struct rcu_segcblist *rsclp);
kernel/rcu/tree.h +1 -0
@@ -198,6 +198,7 @@ struct rcu_data {/* 5) Callback offloading. */ #ifdef CONFIG_RCU_NOCB_CPU struct swait_queue_head nocb_cb_wq;/* For nocb kthreads to sleep on. */ +struct swait_queue_head nocb_state_wq;/* For offloading state changes */ struct task_struct *nocb_gp_kthread;raw_spinlock_t nocb_lock;/* Guard following pair of fields. */ atomic_t nocb_lock_contended;/* Contention experienced. */
kernel/rcu/tree_plugin.h +108 -16
172 lines not on this page · raw message
Signature · 1 line
2.28.0
Paul E. McKenney
maintainerRe: [RFC PATCH 04/12] rcu: De-offloading CB kthread
Quoted 109 lines · Frederic Weisbecker
In order to de-offload the callbacks processing of an rdp, we must clear
SEGCBLIST_OFFLOADand notify the CB kthread so that it clears its own bit flag and goes to sleep to stop handling callbacks. The GP kthread will also be notified the same way. Whoever acknowledges and clears its own bit last must notify the de-offloading worker so that it can resume the de-offloading while being sure that callbacks won't be handled remotely anymore.Inspired-by Paul E. McKenney <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>--- include/linux/rcupdate.h | 2 + kernel/rcu/rcu_segcblist.c | 10 ++- kernel/rcu/rcu_segcblist.h | 2 +- kernel/rcu/tree.h | 1 + kernel/rcu/tree_plugin.h | 124 ++++++++++++++++++++++++++++++++----- 5 files changed, 119 insertions(+), 20 deletions(-)include/linux/rcupdate.h +2
-0@@ -97,8 +97,10 @@ static inline void rcu_user_exit(void) { }#ifdef CONFIG_RCU_NOCB_CPU void rcu_init_nohz (void ); +void rcu_nocb_cpu_deoffload (int cpu);#else /* #ifdef CONFIG_RCU_NOCB_CPU */ static inline void rcu_init_nohz (void ) { } +static inline void rcu_nocb_cpu_deoffload (int cpu) { }#endif /* #else #ifdef CONFIG_RCU_NOCB_CPU */ /** kernel/rcu/rcu_segcblist.c +7
-3@@ -170,10 +170,14 @@ void rcu_segcblist_disable(struct rcu_segcblist *rsclp)* Mark the specified rcu_segcblist structure as offloaded. This * structure must be empty. */ -void rcu_segcblist_offload (struct rcu_segcblist *rsclp) +void rcu_segcblist_offload (struct rcu_segcblist *rsclp,bool offload) { -rcu_segcblist_clear_flags (rsclp,SEGCBLIST_SOFTIRQ_ONLY ); -rcu_segcblist_set_flags (rsclp,SEGCBLIST_OFFLOADED ); +if (offload) { +rcu_segcblist_clear_flags (rsclp,SEGCBLIST_SOFTIRQ_ONLY ); +rcu_segcblist_set_flags (rsclp,SEGCBLIST_OFFLOADED ); + }else { +rcu_segcblist_clear_flags (rsclp,SEGCBLIST_OFFLOADED ); + } }/* kernel/rcu/rcu_segcblist.h +1
-1@@ -105,7 +105,7 @@ static inline bool rcu_segcblist_restempty(struct rcu_segcblist *rsclp, int seg)void rcu_segcblist_inc_len (struct rcu_segcblist *rsclp);void rcu_segcblist_init (struct rcu_segcblist *rsclp);void rcu_segcblist_disable (struct rcu_segcblist *rsclp); -void rcu_segcblist_offload (struct rcu_segcblist *rsclp); +void rcu_segcblist_offload (struct rcu_segcblist *rsclp,bool offload);bool rcu_segcblist_ready_cbs (struct rcu_segcblist *rsclp);bool rcu_segcblist_pend_cbs (struct rcu_segcblist *rsclp);struct rcu_head *rcu_segcblist_first_cb (struct rcu_segcblist *rsclp);kernel/rcu/tree.h +1
-0@@ -198,6 +198,7 @@ struct rcu_data {/* 5) Callback offloading. */ #ifdef CONFIG_RCU_NOCB_CPU struct swait_queue_head nocb_cb_wq;/* For nocb kthreads to sleep on. */ +struct swait_queue_head nocb_state_wq;/* For offloading state changes */ struct task_struct *nocb_gp_kthread;raw_spinlock_t nocb_lock;/* Guard following pair of fields. */ atomic_t nocb_lock_contended;/* Contention experienced. */ kernel/rcu/tree_plugin.h +11
-0@@ -2052,6 +2052,17 @@ static int rcu_nocb_gp_kthread(void *arg)return 0 ; } +static inline bool nocb_cb_can_run (struct rcu_data *rdp) +{ +u8 flags =SEGCBLIST_OFFLOADED |SEGCBLIST_KTHREAD_CB ; +return rcu_segcblist_test_flags (&rdp->cblist, flags); +} + +static inline bool nocb_cb_wait_cond (struct rcu_data *rdp) +{ +return nocb_cb_can_run (rdp) && !READ_ONCE (rdp->nocb_cb_sleep); +} +/* * Invoke any ready callbacks from the corresponding no-CBs CPU, * then, if there are no more, wait for more to appear.
kernel/rcu/tree_plugin.h static void nocb_cb_wait(struct rcu_data *rdp) · line 2077
Quoted 6 lines
kernel/rcu/tree_plugin.h +2
-0@@ -2061,7 +2072,9 @@ static void nocb_cb_wait(struct rcu_data *rdp)unsigned long cur_gp_seq;unsigned long flags;bool needwake_gp = false; +bool needwake_state = false;struct rcu_node *rnp = rdp->mynode; +struct rcu_segcblist *cblist = &rdp->cblist;
This is just a convenience variable, correct? As in to avoid typing "&rdp->" repeatedly? If so, please put a "const" on it.
Quoted 110 lines
kernel/rcu/tree_plugin.h +70
-15local_irq_save (flags);rcu_momentary_dyntick_idle ();@@ -2071,32 +2084,50 @@ static void nocb_cb_wait(struct rcu_data *rdp)local_bh_enable ();lockdep_assert_irqs_enabled ();rcu_nocb_lock_irqsave (rdp, flags); -if (rcu_segcblist_nextgp (&rdp->cblist, &cur_gp_seq) && +if (rcu_segcblist_nextgp (cblist, &cur_gp_seq) &&rcu_seq_done (&rnp->gp_seq, cur_gp_seq) &&raw_spin_trylock_rcu_node (rnp)) {/* irqs already disabled. */ needwake_gp =rcu_advance_cbs (rdp->mynode, rdp);raw_spin_unlock_rcu_node (rnp);/* irqs remain disabled. */ } -if (rcu_segcblist_ready_cbs (&rdp->cblist)) { -rcu_nocb_unlock_irqrestore (rdp, flags); -if (needwake_gp) -rcu_gp_kthread_wake (); -return ; - } -trace_rcu_nocb_wake (rcu_state.name, rdp->cpu,TPS ("CBSleep" ));WRITE_ONCE (rdp->nocb_cb_sleep, true); + +if (rcu_segcblist_test_flags (cblist,SEGCBLIST_OFFLOADED )) { +if (rcu_segcblist_ready_cbs (cblist)) +WRITE_ONCE (rdp->nocb_cb_sleep, false); + }else { +/* +* De-offloading. Clear our flag and notify the de-offload worker. +* We won't touch the callbacks and keep sleeping until we ever +* get re-offloaded. +*/ +WARN_ON_ONCE (!rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_CB )); +rcu_segcblist_clear_flags (cblist,SEGCBLIST_KTHREAD_CB ); +if (!rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_GP )) + needwake_state = true; + } + +if (rdp->nocb_cb_sleep) +trace_rcu_nocb_wake (rcu_state.name, rdp->cpu,TPS ("CBSleep" )); +rcu_nocb_unlock_irqrestore (rdp, flags);if (needwake_gp)rcu_gp_kthread_wake (); -swait_event_interruptible_exclusive (rdp->nocb_cb_wq, - !READ_ONCE (rdp->nocb_cb_sleep)); -if (!smp_load_acquire (&rdp->nocb_cb_sleep)) {/* VVV */ + +if (needwake_state) +swake_up_one (&rdp->nocb_state_wq); + +do { +swait_event_interruptible_exclusive (rdp->nocb_cb_wq, +nocb_cb_wait_cond (rdp)); +/* ^^^ Ensure CB invocation follows _sleep test. */ -return ; - } -WARN_ON (signal_pending (current)); -trace_rcu_nocb_wake (rcu_state.name, rdp->cpu,TPS ("WokeEmpty" )); +if (smp_load_acquire (&rdp->nocb_cb_sleep)) { +WARN_ON (signal_pending (current)); +trace_rcu_nocb_wake (rcu_state.name, rdp->cpu,TPS ("WokeEmpty" )); + } + }while (!nocb_cb_can_run (rdp)); }/* @@ -2158,6 +2189,65 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)do_nocb_deferred_wakeup_common (rdp); } +static void __rcu_nocb_rdp_deoffload (struct rcu_data *rdp) +{ +unsigned long flags; +struct rcu_node *rnp = rdp->mynode; +struct rcu_segcblist *cblist = &rdp->cblist; +bool wake_cb = false; + +printk ("De-offloading %d\n" , rdp->cpu); + +rcu_nocb_lock_irqsave (rdp, flags); +raw_spin_lock_rcu_node (rnp); +rcu_segcblist_offload (cblist, false); +raw_spin_unlock_rcu_node (rnp); + +if (rdp->nocb_cb_sleep) { + rdp->nocb_cb_sleep = false; + wake_cb = true; + } +rcu_nocb_unlock_irqrestore (rdp, flags); + +if (wake_cb) +swake_up_one (&rdp->nocb_cb_wq); + +swait_event_exclusive (rdp->nocb_state_wq, + !rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_CB )); +} + +static long rcu_nocb_rdp_deoffload (void *arg) +{ +struct rcu_data *rdp = arg; + +WARN_ON_ONCE (rdp->cpu !=raw_smp_processor_id ()); +__rcu_nocb_rdp_deoffload (rdp); + +return 0 ; +} +
kernel/rcu/tree_plugin.h static void do_nocb_deferred_wakeup(struct rcu_data *rdp) · line 2238
Quoted 10 lines
kernel/rcu/tree_plugin.h +10
-0+void rcu_nocb_cpu_deoffload (int cpu) +{ +struct rcu_data *rdp =per_cpu_ptr (&rcu_data, cpu); + +if (rdp == rdp->nocb_gp_rdp) { +pr_info ("Can't deoffload an rdp GP leader (yet)\n" ); +return ; + } +mutex_lock (&rcu_state.barrier_mutex); +cpus_read_lock ();
And you do in fact acquire rcu_state.barrier_mutex as well as blocking CPU-hotplug operations. Very good!
kernel/rcu/tree_plugin.h static void do_nocb_deferred_wakeup(struct rcu_data *rdp) · line 2245
Quoted 7 lines
kernel/rcu/tree_plugin.h +7
-0+if (rcu_segcblist_is_offloaded (&rdp->cblist)) { +if (cpu_online (cpu)) { +work_on_cpu (cpu, rcu_nocb_rdp_deoffload, rdp); + }else { +__rcu_nocb_rdp_deoffload (rdp); + } +cpumask_clear_cpu (cpu, rcu_nocb_mask);
In the direct-call case, I get it. But in the work_on_cpu() case, how do you know that the work has completed? Ah, because work_on_cpu() is defined to wait until the work is done. Never mind! ;-)
Thanx, Paul
Quoted 29 lines
kernel/rcu/tree_plugin.h +8
-1+ } +cpus_read_unlock (); +mutex_unlock (&rcu_state.barrier_mutex); +} +void __init rcu_init_nohz (void ) {int cpu;@@ -2200,7 +2290,8 @@ void __init rcu_init_nohz(void) rdp =per_cpu_ptr (&rcu_data, cpu);if (rcu_segcblist_empty (&rdp->cblist))rcu_segcblist_init (&rdp->cblist); -rcu_segcblist_offload (&rdp->cblist); +rcu_segcblist_offload (&rdp->cblist, true); +rcu_segcblist_set_flags (&rdp->cblist,SEGCBLIST_KTHREAD_CB ); }rcu_organize_nocb_kthreads (); }@@ -2210,6 +2301,7 @@ static void __init rcu_boot_init_nocb_percpu_data(struct rcu_data *rdp) {init_swait_queue_head (&rdp->nocb_cb_wq);init_swait_queue_head (&rdp->nocb_gp_wq); +init_swait_queue_head (&rdp->nocb_state_wq);raw_spin_lock_init (&rdp->nocb_lock);raw_spin_lock_init (&rdp->nocb_bypass_lock);raw_spin_lock_init (&rdp->nocb_gp_lock);Signature · 1 line
2.28.0
Frederic Weisbecker
maintainerRFC PATCH 5/12 rcu: De-offloading GP kthread
In reply to Frederic WeisbeckerIn order to de-offload the callbacks processing of an rdp, we must clear SEGCBLIST_OFFLOAD and notify the GP kthread so that it clears its own bit flag and ignore the target rdp from its loop. The CB kthread is also notified the same way. Whoever acknowledges and clears its own bit last must notify the de-offloading worker so that it can resume the de-offloading while being sure that callbacks won't be handled remotely anymore.
--- kernel/rcu/tree_plugin.h | 53 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-)
kernel/rcu/tree_plugin.h +51 -2
@@ -1900,6 +1900,33 @@ static void do_nocb_bypass_wakeup_timer(struct timer_list *t)__call_rcu_nocb_wake (rdp, true, flags); } +static inline bool nocb_gp_enabled_cb (struct rcu_data *rdp) +{ +u8 flags =SEGCBLIST_OFFLOADED |SEGCBLIST_KTHREAD_GP ; + +return rcu_segcblist_test_flags (&rdp->cblist, flags); +} + +static inline bool nocb_gp_update_state (struct rcu_data *rdp,bool *needwake_state) +{ +struct rcu_segcblist *cblist = &rdp->cblist; + +if (rcu_segcblist_test_flags (cblist,SEGCBLIST_OFFLOADED )) { +return true; + }else { +/* +* De-offloading. Clear our flag and notify the de-offload worker. +* We will ignore this rdp until it ever gets re-offloaded. +*/ +WARN_ON_ONCE (!rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_GP )); +rcu_segcblist_clear_flags (cblist,SEGCBLIST_KTHREAD_GP ); +if (!rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_CB )) + *needwake_state = true; +return false; + } +} + +/* * No-CBs GP kthreads come here to wait for additional callbacks to show up * or for grace periods to end.
@@ -1927,8 +1954,17 @@ static void nocb_gp_wait(struct rcu_data *my_rdp)* and the global grace-period kthread are awakened if needed. */ for (rdp = my_rdp; rdp; rdp = rdp->nocb_next_cb_rdp) { +bool needwake_state = false; +if (!nocb_gp_enabled_cb (rdp)) +continue ;trace_rcu_nocb_wake (rcu_state.name, rdp->cpu,TPS ("Check" ));rcu_nocb_lock_irqsave (rdp, flags); +if (!nocb_gp_update_state (rdp, &needwake_state)) { +rcu_nocb_unlock_irqrestore (rdp, flags); +if (needwake_state) +swake_up_one (&rdp->nocb_state_wq); +continue ; + } bypass_ncbs =rcu_cblist_n_cbs (&rdp->nocb_bypass); if (bypass_ncbs && (time_after(j, READ_ONCE(rdp->nocb_bypass_first) + 1) ||
@@ -2194,7 +2230,8 @@ static void __rcu_nocb_rdp_deoffload(struct rcu_data *rdp)unsigned long flags;struct rcu_node *rnp = rdp->mynode;struct rcu_segcblist *cblist = &rdp->cblist; -bool wake_cb = false; +struct rcu_data *rdp_gp = rdp->nocb_gp_rdp; +bool wake_cb = false, wake_gp = false;printk ("De-offloading %d\n" , rdp->cpu);
@@ -2212,8 +2249,19 @@ static void __rcu_nocb_rdp_deoffload(struct rcu_data *rdp)if (wake_cb)swake_up_one (&rdp->nocb_cb_wq); +raw_spin_lock_irqsave (&rdp_gp->nocb_gp_lock, flags); +if (rdp_gp->nocb_gp_sleep) { + rdp_gp->nocb_gp_sleep = false; + wake_gp = true; + } +raw_spin_unlock_irqrestore (&rdp_gp->nocb_gp_lock, flags); + +if (wake_gp) +wake_up_process (rdp_gp->nocb_gp_kthread); +swait_event_exclusive (rdp->nocb_state_wq, - !rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_CB )); + !rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_CB | +SEGCBLIST_KTHREAD_GP )); }static long rcu_nocb_rdp_deoffload (void *arg)
@@ -2292,6 +2340,7 @@ void __init rcu_init_nohz(void)rcu_segcblist_init (&rdp->cblist);rcu_segcblist_offload (&rdp->cblist, true);rcu_segcblist_set_flags (&rdp->cblist,SEGCBLIST_KTHREAD_CB ); +rcu_segcblist_set_flags (&rdp->cblist,SEGCBLIST_KTHREAD_GP ); }rcu_organize_nocb_kthreads (); }
Signature · 1 line
2.28.0
Paul E. McKenney
maintainerRe: [RFC PATCH 05/12] rcu: De-offloading GP kthread
Quoted 108 lines · Frederic Weisbecker
In order to de-offload the callbacks processing of an rdp, we must clear
SEGCBLIST_OFFLOADand notify the GP kthread so that it clears its own bit flag and ignore the target rdp from its loop. The CB kthread is also notified the same way. Whoever acknowledges and clears its own bit last must notify the de-offloading worker so that it can resume the de-offloading while being sure that callbacks won't be handled remotely anymore.Inspired-by Paul E. McKenney <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>--- kernel/rcu/tree_plugin.h | 53 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-)kernel/rcu/tree_plugin.h +50
-2@@ -1900,6 +1900,33 @@ static void do_nocb_bypass_wakeup_timer(struct timer_list *t)__call_rcu_nocb_wake (rdp, true, flags); } +static inline bool nocb_gp_enabled_cb (struct rcu_data *rdp) +{ +u8 flags =SEGCBLIST_OFFLOADED |SEGCBLIST_KTHREAD_GP ; + +return rcu_segcblist_test_flags (&rdp->cblist, flags); +} + +static inline bool nocb_gp_update_state (struct rcu_data *rdp,bool *needwake_state) +{ +struct rcu_segcblist *cblist = &rdp->cblist; + +if (rcu_segcblist_test_flags (cblist,SEGCBLIST_OFFLOADED )) { +return true; + }else { +/* +* De-offloading. Clear our flag and notify the de-offload worker. +* We will ignore this rdp until it ever gets re-offloaded. +*/ +WARN_ON_ONCE (!rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_GP )); +rcu_segcblist_clear_flags (cblist,SEGCBLIST_KTHREAD_GP ); +if (!rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_CB )) + *needwake_state = true; +return false; + } +} + +/* * No-CBs GP kthreads come here to wait for additional callbacks to show up * or for grace periods to end. @@ -1927,8 +1954,17 @@ static void nocb_gp_wait(struct rcu_data *my_rdp)* and the global grace-period kthread are awakened if needed. */ for (rdp = my_rdp; rdp; rdp = rdp->nocb_next_cb_rdp) { +bool needwake_state = false; +if (!nocb_gp_enabled_cb (rdp)) +continue ;trace_rcu_nocb_wake (rcu_state.name, rdp->cpu,TPS ("Check" ));rcu_nocb_lock_irqsave (rdp, flags); +if (!nocb_gp_update_state (rdp, &needwake_state)) { +rcu_nocb_unlock_irqrestore (rdp, flags); +if (needwake_state) +swake_up_one (&rdp->nocb_state_wq); +continue ; + } bypass_ncbs =rcu_cblist_n_cbs (&rdp->nocb_bypass); if (bypass_ncbs && (time_after(j, READ_ONCE(rdp->nocb_bypass_first) + 1) ||@@ -2194,7 +2230,8 @@ static void __rcu_nocb_rdp_deoffload(struct rcu_data *rdp)unsigned long flags;struct rcu_node *rnp = rdp->mynode;struct rcu_segcblist *cblist = &rdp->cblist; -bool wake_cb = false; +struct rcu_data *rdp_gp = rdp->nocb_gp_rdp; +bool wake_cb = false, wake_gp = false;printk ("De-offloading %d\n" , rdp->cpu);@@ -2212,8 +2249,19 @@ static void __rcu_nocb_rdp_deoffload(struct rcu_data *rdp)if (wake_cb)swake_up_one (&rdp->nocb_cb_wq); +raw_spin_lock_irqsave (&rdp_gp->nocb_gp_lock, flags); +if (rdp_gp->nocb_gp_sleep) { + rdp_gp->nocb_gp_sleep = false; + wake_gp = true; + } +raw_spin_unlock_irqrestore (&rdp_gp->nocb_gp_lock, flags); + +if (wake_gp) +wake_up_process (rdp_gp->nocb_gp_kthread); +swait_event_exclusive (rdp->nocb_state_wq, - !rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_CB )); + !rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_CB | +SEGCBLIST_KTHREAD_GP )); }static long rcu_nocb_rdp_deoffload (void *arg)
kernel/rcu/tree_plugin.h void __init rcu_init_nohz(void) · line 2343
Quoted 4 lines
kernel/rcu/tree_plugin.h +1
-0@@ -2292,6 +2340,7 @@ void __init rcu_init_nohz(void)rcu_segcblist_init (&rdp->cblist);rcu_segcblist_offload (&rdp->cblist, true);rcu_segcblist_set_flags (&rdp->cblist,SEGCBLIST_KTHREAD_CB ); +rcu_segcblist_set_flags (&rdp->cblist,SEGCBLIST_KTHREAD_GP );
OK, I will bite at this nit...
Why not "SEGCBLIST_KTHREAD_CB | SEGCBLIST_KTHREAD_GP"?
Thanx, Paul
Quoted 6 lines
kernel/rcu/tree_plugin.h +0
-0}rcu_organize_nocb_kthreads (); }Signature · 1 line
2.28.0
Frederic Weisbecker
maintainerRe: [RFC PATCH 05/12] rcu: De-offloading GP kthread
Quoted 10 lines · Paul E. McKenney
kernel/rcu/tree_plugin.h void __init rcu_init_nohz(void) · line 2343
Quoted 5 lines · Frederic Weisbecker
kernel/rcu/tree_plugin.h +1
-0@@ -2292,6 +2340,7 @@ void __init rcu_init_nohz(void)rcu_segcblist_init (&rdp->cblist);rcu_segcblist_offload (&rdp->cblist, true);rcu_segcblist_set_flags (&rdp->cblist,SEGCBLIST_KTHREAD_CB ); +rcu_segcblist_set_flags (&rdp->cblist,SEGCBLIST_KTHREAD_GP );OK, I will bite at this nit...
Why not "
SEGCBLIST_KTHREAD_CB|SEGCBLIST_KTHREAD_GP"?
That spared a broken line :o)
But you're right, I'll do that.
Quoted 9 lines
Thanx, Paul
Quoted 6 lines
kernel/rcu/tree_plugin.h +0
-0}rcu_organize_nocb_kthreads (); }Signature · 1 line
2.28.0
Paul E. McKenney
maintainerRe: [RFC PATCH 05/12] rcu: De-offloading GP kthread
Quoted 10 lines · Frederic Weisbecker
Quoted 9 lines · Paul E. McKenney
kernel/rcu/tree_plugin.h void __init rcu_init_nohz(void) · line 2343
Quoted 5 lines · Frederic Weisbecker
kernel/rcu/tree_plugin.h +1
-0@@ -2292,6 +2340,7 @@ void __init rcu_init_nohz(void)rcu_segcblist_init (&rdp->cblist);rcu_segcblist_offload (&rdp->cblist, true);rcu_segcblist_set_flags (&rdp->cblist,SEGCBLIST_KTHREAD_CB ); +rcu_segcblist_set_flags (&rdp->cblist,SEGCBLIST_KTHREAD_GP );OK, I will bite at this nit...
Quoted 5 lines
Quoted 1 line
Why not "
SEGCBLIST_KTHREAD_CB|SEGCBLIST_KTHREAD_GP"?That spared a broken line :o)
But you're right, I'll do that.
Either way is fine, just curious. Your choice!
Thanx, Paul
Frederic Weisbecker
maintainerRFC PATCH 6/12 rcu: Re-offload support
In reply to Frederic WeisbeckerIn order to re-offload the callbacks processing of an rdp, we must clear SEGCBLIST_SOFTIRQ_ONLY, set SEGCBLIST_OFFLOADED and notify the CB and GP kthreads so that they both set their own bit flag and start processing the callbacks remotely. The re-offloading worker is then notified that it can stop processing the callbacks locally.
Ordering must be carefully enforced so that the callbacks that used to be processed locally without locking must have their latest updates visible by the time they get processed by the kthreads.
--- include/linux/rcupdate.h | 2 + kernel/rcu/tree_plugin.h | 123 +++++++++++++++++++++++++++++++++++---- 2 files changed, 113 insertions(+), 12 deletions(-)
include/linux/rcupdate.h +2 -0
@@ -97,9 +97,11 @@ static inline void rcu_user_exit(void) { }#ifdef CONFIG_RCU_NOCB_CPU void rcu_init_nohz (void ); +void rcu_nocb_cpu_offload (int cpu);void rcu_nocb_cpu_deoffload (int cpu);#else /* #ifdef CONFIG_RCU_NOCB_CPU */ static inline void rcu_init_nohz (void ) { } +static inline void rcu_nocb_cpu_offload (int cpu) { }static inline void rcu_nocb_cpu_deoffload (int cpu) { }#endif /* #else #ifdef CONFIG_RCU_NOCB_CPU */
kernel/rcu/tree_plugin.h +111 -12
183 lines not on this page · raw message
Signature · 1 line
2.28.0
Frederic Weisbecker
maintainerRFC PATCH 7/12 rcu: Shutdown nocb timer on de-offloading
In reply to Frederic WeisbeckerMake sure the nocb timer can't fire anymore before we reach the final de-offload state. Spuriously waking up the GP kthread is no big deal but we must prevent from executing the timer callback without nocb locking.
--- kernel/rcu/tree.h | 1 + kernel/rcu/tree_plugin.h | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-)
kernel/rcu/tree.h +1 -0
@@ -254,6 +254,7 @@ struct rcu_data { };/* Values for nocb_defer_wakeup field in struct rcu_data. */ +#define RCU_NOCB_WAKE_OFF -1#define RCU_NOCB_WAKE_NOT 0#define RCU_NOCB_WAKE 1#define RCU_NOCB_WAKE_FORCE 2
kernel/rcu/tree_plugin.h +11 -1
@@ -1637,6 +1637,8 @@ static void wake_nocb_gp(struct rcu_data *rdp, bool force,static void wake_nocb_gp_defer (struct rcu_data *rdp,int waketype,const char *reason) { +if (rdp->nocb_defer_wakeup ==RCU_NOCB_WAKE_OFF ) +return ;if (rdp->nocb_defer_wakeup ==RCU_NOCB_WAKE_NOT )mod_timer (&rdp->nocb_timer, jiffies +1 );if (rdp->nocb_defer_wakeup < waketype)
@@ -2214,7 +2216,7 @@ static int rcu_nocb_cb_kthread(void *arg)/* Is a deferred wakeup of rcu_nocb_kthread() required? */ static int rcu_nocb_need_deferred_wakeup (struct rcu_data *rdp) { -return READ_ONCE (rdp->nocb_defer_wakeup); +return READ_ONCE (rdp->nocb_defer_wakeup) >RCU_NOCB_WAKE_NOT ; }/* Do a deferred wakeup of rcu_nocb_kthread(). */
@@ -2299,6 +2301,12 @@ static void __rcu_nocb_rdp_deoffload(struct rcu_data *rdp)swait_event_exclusive (rdp->nocb_state_wq, !rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_CB |SEGCBLIST_KTHREAD_GP )); + +/* Make sure nocb timer won't stay around */ +rcu_nocb_lock_irqsave (rdp, flags); +WRITE_ONCE (rdp->nocb_defer_wakeup,RCU_NOCB_WAKE_OFF ); +rcu_nocb_unlock_irqrestore (rdp, flags); +del_timer_sync (&rdp->nocb_timer); }static long rcu_nocb_rdp_deoffload (void *arg)
@@ -2344,6 +2352,8 @@ static void __rcu_nocb_rdp_offload(struct rcu_data *rdp)* SEGCBLIST_SOFTIRQ_ONLY mode. */ raw_spin_lock_irqsave (&rdp->nocb_lock, flags); +/* Re-enable nocb timer */ +WRITE_ONCE (rdp->nocb_defer_wakeup,RCU_NOCB_WAKE_NOT );/* * We didn't take the nocb lock while working on the * rdp->cblist in SEGCBLIST_SOFTIRQ_ONLY mode.
Signature · 1 line
2.28.0
Paul E. McKenney
maintainerRe: [RFC PATCH 07/12] rcu: Shutdown nocb timer on de-offloading
Quoted 3 lines · Frederic Weisbecker
Make sure the nocb timer can't fire anymore before we reach the final de-offload state. Spuriously waking up the GP kthread is no big deal but we must prevent from executing the timer callback without nocb locking.
If we had just the previous patch and not this patch, would things break? Or are you relying on the fact that there is not yet a connection to userspace controls for this functionality?
Just looking out for bisectability...
Thanx, Paul
Quoted 72 lines
Inspired-by Paul E. McKenney <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>--- kernel/rcu/tree.h | 1 + kernel/rcu/tree_plugin.h | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-)kernel/rcu/tree.h +1
-0@@ -254,6 +254,7 @@ struct rcu_data { };/* Values for nocb_defer_wakeup field in struct rcu_data. */ +#define RCU_NOCB_WAKE_OFF -1#define RCU_NOCB_WAKE_NOT 0#define RCU_NOCB_WAKE 1#define RCU_NOCB_WAKE_FORCE 2kernel/rcu/tree_plugin.h +11
-1@@ -1637,6 +1637,8 @@ static void wake_nocb_gp(struct rcu_data *rdp, bool force,static void wake_nocb_gp_defer (struct rcu_data *rdp,int waketype,const char *reason) { +if (rdp->nocb_defer_wakeup ==RCU_NOCB_WAKE_OFF ) +return ;if (rdp->nocb_defer_wakeup ==RCU_NOCB_WAKE_NOT )mod_timer (&rdp->nocb_timer, jiffies +1 );if (rdp->nocb_defer_wakeup < waketype)@@ -2214,7 +2216,7 @@ static int rcu_nocb_cb_kthread(void *arg)/* Is a deferred wakeup of rcu_nocb_kthread() required? */ static int rcu_nocb_need_deferred_wakeup (struct rcu_data *rdp) { -return READ_ONCE (rdp->nocb_defer_wakeup); +return READ_ONCE (rdp->nocb_defer_wakeup) >RCU_NOCB_WAKE_NOT ; }/* Do a deferred wakeup of rcu_nocb_kthread(). */ @@ -2299,6 +2301,12 @@ static void __rcu_nocb_rdp_deoffload(struct rcu_data *rdp)swait_event_exclusive (rdp->nocb_state_wq, !rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_CB |SEGCBLIST_KTHREAD_GP )); + +/* Make sure nocb timer won't stay around */ +rcu_nocb_lock_irqsave (rdp, flags); +WRITE_ONCE (rdp->nocb_defer_wakeup,RCU_NOCB_WAKE_OFF ); +rcu_nocb_unlock_irqrestore (rdp, flags); +del_timer_sync (&rdp->nocb_timer); }static long rcu_nocb_rdp_deoffload (void *arg)@@ -2344,6 +2352,8 @@ static void __rcu_nocb_rdp_offload(struct rcu_data *rdp)* SEGCBLIST_SOFTIRQ_ONLY mode. */ raw_spin_lock_irqsave (&rdp->nocb_lock, flags); +/* Re-enable nocb timer */ +WRITE_ONCE (rdp->nocb_defer_wakeup,RCU_NOCB_WAKE_NOT );/* * We didn't take the nocb lock while working on the * rdp->cblist in SEGCBLIST_SOFTIRQ_ONLY mode. Signature · 1 line
2.28.0
Frederic Weisbecker
maintainerRe: [RFC PATCH 07/12] rcu: Shutdown nocb timer on de-offloading
Quoted 8 lines · Paul E. McKenney
Quoted 3 lines · Frederic Weisbecker
Make sure the nocb timer can't fire anymore before we reach the final de-offload state. Spuriously waking up the GP kthread is no big deal but we must prevent from executing the timer callback without nocb locking.
If we had just the previous patch and not this patch, would things break? Or are you relying on the fact that there is not yet a connection to userspace controls for this functionality?
Exactly it shouldn't break because only the last patch makes the code eventually used.
Thanks.
Paul E. McKenney
maintainerRe: [RFC PATCH 07/12] rcu: Shutdown nocb timer on de-offloading
Quoted 6 lines · Frederic Weisbecker
Quoted 5 lines · Paul E. McKenney
Quoted 3 lines · Frederic Weisbecker
Make sure the nocb timer can't fire anymore before we reach the final de-offload state. Spuriously waking up the GP kthread is no big deal but we must prevent from executing the timer callback without nocb locking.
Quoted 6 lines
Quoted 3 lines
If we had just the previous patch and not this patch, would things break? Or are you relying on the fact that there is not yet a connection to userspace controls for this functionality?
Exactly it shouldn't break because only the last patch makes the code eventually used.
That works, thank you!
Thanx, Paul
Frederic Weisbecker
maintainerRFC PATCH 8/12 rcu: Flush bypass before setting SEGCBLIST_SOFTIRQ_ONLY
In reply to Frederic WeisbeckerMake sure to handle the pending bypass queue before we switch to the final de-offload state. We'll have to be careful and later set SEGCBLIST_SOFTIRQ_ONLY before re-enabling again IRQs, or new bypass callbacks could be queued in the meantine.
--- kernel/rcu/tree_plugin.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
kernel/rcu/tree_plugin.h +8 -2
@@ -2302,11 +2302,17 @@ static void __rcu_nocb_rdp_deoffload(struct rcu_data *rdp) !rcu_segcblist_test_flags (cblist,SEGCBLIST_KTHREAD_CB | SEGCBLIST_KTHREAD_GP)); +rcu_nocb_lock_irqsave (rdp, flags);/* Make sure nocb timer won't stay around */ -rcu_nocb_lock_irqsave (rdp, flags);WRITE_ONCE (rdp->nocb_defer_wakeup,RCU_NOCB_WAKE_OFF ); -rcu_nocb_unlock_irqrestore (rdp, flags);del_timer_sync (&rdp->nocb_timer); +/* +* Flush bypass. While IRQs are disabled and once we set +* SEGCBLIST_SOFTIRQ_ONLY, no callback is supposed to be +* enqueued on bypass. +*/ +rcu_nocb_flush_bypass (rdp,NULL , jiffies); +rcu_nocb_unlock_irqrestore (rdp, flags); }static long rcu_nocb_rdp_deoffload (void *arg)
Signature · 1 line
2.28.0
Frederic Weisbecker
maintainerRFC PATCH 9/12 rcu: Set SEGCBLIST_SOFTIRQ_ONLY at the very last stage of de-offloading
In reply to Frederic WeisbeckerSet SEGCBLIST_SOFTIRQ_ONLY once everything is settled. After that, the callbacks are handled locklessly and locally.
--- kernel/rcu/tree_plugin.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
kernel/rcu/tree_plugin.h +8 -1
@@ -2312,7 +2312,14 @@ static void __rcu_nocb_rdp_deoffload(struct rcu_data *rdp)* enqueued on bypass. */ rcu_nocb_flush_bypass (rdp,NULL , jiffies); -rcu_nocb_unlock_irqrestore (rdp, flags); +rcu_segcblist_set_flags (cblist,SEGCBLIST_SOFTIRQ_ONLY ); +/* +* With SEGCBLIST_SOFTIRQ_ONLY, we can't use +* rcu_nocb_unlock_irqrestore() anymore. Theoretically we +* could set SEGCBLIST_SOFTIRQ_ONLY with cb unlocked and IRQs +* disabled now, but let's be paranoid. +*/ +raw_spin_unlock_irqrestore (&rdp->nocb_lock, flags); }static long rcu_nocb_rdp_deoffload (void *arg)
Signature · 1 line
2.28.0
Frederic Weisbecker
maintainerRFC PATCH 10/12 rcu: Process batch locally as long as offloading isn't complete
In reply to Frederic WeisbeckerDuring the offloading or de-offloading process, make sure to process the callbacks batch locally whenever the segcblist isn't entirely offloaded. This enforces callback service processing while we are still in intermediate (de-)offloading state.
FIXME: Note that __call_rcu_core() isn't called during these intermediate states. Some pieces there may still be necessary.
--- kernel/rcu/rcu_segcblist.h | 12 ++++++++++++ kernel/rcu/tree.c | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-)
kernel/rcu/rcu_segcblist.h +12 -0
@@ -92,6 +92,18 @@ static inline bool rcu_segcblist_is_offloaded(struct rcu_segcblist *rsclp)return false; } +static inline bool rcu_segcblist_completely_offloaded (struct rcu_segcblist *rsclp) +{ +int flags =SEGCBLIST_KTHREAD_CB |SEGCBLIST_KTHREAD_GP |SEGCBLIST_OFFLOADED ; + +if (IS_ENABLED (CONFIG_RCU_NOCB_CPU )) { +if ((rsclp->flags & flags) == flags) +return true; + } + +return false; +} +/* * Are all segments following the specified segment of the specified * rcu_segcblist structure empty of callbacks? (The specified
kernel/rcu/tree.c +2 -1
@@ -2620,6 +2620,7 @@ static __latent_entropy void rcu_core(void)struct rcu_data *rdp =raw_cpu_ptr (&rcu_data);struct rcu_node *rnp = rdp->mynode;const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist); +const bool do_batch = !rcu_segcblist_completely_offloaded (&rdp->cblist);if (cpu_is_offline (smp_processor_id ()))return ;
@@ -2649,7 +2650,7 @@ static __latent_entropy void rcu_core(void)rcu_check_gp_start_stall (rnp, rdp,rcu_jiffies_till_stall_check ());/* If there are callbacks ready, invoke them. */ -if (!offloaded &&rcu_segcblist_ready_cbs (&rdp->cblist) && +if (do_batch &&rcu_segcblist_ready_cbs (&rdp->cblist) &&likely (READ_ONCE (rcu_scheduler_fully_active)))rcu_do_batch (rdp);
Signature · 1 line
2.28.0
Paul E. McKenney
maintainerRe: [RFC PATCH 10/12] rcu: Process batch locally as long as offloading isn't complete
Quoted 7 lines · Frederic Weisbecker
During the offloading or de-offloading process, make sure to process the callbacks batch locally whenever the segcblist isn't entirely offloaded. This enforces callback service processing while we are still in intermediate (de-)offloading state.
FIXME: Note that
__call_rcu_core()isn't called during these intermediate states. Some pieces there may still be necessary.
Joel's per-segment callback-count work might help there, though I believe that to be a separate issue.
The key point is that if there are a lot of callbacks, but all of them are ready to be invoked, then there isn't much point in making the grace periods complete faster. Right now, lacking per-segment counts, RCU just assumes that none of the callbacks are ready to be invoked.
Thanx, Paul
Quoted 60 lines
Inspired-by Paul E. McKenney <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>--- kernel/rcu/rcu_segcblist.h | 12 ++++++++++++ kernel/rcu/tree.c | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-)kernel/rcu/rcu_segcblist.h +12
-0@@ -92,6 +92,18 @@ static inline bool rcu_segcblist_is_offloaded(struct rcu_segcblist *rsclp)return false; } +static inline bool rcu_segcblist_completely_offloaded (struct rcu_segcblist *rsclp) +{ +int flags =SEGCBLIST_KTHREAD_CB |SEGCBLIST_KTHREAD_GP |SEGCBLIST_OFFLOADED ; + +if (IS_ENABLED (CONFIG_RCU_NOCB_CPU )) { +if ((rsclp->flags & flags) == flags) +return true; + } + +return false; +} +/* * Are all segments following the specified segment of the specified * rcu_segcblist structure empty of callbacks? (The specified kernel/rcu/tree.c +2
-1@@ -2620,6 +2620,7 @@ static __latent_entropy void rcu_core(void)struct rcu_data *rdp =raw_cpu_ptr (&rcu_data);struct rcu_node *rnp = rdp->mynode;const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist); +const bool do_batch = !rcu_segcblist_completely_offloaded (&rdp->cblist);if (cpu_is_offline (smp_processor_id ()))return ;@@ -2649,7 +2650,7 @@ static __latent_entropy void rcu_core(void)rcu_check_gp_start_stall (rnp, rdp,rcu_jiffies_till_stall_check ());/* If there are callbacks ready, invoke them. */ -if (!offloaded &&rcu_segcblist_ready_cbs (&rdp->cblist) && +if (do_batch &&rcu_segcblist_ready_cbs (&rdp->cblist) &&likely (READ_ONCE (rcu_scheduler_fully_active)))rcu_do_batch (rdp);Signature · 1 line
2.28.0
Frederic Weisbecker
maintainerRFC PATCH 11/12 rcu: Locally accelerate callbacks as long as offloading isn't complete
In reply to Frederic WeisbeckerI have no idea what I'm doing but doing that looks necessary to me.
--- kernel/rcu/tree.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/rcu/tree.c +3 -4
@@ -2619,7 +2619,6 @@ static __latent_entropy void rcu_core(void)unsigned long flags;struct rcu_data *rdp =raw_cpu_ptr (&rcu_data);struct rcu_node *rnp = rdp->mynode; -const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);const bool do_batch = !rcu_segcblist_completely_offloaded (&rdp->cblist);if (cpu_is_offline (smp_processor_id ()))
@@ -2640,11 +2639,11 @@ static __latent_entropy void rcu_core(void)/* No grace period and unregistered callbacks? */ if (!rcu_gp_in_progress () && -rcu_segcblist_is_enabled (&rdp->cblist) && !offloaded) { -local_irq_save (flags); +rcu_segcblist_is_enabled (&rdp->cblist) && do_batch) { +rcu_nocb_lock_irqsave (rdp, flags);if (!rcu_segcblist_restempty (&rdp->cblist,RCU_NEXT_READY_TAIL ))rcu_accelerate_cbs_unlocked (rnp, rdp); -local_irq_restore (flags); +rcu_nocb_unlock_irqrestore (rdp, flags); }rcu_check_gp_start_stall (rnp, rdp,rcu_jiffies_till_stall_check ());
Signature · 1 line
2.28.0
Paul E. McKenney
maintainerRe: [RFC PATCH 11/12] rcu: Locally accelerate callbacks as long as offloading isn't complete
Quoted 1 line · Frederic Weisbecker
I have no idea what I'm doing but doing that looks necessary to me.
Now -there- is a commit log that inspires confidence!!! ;-)
Quoted 25 lines
Inspired-by Paul E. McKenney <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>--- kernel/rcu/tree.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)kernel/rcu/tree.c +0
-1@@ -2619,7 +2619,6 @@ static __latent_entropy void rcu_core(void)unsigned long flags;struct rcu_data *rdp =raw_cpu_ptr (&rcu_data);struct rcu_node *rnp = rdp->mynode; -const bool offloaded =rcu_segcblist_is_offloaded (&rdp->cblist);const bool do_batch = !rcu_segcblist_completely_offloaded (&rdp->cblist);if (cpu_is_offline (smp_processor_id ()))
kernel/rcu/tree.c static __latent_entropy void rcu_core(void) · line 2645
Quoted 9 lines
kernel/rcu/tree.c +2
-2@@ -2640,11 +2639,11 @@ static __latent_entropy void rcu_core(void)/* No grace period and unregistered callbacks? */ if (!rcu_gp_in_progress () && -rcu_segcblist_is_enabled (&rdp->cblist) && !offloaded) { -local_irq_save (flags); +rcu_segcblist_is_enabled (&rdp->cblist) && do_batch) { +rcu_nocb_lock_irqsave (rdp, flags);if (!rcu_segcblist_restempty (&rdp->cblist,RCU_NEXT_READY_TAIL ))rcu_accelerate_cbs_unlocked (rnp, rdp);
It might also be that rcu_advance_cbs() is needed somewhere. I will need to look carefully to work out whether either of them need to be invoked at this particular point in the code.
Thanx, Paul
Quoted 8 lines
kernel/rcu/tree.c +1
-1-local_irq_restore (flags); +rcu_nocb_unlock_irqrestore (rdp, flags); }rcu_check_gp_start_stall (rnp, rdp,rcu_jiffies_till_stall_check ());Signature · 1 line
2.28.0
Frederic Weisbecker
maintainerRFC PATCH 12/12 rcu: Nocb (de)activate through sysfs
In reply to Frederic WeisbeckerNot for merge.
Make nocb toggable for a given CPU using:
/sys/devices/system/cpu/cpu*/hotplug/nocb
This is only intended for those who want to test this patchset. The real interfaces will be cpuset/isolation and rcutorture.
--- kernel/cpu.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
kernel/cpu.c +23 -0
@@ -2224,10 +2224,33 @@ static ssize_t show_cpuhp_fail(struct device *dev, static DEVICE_ATTR(fail, 0644, show_cpuhp_fail, write_cpuhp_fail); +static ssize_t write_nocb (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +int val, ret; + + ret =kstrtoint (buf,10 , &val); +if (ret) +return ret; + +if (val ==0 ) +rcu_nocb_cpu_deoffload (dev->id); +else if (val ==1 ) +rcu_nocb_cpu_offload (dev->id); +else +return -EINVAL ; + +return count; +} + +static DEVICE_ATTR(nocb, 0644, NULL, write_nocb); +static struct attribute *cpuhp_cpu_attrs[] = { &dev_attr_state.attr, &dev_attr_target.attr, &dev_attr_fail.attr, + &dev_attr_nocb.attr,NULL };
Signature · 1 line
2.28.0
Paul E. McKenney
maintainerRe: [RFC PATCH 12/12] rcu: Nocb (de)activate through sysfs
Quoted 7 lines · Frederic Weisbecker
Not for merge.
Make nocb toggable for a given CPU using:
/sys/devices/system/cpu/cpu*/hotplug/nocbThis is only intended for those who want to test this patchset. The real interfaces will be cpuset/isolation and rcutorture.
Excellent choice for testing in the near term!
How does rcutorture fare with this series if an additional kthread toggles offloading on and off continually?
All questions and concerns aside, excellent progress and nice work!!!
Thanx, Paul
Quoted 52 lines
Not-Signed-off-by Frederic Weisbecker <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>--- kernel/cpu.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)kernel/cpu.c +23
-0@@ -2224,10 +2224,33 @@ static ssize_t show_cpuhp_fail(struct device *dev, static DEVICE_ATTR(fail, 0644, show_cpuhp_fail, write_cpuhp_fail); +static ssize_t write_nocb (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +int val, ret; + + ret =kstrtoint (buf,10 , &val); +if (ret) +return ret; + +if (val ==0 ) +rcu_nocb_cpu_deoffload (dev->id); +else if (val ==1 ) +rcu_nocb_cpu_offload (dev->id); +else +return -EINVAL ; + +return count; +} + +static DEVICE_ATTR(nocb, 0644, NULL, write_nocb); +static struct attribute *cpuhp_cpu_attrs[] = { &dev_attr_state.attr, &dev_attr_target.attr, &dev_attr_fail.attr, + &dev_attr_nocb.attr,NULL };Signature · 1 line
2.28.0
Frederic Weisbecker
maintainerRe: [RFC PATCH 12/12] rcu: Nocb (de)activate through sysfs
Quoted 6 lines · Paul E. McKenney
Quoted 5 lines · Frederic Weisbecker
Not for merge.
Make nocb toggable for a given CPU using:
/sys/devices/system/cpu/cpu*/hotplug/nocb
Quoted 7 lines
Quoted 2 lines
This is only intended for those who want to test this patchset. The real interfaces will be cpuset/isolation and rcutorture.
Excellent choice for testing in the near term!
How does rcutorture fare with this series if an additional kthread toggles offloading on and off continually?
So yeah that would be the plan: having something that randomly toggles offloading from the RCU tests themselves. I'm not quite familiar with rcutorture internals yet though.
Quoted 2 lines
All questions and concerns aside, excellent progress and nice work!!!
Thanks! We are slowly making progress :)
Paul E. McKenney
maintainerRe: [RFC PATCH 12/12] rcu: Nocb (de)activate through sysfs
Quoted 10 lines · Frederic Weisbecker
Quoted 9 lines · Paul E. McKenney
Quoted 7 lines · Frederic Weisbecker
Not for merge.
Make nocb toggable for a given CPU using:
/sys/devices/system/cpu/cpu*/hotplug/nocbThis is only intended for those who want to test this patchset. The real interfaces will be cpuset/isolation and rcutorture.
Quoted 8 lines
Quoted 4 lines
Excellent choice for testing in the near term!
How does rcutorture fare with this series if an additional kthread toggles offloading on and off continually?
So yeah that would be the plan: having something that randomly toggles offloading from the RCU tests themselves. I'm not quite familiar with rcutorture internals yet though.
If you supply a function that selects a CPU and does the toggle, I can quickly and easily wire it into rcutorture. I of course have no objection to your learning to do this yourself, but the offer stands.
Quoted 3 lines
Quoted 1 line
All questions and concerns aside, excellent progress and nice work!!!
Thanks! We are slowly making progress :)
Better than quickly failing to make progress, to be sure! ;-)
Thanx, Paul
Frederic Weisbecker
maintainerRe: [RFC PATCH 12/12] rcu: Nocb (de)activate through sysfs
Quoted 16 lines · Paul E. McKenney
Quoted 15 lines · Frederic Weisbecker
Quoted 13 lines · Paul E. McKenney
Quoted 7 lines · Frederic Weisbecker
Not for merge.
Make nocb toggable for a given CPU using:
/sys/devices/system/cpu/cpu*/hotplug/nocbThis is only intended for those who want to test this patchset. The real interfaces will be cpuset/isolation and rcutorture.
Excellent choice for testing in the near term!
How does rcutorture fare with this series if an additional kthread toggles offloading on and off continually?
Quoted 7 lines
Quoted 3 lines
So yeah that would be the plan: having something that randomly toggles offloading from the RCU tests themselves. I'm not quite familiar with rcutorture internals yet though.
If you supply a function that selects a CPU and does the toggle, I can quickly and easily wire it into rcutorture. I of course have no objection to your learning to do this yourself, but the offer stands.
I gladly accept your proposal! This way I will integrate it in the set and start testing.
The functions to call would be:
void rcu_nocb_cpu_offload(int cpu);
void rcu_nocb_cpu_deoffload(int cpu);
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
All questions and concerns aside, excellent progress and nice work!!!
Thanks! We are slowly making progress :)
Better than quickly failing to make progress, to be sure! ;-)
;-)
Thanks a lot!
Paul E. McKenney
maintainerRe: [RFC PATCH 12/12] rcu: Nocb (de)activate through sysfs
Quoted 25 lines · Frederic Weisbecker
Quoted 16 lines · Paul E. McKenney
Quoted 15 lines · Frederic Weisbecker
Quoted 13 lines · Paul E. McKenney
Quoted 7 lines · Frederic Weisbecker
Not for merge.
Make nocb toggable for a given CPU using:
/sys/devices/system/cpu/cpu*/hotplug/nocbThis is only intended for those who want to test this patchset. The real interfaces will be cpuset/isolation and rcutorture.
Excellent choice for testing in the near term!
How does rcutorture fare with this series if an additional kthread toggles offloading on and off continually?
Quoted 7 lines
Quoted 3 lines
So yeah that would be the plan: having something that randomly toggles offloading from the RCU tests themselves. I'm not quite familiar with rcutorture internals yet though.
If you supply a function that selects a CPU and does the toggle, I can quickly and easily wire it into rcutorture. I of course have no objection to your learning to do this yourself, but the offer stands.
Quoted 7 lines
I gladly accept your proposal! This way I will integrate it in the set and start testing.
The functions to call would be:
void
rcu_nocb_cpu_offload(int cpu);
voidrcu_nocb_cpu_deoffload(int cpu);
I freely confess that I am surprised that there are no error returns (offline CPU? non-existent CPU?), but here is a first-cut patch to rcutorture that tests the above interfaces.
Thoughts?
Thanx, Paul
------------------------------------------------------------------------
Documentation/admin-guide/kernel-parameters.txt +8 -0
@@ -4302,6 +4302,14 @@ stress RCU, they don't participate in the actual test, hence the "fake". + rcutorture.nocbs_nthreads= [KNL] + Set number of RCU callback-offload togglers. + Zero (the default) disables toggling. + + rcutorture.nocbs_toggle= [KNL] + Set the delay in milliseconds between successive + callback-offload toggling attempts. + rcutorture.nreaders= [KNL] Set number of RCU readers. The value -1 selects N-1, where N is the number of CPUs. A value
kernel/rcu/rcutorture.c +86 -3
147 lines not on this page · raw message