selftests/bpf: use __bpf_constant_htons in test_prog.c for flow dissector
Subsystems (5)
PATCH 1/1 selftests/bpf: use __bpf_constant_htons in test_prog.c for flow dissector
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 a0517a0f7ef23 ("selftests/bpf: use __bpf_constant_htons in test_prog.c"), but later added another bunch of bpf_htons in commit bf0f0fd939451 ("selftests/bpf:
add simple BPF_PROG_TEST_RUN examples for flow dissector").
--- tools/testing/selftests/bpf/test_progs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/test_progs.c +2 -2
@@ -1954,7 +1954,7 @@ static struct bpf_flow_keys pkt_v4_flow_keys = { .thoff = sizeof(struct iphdr), .addr_proto = ETH_P_IP, .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 = {
@@ -1962,7 +1962,7 @@ static struct bpf_flow_keys pkt_v6_flow_keys = { .thoff = sizeof(struct ipv6hdr), .addr_proto = ETH_P_IPV6, .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 )
Signature · 1 line
2.21.0.rc2.261.ga7da99ff1b-goog
Quoted 4 lines · Stanislav Fomichev
Older GCC (<4.8) isn't smart enough to optimize !__builtin_constant_p() branch in
bpf_htons.
Quoted 8 lines
I recently fixed it for
pkt_v4andpkt_v6in commita0517a0f7ef23("selftests/bpf: use__bpf_constant_htonsintest_prog.c"), but later added another bunch ofbpf_htonsin commitbf0f0fd939451("selftests/bpf:
add simpleBPF_PROG_TEST_RUNexamples for flow dissector").Fixes bf0f0fd939451 ("selftests/bpf: add simple BPF_PROG_TEST_RUN examples for flow dissector")Signed-off-by Stanislav Fomichev <[email protected]>
Quoted 29 lines
--- tools/testing/selftests/bpf/test_progs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/testing/selftests/bpf/test_progs.c +2
-3@@ -1954,7 +1954,7 @@ static struct bpf_flow_keys pkt_v4_flow_keys = { .thoff = sizeof(struct iphdr), .addr_proto = ETH_P_IP, .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 = {@@ -1962,7 +1962,7 @@ static struct bpf_flow_keys pkt_v6_flow_keys = { .thoff = sizeof(struct ipv6hdr), .addr_proto = ETH_P_IPV6, .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 ) --2.21.0.rc2.261.ga7da99ff1b-goog
Quoted 11 lines · Stanislav Fomichev
Older GCC (<4.8) isn't smart enough to optimize !__builtin_constant_p() branch in
bpf_htons.I recently fixed it for
pkt_v4andpkt_v6in commita0517a0f7ef23("selftests/bpf: use__bpf_constant_htonsintest_prog.c"), but later added another bunch ofbpf_htonsin commitbf0f0fd939451("selftests/bpf:
add simpleBPF_PROG_TEST_RUNexamples for flow dissector").Fixes bf0f0fd939451 ("selftests/bpf: add simple BPF_PROG_TEST_RUN examples for flow dissector")Signed-off-by Stanislav Fomichev <[email protected]>
Applied, thanks!