From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751835AbdJXOzE (ORCPT ); Tue, 24 Oct 2017 10:55:04 -0400 Received: from terminus.zytor.com ([65.50.211.136]:45645 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751793AbdJXOy7 (ORCPT ); Tue, 24 Oct 2017 10:54:59 -0400 Date: Tue, 24 Oct 2017 07:50:07 -0700 From: tip-bot for Frederic Weisbecker Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, peterz@infradead.org, efault@gmx.de, cl@linux.com, kernellwp@gmail.com, mingo@kernel.org, lcapitulino@redhat.com, cmetcalf@mellanox.com, torvalds@linux-foundation.org, riel@redhat.com, frederic@kernel.org, paulmck@linux.vnet.ibm.com, tglx@linutronix.de Reply-To: efault@gmx.de, hpa@zytor.com, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@kernel.org, kernellwp@gmail.com, cl@linux.com, cmetcalf@mellanox.com, lcapitulino@redhat.com, paulmck@linux.vnet.ibm.com, tglx@linutronix.de, frederic@kernel.org, torvalds@linux-foundation.org, riel@redhat.com In-Reply-To: <1508850421-10058-4-git-send-email-frederic@kernel.org> References: <1508850421-10058-4-git-send-email-frederic@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] housekeeping: Provide a dynamic off-case to housekeeping_any_cpu() Git-Commit-ID: da65e6d81cc6b51cbcefddca9f69d43e7da7b1c1 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: da65e6d81cc6b51cbcefddca9f69d43e7da7b1c1 Gitweb: https://git.kernel.org/tip/da65e6d81cc6b51cbcefddca9f69d43e7da7b1c1 Author: Frederic Weisbecker AuthorDate: Tue, 24 Oct 2017 15:06:52 +0200 Committer: Ingo Molnar CommitDate: Tue, 24 Oct 2017 15:20:13 +0200 housekeeping: Provide a dynamic off-case to housekeeping_any_cpu() housekeeping_any_cpu() doesn't handle correctly the case where CONFIG_NO_HZ_FULL=y and no CPU is in nohz_full mode. So far no caller needs this but let's prepare to avoid any future surprise. 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-4-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar --- include/linux/housekeeping.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/include/linux/housekeeping.h b/include/linux/housekeeping.h index 3d6a8e6..64d0ee5 100644 --- a/include/linux/housekeeping.h +++ b/include/linux/housekeeping.h @@ -7,25 +7,20 @@ #ifdef CONFIG_NO_HZ_FULL extern cpumask_var_t housekeeping_mask; - -static inline int housekeeping_any_cpu(void) -{ - return cpumask_any_and(housekeeping_mask, cpu_online_mask); -} - 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 void housekeeping_init(void) { } -#endif /* CONFIG_NO_HZ_FULL */ - - static inline const struct cpumask *housekeeping_cpumask(void) { #ifdef CONFIG_NO_HZ_FULL