From: Josh Poimboeuf <jpoimboe@kernel.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>,
Mark Rutland <mark.rutland@arm.com>,
Jason Baron <jbaron@akamai.com>,
Steven Rostedt <rostedt@goodmis.org>,
Ard Biesheuvel <ardb@kernel.org>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Sami Tolvanen <samitolvanen@google.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Will McVicker <willmcvicker@google.com>,
Kees Cook <keescook@chromium.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2.1 02/11] static_call: Flip key type union bit
Date: Tue, 21 Mar 2023 22:03:06 -0700 [thread overview]
Message-ID: <20230322050306.zizbrqc2hwl5s4tj@treble> (raw)
In-Reply-To: <a7f3a10a7dedfd41cc25bdc5bf35e74d3483a684.1679456900.git.jpoimboe@kernel.org>
Flip the meaning of the key->type union field. This will make it easier
to converge some of the DECLARE_STATIC_CALL() macros.
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
include/linux/static_call.h | 3 ---
include/linux/static_call_types.h | 4 ++--
kernel/static_call_inline.c | 8 ++++----
tools/include/linux/static_call_types.h | 4 ++--
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/include/linux/static_call.h b/include/linux/static_call.h
index 141e6b176a1b..f984b8f6d974 100644
--- a/include/linux/static_call.h
+++ b/include/linux/static_call.h
@@ -186,7 +186,6 @@ extern long __static_call_return0(void);
DECLARE_STATIC_CALL(name, _func); \
struct static_call_key STATIC_CALL_KEY(name) = { \
.func = _func, \
- .type = 1, \
}; \
ARCH_DEFINE_STATIC_CALL_TRAMP(name, _func)
@@ -194,7 +193,6 @@ extern long __static_call_return0(void);
DECLARE_STATIC_CALL(name, _func); \
struct static_call_key STATIC_CALL_KEY(name) = { \
.func = NULL, \
- .type = 1, \
}; \
ARCH_DEFINE_STATIC_CALL_NULL_TRAMP(name)
@@ -202,7 +200,6 @@ extern long __static_call_return0(void);
DECLARE_STATIC_CALL(name, _func); \
struct static_call_key STATIC_CALL_KEY(name) = { \
.func = __static_call_return0, \
- .type = 1, \
}; \
ARCH_DEFINE_STATIC_CALL_RET0_TRAMP(name)
diff --git a/include/linux/static_call_types.h b/include/linux/static_call_types.h
index 87c3598609e8..c4c4efb6f6fa 100644
--- a/include/linux/static_call_types.h
+++ b/include/linux/static_call_types.h
@@ -61,10 +61,10 @@ struct static_call_site {
struct static_call_key {
void *func;
union {
- /* bit 0: 0 = mods, 1 = sites */
+ /* bit 0: 0 = sites, 1 = mods */
unsigned long type;
- struct static_call_mod *_mods;
struct static_call_site *_sites;
+ struct static_call_mod *_mods;
};
};
diff --git a/kernel/static_call_inline.c b/kernel/static_call_inline.c
index 1328370d3cf6..41f6bda6773a 100644
--- a/kernel/static_call_inline.c
+++ b/kernel/static_call_inline.c
@@ -112,7 +112,7 @@ static inline void static_call_sort_entries(struct static_call_site *start,
static inline bool static_call_key_has_mods(struct static_call_key *key)
{
- return !(key->type & 1);
+ return !!(key->type & 1);
}
static inline struct static_call_mod *static_call_key_mods(struct static_call_key *key)
@@ -120,12 +120,13 @@ static inline struct static_call_mod *static_call_key_mods(struct static_call_ke
if (!static_call_key_has_mods(key))
return NULL;
- return key->_mods;
+ return (struct static_call_mod *)(key->type & ~1);
}
static inline void static_call_key_set_mods(struct static_call_key *key, struct static_call_mod *mods)
{
key->_mods = mods;
+ key->type |= 1;
}
static inline struct static_call_site *static_call_key_sites(struct static_call_key *key)
@@ -133,13 +134,12 @@ static inline struct static_call_site *static_call_key_sites(struct static_call_
if (static_call_key_has_mods(key))
return NULL;
- return (struct static_call_site *)(key->type & ~1);
+ return key->_sites;
}
static inline void static_call_key_set_sites(struct static_call_key *key, struct static_call_site *sites)
{
key->_sites = sites;
- key->type |= 1;
}
void __static_call_update(struct static_call_key *key, void *tramp, void *func)
diff --git a/tools/include/linux/static_call_types.h b/tools/include/linux/static_call_types.h
index 87c3598609e8..c4c4efb6f6fa 100644
--- a/tools/include/linux/static_call_types.h
+++ b/tools/include/linux/static_call_types.h
@@ -61,10 +61,10 @@ struct static_call_site {
struct static_call_key {
void *func;
union {
- /* bit 0: 0 = mods, 1 = sites */
+ /* bit 0: 0 = sites, 1 = mods */
unsigned long type;
- struct static_call_mod *_mods;
struct static_call_site *_sites;
+ struct static_call_mod *_mods;
};
};
--
2.39.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-03-22 5:04 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-22 4:00 [PATCH v2 00/11] static_call: Improve NULL/ret0 handling Josh Poimboeuf
2023-03-22 4:00 ` [PATCH v2 01/11] static_call: Improve key type abstraction Josh Poimboeuf
2023-03-22 4:53 ` Josh Poimboeuf
2023-03-22 5:02 ` [PATCH v2.1 " Josh Poimboeuf
2023-03-22 4:00 ` [PATCH v2 02/11] static_call: Flip key type union bit Josh Poimboeuf
2023-03-22 5:03 ` Josh Poimboeuf [this message]
2023-03-22 4:00 ` [PATCH v2 03/11] static_call: Remove static_call_mod_init() declaration Josh Poimboeuf
2023-03-22 4:00 ` [PATCH v2 04/11] static_call: Remove static_call.h dependency on cpu.h Josh Poimboeuf
2023-03-22 4:00 ` [PATCH v2 05/11] static_call: Make ARCH_ADD_TRAMP_KEY() generic Josh Poimboeuf
2023-03-22 4:00 ` [PATCH v2 06/11] static_call: "EXPORT_STATIC_CALL_TRAMP" -> "EXPORT_STATIC_CALL_RO" Josh Poimboeuf
2023-03-22 4:00 ` [PATCH v2 07/11] static_call: Reorganize static call headers Josh Poimboeuf
2023-03-22 4:00 ` [PATCH v2 08/11] arm64/static_call: Fix static call CFI violations Josh Poimboeuf
2023-03-22 12:22 ` Mark Rutland
2023-03-22 14:19 ` Peter Zijlstra
2023-03-22 18:26 ` Josh Poimboeuf
2023-03-22 18:09 ` Josh Poimboeuf
2023-03-22 18:07 ` Sami Tolvanen
2023-03-22 18:33 ` Josh Poimboeuf
2023-03-22 4:00 ` [PATCH v2 09/11] static_call: Make NULL static calls consistent Josh Poimboeuf
2023-03-22 14:45 ` Peter Zijlstra
2023-03-22 14:59 ` Peter Zijlstra
2023-03-22 18:35 ` Josh Poimboeuf
2023-03-22 15:04 ` Christophe Leroy
2023-03-22 4:00 ` [PATCH v2 10/11] static_call: Remove static_call_cond() Josh Poimboeuf
2023-03-22 4:00 ` [PATCH v2 11/11] static_call: Remove DEFINE_STATIC_CALL_RET0() Josh Poimboeuf
2023-03-22 15:04 ` Christophe Leroy
2023-03-22 18:50 ` Josh Poimboeuf
2023-03-22 15:15 ` Peter Zijlstra
2023-03-22 18:45 ` Josh Poimboeuf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230322050306.zizbrqc2hwl5s4tj@treble \
--to=jpoimboe@kernel.org \
--cc=ardb@kernel.org \
--cc=christophe.leroy@csgroup.eu \
--cc=jbaron@akamai.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=ndesaulniers@google.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=samitolvanen@google.com \
--cc=seanjc@google.com \
--cc=willmcvicker@google.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox