[PATCH bpf-next v2] bpf: fix bpf_trampoline_{,un}link_cgroup_shim ifdef guards

[PATCH bpf-next v2] bpf: fix bpf_trampoline_{,un}link_cgroup_shim ifdef guards

[Stanislav Fomichev]

They were updated in kernel/bpf/trampoline.c to fix another build
issue. We should to do the same for include/linux/bpf.h header.

v2:
- Martin: bpf_trampoline_link_cgroup_shim should be fixed as well

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 3908fcddc65d ("bpf: fix lsm_cgroup build errors on esoteric configs")
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
 include/linux/bpf.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index a5bf00649995..11950029284f 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -1254,9 +1254,6 @@ struct bpf_dummy_ops {
 int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr,
 			    union bpf_attr __user *uattr);
 #endif
-int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
-				    int cgroup_atype);
-void bpf_trampoline_unlink_cgroup_shim(struct bpf_prog *prog);
 #else
 static inline const struct bpf_struct_ops *bpf_struct_ops_find(u32 type_id)
 {
@@ -1280,6 +1277,13 @@ static inline int bpf_struct_ops_map_sys_lookup_elem(struct bpf_map *map,
 {
 	return -EINVAL;
 }
+#endif
+
+#if defined(CONFIG_CGROUP_BPF) && defined(CONFIG_BPF_LSM)
+int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
+				    int cgroup_atype);
+void bpf_trampoline_unlink_cgroup_shim(struct bpf_prog *prog);
+#else
 static inline int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
 						  int cgroup_atype)
 {
-- 
2.37.0.170.g444d1eabd0-goog

Re: [PATCH bpf-next v2] bpf: fix bpf_trampoline_{,un}link_cgroup_shim ifdef guards

[Martin KaFai Lau]

On Wed, Jul 20, 2022 at 08:52:20AM -0700, Stanislav Fomichev wrote:
> They were updated in kernel/bpf/trampoline.c to fix another build
> issue. We should to do the same for include/linux/bpf.h header.
> 
> v2:
> - Martin: bpf_trampoline_link_cgroup_shim should be fixed as well
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Fixes: 3908fcddc65d ("bpf: fix lsm_cgroup build errors on esoteric configs")
Acked-by: Martin KaFai Lau <kafai@fb.com>

Re: [PATCH bpf-next v2] bpf: fix bpf_trampoline_{,un}link_cgroup_shim ifdef guards

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:

On Wed, 20 Jul 2022 08:52:20 -0700 you wrote:
> They were updated in kernel/bpf/trampoline.c to fix another build
> issue. We should to do the same for include/linux/bpf.h header.
> 
> v2:
> - Martin: bpf_trampoline_link_cgroup_shim should be fixed as well
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Fixes: 3908fcddc65d ("bpf: fix lsm_cgroup build errors on esoteric configs")
> Signed-off-by: Stanislav Fomichev <sdf@google.com>
> 
> [...]

Here is the summary with links:
  - [bpf-next,v2] bpf: fix bpf_trampoline_{,un}link_cgroup_shim ifdef guards
    https://git.kernel.org/bpf/bpf-next/c/9cb61fda8c71

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html