From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752649AbdJ0MIR (ORCPT ); Fri, 27 Oct 2017 08:08:17 -0400 Received: from terminus.zytor.com ([65.50.211.136]:45431 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752190AbdJ0MIN (ORCPT ); Fri, 27 Oct 2017 08:08:13 -0400 Date: Fri, 27 Oct 2017 05:02:37 -0700 From: tip-bot for Frederic Weisbecker Message-ID: Cc: paulmck@linux.vnet.ibm.com, peterz@infradead.org, kernellwp@gmail.com, cmetcalf@mellanox.com, riel@redhat.com, tglx@linutronix.de, torvalds@linux-foundation.org, cl@linux.com, efault@gmx.de, linux-kernel@vger.kernel.org, mingo@kernel.org, frederic@kernel.org, lcapitulino@redhat.com, hpa@zytor.com Reply-To: peterz@infradead.org, paulmck@linux.vnet.ibm.com, kernellwp@gmail.com, cmetcalf@mellanox.com, riel@redhat.com, cl@linux.com, efault@gmx.de, torvalds@linux-foundation.org, tglx@linutronix.de, hpa@zytor.com, lcapitulino@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, frederic@kernel.org In-Reply-To: <1509072159-31808-4-git-send-email-frederic@kernel.org> References: <1509072159-31808-4-git-send-email-frederic@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/isolation: Provide a dynamic off-case to housekeeping_any_cpu() Git-Commit-ID: 9f0ca2d97ef0b5e966be2cfef26c7c094ec14e41 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: 9f0ca2d97ef0b5e966be2cfef26c7c094ec14e41 Gitweb: https://git.kernel.org/tip/9f0ca2d97ef0b5e966be2cfef26c7c094ec14e41 Author: Frederic Weisbecker AuthorDate: Fri, 27 Oct 2017 04:42:30 +0200 Committer: Ingo Molnar CommitDate: Fri, 27 Oct 2017 09:55:26 +0200 sched/isolation: 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 Acked-by: Thomas Gleixner 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: Wanpeng Li Link: http://lkml.kernel.org/r/1509072159-31808-4-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar --- include/linux/sched/isolation.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/include/linux/sched/isolation.h b/include/linux/sched/isolation.h index b7cfbc4..040df04 100644 --- a/include/linux/sched/isolation.h +++ b/include/linux/sched/isolation.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