From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932275AbdJXOzv (ORCPT ); Tue, 24 Oct 2017 10:55:51 -0400 Received: from terminus.zytor.com ([65.50.211.136]:38801 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751427AbdJXOzq (ORCPT ); Tue, 24 Oct 2017 10:55:46 -0400 Date: Tue, 24 Oct 2017 07:50:56 -0700 From: tip-bot for Frederic Weisbecker Message-ID: Cc: hpa@zytor.com, peterz@infradead.org, cmetcalf@mellanox.com, paulmck@linux.vnet.ibm.com, cl@linux.com, tglx@linutronix.de, lcapitulino@redhat.com, mingo@kernel.org, efault@gmx.de, kernellwp@gmail.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, riel@redhat.com, frederic@kernel.org Reply-To: riel@redhat.com, frederic@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, kernellwp@gmail.com, mingo@kernel.org, tglx@linutronix.de, lcapitulino@redhat.com, efault@gmx.de, cl@linux.com, cmetcalf@mellanox.com, paulmck@linux.vnet.ibm.com, peterz@infradead.org, hpa@zytor.com In-Reply-To: <1508850421-10058-6-git-send-email-frederic@kernel.org> References: <1508850421-10058-6-git-send-email-frederic@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] housekeeping: Use its own static key Git-Commit-ID: a8269e3baec363b58348208719f08c9c313b1bdf 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: a8269e3baec363b58348208719f08c9c313b1bdf Gitweb: https://git.kernel.org/tip/a8269e3baec363b58348208719f08c9c313b1bdf Author: Frederic Weisbecker AuthorDate: Tue, 24 Oct 2017 15:06:54 +0200 Committer: Ingo Molnar CommitDate: Tue, 24 Oct 2017 15:20:14 +0200 housekeeping: Use its own static key Housekeeping code still depends on nohz_full static key. Since we want to decouple housekeeping from nohz, let's create a housekeeping own static key. It's mostly relevant for calls to is_housekeeping_cpu() from the scheduler. 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-6-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar --- include/linux/housekeeping.h | 3 ++- kernel/housekeeping.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/linux/housekeeping.h b/include/linux/housekeeping.h index 31a1401..cbe8d63 100644 --- a/include/linux/housekeeping.h +++ b/include/linux/housekeeping.h @@ -6,6 +6,7 @@ #include #ifdef CONFIG_NO_HZ_FULL +DECLARE_STATIC_KEY_FALSE(housekeeping_overriden); extern int housekeeping_any_cpu(void); extern const struct cpumask *housekeeping_cpumask(void); extern void housekeeping_affine(struct task_struct *t); @@ -31,7 +32,7 @@ static inline void housekeeping_init(void) { } static inline bool is_housekeeping_cpu(int cpu) { #ifdef CONFIG_NO_HZ_FULL - if (tick_nohz_full_enabled()) + if (static_branch_unlikely(&housekeeping_overriden)) return housekeeping_test_cpu(cpu); #endif return true; diff --git a/kernel/housekeeping.c b/kernel/housekeeping.c index 0e70dc8..272c344 100644 --- a/kernel/housekeeping.c +++ b/kernel/housekeeping.c @@ -10,12 +10,15 @@ #include #include #include +#include +DEFINE_STATIC_KEY_FALSE(housekeeping_overriden); +EXPORT_SYMBOL_GPL(housekeeping_overriden); static cpumask_var_t housekeeping_mask; int housekeeping_any_cpu(void) { - if (tick_nohz_full_enabled()) + if (static_branch_unlikely(&housekeeping_overriden)) return cpumask_any_and(housekeeping_mask, cpu_online_mask); return smp_processor_id(); @@ -23,7 +26,7 @@ int housekeeping_any_cpu(void) const struct cpumask *housekeeping_cpumask(void) { - if (tick_nohz_full_enabled()) + if (static_branch_unlikely(&housekeeping_overriden)) return housekeeping_mask; return cpu_possible_mask; @@ -31,19 +34,18 @@ const struct cpumask *housekeeping_cpumask(void) void housekeeping_affine(struct task_struct *t) { - if (tick_nohz_full_enabled()) + if (static_branch_unlikely(&housekeeping_overriden)) set_cpus_allowed_ptr(t, housekeeping_mask); } bool housekeeping_test_cpu(int cpu) { - if (tick_nohz_full_enabled()) + if (static_branch_unlikely(&housekeeping_overriden)) return cpumask_test_cpu(cpu, housekeeping_mask); return true; } - void __init housekeeping_init(void) { if (!tick_nohz_full_enabled()) @@ -59,6 +61,8 @@ void __init housekeeping_init(void) cpumask_andnot(housekeeping_mask, cpu_possible_mask, tick_nohz_full_mask); + static_branch_enable(&housekeeping_overriden); + /* We need at least one CPU to handle housekeeping work */ WARN_ON_ONCE(cpumask_empty(housekeeping_mask)); }