]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
bpf: Use -Wno-address-of-packed-member in some selftests
authorJose E. Marchesi <jose.marchesi@oracle.com>
Tue, 6 Feb 2024 10:23:30 +0000 (11:23 +0100)
committerAndrii Nakryiko <andrii@kernel.org>
Tue, 6 Feb 2024 17:40:25 +0000 (09:40 -0800)
[Differences from V2:
- Remove conditionals in the source files pragmas, as the
  pragma is supported by both GCC and clang.]

Both GCC and clang implement the -Wno-address-of-packed-member
warning, which is enabled by -Wall, that warns about taking the
address of a packed struct field when it can lead to an "unaligned"
address.

This triggers the following errors (-Werror) when building three
particular BPF selftests with GCC:

  progs/test_cls_redirect.c
  986 |         if (ipv4_is_fragment((void *)&encap->ip)) {
  progs/test_cls_redirect_dynptr.c
  410 |         pkt_ipv4_checksum((void *)&encap_gre->ip);
  progs/test_cls_redirect.c
  521 |         pkt_ipv4_checksum((void *)&encap_gre->ip);
  progs/test_tc_tunnel.c
   232 |         set_ipv4_csum((void *)&h_outer.ip);

These warnings do not signal any real problem in the tests as far as I
can see.

This patch adds pragmas to these test files that inhibit the
-Waddress-of-packed-member warning.

Tested in bpf-next master.
No regressions.

Signed-off-by: Jose E. Marchesi <jose.marchesi@oracle.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/bpf/20240206102330.7113-1-jose.marchesi@oracle.com
tools/testing/selftests/bpf/progs/test_cls_redirect.c
tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c
tools/testing/selftests/bpf/progs/test_tc_tunnel.c

index 66b3049822450d6f77f4cfc3a1383263f57a68b6..bfc9179259d5b26c6cd5cd24928ba4400ee6d9aa 100644 (file)
@@ -22,6 +22,8 @@
 
 #include "test_cls_redirect.h"
 
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+
 #ifdef SUBPROGS
 #define INLINING __noinline
 #else
index f41c81212ee9270120b4e72dba764afbba3bc64e..da54c09e9a154026581b677be7dc14aab2dbdd7c 100644 (file)
@@ -23,6 +23,8 @@
 #include "test_cls_redirect.h"
 #include "bpf_kfuncs.h"
 
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+
 #define offsetofend(TYPE, MEMBER) \
        (offsetof(TYPE, MEMBER) + sizeof((((TYPE *)0)->MEMBER)))
 
index e6e678aa98746c1d26de78343ed8a94485d6bb63..d8d7ab5e8e30fa8fe8821a033485f7df7a38ef5a 100644 (file)
@@ -20,6 +20,8 @@
 #include <bpf/bpf_endian.h>
 #include <bpf/bpf_helpers.h>
 
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+
 static const int cfg_port = 8000;
 
 static const int cfg_udp_src = 20000;