From: Stanislav Fomichev <stfomichev@gmail.com>
To: "Alexis Lothoré (eBPF Foundation)" <alexis.lothore@bootlin.com>
Cc: Andrii Nakryiko <andrii@kernel.org>,
Eduard Zingerman <eddyz87@gmail.com>,
Mykola Lysenko <mykolal@fb.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@fomichev.me>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>, Shuah Khan <shuah@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Jesper Dangaard Brouer <hawk@kernel.org>,
ebpf@linuxfoundation.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Bastien Curutchet <bastien.curutchet@bootlin.com>,
bpf@vger.kernel.org, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH bpf-next v3 11/14] selftests/bpf: use the same udp and tcp headers in tests under test_progs
Date: Wed, 20 Nov 2024 07:55:58 -0800 [thread overview]
Message-ID: <Zz4GjuLfY8gAf8is@mini-arch> (raw)
In-Reply-To: <20241120-flow_dissector-v3-11-45b46494f937@bootlin.com>
On 11/20, Alexis Lothoré (eBPF Foundation) wrote:
> Trying to add udp-dedicated helpers in network_helpers involves
> including some udp header, which makes multiple test_progs tests build
> fail:
>
> In file included from ./progs/test_cls_redirect.h:13,
> from [...]/prog_tests/cls_redirect.c:15:
> [...]/usr/include/linux/udp.h:23:8: error: redefinition of ‘struct udphdr’
> 23 | struct udphdr {
> | ^~~~~~
> In file included from ./network_helpers.h:17,
> from [...]/prog_tests/cls_redirect.c:13:
> [...]/usr/include/netinet/udp.h:55:8: note: originally defined here
> 55 | struct udphdr
> | ^~~~~~
>
> This error is due to struct udphdr being defined in both <linux/udp.h>
> and <netinet/udp.h>.
>
> Use only <netinet/udp.h> in every test. While at it, perform the same
> for tcp.h. For some tests, the change needs to be done in the eBPF
> program part as well, because of some headers sharing between both
> sides.
>
> Signed-off-by: Alexis Lothoré (eBPF Foundation) <alexis.lothore@bootlin.com>
Acked-by: Stanislav Fomichev <sdf@fomichev.me>
next prev parent reply other threads:[~2024-11-20 15:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-20 7:43 [PATCH bpf-next v3 00/14] selftests/bpf: migrate test_flow_dissector.sh to test_progs Alexis Lothoré (eBPF Foundation)
2024-11-20 7:43 ` [PATCH bpf-next v3 01/14] selftests/bpf: add a macro to compare raw memory Alexis Lothoré (eBPF Foundation)
2024-11-20 7:43 ` [PATCH bpf-next v3 02/14] selftests/bpf: use ASSERT_MEMEQ to compare bpf flow keys Alexis Lothoré (eBPF Foundation)
2024-11-20 7:43 ` [PATCH bpf-next v3 03/14] selftests/bpf: replace CHECK calls with ASSERT macros in flow_dissector test Alexis Lothoré (eBPF Foundation)
2024-11-20 7:43 ` [PATCH bpf-next v3 04/14] selftests/bpf: re-split main function into dedicated tests Alexis Lothoré (eBPF Foundation)
2024-11-20 7:43 ` [PATCH bpf-next v3 05/14] selftests/bpf: expose all subtests from flow_dissector Alexis Lothoré (eBPF Foundation)
2024-11-20 7:43 ` [PATCH bpf-next v3 06/14] selftests/bpf: add gre packets testing to flow_dissector Alexis Lothoré (eBPF Foundation)
2024-11-20 7:43 ` [PATCH bpf-next v3 07/14] selftests/bpf: migrate flow_dissector namespace exclusivity test Alexis Lothoré (eBPF Foundation)
2024-11-20 7:43 ` [PATCH bpf-next v3 08/14] selftests/bpf: Enable generic tc actions in selftests config Alexis Lothoré (eBPF Foundation)
2024-11-20 7:43 ` [PATCH bpf-next v3 09/14] selftests/bpf: move ip checksum helper to network helpers Alexis Lothoré (eBPF Foundation)
2024-11-20 15:55 ` Stanislav Fomichev
2024-11-20 7:43 ` [PATCH bpf-next v3 10/14] selftests/bpf: document pseudo-header checksum helpers Alexis Lothoré (eBPF Foundation)
2024-11-20 15:55 ` Stanislav Fomichev
2024-11-20 7:43 ` [PATCH bpf-next v3 11/14] selftests/bpf: use the same udp and tcp headers in tests under test_progs Alexis Lothoré (eBPF Foundation)
2024-11-20 15:55 ` Stanislav Fomichev [this message]
2024-11-20 7:43 ` [PATCH bpf-next v3 12/14] selftests/bpf: add network helpers to generate udp checksums Alexis Lothoré (eBPF Foundation)
2024-11-20 15:56 ` Stanislav Fomichev
2024-11-20 7:43 ` [PATCH bpf-next v3 13/14] selftests/bpf: migrate bpf flow dissectors tests to test_progs Alexis Lothoré (eBPF Foundation)
2024-11-20 15:56 ` Stanislav Fomichev
2024-11-20 7:43 ` [PATCH bpf-next v3 14/14] selftests/bpf: remove test_flow_dissector.sh Alexis Lothoré (eBPF Foundation)
2024-11-25 22:10 ` [PATCH bpf-next v3 00/14] selftests/bpf: migrate test_flow_dissector.sh to test_progs patchwork-bot+netdevbpf
2024-11-26 10:48 ` Alexis Lothoré
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zz4GjuLfY8gAf8is@mini-arch \
--to=stfomichev@gmail.com \
--cc=alexis.lothore@bootlin.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bastien.curutchet@bootlin.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=ebpf@linuxfoundation.org \
--cc=eddyz87@gmail.com \
--cc=haoluo@google.com \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=netdev@vger.kernel.org \
--cc=sdf@fomichev.me \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=yonghong.song@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.