lkml.org 
[lkml]   [2017]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch V2 21/29] lockup_detector: Cleanup sysctl variable name space
    Reflect that these variables are user interface related and remove the
    whitespace damage in the sysctl table while at it.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Don Zickus <dzickus@redhat.com>
    Cc: Chris Metcalf <cmetcalf@mellanox.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Sebastian Siewior <bigeasy@linutronix.de>
    Cc: Nicholas Piggin <npiggin@gmail.com>
    Cc: Ulrich Obergfell <uobergfe@redhat.com>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Link: http://lkml.kernel.org/r/20170831073054.663135372@linutronix.de

    ---
    include/linux/nmi.h | 16 ++++++++--------
    kernel/sysctl.c | 16 ++++++++--------
    kernel/watchdog.c | 41 ++++++++++++++++++++---------------------
    3 files changed, 36 insertions(+), 37 deletions(-)

    --- a/include/linux/nmi.h
    +++ b/include/linux/nmi.h
    @@ -17,8 +17,8 @@ void lockup_detector_cleanup(void);
    bool is_hardlockup(void);

    extern int watchdog_user_enabled;
    -extern int nmi_watchdog_enabled;
    -extern int soft_watchdog_enabled;
    +extern int nmi_watchdog_user_enabled;
    +extern int soft_watchdog_user_enabled;
    extern int watchdog_thresh;
    extern unsigned long watchdog_enabled;

    @@ -62,12 +62,12 @@ static inline void reset_hung_task_detec
    * 'watchdog_enabled' variable. Each lockup detector has its dedicated bit -
    * bit 0 for the hard lockup detector and bit 1 for the soft lockup detector.
    *
    - * 'watchdog_user_enabled', 'nmi_watchdog_enabled' and 'soft_watchdog_enabled'
    - * are variables that are only used as an 'interface' between the parameters
    - * in /proc/sys/kernel and the internal state bits in 'watchdog_enabled'. The
    - * 'watchdog_thresh' variable is handled differently because its value is not
    - * boolean, and the lockup detectors are 'suspended' while 'watchdog_thresh'
    - * is equal zero.
    + * 'watchdog_user_enabled', 'nmi_watchdog_user_enabled' and
    + * 'soft_watchdog_user_enabled' are variables that are only used as an
    + * 'interface' between the parameters in /proc/sys/kernel and the internal
    + * state bits in 'watchdog_enabled'. The 'watchdog_thresh' variable is
    + * handled differently because its value is not boolean, and the lockup
    + * detectors are 'suspended' while 'watchdog_thresh' is equal zero.
    */
    #define NMI_WATCHDOG_ENABLED_BIT 0
    #define SOFT_WATCHDOG_ENABLED_BIT 1
    --- a/kernel/sysctl.c
    +++ b/kernel/sysctl.c
    @@ -871,9 +871,9 @@ static struct ctl_table kern_table[] = {
    #if defined(CONFIG_LOCKUP_DETECTOR)
    {
    .procname = "watchdog",
    - .data = &watchdog_user_enabled,
    - .maxlen = sizeof (int),
    - .mode = 0644,
    + .data = &watchdog_user_enabled,
    + .maxlen = sizeof(int),
    + .mode = 0644,
    .proc_handler = proc_watchdog,
    .extra1 = &zero,
    .extra2 = &one,
    @@ -889,8 +889,8 @@ static struct ctl_table kern_table[] = {
    },
    {
    .procname = "nmi_watchdog",
    - .data = &nmi_watchdog_enabled,
    - .maxlen = sizeof (int),
    + .data = &nmi_watchdog_user_enabled,
    + .maxlen = sizeof(int),
    .mode = NMI_WATCHDOG_SYSCTL_PERM,
    .proc_handler = proc_nmi_watchdog,
    .extra1 = &zero,
    @@ -906,9 +906,9 @@ static struct ctl_table kern_table[] = {
    #ifdef CONFIG_SOFTLOCKUP_DETECTOR
    {
    .procname = "soft_watchdog",
    - .data = &soft_watchdog_enabled,
    - .maxlen = sizeof (int),
    - .mode = 0644,
    + .data = &soft_watchdog_user_enabled,
    + .maxlen = sizeof(int),
    + .mode = 0644,
    .proc_handler = proc_soft_watchdog,
    .extra1 = &zero,
    .extra2 = &one,
    --- a/kernel/watchdog.c
    +++ b/kernel/watchdog.c
    @@ -31,8 +31,6 @@

    static DEFINE_MUTEX(watchdog_mutex);

    -int __read_mostly nmi_watchdog_enabled;
    -
    #if defined(CONFIG_HARDLOCKUP_DETECTOR) || defined(CONFIG_HAVE_NMI_WATCHDOG)
    unsigned long __read_mostly watchdog_enabled = SOFT_WATCHDOG_ENABLED |
    NMI_WATCHDOG_ENABLED;
    @@ -40,6 +38,17 @@ unsigned long __read_mostly watchdog_ena
    unsigned long __read_mostly watchdog_enabled = SOFT_WATCHDOG_ENABLED;
    #endif

    +int __read_mostly nmi_watchdog_user_enabled;
    +int __read_mostly soft_watchdog_user_enabled;
    +int __read_mostly watchdog_user_enabled;
    +int __read_mostly watchdog_thresh = 10;
    +
    +struct cpumask watchdog_allowed_mask __read_mostly;
    +static bool softlockup_threads_initialized __read_mostly;
    +
    +struct cpumask watchdog_cpumask __read_mostly;
    +unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);
    +
    #ifdef CONFIG_HARDLOCKUP_DETECTOR
    /*
    * Should we panic when a soft-lockup or hard-lockup occurs:
    @@ -85,12 +94,6 @@ static int __init hardlockup_all_cpu_bac
    # endif /* CONFIG_SMP */
    #endif /* CONFIG_HARDLOCKUP_DETECTOR */

    -int __read_mostly watchdog_user_enabled;
    -int __read_mostly watchdog_thresh = 10;
    -
    -struct cpumask watchdog_cpumask __read_mostly;
    -unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);
    -
    /*
    * These functions can be overridden if an architecture implements its
    * own hardlockup detector.
    @@ -113,7 +116,7 @@ void __weak watchdog_nmi_disable(unsigne
    * watchdog_nmi_reconfigure can be implemented to be notified after any
    * watchdog configuration change. The arch hardlockup watchdog should
    * respond to the following variables:
    - * - nmi_watchdog_enabled
    + * - watchdog_enabled
    * - watchdog_thresh
    * - watchdog_cpumask
    * - sysctl_hardlockup_all_cpu_backtrace
    @@ -126,10 +129,6 @@ void __weak watchdog_nmi_reconfigure(voi
    /* Global variables, exported for sysctl */
    unsigned int __read_mostly softlockup_panic =
    CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE;
    -int __read_mostly soft_watchdog_enabled;
    -
    -struct cpumask watchdog_allowed_mask __read_mostly;
    -static bool softlockup_threads_initialized __read_mostly;

    static u64 __read_mostly sample_period;

    @@ -606,14 +605,14 @@ static void proc_watchdog_update(void)
    /*
    * common function for watchdog, nmi_watchdog and soft_watchdog parameter
    *
    - * caller | table->data points to | 'which' contains the flag(s)
    - * -------------------|-----------------------|-----------------------------
    - * proc_watchdog | watchdog_user_enabled | NMI_WATCHDOG_ENABLED or'ed
    - * | | with SOFT_WATCHDOG_ENABLED
    - * -------------------|-----------------------|-----------------------------
    - * proc_nmi_watchdog | nmi_watchdog_enabled | NMI_WATCHDOG_ENABLED
    - * -------------------|-----------------------|-----------------------------
    - * proc_soft_watchdog | soft_watchdog_enabled | SOFT_WATCHDOG_ENABLED
    + * caller | table->data points to | 'which'
    + * -------------------|----------------------------|--------------------------
    + * proc_watchdog | watchdog_user_enabled | NMI_WATCHDOG_ENABLED |
    + * | | SOFT_WATCHDOG_ENABLED
    + * -------------------|----------------------------|--------------------------
    + * proc_nmi_watchdog | nmi_watchdog_user_enabled | NMI_WATCHDOG_ENABLED
    + * -------------------|----------------------------|--------------------------
    + * proc_soft_watchdog | soft_watchdog_user_enabled | SOFT_WATCHDOG_ENABLED
    */
    static int proc_watchdog_common(int which, struct ctl_table *table, int write,
    void __user *buffer, size_t *lenp, loff_t *ppos)

    \
     
     \ /
      Last update: 2017-09-12 21:50    [W:3.177 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site