compiler_types: Refactor the use of btf_type_tag attribute.
PATCH 1/1 compiler_types: Refactor the use of btf_type_tag attribute.
Previous patches have introduced the compiler attribute btf_type_tag for __user and __percpu. The availability of this attribute depends on some CONFIGs and compiler support. This patch refactors the use of btf_type_tag by introducing BTF_TYPE_TAG, which hides all the dependencies.
No functional change.
--- include/linux/compiler_types.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
include/linux/compiler_types.h +9 -10
@@ -4,6 +4,13 @@#ifndef __ASSEMBLY__ +#if defined(CONFIG_DEBUG_INFO_BTF ) && defined(CONFIG_PAHOLE_HAS_BTF_TAG ) && \ +__has_attribute (btf_type_tag) +# define BTF_TYPE_TAG (value) __attribute__((btf_type_tag(#value))) +#else +# define BTF_TYPE_TAG (value)/* nothing */ +#endif +#ifdef __CHECKER__/* address spaces */ # define __kernel __attribute__((address_space(0)))
@@ -31,19 +38,11 @@ static inline void __chk_io_ptr(const volatile void __iomem *ptr) { }# define __kernel# ifdef STRUCTLEAK_PLUGIN # define __user __attribute__((user)) -# elif defined(CONFIG_DEBUG_INFO_BTF ) && defined(CONFIG_PAHOLE_HAS_BTF_TAG ) && \ -__has_attribute (btf_type_tag) -# define __user __attribute__((btf_type_tag("user")))# else -# define __user +# define __user BTF_TYPE_TAG(user)# endif # define __iomem -# if defined(CONFIG_DEBUG_INFO_BTF ) && defined(CONFIG_PAHOLE_HAS_BTF_TAG ) && \ -__has_attribute (btf_type_tag) -# define __percpu __attribute__((btf_type_tag("percpu"))) -# else -# define __percpu -# endif +# define __percpu BTF_TYPE_TAG(percpu)# define __rcu# define __chk_user_ptr (x) (void)0# define __chk_io_ptr (x) (void)0
Signature · 1 line
2.35.1.723.g4982287a31-goog
Quoted 11 lines · Hao Luo
Previous patches have introduced the compiler attribute
btf_type_tagfor__userand__percpu. The availability of this attribute depends on some CONFIGs and compiler support. This patch refactors the use ofbtf_type_tagby introducingBTF_TYPE_TAG, which hides all the dependencies.No functional change.
Suggested-by Andrii Nakryiko <[email protected]>Cc Yonghong Song <[email protected]>Signed-off-by Hao Luo <[email protected]>
LGTM. Thanks!
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Thu, 10 Mar 2022 13:16:55 -0800 you wrote:
Previous patches have introduced the compiler attribute
btf_type_tagfor__userand__percpu. The availability of this attribute depends on some CONFIGs and compiler support. This patch refactors the use ofbtf_type_tagby introducingBTF_TYPE_TAG, which hides all the dependencies.No functional change.
[...]
Here is the summary with links:
- [bpf-next] compiler_types: Refactor the use of btf_type_tag attribute.
https://git.kernel.org/bpf/bpf-next/c/6789ab9668d9
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html