Skip to content

Commit

Permalink
bpf: Use -Wno-address-of-packed-member in some selftests
Browse files Browse the repository at this point in the history
[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
  • Loading branch information
jemarch authored and anakryiko committed Feb 6, 2024
1 parent 563918a commit c27aa46
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions tools/testing/selftests/bpf/progs/test_cls_redirect.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

#include "test_cls_redirect.h"

#pragma GCC diagnostic ignored "-Waddress-of-packed-member"

#ifdef SUBPROGS
#define INLINING __noinline
#else
Expand Down
2 changes: 2 additions & 0 deletions tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)))

Expand Down
2 changes: 2 additions & 0 deletions tools/testing/selftests/bpf/progs/test_tc_tunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit c27aa46

Please sign in to comment.