Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3717f613 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull RCU updates from Ingo Molnar:
 "The main RCU related changes in this cycle were:

   - Additional cleanups after RCU flavor consolidation

   - Grace-period forward-progress cleanups and improvements

   - Documentation updates

   - Miscellaneous fixes

   - spin_is_locked() conversions to lockdep

   - SPDX changes to RCU source and header files

   - SRCU updates

   - Torture-test updates, including nolibc updates and moving nolibc to
     tools/include"

* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)
  locking/locktorture: Convert to SPDX license identifier
  linux/torture: Convert to SPDX license identifier
  torture: Convert to SPDX license identifier
  linux/srcu: Convert to SPDX license identifier
  linux/rcutree: Convert to SPDX license identifier
  linux/rcutiny: Convert to SPDX license identifier
  linux/rcu_sync: Convert to SPDX license identifier
  linux/rcu_segcblist: Convert to SPDX license identifier
  linux/rcupdate: Convert to SPDX license identifier
  linux/rcu_node_tree: Convert to SPDX license identifier
  rcu/update: Convert to SPDX license identifier
  rcu/tree: Convert to SPDX license identifier
  rcu/tiny: Convert to SPDX license identifier
  rcu/sync: Convert to SPDX license identifier
  rcu/srcu: Convert to SPDX license identifier
  rcu/rcutorture: Convert to SPDX license identifier
  rcu/rcu_segcblist: Convert to SPDX license identifier
  rcu/rcuperf: Convert to SPDX license identifier
  rcu/rcu.h: Convert to SPDX license identifier
  RCU/torture.txt: Remove section MODULE PARAMETERS
  ...
parents b1b988a6 cae45e1c

Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg

+11 −7
Original line number Diff line number Diff line
@@ -328,13 +328,13 @@ 
     inkscape:window-height="1148"

     id="namedview90"

     showgrid="true"

     inkscape:zoom="0.80021373"

     inkscape:cx="462.49289"

     inkscape:cy="473.6718"

     inkscape:zoom="0.69092787"

     inkscape:cx="476.34085"

     inkscape:cy="712.80957"

     inkscape:window-x="770"

     inkscape:window-y="24"

     inkscape:window-maximized="0"

     inkscape:current-layer="g4114-9-3-9"

     inkscape:current-layer="g4"

     inkscape:snap-grids="false"

     fit-margin-top="5"

     fit-margin-right="5"
@@ -813,14 +813,18 @@ 
      <text

         sodipodi:linespacing="125%"

         id="text4110-5-7-6-2-4-0"

         y="841.88086"

         y="670.74316"

         x="1460.1007"

         style="font-size:267.24359131px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"

         xml:space="preserve"><tspan

           y="841.88086"

           y="670.74316"

           x="1460.1007"

           sodipodi:role="line"

           id="tspan4925-1-2-4-5">Request</tspan><tspan

           y="1004.7976"

           x="1460.1007"

           sodipodi:role="line"

           id="tspan4925-1-2-4-5">reched_cpu()</tspan></text>

           id="tspan3100">context switch</tspan></text>

    </g>

  </g>

</svg>

Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html

+13 −13
Original line number Diff line number Diff line
@@ -72,10 +72,10 @@ will ignore it because idle and offline CPUs are already residing 
in quiescent states.

Otherwise, the expedited grace period will use

<tt>smp_call_function_single()</tt> to send the CPU an IPI, which

is handled by <tt>sync_rcu_exp_handler()</tt>.

is handled by <tt>rcu_exp_handler()</tt>.



<p>

However, because this is preemptible RCU, <tt>sync_rcu_exp_handler()</tt>

However, because this is preemptible RCU, <tt>rcu_exp_handler()</tt>

can check to see if the CPU is currently running in an RCU read-side

critical section.

If not, the handler can immediately report a quiescent state.
@@ -145,19 +145,18 @@ expedited grace period is shown in the following diagram: 
<p><img src="ExpSchedFlow.svg" alt="ExpSchedFlow.svg" width="55%">



<p>

As with RCU-preempt's <tt>synchronize_rcu_expedited()</tt>,

As with RCU-preempt, RCU-sched's

<tt>synchronize_sched_expedited()</tt> ignores offline and

idle CPUs, again because they are in remotely detectable

quiescent states.

However, the <tt>synchronize_rcu_expedited()</tt> handler

is <tt>sync_sched_exp_handler()</tt>, and because the

However, because the

<tt>rcu_read_lock_sched()</tt> and <tt>rcu_read_unlock_sched()</tt>

leave no trace of their invocation, in general it is not possible to tell

whether or not the current CPU is in an RCU read-side critical section.

The best that <tt>sync_sched_exp_handler()</tt> can do is to check

The best that RCU-sched's <tt>rcu_exp_handler()</tt> can do is to check

for idle, on the off-chance that the CPU went idle while the IPI

was in flight.

If the CPU is idle, then <tt>sync_sched_exp_handler()</tt> reports

If the CPU is idle, then <tt>rcu_exp_handler()</tt> reports

the quiescent state.



<p> Otherwise, the handler forces a future context switch by setting the
@@ -298,19 +297,18 @@ Instead, the task pushing the grace period forward will include the 
idle CPUs in the mask passed to <tt>rcu_report_exp_cpu_mult()</tt>.



<p>

For RCU-sched, there is an additional check for idle in the IPI

handler, <tt>sync_sched_exp_handler()</tt>.

