Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Edward Cree <ecree@solarflare.com>
Subject: [RFC PATCH 1/2] static_call: fix out-of-line static call
 implementation
To:     Nadav Amit <namit@vmware.com>, Josh Poimboeuf <jpoimboe@redhat.com>
CC:     <linux-kernel@vger.kernel.org>, <x86@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
References: <cf6e9449-f3f6-e0fc-8096-eaba6b5a3b97@solarflare.com>
Message-ID: <51f7404c-9be7-fed5-7815-cefaab2d3c62@solarflare.com>
Date:   Wed, 12 Dec 2018 17:50:02 +0000
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.5.2
MIME-Version: 1.0
In-Reply-To: <cf6e9449-f3f6-e0fc-8096-eaba6b5a3b97@solarflare.com>
Content-Type: text/plain; charset="utf-8"
Content-Language: en-GB
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Actually call __static_call_update() from static_call_update(), and fix the
 former so it can actually compile.  Also make it update key.func.

Signed-off-by: Edward Cree <ecree@solarflare.com>
---
 include/linux/static_call.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/linux/static_call.h b/include/linux/static_call.h
index 6daff586c97d..38d6c1e4c85d 100644
--- a/include/linux/static_call.h
+++ b/include/linux/static_call.h
@@ -153,16 +153,18 @@ struct static_call_key {
 
 #define static_call(key, args...) STATIC_CALL_TRAMP(key)(args)
 
-#define __static_call_update(key, func)					\
+#define __static_call_update(key, _func)				\
 ({									\
 	cpus_read_lock();						\
-	arch_static_call_transform(NULL, key->tramp, func);		\
+	arch_static_call_transform(NULL, key.tramp, _func);		\
+	WRITE_ONCE(key.func, _func);					\
 	cpus_read_unlock();						\
 })
 
 #define static_call_update(key, func)					\
 ({									\
 	BUILD_BUG_ON(!__same_type(func, STATIC_CALL_TRAMP(key)));	\
+	__static_call_update(key, func);				\
 })
 
 #define EXPORT_STATIC_CALL(key)						\