Commit 9028bbcc authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

selftest/bpf: Fix compilation warnings in 32-bit mode 



Fix compilation warnings emitted when compiling selftests for 32-bit platform
(x86 in my case).

Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200813204945.1020225-3-andriin@fb.com
parent 09f44b75

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

+4 −4
Original line number Diff line number Diff line
@@ -159,15 +159,15 @@ void test_bpf_obj_id(void) 
		/* Check getting link info */

		info_len = sizeof(struct bpf_link_info) * 2;

		bzero(&link_infos[i], info_len);

		link_infos[i].raw_tracepoint.tp_name = (__u64)&tp_name;

		link_infos[i].raw_tracepoint.tp_name = ptr_to_u64(&tp_name);

		link_infos[i].raw_tracepoint.tp_name_len = sizeof(tp_name);

		err = bpf_obj_get_info_by_fd(bpf_link__fd(links[i]),

					     &link_infos[i], &info_len);

		if (CHECK(err ||

			  link_infos[i].type != BPF_LINK_TYPE_RAW_TRACEPOINT ||

			  link_infos[i].prog_id != prog_infos[i].id ||

			  link_infos[i].raw_tracepoint.tp_name != (__u64)&tp_name ||

			  strcmp((char *)link_infos[i].raw_tracepoint.tp_name,

			  link_infos[i].raw_tracepoint.tp_name != ptr_to_u64(&tp_name) ||

			  strcmp(u64_to_ptr(link_infos[i].raw_tracepoint.tp_name),

				 "sys_enter") ||

			  info_len != sizeof(struct bpf_link_info),

			  "get-link-info(fd)",
@@ -178,7 +178,7 @@ void test_bpf_obj_id(void) 
			  link_infos[i].type, BPF_LINK_TYPE_RAW_TRACEPOINT,

			  link_infos[i].id,

			  link_infos[i].prog_id, prog_infos[i].id,

			  (char *)link_infos[i].raw_tracepoint.tp_name,

			  (const char *)u64_to_ptr(link_infos[i].raw_tracepoint.tp_name),

			  "sys_enter"))

			goto done;

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

+2 −2
Original line number Diff line number Diff line
@@ -159,8 +159,8 @@ void test_core_extern(void) 
		exp = (uint64_t *)&t->data;

		for (j = 0; j < n; j++) {

			CHECK(got[j] != exp[j], "check_res",

			      "result #%d: expected %lx, but got %lx\n",

			       j, exp[j], got[j]);

			      "result #%d: expected %llx, but got %llx\n",

			       j, (__u64)exp[j], (__u64)got[j]);

		}

cleanup:

		test_core_extern__destroy(skel);

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

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ static void test_fexit_bpf2bpf_common(const char *obj_file, 
	__u32 duration = 0, retval;

	struct bpf_map *data_map;

	const int zero = 0;

	u64 *result = NULL;

	__u64 *result = NULL;



	err = bpf_prog_load(target_obj_file, BPF_PROG_TYPE_UNSPEC,

			    &pkt_obj, &pkt_fd);
@@ -29,7 +29,7 @@ static void test_fexit_bpf2bpf_common(const char *obj_file, 


	link = calloc(sizeof(struct bpf_link *), prog_cnt);

	prog = calloc(sizeof(struct bpf_program *), prog_cnt);

	result = malloc((prog_cnt + 32 /* spare */) * sizeof(u64));

	result = malloc((prog_cnt + 32 /* spare */) * sizeof(__u64));

	if (CHECK(!link || !prog || !result, "alloc_memory",

		  "failed to alloc memory"))

		goto close_prog;
@@ -72,7 +72,7 @@ static void test_fexit_bpf2bpf_common(const char *obj_file, 
		goto close_prog;



	for (i = 0; i < prog_cnt; i++)

		if (CHECK(result[i] != 1, "result", "fexit_bpf2bpf failed err %ld\n",

		if (CHECK(result[i] != 1, "result", "fexit_bpf2bpf failed err %llu\n",

			  result[i]))

			goto close_prog;

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

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ void test_flow_dissector(void) 
		CHECK_ATTR(tattr.data_size_out != sizeof(flow_keys) ||

			   err || tattr.retval != 1,

			   tests[i].name,

			   "err %d errno %d retval %d duration %d size %u/%lu\n",

			   "err %d errno %d retval %d duration %d size %u/%zu\n",

			   err, errno, tattr.retval, tattr.duration,

			   tattr.data_size_out, sizeof(flow_keys));

		CHECK_FLOW_KEYS(tests[i].name, flow_keys, tests[i].keys);

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

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
static void test_global_data_number(struct bpf_object *obj, __u32 duration)

{

	int i, err, map_fd;

	uint64_t num;

	__u64 num;



	map_fd = bpf_find_map(__func__, obj, "result_number");

	if (CHECK_FAIL(map_fd < 0))
@@ -14,7 +14,7 @@ static void test_global_data_number(struct bpf_object *obj, __u32 duration) 
	struct {

		char *name;

		uint32_t key;

		uint64_t num;

		__u64 num;

	} tests[] = {

		{ "relocate .bss reference",     0, 0 },

		{ "relocate .data reference",    1, 42 },
@@ -32,7 +32,7 @@ static void test_global_data_number(struct bpf_object *obj, __u32 duration) 
	for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {

		err = bpf_map_lookup_elem(map_fd, &tests[i].key, &num);

		CHECK(err || num != tests[i].num, tests[i].name,

		      "err %d result %lx expected %lx\n",

		      "err %d result %llx expected %llx\n",

		      err, num, tests[i].num);

	}

}