Merge commit 'v2.6.31-rc6' into core/rcu
authorIngo Molnar <mingo@elte.hu>
Sat, 15 Aug 2009 16:55:58 +0000 (18:55 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 15 Aug 2009 16:56:13 +0000 (18:56 +0200)
Merge reason: the branch was on pre-rc1 .30, update to latest.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
16 files changed:
Documentation/RCU/RTFP.txt
Documentation/RCU/UP.txt
Documentation/RCU/checklist.txt
Documentation/RCU/rcubarrier.txt
Documentation/RCU/torture.txt
Documentation/RCU/whatisRCU.txt
include/linux/rcuclassic.h [deleted file]
include/linux/rcupdate.h
include/linux/rcupreempt.h
include/linux/rcutree.h
init/Kconfig
kernel/Makefile
kernel/rcuclassic.c [deleted file]
kernel/rcupdate.c
kernel/rcutorture.c
kernel/sched.c

index 9f711d2..d2b8523 100644 (file)
@@ -743,3 +743,80 @@ Revised:
        RCU, realtime RCU, sleepable RCU, performance.
 "
 }
+
+@article{PaulEMcKenney2008RCUOSR
+,author="Paul E. McKenney and Jonathan Walpole"
+,title="Introducing technology into the {Linux} kernel: a case study"
+,Year="2008"
+,journal="SIGOPS Oper. Syst. Rev."
+,volume="42"
+,number="5"
+,pages="4--17"
+,issn="0163-5980"
+,doi={http://doi.acm.org/10.1145/1400097.1400099}
+,publisher="ACM"
+,address="New York, NY, USA"
+,annotation={
+       Linux changed RCU to a far greater degree than RCU has changed Linux.
+}
+}
+
+@unpublished{PaulEMcKenney2008HierarchicalRCU
+,Author="Paul E. McKenney"
+,Title="Hierarchical {RCU}"
+,month="November"
+,day="3"
+,year="2008"
+,note="Available:
+\url{http://lwn.net/Articles/305782/}
+[Viewed November 6, 2008]"
+,annotation="
+       RCU with combining-tree-based grace-period detection,
+       permitting it to handle thousands of CPUs.
+"
+}
+
+@conference{PaulEMcKenney2009MaliciousURCU
+,Author="Paul E. McKenney"
+,Title="Using a Malicious User-Level {RCU} to Torture {RCU}-Based Algorithms"
+,Booktitle="linux.conf.au 2009"
+,month="January"
+,year="2009"
+,address="Hobart, Australia"
+,note="Available:
+\url{http://www.rdrop.com/users/paulmck/RCU/urcutorture.2009.01.22a.pdf}
+[Viewed February 2, 2009]"
+,annotation="
+       Realtime RCU and torture-testing RCU uses.
+"
+}
+
+@unpublished{MathieuDesnoyers2009URCU
+,Author="Mathieu Desnoyers"
+,Title="[{RFC} git tree] Userspace {RCU} (urcu) for {Linux}"
+,month="February"
+,day="5"
+,year="2009"
+,note="Available:
+\url{http://lkml.org/lkml/2009/2/5/572}
+\url{git://lttng.org/userspace-rcu.git}
+[Viewed February 20, 2009]"
+,annotation="
+       Mathieu Desnoyers's user-space RCU implementation.
+       git://lttng.org/userspace-rcu.git
+"
+}
+
+@unpublished{PaulEMcKenney2009BloatWatchRCU
+,Author="Paul E. McKenney"
+,Title="{RCU}: The {Bloatwatch} Edition"
+,month="March"
+,day="17"
+,year="2009"
+,note="Available:
+\url{http://lwn.net/Articles/323929/}
+[Viewed March 20, 2009]"
+,annotation="
+       Uniprocessor assumptions allow simplified RCU implementation.
+"
+}
index aab4a9e..90ec534 100644 (file)
@@ -2,14 +2,13 @@ RCU on Uniprocessor Systems
 
 
 A common misconception is that, on UP systems, the call_rcu() primitive
-may immediately invoke its function, and that the synchronize_rcu()
-primitive may return immediately.  The basis of this misconception
+may immediately invoke its function.  The basis of this misconception
 is that since there is only one CPU, it should not be necessary to
 wait for anything else to get done, since there are no other CPUs for
 anything else to be happening on.  Although this approach will -sort- -of-
 work a surprising amount of the time, it is a very bad idea in general.
-This document presents three examples that demonstrate exactly how bad an
-idea this is.
+This document presents three examples that demonstrate exactly how bad
+an idea this is.
 
 
 Example 1: softirq Suicide
@@ -82,11 +81,18 @@ Quick Quiz #2: What locking restriction must RCU callbacks respect?
 
 Summary
 
-Permitting call_rcu() to immediately invoke its arguments or permitting
-synchronize_rcu() to immediately return breaks RCU, even on a UP system.
-So do not do it!  Even on a UP system, the RCU infrastructure -must-
-respect grace periods, and -must- invoke callbacks from a known environment
-in which no locks are held.
+Permitting call_rcu() to immediately invoke its arguments breaks RCU,
+even on a UP system.  So do not do it!  Even on a UP system, the RCU
+infrastructure -must- respect grace periods, and -must- invoke callbacks
+from a known environment in which no locks are held.
+
+It -is- safe for synchronize_sched() and synchronize_rcu_bh() to return
+immediately on an UP system.  It is also safe for synchronize_rcu()
+to return immediately on UP systems, except when running preemptable
+RCU.
+
+Quick Quiz #3: Why can't synchronize_rcu() return immediately on
+       UP systems running preemptable RCU?
 
 
 Answer to Quick Quiz #1:
@@ -117,3 +123,13 @@ Answer to Quick Quiz #2:
        callbacks acquire locks directly.  However, a great many RCU
        callbacks do acquire locks -indirectly-, for example, via
        the kfree() primitive.
+
+Answer to Quick Quiz #3:
+       Why can't synchronize_rcu() return immediately on UP systems
+       running preemptable RCU?
+
+       Because some other task might have been preempted in the middle
+       of an RCU read-side critical section.  If synchronize_rcu()
+       simply immediately returned, it would prematurely signal the
+       end of the grace period, which would come as a nasty shock to
+       that other thread when it started running again.
index accfe2f..51525a3 100644 (file)
@@ -11,7 +11,10 @@ over a rather long period of time, but improvements are always welcome!
        structure is updated more than about 10% of the time, then
        you should strongly consider some other approach, unless
        detailed performance measurements show that RCU is nonetheless
-       the right tool for the job.
+       the right tool for the job.  Yes, you might think of RCU
+       as simply cutting overhead off of the readers and imposing it
+       on the writers.  That is exactly why normal uses of RCU will
+       do much more reading than updating.
 
        Another exception is where performance is not an issue, and RCU
        provides a simpler implementation.  An example of this situation
@@ -240,10 +243,11 @@ over a rather long period of time, but improvements are always welcome!
        instead need to use synchronize_irq() or synchronize_sched().
 
 12.    Any lock acquired by an RCU callback must be acquired elsewhere
-       with irq disabled, e.g., via spin_lock_irqsave().  Failing to
-       disable irq on a given acquisition of that lock will result in
-       deadlock as soon as the RCU callback happens to interrupt that
-       acquisition's critical section.
+       with softirq disabled, e.g., via spin_lock_irqsave(),
+       spin_lock_bh(), etc.  Failing to disable irq on a given
+       acquisition of that lock will result in deadlock as soon as the
+       RCU callback happens to interrupt that acquisition's critical
+       section.
 
 13.    RCU callbacks can be and are executed in parallel.  In many cases,
        the callback code simply wrappers around kfree(), so that this
@@ -310,3 +314,9 @@ over a rather long period of time, but improvements are always welcome!
        Because these primitives only wait for pre-existing readers,
        it is the caller's responsibility to guarantee safety to
        any subsequent readers.
+
+16.    The various RCU read-side primitives do -not- contain memory
+       barriers.  The CPU (and in some cases, the compiler) is free
+       to reorder code into and out of RCU read-side critical sections.
+       It is the responsibility of the RCU update-side primitives to
+       deal with this.
index 909602d..e439a0e 100644 (file)
@@ -170,6 +170,13 @@ module invokes call_rcu() from timers, you will need to first cancel all
 the timers, and only then invoke rcu_barrier() to wait for any remaining
 RCU callbacks to complete.
 
+Of course, if you module uses call_rcu_bh(), you will need to invoke
+rcu_barrier_bh() before unloading.  Similarly, if your module uses
+call_rcu_sched(), you will need to invoke rcu_barrier_sched() before
+unloading.  If your module uses call_rcu(), call_rcu_bh(), -and-
+call_rcu_sched(), then you will need to invoke each of rcu_barrier(),
+rcu_barrier_bh(), and rcu_barrier_sched().
+
 
 Implementing rcu_barrier()
 
index a342b6e..9dba3bb 100644 (file)
@@ -76,8 +76,10 @@ torture_type The type of RCU to test: "rcu" for the rcu_read_lock() API,
                "rcu_sync" for rcu_read_lock() with synchronous reclamation,
                "rcu_bh" for the rcu_read_lock_bh() API, "rcu_bh_sync" for
                rcu_read_lock_bh() with synchronous reclamation, "srcu" for
-               the "srcu_read_lock()" API, and "sched" for the use of
-               preempt_disable() together with synchronize_sched().
+               the "srcu_read_lock()" API, "sched" for the use of
+               preempt_disable() together with synchronize_sched(),
+               and "sched_expedited" for the use of preempt_disable()
+               with synchronize_sched_expedited().
 
 verbose                Enable debug printk()s.  Default is disabled.
 
@@ -162,6 +164,23 @@ of the "old" and "current" counters for the corresponding CPU.  The
 "idx" value maps the "old" and "current" values to the underlying array,
 and is useful for debugging.
 
+Similarly, sched_expedited RCU provides the following:
+
+       sched_expedited-torture: rtc: d0000000016c1880 ver: 1090796 tfle: 0 rta: 1090796 rtaf: 0 rtf: 1090787 rtmbe: 0 nt: 27713319
+       sched_expedited-torture: Reader Pipe:  12660320201 95875 0 0 0 0 0 0 0 0 0
+       sched_expedited-torture: Reader Batch:  12660424885 0 0 0 0 0 0 0 0 0 0
+       sched_expedited-torture: Free-Block Circulation:  1090795 1090795 1090794 1090793 1090792 1090791 1090790 1090789 1090788 1090787 0
+       state: -1 / 0:0 3:0 4:0
+
+As before, the first four lines are similar to those for RCU.
+The last line shows the task-migration state.  The first number is
+-1 if synchronize_sched_expedited() is idle, -2 if in the process of
+posting wakeups to the migration kthreads, and N when waiting on CPU N.
+Each of the colon-separated fields following the "/" is a CPU:state pair.
+Valid states are "0" for idle, "1" for waiting for quiescent state,
+"2" for passed through quiescent state, and "3" when a race with a
+CPU-hotplug event forces use of the synchronize_sched() primitive.
+
 
 USAGE
 
index 9617082..97ded24 100644 (file)
@@ -785,6 +785,7 @@ RCU pointer/list traversal:
        rcu_dereference
        list_for_each_entry_rcu
        hlist_for_each_entry_rcu
+       hlist_nulls_for_each_entry_rcu
 
        list_for_each_continue_rcu      (to be deprecated in favor of new
                                         list_for_each_entry_continue_rcu)
@@ -807,19 +808,23 @@ RCU:      Critical sections       Grace period            Barrier
 
        rcu_read_lock           synchronize_net         rcu_barrier
        rcu_read_unlock         synchronize_rcu
+                               synchronize_rcu_expedited
                                call_rcu
 
 
 bh:    Critical sections       Grace period            Barrier
 
        rcu_read_lock_bh        call_rcu_bh             rcu_barrier_bh
-       rcu_read_unlock_bh
+       rcu_read_unlock_bh      synchronize_rcu_bh
+                               synchronize_rcu_bh_expedited
 
 
 sched: Critical sections       Grace period            Barrier
 
-       [preempt_disable]       synchronize_sched       rcu_barrier_sched
-       [and friends]           call_rcu_sched
+       rcu_read_lock_sched     synchronize_sched       rcu_barrier_sched
+       rcu_read_unlock_sched   call_rcu_sched
+       [preempt_disable]       synchronize_sched_expedited
+       [and friends]
 
 
 SRCU:  Critical sections       Grace period            Barrier
@@ -827,6 +832,9 @@ SRCU:       Critical sections       Grace period            Barrier
        srcu_read_lock          synchronize_srcu        N/A
        srcu_read_unlock
 
+SRCU:  Initialization/cleanup
+       init_srcu_struct
+       cleanup_srcu_struct
 
 See the comment headers in the source code (or the docbook generated
 from them) for more information.
diff --git a/include/linux/rcuclassic.h b/include/linux/rcuclassic.h
deleted file mode 100644 (file)
index bfd92e1..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Read-Copy Update mechanism for mutual exclusion (classic version)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Copyright IBM Corporation, 2001
- *
- * Author: Dipankar Sarma <dipankar@in.ibm.com>
- *
- * Based on the original work by Paul McKenney <paulmck@us.ibm.com>
- * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
- * Papers:
- * http://www.rdrop.com/users/paulmck/paper/rclockpdcsproof.pdf
- * http://lse.sourceforge.net/locking/rclock_OLS.2001.05.01c.sc.pdf (OLS2001)
- *
- * For detailed explanation of Read-Copy Update mechanism see -
- *             Documentation/RCU
- *
- */
-
-#ifndef __LINUX_RCUCLASSIC_H
-#define __LINUX_RCUCLASSIC_H
-
-#include <linux/cache.h>
-#include <linux/spinlock.h>
-#include <linux/threads.h>
-#include <linux/cpumask.h>
-#include <linux/seqlock.h>
-
-#ifdef CONFIG_RCU_CPU_STALL_DETECTOR
-#define RCU_SECONDS_TILL_STALL_CHECK   (10 * HZ) /* for rcp->jiffies_stall */
-#define RCU_SECONDS_TILL_STALL_RECHECK (30 * HZ) /* for rcp->jiffies_stall */
-#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
-
-/* Global control variables for rcupdate callback mechanism. */
-struct rcu_ctrlblk {
-       long    cur;            /* Current batch number.                      */
-       long    completed;      /* Number of the last completed batch         */
-       long    pending;        /* Number of the last pending batch           */
-#ifdef CONFIG_RCU_CPU_STALL_DETECTOR
-       unsigned long gp_start; /* Time at which GP started in jiffies. */
-       unsigned long jiffies_stall;
-                               /* Time at which to check for CPU stalls. */
-#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
-
-       int     signaled;
-
-       spinlock_t      lock    ____cacheline_internodealigned_in_smp;
-       DECLARE_BITMAP(cpumask, NR_CPUS); /* CPUs that need to switch for */
-                                         /* current batch to proceed.     */
-} ____cacheline_internodealigned_in_smp;
-
-/* Is batch a before batch b ? */
-static inline int rcu_batch_before(long a, long b)
-{
-       return (a - b) < 0;
-}
-
-/* Is batch a after batch b ? */
-static inline int rcu_batch_after(long a, long b)
-{
-       return (a - b) > 0;
-}
-
-/* Per-CPU data for Read-Copy UPdate. */
-struct rcu_data {
-       /* 1) quiescent state handling : */
-       long            quiescbatch;     /* Batch # for grace period */
-       int             passed_quiesc;   /* User-mode/idle loop etc. */
-       int             qs_pending;      /* core waits for quiesc state */
-
-       /* 2) batch handling */
-       /*
-        * if nxtlist is not NULL, then:
-        * batch:
-        *      The batch # for the last entry of nxtlist
-        * [*nxttail[1], NULL = *nxttail[2]):
-        *      Entries that batch # <= batch
-        * [*nxttail[0], *nxttail[1]):
-        *      Entries that batch # <= batch - 1
-        * [nxtlist, *nxttail[0]):
-        *      Entries that batch # <= batch - 2
-        *      The grace period for these entries has completed, and
-        *      the other grace-period-completed entries may be moved
-        *      here temporarily in rcu_process_callbacks().
-        */
-       long            batch;
-       struct rcu_head *nxtlist;
-       struct rcu_head **nxttail[3];
-       long            qlen;            /* # of queued callbacks */
-       struct rcu_head *donelist;
-       struct rcu_head **donetail;
-       long            blimit;          /* Upper limit on a processed batch */
-       int cpu;
-       struct rcu_head barrier;
-};
-
-/*
- * Increment the quiescent state counter.
- * The counter is a bit degenerated: We do not need to know
- * how many quiescent states passed, just if there was at least
- * one since the start of the grace period. Thus just a flag.
- */
-extern void rcu_qsctr_inc(int cpu);
-extern void rcu_bh_qsctr_inc(int cpu);
-
-extern int rcu_pending(int cpu);
-extern int rcu_needs_cpu(int cpu);
-
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-extern struct lockdep_map rcu_lock_map;
-# define rcu_read_acquire()    \
-                       lock_acquire(&rcu_lock_map, 0, 0, 2, 1, NULL, _THIS_IP_)
-# define rcu_read_release()    lock_release(&rcu_lock_map, 1, _THIS_IP_)
-#else
-# define rcu_read_acquire()    do { } while (0)
-# define rcu_read_release()    do { } while (0)
-#endif
-
-#define __rcu_read_lock() \
-       do { \
-               preempt_disable(); \
-               __acquire(RCU); \
-               rcu_read_acquire(); \
-       } while (0)
-#define __rcu_read_unlock() \
-       do { \
-               rcu_read_release(); \
-               __release(RCU); \
-               preempt_enable(); \
-       } while (0)
-#define __rcu_read_lock_bh() \
-       do { \
-               local_bh_disable(); \
-               __acquire(RCU_BH); \
-               rcu_read_acquire(); \
-       } while (0)
-#define __rcu_read_unlock_bh() \
-       do { \
-               rcu_read_release(); \
-               __release(RCU_BH); \
-               local_bh_enable(); \
-       } while (0)
-
-#define __synchronize_sched() synchronize_rcu()
-
-#define call_rcu_sched(head, func) call_rcu(head, func)
-
-extern void __rcu_init(void);
-#define rcu_init_sched()       do { } while (0)
-extern void rcu_check_callbacks(int cpu, int user);
-extern void rcu_restart_cpu(int cpu);
-
-extern long rcu_batches_completed(void);
-extern long rcu_batches_completed_bh(void);
-
-#define rcu_enter_nohz()       do { } while (0)
-#define rcu_exit_nohz()                do { } while (0)
-
-/* A context switch is a grace period for rcuclassic. */
-static inline int rcu_blocking_is_gp(void)
-{
-       return num_online_cpus() == 1;
-}
-
-#endif /* __LINUX_RCUCLASSIC_H */
index 15fbb3c..3c89d6a 100644 (file)
@@ -51,12 +51,22 @@ struct rcu_head {
        void (*func)(struct rcu_head *head);
 };
 
-/* Internal to kernel, but needed by rcupreempt.h. */
+/* Exported common interfaces */
+extern void synchronize_rcu(void);
+extern void synchronize_rcu_bh(void);
+extern void rcu_barrier(void);
+extern void rcu_barrier_bh(void);
+extern void rcu_barrier_sched(void);
+extern void synchronize_sched_expedited(void);
+extern int sched_expedited_torture_stats(char *page);
+
+/* Internal to kernel */
+extern void rcu_init(void);
+extern void rcu_scheduler_starting(void);
+extern int rcu_needs_cpu(int cpu);
 extern int rcu_scheduler_active;
 
-#if defined(CONFIG_CLASSIC_RCU)
-#include <linux/rcuclassic.h>
-#elif defined(CONFIG_TREE_RCU)
+#if defined(CONFIG_TREE_RCU)
 #include <linux/rcutree.h>
 #elif defined(CONFIG_PREEMPT_RCU)
 #include <linux/rcupreempt.h>
@@ -259,15 +269,4 @@ extern void call_rcu(struct rcu_head *head,
 extern void call_rcu_bh(struct rcu_head *head,
                        void (*func)(struct rcu_head *head));
 
-/* Exported common interfaces */
-extern void synchronize_rcu(void);
-extern void rcu_barrier(void);
-extern void rcu_barrier_bh(void);
-extern void rcu_barrier_sched(void);
-
-/* Internal to kernel */
-extern void rcu_init(void);
-extern void rcu_scheduler_starting(void);
-extern int rcu_needs_cpu(int cpu);
-
 #endif /* __LINUX_RCUPDATE_H */
index fce5227..f164ac9 100644 (file)
@@ -74,6 +74,16 @@ extern int rcu_needs_cpu(int cpu);
 
 extern void __synchronize_sched(void);
 
+static inline void synchronize_rcu_expedited(void)
+{
+       synchronize_rcu();  /* Placeholder for new rcupreempt implementation. */
+}
+
+static inline void synchronize_rcu_bh_expedited(void)
+{
+       synchronize_rcu_bh();  /* Placeholder for new rcupreempt impl. */
+}
+
 extern void __rcu_init(void);
 extern void rcu_init_sched(void);
 extern void rcu_check_callbacks(int cpu, int user);
index 5a51538..d4dfd24 100644 (file)
@@ -286,8 +286,14 @@ static inline void __rcu_read_unlock_bh(void)
 
 #define call_rcu_sched(head, func) call_rcu(head, func)
 
-static inline void rcu_init_sched(void)
+static inline void synchronize_rcu_expedited(void)
+{
+       synchronize_sched_expedited();
+}
+
+static inline void synchronize_rcu_bh_expedited(void)
 {
+       synchronize_sched_expedited();
 }
 
 extern void __rcu_init(void);
@@ -297,6 +303,10 @@ extern void rcu_restart_cpu(int cpu);
 extern long rcu_batches_completed(void);
 extern long rcu_batches_completed_bh(void);
 
+static inline void rcu_init_sched(void)
+{
+}
+
 #ifdef CONFIG_NO_HZ
 void rcu_enter_nohz(void);
 void rcu_exit_nohz(void);
index 3f7e609..25373cf 100644 (file)
@@ -316,21 +316,13 @@ choice
        prompt "RCU Implementation"
        default TREE_RCU
 
-config CLASSIC_RCU
-       bool "Classic RCU"
-       help
-         This option selects the classic RCU implementation that is
-         designed for best read-side performance on non-realtime
-         systems.
-
-         Select this option if you are unsure.
-
 config TREE_RCU
        bool "Tree-based hierarchical RCU"
        help
          This option selects the RCU implementation that is
          designed for very large SMP system with hundreds or
-         thousands of CPUs.
+         thousands of CPUs.  It also scales down nicely to
+         smaller systems.
 
 config PREEMPT_RCU
        bool "Preemptible RCU"
index 2093a69..2419c9d 100644 (file)
@@ -80,7 +80,6 @@ obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o
 obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
 obj-$(CONFIG_SECCOMP) += seccomp.o
 obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o
-obj-$(CONFIG_CLASSIC_RCU) += rcuclassic.o
 obj-$(CONFIG_TREE_RCU) += rcutree.o
 obj-$(CONFIG_PREEMPT_RCU) += rcupreempt.o
 obj-$(CONFIG_TREE_RCU_TRACE) += rcutree_trace.o
diff --git a/kernel/rcuclassic.c b/kernel/rcuclassic.c
deleted file mode 100644 (file)
index 0f2b0b3..0000000
+++ /dev/null
@@ -1,807 +0,0 @@
-/*
- * Read-Copy Update mechanism for mutual exclusion
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Copyright IBM Corporation, 2001
- *
- * Authors: Dipankar Sarma <dipankar@in.ibm.com>
- *         Manfred Spraul <manfred@colorfullife.com>
- *
- * Based on the original work by Paul McKenney <paulmck@us.ibm.com>
- * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
- * Papers:
- * http://www.rdrop.com/users/paulmck/paper/rclockpdcsproof.pdf
- * http://lse.sourceforge.net/locking/rclock_OLS.2001.05.01c.sc.pdf (OLS2001)
- *
- * For detailed explanation of Read-Copy Update mechanism see -
- *             Documentation/RCU
- *
- */
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/smp.h>
-#include <linux/rcupdate.h>
-#include <linux/interrupt.h>
-#include <linux/sched.h>
-#include <asm/atomic.h>
-#include <linux/bitops.h>
-#include <linux/module.h>
-#include <linux/completion.h>
-#include <linux/moduleparam.h>
-#include <linux/percpu.h>
-#include <linux/notifier.h>
-#include <linux/cpu.h>
-#include <linux/mutex.h>
-#include <linux/time.h>
-
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-static struct lock_class_key rcu_lock_key;
-struct lockdep_map rcu_lock_map =
-       STATIC_LOCKDEP_MAP_INIT("rcu_read_lock", &rcu_lock_key);
-EXPORT_SYMBOL_GPL(rcu_lock_map);
-#endif
-
-
-/* Definition for rcupdate control block. */
-static struct rcu_ctrlblk rcu_ctrlblk = {
-       .cur = -300,
-       .completed = -300,
-       .pending = -300,
-       .lock = __SPIN_LOCK_UNLOCKED(&rcu_ctrlblk.lock),
-       .cpumask = CPU_BITS_NONE,
-};
-
-static struct rcu_ctrlblk rcu_bh_ctrlblk = {
-       .cur = -300,
-       .completed = -300,
-       .pending = -300,
-       .lock = __SPIN_LOCK_UNLOCKED(&rcu_bh_ctrlblk.lock),
-       .cpumask = CPU_BITS_NONE,
-};
-
-static DEFINE_PER_CPU(struct rcu_data, rcu_data);
-static DEFINE_PER_CPU(struct rcu_data, rcu_bh_data);
-
-/*
- * Increment the quiescent state counter.
- * The counter is a bit degenerated: We do not need to know
- * how many quiescent states passed, just if there was at least
- * one since the start of the grace period. Thus just a flag.
- */
-void rcu_qsctr_inc(int cpu)
-{
-       struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
-       rdp->passed_quiesc = 1;
-}
-
-void rcu_bh_qsctr_inc(int cpu)
-{
-       struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);
-       rdp->passed_quiesc = 1;
-}
-
-static int blimit = 10;
-static int qhimark = 10000;
-static int qlowmark = 100;
-
-#ifdef CONFIG_SMP
-static void force_quiescent_state(struct rcu_data *rdp,
-                       struct rcu_ctrlblk *rcp)
-{
-       int cpu;
-       unsigned long flags;
-
-       set_need_resched();
-       spin_lock_irqsave(&rcp->lock, flags);
-       if (unlikely(!rcp->signaled)) {
-               rcp->signaled = 1;
-               /*
-                * Don't send IPI to itself. With irqs disabled,
-                * rdp->cpu is the current cpu.
-                *
-                * cpu_online_mask is updated by the _cpu_down()
-                * using __stop_machine(). Since we're in irqs disabled
-                * section, __stop_machine() is not exectuting, hence
-                * the cpu_online_mask is stable.
-                *
-                * However,  a cpu might have been offlined _just_ before
-                * we disabled irqs while entering here.
-                * And rcu subsystem might not yet have handled the CPU_DEAD
-                * notification, leading to the offlined cpu's bit
-                * being set in the rcp->cpumask.
-                *
-                * Hence cpumask = (rcp->cpumask & cpu_online_mask) to prevent
-                * sending smp_reschedule() to an offlined CPU.
-                */
-               for_each_cpu_and(cpu,
-                                 to_cpumask(rcp->cpumask), cpu_online_mask) {
-                       if (cpu != rdp->cpu)
-                               smp_send_reschedule(cpu);
-               }
-       }
-       spin_unlock_irqrestore(&rcp->lock, flags);
-}
-#else
-static inline void force_quiescent_state(struct rcu_data *rdp,
-                       struct rcu_ctrlblk *rcp)
-{
-       set_need_resched();
-}
-#endif
-
-static void __call_rcu(struct rcu_head *head, struct rcu_ctrlblk *rcp,
-               struct rcu_data *rdp)
-{
-       long batch;
-
-       head->next = NULL;
-       smp_mb(); /* Read of rcu->cur must happen after any change by caller. */
-
-       /*
-        * Determine the batch number of this callback.
-        *
-        * Using ACCESS_ONCE to avoid the following error when gcc eliminates
-        * local variable "batch" and emits codes like this:
-        *      1) rdp->batch = rcp->cur + 1 # gets old value
-        *      ......
-        *      2)rcu_batch_after(rcp->cur + 1, rdp->batch) # gets new value
-        * then [*nxttail[0], *nxttail[1]) may contain callbacks
-        * that batch# = rdp->batch, see the comment of struct rcu_data.
-        */
-       batch = ACCESS_ONCE(rcp->cur) + 1;
-
-       if (rdp->nxtlist && rcu_batch_after(batch, rdp->batch)) {
-               /* process callbacks */
-               rdp->nxttail[0] = rdp->nxttail[1];
-               rdp->nxttail[1] = rdp->nxttail[2];
-               if (rcu_batch_after(batch - 1, rdp->batch))
-                       rdp->nxttail[0] = rdp->nxttail[2];
-       }
-
-       rdp->batch = batch;
-       *rdp->nxttail[2] = head;
-       rdp->nxttail[2] = &head->next;
-
-       if (unlikely(++rdp->qlen > qhimark)) {
-               rdp->blimit = INT_MAX;
-               force_quiescent_state(rdp, &rcu_ctrlblk);
-       }
-}
-
-#ifdef CONFIG_RCU_CPU_STALL_DETECTOR
-
-static void record_gp_stall_check_time(struct rcu_ctrlblk *rcp)
-{
-       rcp->gp_start = jiffies;
-       rcp->jiffies_stall = jiffies + RCU_SECONDS_TILL_STALL_CHECK;
-}
-
-static void print_other_cpu_stall(struct rcu_ctrlblk *rcp)
-{
-       int cpu;
-       long delta;
-       unsigned long flags;
-
-       /* Only let one CPU complain about others per time interval. */
-
-       spin_lock_irqsave(&rcp->lock, flags);
-       delta = jiffies - rcp->jiffies_stall;
-       if (delta < 2 || rcp->cur != rcp->completed) {
-               spin_unlock_irqrestore(&rcp->lock, flags);
-               return;
-       }
-       rcp->jiffies_stall = jiffies + RCU_SECONDS_TILL_STALL_RECHECK;
-       spin_unlock_irqrestore(&rcp->lock, flags);
-
-       /* OK, time to rat on our buddy... */
-
-       printk(KERN_ERR "INFO: RCU detected CPU stalls:");
-       for_each_possible_cpu(cpu) {
-               if (cpumask_test_cpu(cpu, to_cpumask(rcp->cpumask)))
-                       printk(" %d", cpu);
-       }
-       printk(" (detected by %d, t=%ld jiffies)\n",
-              smp_processor_id(), (long)(jiffies - rcp->gp_start));
-}
-
-static void print_cpu_stall(struct rcu_ctrlblk *rcp)
-{
-       unsigned long flags;
-
-       printk(KERN_ERR "INFO: RCU detected CPU %d stall (t=%lu/%lu jiffies)\n",
-                       smp_processor_id(), jiffies,
-                       jiffies - rcp->gp_start);
-       dump_stack();
-       spin_lock_irqsave(&rcp->lock, flags);
-       if ((long)(jiffies - rcp->jiffies_stall) >= 0)
-               rcp->jiffies_stall =
-                       jiffies + RCU_SECONDS_TILL_STALL_RECHECK;
-       spin_unlock_irqrestore(&rcp->lock, flags);
-       set_need_resched();  /* kick ourselves to get things going. */
-}
-
-static void check_cpu_stall(struct rcu_ctrlblk *rcp)
-{
-       long delta;
-
-       delta = jiffies - rcp->jiffies_stall;
-       if (cpumask_test_cpu(smp_processor_id(), to_cpumask(rcp->cpumask)) &&
-               delta >= 0) {
-
-               /* We haven't checked in, so go dump stack. */
-               print_cpu_stall(rcp);
-
-       } else if (rcp->cur != rcp->completed && delta >= 2) {
-
-               /* They had two seconds to dump stack, so complain. */
-               print_other_cpu_stall(rcp);
-       }
-}
-
-#else /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
-
-static void record_gp_stall_check_time(struct rcu_ctrlblk *rcp)
-{
-}
-
-static inline void check_cpu_stall(struct rcu_ctrlblk *rcp)
-{
-}
-
-#endif /* #else #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
-
-/**
- * call_rcu - Queue an RCU callback for invocation after a grace period.
- * @head: structure to be used for queueing the RCU updates.
- * @func: actual update function to be invoked after the grace period
- *
- * The update function will be invoked some time after a full grace
- * period elapses, in other words after all currently executing RCU
- * read-side critical sections have completed.  RCU read-side critical
- * sections are delimited by rcu_read_lock() and rcu_read_unlock(),
- * and may be nested.
- */
-void call_rcu(struct rcu_head *head,
-                               void (*func)(struct rcu_head *rcu))
-{
-       unsigned long flags;
-
-       head->func = func;
-       local_irq_save(flags);
-       __call_rcu(head, &rcu_ctrlblk, &__get_cpu_var(rcu_data));
-       local_irq_restore(flags);
-}
-EXPORT_SYMBOL_GPL(call_rcu);
-
-/**
- * call_rcu_bh - Queue an RCU for invocation after a quicker grace period.
- * @head: structure to be used for queueing the RCU updates.
- * @func: actual update function to be invoked after the grace period
- *
- * The update function will be invoked some time after a full grace
- * period elapses, in other words after all currently executing RCU
- * read-side critical sections have completed. call_rcu_bh() assumes
- * that the read-side critical sections end on completion of a softirq
- * handler. This means that read-side critical sections in process
- * context must not be interrupted by softirqs. This interface is to be
- * used when most of the read-side critical sections are in softirq context.
- * RCU read-side critical sections are delimited by rcu_read_lock() and
- * rcu_read_unlock(), * if in interrupt context or rcu_read_lock_bh()
- * and rcu_read_unlock_bh(), if in process context. These may be nested.
- */
-void call_rcu_bh(struct rcu_head *head,
-                               void (*func)(struct rcu_head *rcu))
-{
-       unsigned long flags;
-
-       head->func = func;
-       local_irq_save(flags);
-       __call_rcu(head, &rcu_bh_ctrlblk, &__get_cpu_var(rcu_bh_data));
-       local_irq_restore(flags);
-}
-EXPORT_SYMBOL_GPL(call_rcu_bh);
-
-/*
- * Return the number of RCU batches processed thus far.  Useful
- * for debug and statistics.
- */
-long rcu_batches_completed(void)
-{
-       return rcu_ctrlblk.completed;
-}
-EXPORT_SYMBOL_GPL(rcu_batches_completed);
-
-/*
- * Return the number of RCU batches processed thus far.  Useful
- * for debug and statistics.
- */
-long rcu_batches_completed_bh(void)
-{
-       return rcu_bh_ctrlblk.completed;
-}
-EXPORT_SYMBOL_GPL(rcu_batches_completed_bh);
-
-/* Raises the softirq for processing rcu_callbacks. */
-static inline void raise_rcu_softirq(void)
-{
-       raise_softirq(RCU_SOFTIRQ);
-}
-
-/*
- * Invoke the completed RCU callbacks. They are expected to be in
- * a per-cpu list.
- */
-static void rcu_do_batch(struct rcu_data *rdp)
-{
-       unsigned long flags;
-       struct rcu_head *next, *list;
-       int count = 0;
-
-       list = rdp->donelist;
-       while (list) {
-               next = list->next;
-               prefetch(next);
-               list->func(list);
-               list = next;
-               if (++count >= rdp->blimit)
-                       break;
-       }
-       rdp->donelist = list;
-
-       local_irq_save(flags);
-       rdp->qlen -= count;
-       local_irq_restore(flags);
-       if (rdp->blimit == INT_MAX && rdp->qlen <= qlowmark)
-               rdp->blimit = blimit;
-
-       if (!rdp->donelist)
-               rdp->donetail = &rdp->donelist;
-       else
-               raise_rcu_softirq();
-}
-
-/*
- * Grace period handling:
- * The grace period handling consists out of two steps:
- * - A new grace period is started.
- *   This is done by rcu_start_batch. The start is not broadcasted to
- *   all cpus, they must pick this up by comparing rcp->cur with
- *   rdp->quiescbatch. All cpus are recorded  in the
- *   rcu_ctrlblk.cpumask bitmap.
- * - All cpus must go through a quiescent state.
- *   Since the start of the grace period is not broadcasted, at least two
- *   calls to rcu_check_quiescent_state are required:
- *   The first call just notices that a new grace period is running. The
- *   following calls check if there was a quiescent state since the beginning
- *   of the grace period. If so, it updates rcu_ctrlblk.cpumask. If
- *   the bitmap is empty, then the grace period is completed.
- *   rcu_check_quiescent_state calls rcu_start_batch(0) to start the next grace
- *   period (if necessary).
- */
-
-/*
- * Register a new batch of callbacks, and start it up if there is currently no
- * active batch and the batch to be registered has not already occurred.
- * Caller must hold rcu_ctrlblk.lock.
- */
-static void rcu_start_batch(struct rcu_ctrlblk *rcp)
-{
-       if (rcp->cur != rcp->pending &&
-                       rcp->completed == rcp->cur) {
-               rcp->cur++;
-               record_gp_stall_check_time(rcp);
-
-               /*
-                * Accessing nohz_cpu_mask before incrementing rcp->cur needs a
-                * Barrier  Otherwise it can cause tickless idle CPUs to be
-                * included in rcp->cpumask, which will extend graceperiods
-                * unnecessarily.
-                */
-               smp_mb();
-               cpumask_andnot(to_cpumask(rcp->cpumask),
-                              cpu_online_mask, nohz_cpu_mask);
-
-               rcp->signaled = 0;
-       }
-}
-
-/*
- * cpu went through a quiescent state since the beginning of the grace period.
- * Clear it from the cpu mask and complete the grace period if it was the last
- * cpu. Start another grace period if someone has further entries pending
- */
-static void cpu_quiet(int cpu, struct rcu_ctrlblk *rcp)
-{
-       cpumask_clear_cpu(cpu, to_cpumask(rcp->cpumask));
-       if (cpumask_empty(to_cpumask(rcp->cpumask))) {
-               /* batch completed ! */
-               rcp->completed = rcp->cur;
-               rcu_start_batch(rcp);
-       }
-}
-
-/*
- * Check if the cpu has gone through a quiescent state (say context
- * switch). If so and if it already hasn't done so in this RCU
- * quiescent cycle, then indicate that it has done so.
- */
-static void rcu_check_quiescent_state(struct rcu_ctrlblk *rcp,
-                                       struct rcu_data *rdp)
-{
-       unsigned long flags;
-
-       if (rdp->quiescbatch != rcp->cur) {
-               /* start new grace period: */
-               rdp->qs_pending = 1;
-               rdp->passed_quiesc = 0;
-               rdp->quiescbatch = rcp->cur;
-               return;
-       }
-
-       /* Grace period already completed for this cpu?
-        * qs_pending is checked instead of the actual bitmap to avoid
-        * cacheline trashing.
-        */
-       if (!rdp->qs_pending)
-               return;
-
-       /*
-        * Was there a quiescent state since the beginning of the grace
-        * period? If no, then exit and wait for the next call.
-        */
-       if (!rdp->passed_quiesc)
-               return;
-       rdp->qs_pending = 0;
-
-       spin_lock_irqsave(&rcp->lock, flags);
-       /*
-        * rdp->quiescbatch/rcp->cur and the cpu bitmap can come out of sync
-        * during cpu startup. Ignore the quiescent state.
-        */
-       if (likely(rdp->quiescbatch == rcp->cur))
-               cpu_quiet(rdp->cpu, rcp);
-
-       spin_unlock_irqrestore(&rcp->lock, flags);
-}
-
-
-#ifdef CONFIG_HOTPLUG_CPU
-
-/* warning! helper for rcu_offline_cpu. do not use elsewhere without reviewing
- * locking requirements, the list it's pulling from has to belong to a cpu
- * which is dead and hence not processing interrupts.
- */
-static void rcu_move_batch(struct rcu_data *this_rdp, struct rcu_head *list,
-                               struct rcu_head **tail, long batch)
-{
-       unsigned long flags;
-
-       if (list) {
-               local_irq_save(flags);
-               this_rdp->batch = batch;
-               *this_rdp->nxttail[2] = list;
-               this_rdp->nxttail[2] = tail;
-               local_irq_restore(flags);
-       }
-}
-
-static void __rcu_offline_cpu(struct rcu_data *this_rdp,
-                               struct rcu_ctrlblk *rcp, struct rcu_data *rdp)
-{
-       unsigned long flags;
-
-       /*
-        * if the cpu going offline owns the grace period
-        * we can block indefinitely waiting for it, so flush
-        * it here
-        */
-       spin_lock_irqsave(&rcp->lock, flags);
-       if (rcp->cur != rcp->completed)
-               cpu_quiet(rdp->cpu, rcp);
-       rcu_move_batch(this_rdp, rdp->donelist, rdp->donetail, rcp->cur + 1);
-       rcu_move_batch(this_rdp, rdp->nxtlist, rdp->nxttail[2], rcp->cur + 1);
-       spin_unlock(&rcp->lock);
-
-       this_rdp->qlen += rdp->qlen;
-       local_irq_restore(flags);
-}
-
-static void rcu_offline_cpu(int cpu)
-{
-       struct rcu_data *this_rdp = &get_cpu_var(rcu_data);
-       struct rcu_data *this_bh_rdp = &get_cpu_var(rcu_bh_data);
-
-       __rcu_offline_cpu(this_rdp, &rcu_ctrlblk,
-                                       &per_cpu(rcu_data, cpu));
-       __rcu_offline_cpu(this_bh_rdp, &rcu_bh_ctrlblk,
-                                       &per_cpu(rcu_bh_data, cpu));
-       put_cpu_var(rcu_data);
-       put_cpu_var(rcu_bh_data);
-}
-
-#else
-
-static void rcu_offline_cpu(int cpu)
-{
-}
-
-#endif
-
-/*
- * This does the RCU processing work from softirq context.
- */
-static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp,
-                                       struct rcu_data *rdp)
-{
-       unsigned long flags;
-       long completed_snap;
-
-       if (rdp->nxtlist) {
-               local_irq_save(flags);
-               completed_snap = ACCESS_ONCE(rcp->completed);
-
-               /*
-                * move the other grace-period-completed entries to
-                * [rdp->nxtlist, *rdp->nxttail[0]) temporarily
-                */
-               if (!rcu_batch_before(completed_snap, rdp->batch))
-                       rdp->nxttail[0] = rdp->nxttail[1] = rdp->nxttail[2];
-               else if (!rcu_batch_before(completed_snap, rdp->batch - 1))
-                       rdp->nxttail[0] = rdp->nxttail[1];
-
-               /*
-                * the grace period for entries in
-                * [rdp->nxtlist, *rdp->nxttail[0]) has completed and
-                * move these entries to donelist
-                */
-               if (rdp->nxttail[0] != &rdp->nxtlist) {
-                       *rdp->donetail = rdp->nxtlist;
-                       rdp->donetail = rdp->nxttail[0];
-                       rdp->nxtlist = *rdp->nxttail[0];
-                       *rdp->donetail = NULL;
-
-                       if (rdp->nxttail[1] == rdp->nxttail[0])
-                               rdp->nxttail[1] = &rdp->nxtlist;
-                       if (rdp->nxttail[2] == rdp->nxttail[0])
-                               rdp->nxttail[2] = &rdp->nxtlist;
-                       rdp->nxttail[0] = &rdp->nxtlist;
-               }
-
-               local_irq_restore(flags);
-
-               if (rcu_batch_after(rdp->batch, rcp->pending)) {
-                       unsigned long flags2;
-
-                       /* and start it/schedule start if it's a new batch */
-                       spin_lock_irqsave(&rcp->lock, flags2);
-                       if (rcu_batch_after(rdp->batch, rcp->pending)) {
-                               rcp->pending = rdp->batch;
-                               rcu_start_batch(rcp);
-                       }
-                       spin_unlock_irqrestore(&rcp->lock, flags2);
-               }
-       }
-
-       rcu_check_quiescent_state(rcp, rdp);
-       if (rdp->donelist)
-               rcu_do_batch(rdp);
-}
-
-static void rcu_process_callbacks(struct softirq_action *unused)
-{
-       /*
-        * Memory references from any prior RCU read-side critical sections
-        * executed by the interrupted code must be see before any RCU
-        * grace-period manupulations below.
-        */
-
-       smp_mb(); /* See above block comment. */
-
-       __rcu_process_callbacks(&rcu_ctrlblk, &__get_cpu_var(rcu_data));
-       __rcu_process_callbacks(&rcu_bh_ctrlblk, &__get_cpu_var(rcu_bh_data));
-
-       /*
-        * Memory references from any later RCU read-side critical sections
-        * executed by the interrupted code must be see after any RCU
-        * grace-period manupulations above.
-        */
-
-       smp_mb(); /* See above block comment. */
-}
-
-static int __rcu_pending(struct rcu_ctrlblk *rcp, struct rcu_data *rdp)
-{
-       /* Check for CPU stalls, if enabled. */
-       check_cpu_stall(rcp);
-
-       if (rdp->nxtlist) {
-               long completed_snap = ACCESS_ONCE(rcp->completed);
-
-               /*
-                * This cpu has pending rcu entries and the grace period
-                * for them has completed.
-                */
-               if (!rcu_batch_before(completed_snap, rdp->batch))
-                       return 1;
-               if (!rcu_batch_before(completed_snap, rdp->batch - 1) &&
-                               rdp->nxttail[0] != rdp->nxttail[1])
-                       return 1;
-               if (rdp->nxttail[0] != &rdp->nxtlist)
-                       return 1;
-
-               /*
-                * This cpu has pending rcu entries and the new batch
-                * for then hasn't been started nor scheduled start
-                */
-               if (rcu_batch_after(rdp->batch, rcp->pending))
-                       return 1;
-       }
-
-       /* This cpu has finished callbacks to invoke */
-       if (rdp->donelist)
-               return 1;
-
-       /* The rcu core waits for a quiescent state from the cpu */
-       if (rdp->quiescbatch != rcp->cur || rdp->qs_pending)
-               return 1;
-
-       /* nothing to do */
-       return 0;
-}
-
-/*
- * Check to see if there is any immediate RCU-related work to be done
- * by the current CPU, returning 1 if so.  This function is part of the
- * RCU implementation; it is -not- an exported member of the RCU API.
- */
-int rcu_pending(int cpu)
-{
-       return __rcu_pending(&rcu_ctrlblk, &per_cpu(rcu_data, cpu)) ||
-               __rcu_pending(&rcu_bh_ctrlblk, &per_cpu(rcu_bh_data, cpu));
-}
-
-/*
- * Check to see if any future RCU-related work will need to be done
- * by the current CPU, even if none need be done immediately, returning
- * 1 if so.  This function is part of the RCU implementation; it is -not-
- * an exported member of the RCU API.
- */
-int rcu_needs_cpu(int cpu)
-{
-       struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
-       struct rcu_data *rdp_bh = &per_cpu(rcu_bh_data, cpu);
-
-       return !!rdp->nxtlist || !!rdp_bh->nxtlist || rcu_pending(cpu);
-}
-
-/*
- * Top-level function driving RCU grace-period detection, normally
- * invoked from the scheduler-clock interrupt.  This function simply
- * increments counters that are read only from softirq by this same
- * CPU, so there are no memory barriers required.
- */
-void rcu_check_callbacks(int cpu, int user)
-{
-       if (user ||
-           (idle_cpu(cpu) && rcu_scheduler_active &&
-            !in_softirq() && hardirq_count() <= (1 << HARDIRQ_SHIFT))) {
-
-               /*
-                * Get here if this CPU took its interrupt from user
-                * mode or from the idle loop, and if this is not a
-                * nested interrupt.  In this case, the CPU is in
-                * a quiescent state, so count it.
-                *
-                * Also do a memory barrier.  This is needed to handle
-                * the case where writes from a preempt-disable section
-                * of code get reordered into schedule() by this CPU's
-                * write buffer.  The memory barrier makes sure that
-                * the rcu_qsctr_inc() and rcu_bh_qsctr_inc() are see
-                * by other CPUs to happen after any such write.
-                */
-
-               smp_mb();  /* See above block comment. */
-               rcu_qsctr_inc(cpu);
-               rcu_bh_qsctr_inc(cpu);
-
-       } else if (!in_softirq()) {
-
-               /*
-                * Get here if this CPU did not take its interrupt from
-                * softirq, in other words, if it is not interrupting
-                * a rcu_bh read-side critical section.  This is an _bh
-                * critical section, so count it.  The memory barrier
-                * is needed for the same reason as is the above one.
-                */
-
-               smp_mb();  /* See above block comment. */
-               rcu_bh_qsctr_inc(cpu);
-       }
-       raise_rcu_softirq();
-}
-
-static void __cpuinit rcu_init_percpu_data(int cpu, struct rcu_ctrlblk *rcp,
-                                               struct rcu_data *rdp)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&rcp->lock, flags);
-       memset(rdp, 0, sizeof(*rdp));
-       rdp->nxttail[0] = rdp->nxttail[1] = rdp->nxttail[2] = &rdp->nxtlist;
-       rdp->donetail = &rdp->donelist;
-       rdp->quiescbatch = rcp->completed;
-       rdp->qs_pending = 0;
-       rdp->cpu = cpu;
-       rdp->blimit = blimit;
-       spin_unlock_irqrestore(&rcp->lock, flags);
-}
-
-static void __cpuinit rcu_online_cpu(int cpu)
-{
-       struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
-       struct rcu_data *bh_rdp = &per_cpu(rcu_bh_data, cpu);
-
-       rcu_init_percpu_data(cpu, &rcu_ctrlblk, rdp);
-       rcu_init_percpu_data(cpu, &rcu_bh_ctrlblk, bh_rdp);
-       open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);
-}
-
-static int __cpuinit rcu_cpu_notify(struct notifier_block *self,
-                               unsigned long action, void *hcpu)
-{
-       long cpu = (long)hcpu;
-
-       switch (action) {
-       case CPU_UP_PREPARE:
-       case CPU_UP_PREPARE_FROZEN:
-               rcu_online_cpu(cpu);
-               break;
-       case CPU_DEAD:
-       case CPU_DEAD_FROZEN:
-               rcu_offline_cpu(cpu);
-               break;
-       default:
-               break;
-       }
-       return NOTIFY_OK;
-}
-
-static struct notifier_block __cpuinitdata rcu_nb = {
-       .notifier_call  = rcu_cpu_notify,
-};
-
-/*
- * Initializes rcu mechanism.  Assumed to be called early.
- * That is before local timer(SMP) or jiffie timer (uniproc) is setup.
- * Note that rcu_qsctr and friends are implicitly
- * initialized due to the choice of ``0'' for RCU_CTR_INVALID.
- */
-void __init __rcu_init(void)
-{
-#ifdef CONFIG_RCU_CPU_STALL_DETECTOR
-       printk(KERN_INFO "RCU-based detection of stalled CPUs is enabled.\n");
-#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
-       rcu_cpu_notify(&rcu_nb, CPU_UP_PREPARE,
-                       (void *)(long)smp_processor_id());
-       /* Register notifier for non-boot CPUs */
-       register_cpu_notifier(&rcu_nb);
-}
-
-module_param(blimit, int, 0);
-module_param(qhimark, int, 0);
-module_param(qlowmark, int, 0);
index a967c9f..eae29c2 100644 (file)
@@ -98,6 +98,30 @@ void synchronize_rcu(void)
 }
 EXPORT_SYMBOL_GPL(synchronize_rcu);
 
+/**
+ * synchronize_rcu_bh - wait until an rcu_bh grace period has elapsed.
+ *
+ * Control will return to the caller some time after a full rcu_bh grace
+ * period has elapsed, in other words after all currently executing rcu_bh
+ * read-side critical sections have completed.  RCU read-side critical
+ * sections are delimited by rcu_read_lock_bh() and rcu_read_unlock_bh(),
+ * and may be nested.
+ */
+void synchronize_rcu_bh(void)
+{
+       struct rcu_synchronize rcu;
+
+       if (rcu_blocking_is_gp())
+               return;
+
+       init_completion(&rcu.completion);
+       /* Will wake me after RCU finished. */
+       call_rcu_bh(&rcu.head, wakeme_after_rcu);
+       /* Wait for it. */
+       wait_for_completion(&rcu.completion);
+}
+EXPORT_SYMBOL_GPL(synchronize_rcu_bh);
+
 static void rcu_barrier_callback(struct rcu_head *notused)
 {
        if (atomic_dec_and_test(&rcu_barrier_cpu_count))
@@ -129,6 +153,7 @@ static void rcu_barrier_func(void *type)
 static inline void wait_migrated_callbacks(void)
 {
        wait_event(rcu_migrate_wq, !atomic_read(&rcu_migrate_type_count));
+       smp_mb(); /* In case we didn't sleep. */
 }
 
 /*
index 9b4a975..b33db53 100644 (file)
@@ -257,14 +257,14 @@ struct rcu_torture_ops {
        void (*init)(void);
        void (*cleanup)(void);
        int (*readlock)(void);
-       void (*readdelay)(struct rcu_random_state *rrsp);
+       void (*read_delay)(struct rcu_random_state *rrsp);
        void (*readunlock)(int idx);
        int (*completed)(void);
-       void (*deferredfree)(struct rcu_torture *p);
+       void (*deferred_free)(struct rcu_torture *p);
        void (*sync)(void);
        void (*cb_barrier)(void);
        int (*stats)(char *page);
-       int irqcapable;
+       int irq_capable;
        char *name;
 };
 static struct rcu_torture_ops *cur_ops = NULL;
@@ -320,7 +320,7 @@ rcu_torture_cb(struct rcu_head *p)
                rp->rtort_mbtest = 0;
                rcu_torture_free(rp);
        } else
-               cur_ops->deferredfree(rp);
+               cur_ops->deferred_free(rp);
 }
 
 static void rcu_torture_deferred_free(struct rcu_torture *p)
@@ -329,18 +329,18 @@ static void rcu_torture_deferred_free(struct rcu_torture *p)
 }
 
 static struct rcu_torture_ops rcu_ops = {
-       .init = NULL,
-       .cleanup = NULL,
-       .readlock = rcu_torture_read_lock,
-       .readdelay = rcu_read_delay,
-       .readunlock = rcu_torture_read_unlock,
-       .completed = rcu_torture_completed,
-       .deferredfree = rcu_torture_deferred_free,
-       .sync = synchronize_rcu,
-       .cb_barrier = rcu_barrier,
-       .stats = NULL,
-       .irqcapable = 1,
-       .name = "rcu"
+       .init           = NULL,
+       .cleanup        = NULL,
+       .readlock       = rcu_torture_read_lock,
+       .read_delay     = rcu_read_delay,
+       .readunlock     = rcu_torture_read_unlock,
+       .completed      = rcu_torture_completed,
+       .deferred_free  = rcu_torture_deferred_free,
+       .sync           = synchronize_rcu,
+       .cb_barrier     = rcu_barrier,
+       .stats          = NULL,
+       .irq_capable    = 1,
+       .name           = "rcu"
 };
 
 static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
@@ -370,18 +370,18 @@ static void rcu_sync_torture_init(void)
 }
 
 static struct rcu_torture_ops rcu_sync_ops = {
-       .init = rcu_sync_torture_init,
-       .cleanup = NULL,
-       .readlock = rcu_torture_read_lock,
-       .readdelay = rcu_read_delay,
-       .readunlock = rcu_torture_read_unlock,
-       .completed = rcu_torture_completed,
-       .deferredfree = rcu_sync_torture_deferred_free,
-       .sync = synchronize_rcu,
-       .cb_barrier = NULL,
-       .stats = NULL,
-       .irqcapable = 1,
-       .name = "rcu_sync"
+       .init           = rcu_sync_torture_init,
+       .cleanup        = NULL,
+       .readlock       = rcu_torture_read_lock,
+       .read_delay     = rcu_read_delay,
+       .readunlock     = rcu_torture_read_unlock,
+       .completed      = rcu_torture_completed,
+       .deferred_free  = rcu_sync_torture_deferred_free,
+       .sync           = synchronize_rcu,
+       .cb_barrier     = NULL,
+       .stats          = NULL,
+       .irq_capable    = 1,
+       .name           = "rcu_sync"
 };
 
 /*
@@ -432,33 +432,33 @@ static void rcu_bh_torture_synchronize(void)
 }
 
 static struct rcu_torture_ops rcu_bh_ops = {
-       .init = NULL,
-       .cleanup = NULL,
-       .readlock = rcu_bh_torture_read_lock,
-       .readdelay = rcu_read_delay,  /* just reuse rcu's version. */
-       .readunlock = rcu_bh_torture_read_unlock,
-       .completed = rcu_bh_torture_completed,
-       .deferredfree = rcu_bh_torture_deferred_free,
-       .sync = rcu_bh_torture_synchronize,
-       .cb_barrier = rcu_barrier_bh,
-       .stats = NULL,
-       .irqcapable = 1,
-       .name = "rcu_bh"
+       .init           = NULL,
+       .cleanup        = NULL,
+       .readlock       = rcu_bh_torture_read_lock,
+       .read_delay     = rcu_read_delay,  /* just reuse rcu's version. */
+       .readunlock     = rcu_bh_torture_read_unlock,
+       .completed      = rcu_bh_torture_completed,
+       .deferred_free  = rcu_bh_torture_deferred_free,
+       .sync           = rcu_bh_torture_synchronize,
+       .cb_barrier     = rcu_barrier_bh,
+       .stats          = NULL,
+       .irq_capable    = 1,
+       .name           = "rcu_bh"
 };
 
 static struct rcu_torture_ops rcu_bh_sync_ops = {
-       .init = rcu_sync_torture_init,
-       .cleanup = NULL,
-       .readlock = rcu_bh_torture_read_lock,
-       .readdelay = rcu_read_delay,  /* just reuse rcu's version. */
-       .readunlock = rcu_bh_torture_read_unlock,
-       .completed = rcu_bh_torture_completed,
-       .deferredfree = rcu_sync_torture_deferred_free,
-       .sync = rcu_bh_torture_synchronize,
-       .cb_barrier = NULL,
-       .stats = NULL,
-       .irqcapable = 1,
-       .name = "rcu_bh_sync"
+       .init           = rcu_sync_torture_init,
+       .cleanup        = NULL,
+       .readlock       = rcu_bh_torture_read_lock,
+       .read_delay     = rcu_read_delay,  /* just reuse rcu's version. */
+       .readunlock     = rcu_bh_torture_read_unlock,
+       .completed      = rcu_bh_torture_completed,
+       .deferred_free  = rcu_sync_torture_deferred_free,
+       .sync           = rcu_bh_torture_synchronize,
+       .cb_barrier     = NULL,
+       .stats          = NULL,
+       .irq_capable    = 1,
+       .name           = "rcu_bh_sync"
 };
 
 /*
@@ -530,17 +530,17 @@ static int srcu_torture_stats(char *page)
 }
 
 static struct rcu_torture_ops srcu_ops = {
-       .init = srcu_torture_init,
-       .cleanup = srcu_torture_cleanup,
-       .readlock = srcu_torture_read_lock,
-       .readdelay = srcu_read_delay,
-       .readunlock = srcu_torture_read_unlock,
-       .completed = srcu_torture_completed,
-       .deferredfree = rcu_sync_torture_deferred_free,
-       .sync = srcu_torture_synchronize,
-       .cb_barrier = NULL,
-       .stats = srcu_torture_stats,
-       .name = "srcu"
+       .init           = srcu_torture_init,
+       .cleanup        = srcu_torture_cleanup,
+       .readlock       = srcu_torture_read_lock,
+       .read_delay     = srcu_read_delay,
+       .readunlock     = srcu_torture_read_unlock,
+       .completed      = srcu_torture_completed,
+       .deferred_free  = rcu_sync_torture_deferred_free,
+       .sync           = srcu_torture_synchronize,
+       .cb_barrier     = NULL,
+       .stats          = srcu_torture_stats,
+       .name           = "srcu"
 };
 
 /*
@@ -574,32 +574,49 @@ static void sched_torture_synchronize(void)
 }
 
 static struct rcu_torture_ops sched_ops = {
-       .init = rcu_sync_torture_init,
-       .cleanup = NULL,
-       .readlock = sched_torture_read_lock,
-       .readdelay = rcu_read_delay,  /* just reuse rcu's version. */
-       .readunlock = sched_torture_read_unlock,
-       .completed = sched_torture_completed,
-       .deferredfree = rcu_sched_torture_deferred_free,
-       .sync = sched_torture_synchronize,
-       .cb_barrier = rcu_barrier_sched,
-       .stats = NULL,
-       .irqcapable = 1,
-       .name = "sched"
+       .init           = rcu_sync_torture_init,
+       .cleanup        = NULL,
+       .readlock       = sched_torture_read_lock,
+       .read_delay     = rcu_read_delay,  /* just reuse rcu's version. */
+       .readunlock     = sched_torture_read_unlock,
+       .completed      = sched_torture_completed,
+       .deferred_free  = rcu_sched_torture_deferred_free,
+       .sync           = sched_torture_synchronize,
+       .cb_barrier     = rcu_barrier_sched,
+       .stats          = NULL,
+       .irq_capable    = 1,
+       .name           = "sched"
 };
 
 static struct rcu_torture_ops sched_ops_sync = {
-       .init = rcu_sync_torture_init,
-       .cleanup = NULL,
-       .readlock = sched_torture_read_lock,
-       .readdelay = rcu_read_delay,  /* just reuse rcu's version. */
-       .readunlock = sched_torture_read_unlock,
-       .completed = sched_torture_completed,
-       .deferredfree = rcu_sync_torture_deferred_free,
-       .sync = sched_torture_synchronize,
-       .cb_barrier = NULL,
-       .stats = NULL,
-       .name = "sched_sync"
+       .init           = rcu_sync_torture_init,
+       .cleanup        = NULL,
+       .readlock       = sched_torture_read_lock,
+       .read_delay     = rcu_read_delay,  /* just reuse rcu's version. */
+       .readunlock     = sched_torture_read_unlock,
+       .completed      = sched_torture_completed,
+       .deferred_free  = rcu_sync_torture_deferred_free,
+       .sync           = sched_torture_synchronize,
+       .cb_barrier     = NULL,
+       .stats          = NULL,
+       .name           = "sched_sync"
+};
+
+extern int rcu_expedited_torture_stats(char *page);
+
+static struct rcu_torture_ops sched_expedited_ops = {
+       .init           = rcu_sync_torture_init,
+       .cleanup        = NULL,
+       .readlock       = sched_torture_read_lock,
+       .read_delay     = rcu_read_delay,  /* just reuse rcu's version. */
+       .readunlock     = sched_torture_read_unlock,
+       .completed      = sched_torture_completed,
+       .deferred_free  = rcu_sync_torture_deferred_free,
+       .sync           = synchronize_sched_expedited,
+       .cb_barrier     = NULL,
+       .stats          = rcu_expedited_torture_stats,
+       .irq_capable    = 1,
+       .name           = "sched_expedited"
 };
 
 /*
@@ -635,7 +652,7 @@ rcu_torture_writer(void *arg)
                                i = RCU_TORTURE_PIPE_LEN;
                        atomic_inc(&rcu_torture_wcount[i]);
                        old_rp->rtort_pipe_count++;
-                       cur_ops->deferredfree(old_rp);
+                       cur_ops->deferred_free(old_rp);
                }
                rcu_torture_current_version++;
                oldbatch = cur_ops->completed();
@@ -700,7 +717,7 @@ static void rcu_torture_timer(unsigned long unused)
        if (p->rtort_mbtest == 0)
                atomic_inc(&n_rcu_torture_mberror);
        spin_lock(&rand_lock);
-       cur_ops->readdelay(&rand);
+       cur_ops->read_delay(&rand);
        n_rcu_torture_timers++;
        spin_unlock(&rand_lock);
        preempt_disable();
@@ -738,11 +755,11 @@ rcu_torture_reader(void *arg)
 
        VERBOSE_PRINTK_STRING("rcu_torture_reader task started");
        set_user_nice(current, 19);
-       if (irqreader && cur_ops->irqcapable)
+       if (irqreader && cur_ops->irq_capable)
                setup_timer_on_stack(&t, rcu_torture_timer, 0);
 
        do {
-               if (irqreader && cur_ops->irqcapable) {
+               if (irqreader && cur_ops->irq_capable) {
                        if (!timer_pending(&t))
                                mod_timer(&t, 1);
                }
@@ -757,7 +774,7 @@ rcu_torture_reader(void *arg)
                }
                if (p->rtort_mbtest == 0)
                        atomic_inc(&n_rcu_torture_mberror);
-               cur_ops->readdelay(&rand);
+               cur_ops->read_delay(&rand);
                preempt_disable();
                pipe_count = p->rtort_pipe_count;
                if (pipe_count > RCU_TORTURE_PIPE_LEN) {
@@ -778,7 +795,7 @@ rcu_torture_reader(void *arg)
        } while (!kthread_should_stop() && fullstop == FULLSTOP_DONTSTOP);
        VERBOSE_PRINTK_STRING("rcu_torture_reader task stopping");
        rcutorture_shutdown_absorb("rcu_torture_reader");
-       if (irqreader && cur_ops->irqcapable)
+       if (irqreader && cur_ops->irq_capable)
                del_timer_sync(&t);
        while (!kthread_should_stop())
                schedule_timeout_uninterruptible(1);
@@ -1078,6 +1095,7 @@ rcu_torture_init(void)
        int firsterr = 0;
        static struct rcu_torture_ops *torture_ops[] =
                { &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &rcu_bh_sync_ops,
+                 &sched_expedited_ops,
                  &srcu_ops, &sched_ops, &sched_ops_sync, };
 
        mutex_lock(&fullstop_mutex);
index 1b59e26..cda8b81 100644 (file)
@@ -7051,6 +7051,11 @@ fail:
        return ret;
 }
 
+#define RCU_MIGRATION_IDLE     0
+#define RCU_MIGRATION_NEED_QS  1
+#define RCU_MIGRATION_GOT_QS   2
+#define RCU_MIGRATION_MUST_SYNC        3
+
 /*
  * migration_thread - this is a highprio system thread that performs
  * thread migration by bumping thread off CPU then 'pushing' onto
@@ -7058,6 +7063,7 @@ fail:
  */
 static int migration_thread(void *data)
 {
+       int badcpu;
        int cpu = (long)data;
        struct rq *rq;
 
@@ -7092,8 +7098,17 @@ static int migration_thread(void *data)
                req = list_entry(head->next, struct migration_req, list);
                list_del_init(head->next);
 
-               spin_unlock(&rq->lock);
-               __migrate_task(req->task, cpu, req->dest_cpu);
+               if (req->task != NULL) {
+                       spin_unlock(&rq->lock);
+                       __migrate_task(req->task, cpu, req->dest_cpu);
+               } else if (likely(cpu == (badcpu = smp_processor_id()))) {
+                       req->dest_cpu = RCU_MIGRATION_GOT_QS;
+                       spin_unlock(&rq->lock);
+               } else {
+                       req->dest_cpu = RCU_MIGRATION_MUST_SYNC;
+                       spin_unlock(&rq->lock);
+                       WARN_ONCE(1, "migration_thread() on CPU %d, expected %d\n", badcpu, cpu);
+               }
                local_irq_enable();
 
                complete(&req->done);
@@ -10581,3 +10596,113 @@ struct cgroup_subsys cpuacct_subsys = {
        .subsys_id = cpuacct_subsys_id,
 };
 #endif /* CONFIG_CGROUP_CPUACCT */
+
+#ifndef CONFIG_SMP
+
+int rcu_expedited_torture_stats(char *page)
+{
+       return 0;
+}
+EXPORT_SYMBOL_GPL(rcu_expedited_torture_stats);
+
+void synchronize_sched_expedited(void)
+{
+}
+EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
+
+#else /* #ifndef CONFIG_SMP */
+
+static DEFINE_PER_CPU(struct migration_req, rcu_migration_req);
+static DEFINE_MUTEX(rcu_sched_expedited_mutex);
+
+#define RCU_EXPEDITED_STATE_POST -2
+#define RCU_EXPEDITED_STATE_IDLE -1
+
+static int rcu_expedited_state = RCU_EXPEDITED_STATE_IDLE;
+
+int rcu_expedited_torture_stats(char *page)
+{
+       int cnt = 0;
+       int cpu;
+
+       cnt += sprintf(&page[cnt], "state: %d /", rcu_expedited_state);
+       for_each_online_cpu(cpu) {
+                cnt += sprintf(&page[cnt], " %d:%d",
+                               cpu, per_cpu(rcu_migration_req, cpu).dest_cpu);
+       }
+       cnt += sprintf(&page[cnt], "\n");
+       return cnt;
+}
+EXPORT_SYMBOL_GPL(rcu_expedited_torture_stats);
+
+static long synchronize_sched_expedited_count;
+
+/*
+ * Wait for an rcu-sched grace period to elapse, but use "big hammer"
+ * approach to force grace period to end quickly.  This consumes
+ * significant time on all CPUs, and is thus not recommended for
+ * any sort of common-case code.
+ *
+ * Note that it is illegal to call this function while holding any
+ * lock that is acquired by a CPU-hotplug notifier.  Failing to
+ * observe this restriction will result in deadlock.
+ */
+void synchronize_sched_expedited(void)
+{
+       int cpu;
+       unsigned long flags;
+       bool need_full_sync = 0;
+       struct rq *rq;
+       struct migration_req *req;
+       long snap;
+       int trycount = 0;
+
+       smp_mb();  /* ensure prior mod happens before capturing snap. */
+       snap = ACCESS_ONCE(synchronize_sched_expedited_count) + 1;
+       get_online_cpus();
+       while (!mutex_trylock(&rcu_sched_expedited_mutex)) {
+               put_online_cpus();
+               if (trycount++ < 10)
+                       udelay(trycount * num_online_cpus());
+               else {
+                       synchronize_sched();
+                       return;
+               }
+               if (ACCESS_ONCE(synchronize_sched_expedited_count) - snap > 0) {
+                       smp_mb(); /* ensure test happens before caller kfree */
+                       return;
+               }
+               get_online_cpus();
+       }
+       rcu_expedited_state = RCU_EXPEDITED_STATE_POST;
+       for_each_online_cpu(cpu) {
+               rq = cpu_rq(cpu);
+               req = &per_cpu(rcu_migration_req, cpu);
+               init_completion(&req->done);
+               req->task = NULL;
+               req->dest_cpu = RCU_MIGRATION_NEED_QS;
+               spin_lock_irqsave(&rq->lock, flags);
+               list_add(&req->list, &rq->migration_queue);
+               spin_unlock_irqrestore(&rq->lock, flags);
+               wake_up_process(rq->migration_thread);
+       }
+       for_each_online_cpu(cpu) {
+               rcu_expedited_state = cpu;
+               req = &per_cpu(rcu_migration_req, cpu);
+               rq = cpu_rq(cpu);
+               wait_for_completion(&req->done);
+               spin_lock_irqsave(&rq->lock, flags);
+               if (unlikely(req->dest_cpu == RCU_MIGRATION_MUST_SYNC))
+                       need_full_sync = 1;
+               req->dest_cpu = RCU_MIGRATION_IDLE;
+               spin_unlock_irqrestore(&rq->lock, flags);
+       }
+       rcu_expedited_state = RCU_EXPEDITED_STATE_IDLE;
+       mutex_unlock(&rcu_sched_expedited_mutex);
+       put_online_cpus();
+       if (need_full_sync)
+               synchronize_sched();
+}
+EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
+
+#endif /* #else #ifndef CONFIG_SMP */