For RCU-sched, there is an additional check:

If the IPI has interrupted the idle loop, then

<tt>sync_sched_exp_handler()</tt> invokes <tt>rcu_report_exp_rdp()</tt>

<tt>rcu_exp_handler()</tt> invokes <tt>rcu_report_exp_rdp()</tt>

to report the corresponding quiescent state.



<p>

For RCU-preempt, there is no specific check for idle in the

IPI handler (<tt>sync_rcu_exp_handler()</tt>), but because

IPI handler (<tt>rcu_exp_handler()</tt>), but because

RCU read-side critical sections are not permitted within the

idle loop, if <tt>sync_rcu_exp_handler()</tt> sees that the CPU is within

idle loop, if <tt>rcu_exp_handler()</tt> sees that the CPU is within

RCU read-side critical section, the CPU cannot possibly be idle.

Otherwise, <tt>sync_rcu_exp_handler()</tt> invokes

Otherwise, <tt>rcu_exp_handler()</tt> invokes

<tt>rcu_report_exp_rdp()</tt> to report the corresponding quiescent

state, regardless of whether or not that quiescent state was due to

the CPU being idle.
@@ -625,6 +623,8 @@ checks, but only during the mid-boot dead zone. 
<p>

With this refinement, synchronous grace periods can now be used from

task context pretty much any time during the life of the kernel.

That is, aside from some points in the suspend, hibernate, or shutdown

code path.



<h3><a name="Summary">

Summary</a></h3>

Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html

+3 −3
Original line number Diff line number Diff line
@@ -485,13 +485,13 @@ section that the grace period must wait on. 
noted by <tt>rcu_node_context_switch()</tt> on the left.

On the other hand, if the CPU takes a scheduler-clock interrupt

while executing in usermode, a quiescent state will be noted by

<tt>rcu_check_callbacks()</tt> on the right.

<tt>rcu_sched_clock_irq()</tt> on the right.

Either way, the passage through a quiescent state will be noted

in a per-CPU variable.



<p>The next time an <tt>RCU_SOFTIRQ</tt> handler executes on

this CPU (for example, after the next scheduler-clock

interrupt), <tt>__rcu_process_callbacks()</tt> will invoke

interrupt), <tt>rcu_core()</tt> will invoke

<tt>rcu_check_quiescent_state()</tt>, which will notice the

recorded quiescent state, and invoke

<tt>rcu_report_qs_rdp()</tt>.
@@ -651,7 +651,7 @@ to end. 
These callbacks are identified by <tt>rcu_advance_cbs()</tt>,

which is usually invoked by <tt>__note_gp_changes()</tt>.

As shown in the diagram below, this invocation can be triggered by

the scheduling-clock interrupt (<tt>rcu_check_callbacks()</tt> on

the scheduling-clock interrupt (<tt>rcu_sched_clock_irq()</tt> on

the left) or by idle entry (<tt>rcu_cleanup_after_idle()</tt> on

the right, but only for kernels build with

<tt>CONFIG_RCU_FAST_NO_HZ=y</tt>).

Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-invocation.svg

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ 
       font-weight="bold"

       font-size="192"

       id="text202-7-5"

       style="font-size:192px;font-style:normal;font-weight:bold;text-anchor:start;fill:#000000;stroke-width:0.025in;font-family:Courier">rcu_check_callbacks()</text>

       style="font-size:192px;font-style:normal;font-weight:bold;text-anchor:start;fill:#000000;stroke-width:0.025in;font-family:Courier">rcu_sched_clock_irq()</text>

    <rect

       x="7069.6187"

       y="5087.4678"

Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp.svg

+4 −4
Original line number Diff line number Diff line
@@ -3902,7 +3902,7 @@ 
         font-style="normal"

         y="-4418.6582"

         x="3745.7725"

         xml:space="preserve">rcu_check_callbacks()</text>

         xml:space="preserve">rcu_sched_clock_irq()</text>

    </g>

    <g

       transform="translate(-850.30204,55463.106)"
@@ -3924,7 +3924,7 @@ 
         font-style="normal"

         y="-4418.6582"

         x="3745.7725"

         xml:space="preserve">rcu_process_callbacks()</text>

         xml:space="preserve">rcu_core()</text>

      <text

         style="font-size:192px;font-style:normal;font-weight:bold;text-anchor:start;fill:#000000;stroke-width:0.025in;font-family:Courier"

         id="text202-7-5-3-27-0"
@@ -3933,7 +3933,7 @@ 
         font-style="normal"

         y="-4165.7954"

         x="3745.7725"

         xml:space="preserve">rcu_check_quiescent_state())</text>

         xml:space="preserve">rcu_check_quiescent_state()</text>

      <text

         style="font-size:192px;font-style:normal;font-weight:bold;text-anchor:start;fill:#000000;stroke-width:0.025in;font-family:Courier"

         id="text202-7-5-3-27-0-9"
@@ -4968,7 +4968,7 @@ 
       font-weight="bold"

       font-size="192"

       id="text202-7-5-19"

       style="font-size:192px;font-style:normal;font-weight:bold;text-anchor:start;fill:#000000;stroke-width:0.025in;font-family:Courier">rcu_check_callbacks()</text>

       style="font-size:192px;font-style:normal;font-weight:bold;text-anchor:start;fill:#000000;stroke-width:0.025in;font-family:Courier">rcu_sched_clock_irq()</text>

    <rect

       x="5314.2671"

       y="82817.688"