mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
static_call: Pull some static_call declarations to the type headers
[ Upstream commit 880cfed3a0
]
Some static call declarations are going to be needed on low level header
files. Move the necessary material to the dedicated static call types
header to avoid inclusion dependency hell.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lkml.kernel.org/r/20210118141223.123667-4-frederic@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
533c293f73
commit
433cd7ca38
3 changed files with 54 additions and 21 deletions
|
@ -107,26 +107,10 @@ extern void arch_static_call_transform(void *site, void *tramp, void *func, bool
|
|||
|
||||
#define STATIC_CALL_TRAMP_ADDR(name) &STATIC_CALL_TRAMP(name)
|
||||
|
||||
/*
|
||||
* __ADDRESSABLE() is used to ensure the key symbol doesn't get stripped from
|
||||
* the symbol table so that objtool can reference it when it generates the
|
||||
* .static_call_sites section.
|
||||
*/
|
||||
#define __static_call(name) \
|
||||
({ \
|
||||
__ADDRESSABLE(STATIC_CALL_KEY(name)); \
|
||||
&STATIC_CALL_TRAMP(name); \
|
||||
})
|
||||
|
||||
#else
|
||||
#define STATIC_CALL_TRAMP_ADDR(name) NULL
|
||||
#endif
|
||||
|
||||
|
||||
#define DECLARE_STATIC_CALL(name, func) \
|
||||
extern struct static_call_key STATIC_CALL_KEY(name); \
|
||||
extern typeof(func) STATIC_CALL_TRAMP(name);
|
||||
|
||||
#define static_call_update(name, func) \
|
||||
({ \
|
||||
BUILD_BUG_ON(!__same_type(*(func), STATIC_CALL_TRAMP(name))); \
|
||||
|
@ -174,7 +158,6 @@ extern int static_call_text_reserved(void *start, void *end);
|
|||
}; \
|
||||
ARCH_DEFINE_STATIC_CALL_NULL_TRAMP(name)
|
||||
|
||||
#define static_call(name) __static_call(name)
|
||||
#define static_call_cond(name) (void)__static_call(name)
|
||||
|
||||
#define EXPORT_STATIC_CALL(name) \
|
||||
|
@ -207,7 +190,6 @@ struct static_call_key {
|
|||
}; \
|
||||
ARCH_DEFINE_STATIC_CALL_NULL_TRAMP(name)
|
||||
|
||||
#define static_call(name) __static_call(name)
|
||||
#define static_call_cond(name) (void)__static_call(name)
|
||||
|
||||
static inline
|
||||
|
@ -252,9 +234,6 @@ struct static_call_key {
|
|||
.func = NULL, \
|
||||
}
|
||||
|
||||
#define static_call(name) \
|
||||
((typeof(STATIC_CALL_TRAMP(name))*)(STATIC_CALL_KEY(name).func))
|
||||
|
||||
static inline void __static_call_nop(void) { }
|
||||
|
||||
/*
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
#include <linux/types.h>
|
||||
#include <linux/stringify.h>
|
||||
#include <linux/compiler.h>
|
||||
|
||||
#define STATIC_CALL_KEY_PREFIX __SCK__
|
||||
#define STATIC_CALL_KEY_PREFIX_STR __stringify(STATIC_CALL_KEY_PREFIX)
|
||||
|
@ -32,4 +33,30 @@ struct static_call_site {
|
|||
s32 key;
|
||||
};
|
||||
|
||||
#define DECLARE_STATIC_CALL(name, func) \
|
||||
extern struct static_call_key STATIC_CALL_KEY(name); \
|
||||
extern typeof(func) STATIC_CALL_TRAMP(name);
|
||||
|
||||
#ifdef CONFIG_HAVE_STATIC_CALL
|
||||
|
||||
/*
|
||||
* __ADDRESSABLE() is used to ensure the key symbol doesn't get stripped from
|
||||
* the symbol table so that objtool can reference it when it generates the
|
||||
* .static_call_sites section.
|
||||
*/
|
||||
#define __static_call(name) \
|
||||
({ \
|
||||
__ADDRESSABLE(STATIC_CALL_KEY(name)); \
|
||||
&STATIC_CALL_TRAMP(name); \
|
||||
})
|
||||
|
||||
#define static_call(name) __static_call(name)
|
||||
|
||||
#else
|
||||
|
||||
#define static_call(name) \
|
||||
((typeof(STATIC_CALL_TRAMP(name))*)(STATIC_CALL_KEY(name).func))
|
||||
|
||||
#endif /* CONFIG_HAVE_STATIC_CALL */
|
||||
|
||||
#endif /* _STATIC_CALL_TYPES_H */
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
#include <linux/types.h>
|
||||
#include <linux/stringify.h>
|
||||
#include <linux/compiler.h>
|
||||
|
||||
#define STATIC_CALL_KEY_PREFIX __SCK__
|
||||
#define STATIC_CALL_KEY_PREFIX_STR __stringify(STATIC_CALL_KEY_PREFIX)
|
||||
|
@ -32,4 +33,30 @@ struct static_call_site {
|
|||
s32 key;
|
||||
};
|
||||
|
||||
#define DECLARE_STATIC_CALL(name, func) \
|
||||
extern struct static_call_key STATIC_CALL_KEY(name); \
|
||||
extern typeof(func) STATIC_CALL_TRAMP(name);
|
||||
|
||||
#ifdef CONFIG_HAVE_STATIC_CALL
|
||||
|
||||
/*
|
||||
* __ADDRESSABLE() is used to ensure the key symbol doesn't get stripped from
|
||||
* the symbol table so that objtool can reference it when it generates the
|
||||
* .static_call_sites section.
|
||||
*/
|
||||
#define __static_call(name) \
|
||||
({ \
|
||||
__ADDRESSABLE(STATIC_CALL_KEY(name)); \
|
||||
&STATIC_CALL_TRAMP(name); \
|
||||
})
|
||||
|
||||
#define static_call(name) __static_call(name)
|
||||
|
||||
#else
|
||||
|
||||
#define static_call(name) \
|
||||
((typeof(STATIC_CALL_TRAMP(name))*)(STATIC_CALL_KEY(name).func))
|
||||
|
||||
#endif /* CONFIG_HAVE_STATIC_CALL */
|
||||
|
||||
#endif /* _STATIC_CALL_TYPES_H */
|
||||
|
|
Loading…
Reference in a new issue