renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 14:14:01 +08:00
Code

selftests/bpf: use __bpf_constant_htons in test_prog.c for flow dissector

Browse Source 
Older GCC (<4.8) isn't smart enough to optimize !__builtin_constant_p()
branch in bpf_htons.

I recently fixed it for pkt_v4 and pkt_v6 in commit a0517a0f7e
("selftests/bpf: use __bpf_constant_htons in test_prog.c"), but
later added another bunch of bpf_htons in commit bf0f0fd939
("selftests/bpf: add simple BPF_PROG_TEST_RUN examples for flow
dissector").

Fixes: bf0f0fd939 ("selftests/bpf: add simple BPF_PROG_TEST_RUN examples for flow dissector")
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Stanislav Fomichev 2019-02-27 11:15:11 -08:00 committed by Daniel Borkmann
parent f2bb53887e
commit ebace0e981
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/testing/selftests/bpf/test_progs.c
View File

@ -1954,7 +1954,7 @@ static struct bpf_flow_keys pkt_v4_flow_keys = {
.thoff = sizeof(struct iphdr), .thoff = sizeof(struct iphdr),
.addr_proto = ETH_P_IP, .addr_proto = ETH_P_IP,
.ip_proto = IPPROTO_TCP, .ip_proto = IPPROTO_TCP,
.n_proto = bpf_htons(ETH_P_IP), .n_proto = __bpf_constant_htons(ETH_P_IP),
}; };
static struct bpf_flow_keys pkt_v6_flow_keys = { static struct bpf_flow_keys pkt_v6_flow_keys = {
@ -1962,7 +1962,7 @@ static struct bpf_flow_keys pkt_v6_flow_keys = {
.thoff = sizeof(struct ipv6hdr), .thoff = sizeof(struct ipv6hdr),
.addr_proto = ETH_P_IPV6, .addr_proto = ETH_P_IPV6,
.ip_proto = IPPROTO_TCP, .ip_proto = IPPROTO_TCP,
.n_proto = bpf_htons(ETH_P_IPV6), .n_proto = __bpf_constant_htons(ETH_P_IPV6),
}; };
static void test_flow_dissector(void) static void test_flow_dissector(void)