2022-03-11 21:05:36

by Hao Luo

Subject: [PATCH bpf-next] 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.

Suggested-by: Andrii Nakryiko <[email protected]>
Cc: Yonghong Song <[email protected]>
Signed-off-by: Hao Luo <[email protected]>
---
include/linux/compiler_types.h | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index b9a8ae9440c7..1bc760ba400c 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -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
--
2.35.1.723.g4982287a31-goog

2022-03-11 21:48:03

by patchwork-bot+netdevbpf

Subject: Re: [PATCH bpf-next] compiler_types: Refactor the use of btf_type_tag attribute.

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Alexei Starovoitov <[email protected]>:

On Thu, 10 Mar 2022 13:16:55 -0800 you wrote:
> 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.
>
> [...]

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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

2022-03-11 23:29:18

by Yonghong Song

Subject: Re: [PATCH bpf-next] compiler_types: Refactor the use of btf_type_tag attribute.

On 3/10/22 1:16 PM, Hao Luo wrote:
> 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.
>
> Suggested-by: Andrii Nakryiko <[email protected]>
> Cc: Yonghong Song <[email protected]>
> Signed-off-by: Hao Luo <[email protected]>

LGTM. Thanks!

Acked-by: Yonghong Song <[email protected]>