From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932210AbdJXOzW (ORCPT ); Tue, 24 Oct 2017 10:55:22 -0400 Received: from terminus.zytor.com ([65.50.211.136]:33665 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751663AbdJXOzU (ORCPT ); Tue, 24 Oct 2017 10:55:20 -0400 Date: Tue, 24 Oct 2017 07:50:31 -0700 From: tip-bot for Frederic Weisbecker Message-ID: Cc: tglx@linutronix.de, torvalds@linux-foundation.org, hpa@zytor.com, mingo@kernel.org, lcapitulino@redhat.com, peterz@infradead.org, kernellwp@gmail.com, cmetcalf@mellanox.com, frederic@kernel.org, riel@redhat.com, linux-kernel@vger.kernel.org, cl@linux.com, paulmck@linux.vnet.ibm.com, efault@gmx.de Reply-To: frederic@kernel.org, kernellwp@gmail.com, cmetcalf@mellanox.com, efault@gmx.de, paulmck@linux.vnet.ibm.com, riel@redhat.com, cl@linux.com, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, lcapitulino@redhat.com, peterz@infradead.org In-Reply-To: <1508850421-10058-5-git-send-email-frederic@kernel.org> References: <1508850421-10058-5-git-send-email-frederic@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] housekeeping: Make housekeeping cpumask private Git-Commit-ID: 9ff138bdbcf1175c138c7f89a9daa918b51bc33a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9ff138bdbcf1175c138c7f89a9daa918b51bc33a Gitweb: https://git.kernel.org/tip/9ff138bdbcf1175c138c7f89a9daa918b51bc33a Author: Frederic Weisbecker AuthorDate: Tue, 24 Oct 2017 15:06:53 +0200 Committer: Ingo Molnar CommitDate: Tue, 24 Oct 2017 15:20:14 +0200 housekeeping: Make housekeeping cpumask private Nobody needs to access this detail. housekeeping_cpumask() already takes care about it. Signed-off-by: Frederic Weisbecker Cc: Chris Metcalf Cc: Christoph Lameter Cc: Linus Torvalds Cc: Luiz Capitulino Cc: Mike Galbraith Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner Cc: Wanpeng Li Link: http://lkml.kernel.org/r/1508850421-10058-5-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar --- include/linux/housekeeping.h | 31 ++++++++++--------------------- kernel/housekeeping.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/include/linux/housekeeping.h b/include/linux/housekeeping.h index 64d0ee5..31a1401 100644 --- a/include/linux/housekeeping.h +++ b/include/linux/housekeeping.h @@ -6,46 +6,35 @@ #include #ifdef CONFIG_NO_HZ_FULL -extern cpumask_var_t housekeeping_mask; +extern int housekeeping_any_cpu(void); +extern const struct cpumask *housekeeping_cpumask(void); +extern void housekeeping_affine(struct task_struct *t); +extern bool housekeeping_test_cpu(int cpu); extern void __init housekeeping_init(void); + #else -static inline void housekeeping_init(void) { } -#endif /* CONFIG_NO_HZ_FULL */ static inline int housekeeping_any_cpu(void) { -#ifdef CONFIG_NO_HZ_FULL - if (tick_nohz_full_enabled()) - return cpumask_any_and(housekeeping_mask, cpu_online_mask); -#endif return smp_processor_id(); } static inline const struct cpumask *housekeeping_cpumask(void) { -#ifdef CONFIG_NO_HZ_FULL - if (tick_nohz_full_enabled()) - return housekeeping_mask; -#endif return cpu_possible_mask; } +static inline void housekeeping_affine(struct task_struct *t) { } +static inline void housekeeping_init(void) { } +#endif /* CONFIG_NO_HZ_FULL */ + static inline bool is_housekeeping_cpu(int cpu) { #ifdef CONFIG_NO_HZ_FULL if (tick_nohz_full_enabled()) - return cpumask_test_cpu(cpu, housekeeping_mask); + return housekeeping_test_cpu(cpu); #endif return true; } -static inline void housekeeping_affine(struct task_struct *t) -{ -#ifdef CONFIG_NO_HZ_FULL - if (tick_nohz_full_enabled()) - set_cpus_allowed_ptr(t, housekeeping_mask); - -#endif -} - #endif /* _LINUX_HOUSEKEEPING_H */ diff --git a/kernel/housekeeping.c b/kernel/housekeeping.c index b41c52e..0e70dc8 100644 --- a/kernel/housekeeping.c +++ b/kernel/housekeeping.c @@ -11,7 +11,38 @@ #include #include -cpumask_var_t housekeeping_mask; +static cpumask_var_t housekeeping_mask; + +int housekeeping_any_cpu(void) +{ + if (tick_nohz_full_enabled()) + return cpumask_any_and(housekeeping_mask, cpu_online_mask); + + return smp_processor_id(); +} + +const struct cpumask *housekeeping_cpumask(void) +{ + if (tick_nohz_full_enabled()) + return housekeeping_mask; + + return cpu_possible_mask; +} + +void housekeeping_affine(struct task_struct *t) +{ + if (tick_nohz_full_enabled()) + set_cpus_allowed_ptr(t, housekeeping_mask); +} + +bool housekeeping_test_cpu(int cpu) +{ + if (tick_nohz_full_enabled()) + return cpumask_test_cpu(cpu, housekeeping_mask); + + return true; +} + void __init housekeeping_init(void) {