From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1953551AbdD3JqV (ORCPT ); Sun, 30 Apr 2017 05:46:21 -0400 Received: from terminus.zytor.com ([65.50.211.136]:49643 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946287AbdD3JqM (ORCPT ); Sun, 30 Apr 2017 05:46:12 -0400 Date: Sun, 30 Apr 2017 02:44:55 -0700 From: tip-bot for Sebastian Andrzej Siewior Message-ID: Cc: linux-kernel@vger.kernel.org, mark.rutland@arm.com, tglx@linutronix.de, bigeasy@linutronix.de, hpa@zytor.com, mingo@kernel.org Reply-To: linux-kernel@vger.kernel.org, mark.rutland@arm.com, tglx@linutronix.de, bigeasy@linutronix.de, hpa@zytor.com, mingo@kernel.org In-Reply-To: <1493377266-2205-2-git-send-email-mark.rutland@arm.com> References: <1493377266-2205-2-git-send-email-mark.rutland@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] jump_label: Provide static_key_[enable|/slow_inc]_cpuslocked() Git-Commit-ID: 2006cddf3c2fd6b4114c704229552a903f180c71 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: 2006cddf3c2fd6b4114c704229552a903f180c71 Gitweb: http://git.kernel.org/tip/2006cddf3c2fd6b4114c704229552a903f180c71 Author: Sebastian Andrzej Siewior AuthorDate: Fri, 28 Apr 2017 12:01:05 +0100 Committer: Thomas Gleixner CommitDate: Sun, 30 Apr 2017 11:19:01 +0200 jump_label: Provide static_key_[enable|/slow_inc]_cpuslocked() Provide static_key_[enable|slow_inc]_cpuslocked() variant that don't take cpu_hotplug_lock(). Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Mark Rutland Cc: suzuki.poulose@arm.com Cc: peterz@infradead.org Cc: catalin.marinas@arm.com Cc: will.deacon@arm.com Cc: rostedt@goodmis.org Cc: jbaron@akamai.com Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1493377266-2205-2-git-send-email-mark.rutland@arm.com Signed-off-by: Thomas Gleixner --- include/linux/jump_label.h | 7 +++++++ kernel/jump_label.c | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index d7b17d1..c80d8b1 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -164,6 +164,7 @@ extern void static_key_slow_dec_cpuslocked(struct static_key *key); extern void jump_label_apply_nops(struct module *mod); extern int static_key_count(struct static_key *key); extern void static_key_enable(struct static_key *key); +extern void static_key_enable_cpuslocked(struct static_key *key); extern void static_key_disable(struct static_key *key); extern void static_key_disable_cpuslocked(struct static_key *key); @@ -252,6 +253,11 @@ static inline void static_key_enable(struct static_key *key) static_key_slow_inc(key); } +static inline void static_key_enable_cpuslocked(struct static_key *key) +{ + static_key_enable(key); +} + static inline void static_key_disable(struct static_key *key) { int count = static_key_count(key); @@ -429,6 +435,7 @@ extern bool ____wrong_branch_error(void); */ #define static_branch_enable(x) static_key_enable(&(x)->key) +#define static_branch_enable_cpuslocked(x) static_key_enable_cpuslocked(&(x)->key) #define static_branch_disable(x) static_key_disable(&(x)->key) #define static_branch_disable_cpuslocked(x) static_key_disable_cpuslocked(&(x)->key) diff --git a/kernel/jump_label.c b/kernel/jump_label.c index d71124e..6343f4c 100644 --- a/kernel/jump_label.c +++ b/kernel/jump_label.c @@ -90,6 +90,16 @@ void static_key_enable(struct static_key *key) } EXPORT_SYMBOL_GPL(static_key_enable); +void static_key_enable_cpuslocked(struct static_key *key) +{ + int count = static_key_count(key); + + WARN_ON_ONCE(count < 0 || count > 1); + + if (!count) + static_key_slow_inc_cpuslocked(key); +} + void static_key_disable(struct static_key *key) { int count = static_key_count(key);