netdev - Re: [PATCH bpf-next] selftests/bpf: use __bpf_constant_htons in test

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAPhsuW5H+9s6pi1i73vnzFNWBa-jq-jxGo4cf9EqU6F7JEHZPQ@mail.gmail.com>
Date:   Wed, 27 Feb 2019 13:27:52 -0800
From:   Song Liu <liu.song.a23@...il.com>
To:     Stanislav Fomichev <sdf@...gle.com>
Cc:     Networking <netdev@...r.kernel.org>, bpf@...r.kernel.org,
        "David S . Miller" <davem@...emloft.net>,
        Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>
Subject: Re: [PATCH bpf-next] selftests/bpf: use __bpf_constant_htons in
 test_prog.c for flow dissector

On Wed, Feb 27, 2019 at 11:16 AM Stanislav Fomichev <sdf@...gle.com> wrote:
>
> 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").
>
> Fixes: bf0f0fd939451 ("selftests/bpf: add simple BPF_PROG_TEST_RUN examples for flow dissector")
>
> Signed-off-by: Stanislav Fomichev <sdf@...gle.com>

Acked-by: Song Liu <songliubraving@...com>

> ---
>  tools/testing/selftests/bpf/test_progs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
> index c59d2e015d16..87cde42559f7 100644
> --- a/tools/testing/selftests/bpf/test_progs.c
> +++ b/tools/testing/selftests/bpf/test_progs.c
> @@ -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
>