Commit e4c9cf0c authored by Yang Jihong's avatar Yang Jihong Committed by Andrii Nakryiko
Browse files

selftests/bpf: Fix xdp_synproxy compilation failure in 32-bit arch 



xdp_synproxy fails to be compiled in the 32-bit arch, log is as follows:

  xdp_synproxy.c: In function 'parse_options':
  xdp_synproxy.c:175:36: error: left shift count >= width of type [-Werror=shift-count-overflow]
    175 |                 *tcpipopts = (mss6 << 32) | (ttl << 24) | (wscale << 16) | mss4;
        |                                    ^~
  xdp_synproxy.c: In function 'syncookie_open_bpf_maps':
  xdp_synproxy.c:289:28: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
    289 |                 .map_ids = (__u64)map_ids,
        |                            ^

Fix it.

Fixes: fb5cd0ce ("selftests/bpf: Add selftests for raw syncookie helpers")
Signed-off-by: default avatarYang Jihong <yangjihong1@huawei.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20221111030836.37632-1-yangjihong1@huawei.com
parent 1cfa97b3

tools/testing/selftests/bpf/xdp_synproxy.c

+3 −2
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ static void parse_options(int argc, char *argv[], unsigned int *ifindex, __u32 * 
		{ "tc", no_argument, NULL, 'c' },

		{ NULL, 0, NULL, 0 },

	};

	unsigned long mss4, mss6, wscale, ttl;

	unsigned long mss4, wscale, ttl;

	unsigned long long mss6;

	unsigned int tcpipopts_mask = 0;



	if (argc < 2)
@@ -286,7 +287,7 @@ static int syncookie_open_bpf_maps(__u32 prog_id, int *values_map_fd, int *ports 


	prog_info = (struct bpf_prog_info) {

		.nr_map_ids = 8,

		.map_ids = (__u64)map_ids,

		.map_ids = (__u64)(unsigned long)map_ids,

	};

	info_len = sizeof(prog_info);