lkml.org 
[lkml]   [2017]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 51/88] rcu: Move expediting-related access/control out of rcupdate.h
    Date
    The rcu_gp_is_normal(), rcu_gp_is_expedited(), rcu_expedite_gp(), and
    rcu_unexpedite_gp() functions are intended only for use within the
    RCU implementation itself -- the sysfs access is what should be used
    outside of RCU. This commit therefore moves the declarations for
    these functions to kernel/rcu/rcu.h, and also includes this file into
    kernel/rcu/rcutorture.c and kernel/rcu/rcuperf.c. This also has the
    beneficial effect of shrinking rcupdate.c a bit.

    Reported-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    ---
    include/linux/rcupdate.h | 26 --------------------------
    kernel/rcu/rcu.h | 26 ++++++++++++++++++++++++++
    kernel/rcu/rcuperf.c | 2 ++
    kernel/rcu/rcutorture.c | 2 ++
    4 files changed, 30 insertions(+), 26 deletions(-)

    diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
    index 6e7e930c1610..049c62c59f1b 100644
    --- a/include/linux/rcupdate.h
    +++ b/include/linux/rcupdate.h
    @@ -46,32 +46,6 @@
    #include <linux/ktime.h>
    #include <linux/irqflags.h>

    -#ifdef CONFIG_TINY_RCU
    -/* Tiny RCU doesn't expedite, as its purpose in life is instead to be tiny. */
    -static inline bool rcu_gp_is_normal(void) /* Internal RCU use. */
    -{
    - return true;
    -}
    -static inline bool rcu_gp_is_expedited(void) /* Internal RCU use. */
    -{
    - return false;
    -}
    -
    -static inline void rcu_expedite_gp(void)
    -{
    -}
    -
    -static inline void rcu_unexpedite_gp(void)
    -{
    -}
    -#else /* #ifdef CONFIG_TINY_RCU */
    -bool rcu_gp_is_normal(void); /* Internal RCU use. */
    -bool rcu_gp_is_expedited(void); /* Internal RCU use. */
    -void rcu_expedite_gp(void);
    -void rcu_unexpedite_gp(void);
    -void rcupdate_announce_bootup_oddness(void);
    -#endif /* #else #ifdef CONFIG_TINY_RCU */
    -
    enum rcutorture_type {
    RCU_FLAVOR,
    RCU_BH_FLAVOR,
    diff --git a/kernel/rcu/rcu.h b/kernel/rcu/rcu.h
    index 73e16ec4054b..ceb78110db1b 100644
    --- a/kernel/rcu/rcu.h
    +++ b/kernel/rcu/rcu.h
    @@ -293,4 +293,30 @@ static inline void rcu_init_levelspread(int *levelspread, const int *levelcnt)

    #endif /* #if defined(SRCU) || !defined(TINY_RCU) */

    +#ifdef CONFIG_TINY_RCU
    +/* Tiny RCU doesn't expedite, as its purpose in life is instead to be tiny. */
    +static inline bool rcu_gp_is_normal(void) /* Internal RCU use. */
    +{
    + return true;
    +}
    +static inline bool rcu_gp_is_expedited(void) /* Internal RCU use. */
    +{
    + return false;
    +}
    +
    +static inline void rcu_expedite_gp(void)
    +{
    +}
    +
    +static inline void rcu_unexpedite_gp(void)
    +{
    +}
    +#else /* #ifdef CONFIG_TINY_RCU */
    +bool rcu_gp_is_normal(void); /* Internal RCU use. */
    +bool rcu_gp_is_expedited(void); /* Internal RCU use. */
    +void rcu_expedite_gp(void);
    +void rcu_unexpedite_gp(void);
    +void rcupdate_announce_bootup_oddness(void);
    +#endif /* #else #ifdef CONFIG_TINY_RCU */
    +
    #endif /* __LINUX_RCU_H */
    diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c
    index d80f11d9f8bd..3cc18110b612 100644
    --- a/kernel/rcu/rcuperf.c
    +++ b/kernel/rcu/rcuperf.c
    @@ -48,6 +48,8 @@
    #include <linux/torture.h>
    #include <linux/vmalloc.h>

    +#include "rcu.h"
    +
    MODULE_LICENSE("GPL");
    MODULE_AUTHOR("Paul E. McKenney <paulmck@linux.vnet.ibm.com>");

    diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
    index a58592b73f19..03cdf79e73d4 100644
    --- a/kernel/rcu/rcutorture.c
    +++ b/kernel/rcu/rcutorture.c
    @@ -52,6 +52,8 @@
    #include <linux/torture.h>
    #include <linux/vmalloc.h>

    +#include "rcu.h"
    +
    MODULE_LICENSE("GPL");
    MODULE_AUTHOR("Paul E. McKenney <paulmck@us.ibm.com> and Josh Triplett <josh@joshtriplett.org>");

    --
    2.5.2
    \
     
     \ /
      Last update: 2017-05-26 00:04    [W:4.157 / U:0.520 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site