selftests/bpf: Fix SIGSEGV, failure in cgrp_local_storage test

root@qemu-armhf:/usr/libexec/kselftests-bpf# /linux/tools/testing/selftests/bpf/./test_progs -w0 -a cgrp_local_storage
cgrp2_local_storage:PASS:join_cgroup /cgrp_local_storage 0 nsec
torvalds#64      cgrp_local_storage:FAIL
Caught signal torvalds#11!
Stack trace:
Segmentation fault

test_cgroup_iter_sleepable:PASS:skel_open 0 nsec
test_cgroup_iter_sleepable:PASS:skel_load 0 nsec
test_cgroup_iter_sleepable:PASS:attach_iter 0 nsec
test_cgroup_iter_sleepable:PASS:iter_create 0 nsec
test_cgroup_iter_sleepable:FAIL:cgroup_id unexpected cgroup_id: actual 4294967311 != expected 15
torvalds#64/11   cgrp_local_storage/cgrp1_iter_sleepable:FAIL

Signed-off-by: Tony Ambardar <[email protected]>

Author: guidosarducci

tools/testing/selftests/bpf/prog_tests/cgrp_local_storage.c

@@ -37,7 +37,7 @@ static void cgroup_mode_value_init(bool cgroup, int hid)
 static void test_tp_btf(int cgroup_fd)
 {
 	struct cgrp_ls_tp_btf *skel;
-	long val1 = 1, val2 = 0;
+	__s64 val1 = 1, val2 = 0;
 	int err;
 
 	skel = cgrp_ls_tp_btf__open_and_load();
@@ -310,7 +310,8 @@ static void cgrp2_local_storage(void)
 
 static void cgrp1_local_storage(void)
 {
-	int cgrp1_fd, cgrp1_hid, cgrp1_id, err;
+	__u64 cgrp1_id;
+	int cgrp1_fd, cgrp1_hid, err;
 
 	/* Setup cgroup1 hierarchy */
 	err = setup_classid_environment();

tools/testing/selftests/bpf/progs/cgrp_ls_negative.c

@@ -11,7 +11,7 @@ struct {
 	__uint(type, BPF_MAP_TYPE_CGRP_STORAGE);
 	__uint(map_flags, BPF_F_NO_PREALLOC);
 	__type(key, int);
-	__type(value, long);
+	__type(value, __s64);
 } map_a SEC(".maps");
 
 SEC("tp_btf/sys_enter")

tools/testing/selftests/bpf/progs/cgrp_ls_recursion.c

@@ -11,14 +11,14 @@ struct {
 	__uint(type, BPF_MAP_TYPE_CGRP_STORAGE);
 	__uint(map_flags, BPF_F_NO_PREALLOC);
 	__type(key, int);
-	__type(value, long);
+	__type(value, __s64);
 } map_a SEC(".maps");
 
 struct {
 	__uint(type, BPF_MAP_TYPE_CGRP_STORAGE);
 	__uint(map_flags, BPF_F_NO_PREALLOC);
 	__type(key, int);
-	__type(value, long);
+	__type(value, __s64);
 } map_b SEC(".maps");
 
 int target_hid = 0;

tools/testing/selftests/bpf/progs/cgrp_ls_sleepable.c

@@ -11,7 +11,7 @@ struct {
 	__uint(type, BPF_MAP_TYPE_CGRP_STORAGE);
 	__uint(map_flags, BPF_F_NO_PREALLOC);
 	__type(key, int);
-	__type(value, long);
+	__type(value, __s64);
 } map_a SEC(".maps");
 
 __s32 target_pid;

tools/testing/selftests/bpf/progs/cgrp_ls_tp_btf.c

@@ -11,14 +11,14 @@ struct {
 	__uint(type, BPF_MAP_TYPE_CGRP_STORAGE);
 	__uint(map_flags, BPF_F_NO_PREALLOC);
 	__type(key, int);
-	__type(value, long);
+	__type(value, __s64);
 } map_a SEC(".maps");
 
 struct {
 	__uint(type, BPF_MAP_TYPE_CGRP_STORAGE);
 	__uint(map_flags, BPF_F_NO_PREALLOC);
 	__type(key, int);
-	__type(value, long);
+	__type(value, __s64);
 } map_b SEC(".maps");
 
 #define MAGIC_VALUE 0xabcd1234