[PATCH bpf-next] bpf/local_storage: Fix build without CONFIG_CGROUP

[PATCH bpf-next] bpf/local_storage: Fix build without CONFIG_CGROUP

[YiFei Zhu]

From: YiFei Zhu <zhuyifei@google.com>

local_storage.o has its compile guard as CONFIG_BPF_SYSCALL, which
does not imply that CONFIG_CGROUP is on. Including cgroup-internal.h
when CONFIG_CGROUP is off cause a compilation failure.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: f67cfc233706 ("bpf: Make cgroup storages shared between programs on the same cgroup")
Signed-off-by: YiFei Zhu <zhuyifei@google.com>
---
 kernel/bpf/local_storage.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/bpf/local_storage.c b/kernel/bpf/local_storage.c
index 3b2c70197d78..571bb351ed3b 100644
--- a/kernel/bpf/local_storage.c
+++ b/kernel/bpf/local_storage.c
@@ -9,12 +9,12 @@
 #include <linux/slab.h>
 #include <uapi/linux/btf.h>
 
-#include "../cgroup/cgroup-internal.h"
-
 DEFINE_PER_CPU(struct bpf_cgroup_storage*, bpf_cgroup_storage[MAX_BPF_CGROUP_STORAGE_TYPE]);
 
 #ifdef CONFIG_CGROUP_BPF
 
+#include "../cgroup/cgroup-internal.h"
+
 #define LOCAL_STORAGE_CREATE_FLAG_MASK					\
 	(BPF_F_NUMA_NODE | BPF_F_ACCESS_MASK)
 
-- 
2.27.0

Re: [PATCH bpf-next] bpf/local_storage: Fix build without CONFIG_CGROUP

[Alexei Starovoitov]

On Fri, Jul 24, 2020 at 2:18 PM YiFei Zhu <zhuyifei1999@gmail.com> wrote:
>
> From: YiFei Zhu <zhuyifei@google.com>
>
> local_storage.o has its compile guard as CONFIG_BPF_SYSCALL, which
> does not imply that CONFIG_CGROUP is on. Including cgroup-internal.h
> when CONFIG_CGROUP is off cause a compilation failure.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Fixes: f67cfc233706 ("bpf: Make cgroup storages shared between programs on the same cgroup")
> Signed-off-by: YiFei Zhu <zhuyifei@google.com>

Applied. Thanks