Skip to content

Commit 5ddafcc

Browse files
cupermirAlexei Starovoitov
authored andcommitted
selftests/bpf: Fix a few tests for GCC related warnings.
This patch corrects a few warnings to allow selftests to compile for GCC. -- progs/cpumask_failure.c -- progs/bpf_misc.h:136:22: error: ‘cpumask’ is used uninitialized [-Werror=uninitialized] 136 | #define __sink(expr) asm volatile("" : "+g"(expr)) | ^~~ progs/cpumask_failure.c:68:9: note: in expansion of macro ‘__sink’ 68 | __sink(cpumask); The macro __sink(cpumask) with the '+' contraint modifier forces the the compiler to expect a read and write from cpumask. GCC detects that cpumask is never initialized and reports an error. This patch removes the spurious non required definitions of cpumask. -- progs/dynptr_fail.c -- progs/dynptr_fail.c:1444:9: error: ‘ptr1’ may be used uninitialized [-Werror=maybe-uninitialized] 1444 | bpf_dynptr_clone(&ptr1, &ptr2); Many of the tests in the file are related to the detection of uninitialized pointers by the verifier. GCC is able to detect possible uninitialized values, and reports this as an error. The patch initializes all of the previous uninitialized structs. -- progs/test_tunnel_kern.c -- progs/test_tunnel_kern.c:590:9: error: array subscript 1 is outside array bounds of ‘struct geneve_opt[1]’ [-Werror=array-bounds=] 590 | *(int *) &gopt.opt_data = bpf_htonl(0xdeadbeef); | ^~~~~~~~~~~~~~~~~~~~~~~ progs/test_tunnel_kern.c:575:27: note: at offset 4 into object ‘gopt’ of size 4 575 | struct geneve_opt gopt; This tests accesses beyond the defined data for the struct geneve_opt which contains as last field "u8 opt_data[0]" which clearly does not get reserved space (in stack) in the function header. This pattern is repeated in ip6geneve_set_tunnel and geneve_set_tunnel functions. GCC is able to see this and emits a warning. The patch introduces a local struct that allocates enough space to safely allow the write to opt_data field. -- progs/jeq_infer_not_null_fail.c -- progs/jeq_infer_not_null_fail.c:21:40: error: array subscript ‘struct bpf_map[0]’ is partly outside array bounds of ‘struct <anonymous>[1]’ [-Werror=array-bounds=] 21 | struct bpf_map *inner_map = map->inner_map_meta; | ^~ progs/jeq_infer_not_null_fail.c:14:3: note: object ‘m_hash’ of size 32 14 | } m_hash SEC(".maps"); This example defines m_hash in the context of the compilation unit and casts it to struct bpf_map which is much smaller than the size of struct bpf_map. It errors out in GCC when it attempts to access an element that would be defined in struct bpf_map outsize of the defined limits for m_hash. This patch disables the warning through a GCC pragma. This changes were tested in bpf-next master selftests without any regressions. Signed-off-by: Cupertino Miranda <[email protected]> Cc: [email protected] Cc: [email protected] Cc: Yonghong Song <[email protected]> Cc: Eduard Zingerman <[email protected]> Cc: Andrii Nakryiko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 792a04b commit 5ddafcc

File tree

4 files changed

+37
-29
lines changed

4 files changed

+37
-29
lines changed

tools/testing/selftests/bpf/progs/cpumask_failure.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,8 @@ SEC("tp_btf/task_newtask")
6161
__failure __msg("bpf_cpumask_set_cpu args#1 expected pointer to STRUCT bpf_cpumask")
6262
int BPF_PROG(test_mutate_cpumask, struct task_struct *task, u64 clone_flags)
6363
{
64-
struct bpf_cpumask *cpumask;
65-
6664
/* Can't set the CPU of a non-struct bpf_cpumask. */
6765
bpf_cpumask_set_cpu(0, (struct bpf_cpumask *)task->cpus_ptr);
68-
__sink(cpumask);
6966

7067
return 0;
7168
}

tools/testing/selftests/bpf/progs/dynptr_fail.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ SEC("?raw_tp")
8080
__failure __msg("Unreleased reference id=2")
8181
int ringbuf_missing_release1(void *ctx)
8282
{
83-
struct bpf_dynptr ptr;
83+
struct bpf_dynptr ptr = {};
8484

8585
bpf_ringbuf_reserve_dynptr(&ringbuf, val, 0, &ptr);
8686

@@ -1385,7 +1385,7 @@ SEC("?raw_tp")
13851385
__failure __msg("Expected an initialized dynptr as arg #1")
13861386
int dynptr_adjust_invalid(void *ctx)
13871387
{
1388-
struct bpf_dynptr ptr;
1388+
struct bpf_dynptr ptr = {};
13891389

13901390
/* this should fail */
13911391
bpf_dynptr_adjust(&ptr, 1, 2);
@@ -1398,7 +1398,7 @@ SEC("?raw_tp")
13981398
__failure __msg("Expected an initialized dynptr as arg #1")
13991399
int dynptr_is_null_invalid(void *ctx)
14001400
{
1401-
struct bpf_dynptr ptr;
1401+
struct bpf_dynptr ptr = {};
14021402

14031403
/* this should fail */
14041404
bpf_dynptr_is_null(&ptr);
@@ -1411,7 +1411,7 @@ SEC("?raw_tp")
14111411
__failure __msg("Expected an initialized dynptr as arg #1")
14121412
int dynptr_is_rdonly_invalid(void *ctx)
14131413
{
1414-
struct bpf_dynptr ptr;
1414+
struct bpf_dynptr ptr = {};
14151415

14161416
/* this should fail */
14171417
bpf_dynptr_is_rdonly(&ptr);
@@ -1424,7 +1424,7 @@ SEC("?raw_tp")
14241424
__failure __msg("Expected an initialized dynptr as arg #1")
14251425
int dynptr_size_invalid(void *ctx)
14261426
{
1427-
struct bpf_dynptr ptr;
1427+
struct bpf_dynptr ptr = {};
14281428

14291429
/* this should fail */
14301430
bpf_dynptr_size(&ptr);
@@ -1437,7 +1437,7 @@ SEC("?raw_tp")
14371437
__failure __msg("Expected an initialized dynptr as arg #1")
14381438
int clone_invalid1(void *ctx)
14391439
{
1440-
struct bpf_dynptr ptr1;
1440+
struct bpf_dynptr ptr1 = {};
14411441
struct bpf_dynptr ptr2;
14421442

14431443
/* this should fail */

tools/testing/selftests/bpf/progs/jeq_infer_not_null_fail.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
#include <bpf/bpf_helpers.h>
55
#include "bpf_misc.h"
66

7+
#ifndef __clang__
8+
#pragma GCC diagnostic ignored "-Warray-bounds"
9+
#endif
10+
711
char _license[] SEC("license") = "GPL";
812

913
struct {

tools/testing/selftests/bpf/progs/test_tunnel_kern.c

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -567,27 +567,33 @@ int ip6vxlan_get_tunnel_src(struct __sk_buff *skb)
567567
return TC_ACT_OK;
568568
}
569569

570+
struct local_geneve_opt {
571+
struct geneve_opt gopt;
572+
int data;
573+
};
574+
570575
SEC("tc")
571576
int geneve_set_tunnel(struct __sk_buff *skb)
572577
{
573578
int ret;
574579
struct bpf_tunnel_key key;
575-
struct geneve_opt gopt;
580+
struct local_geneve_opt local_gopt;
581+
struct geneve_opt *gopt = (struct geneve_opt *) &local_gopt;
576582

577583
__builtin_memset(&key, 0x0, sizeof(key));
578584
key.remote_ipv4 = 0xac100164; /* 172.16.1.100 */
579585
key.tunnel_id = 2;
580586
key.tunnel_tos = 0;
581587
key.tunnel_ttl = 64;
582588

583-
__builtin_memset(&gopt, 0x0, sizeof(gopt));
584-
gopt.opt_class = bpf_htons(0x102); /* Open Virtual Networking (OVN) */
585-
gopt.type = 0x08;
586-
gopt.r1 = 0;
587-
gopt.r2 = 0;
588-
gopt.r3 = 0;
589-
gopt.length = 2; /* 4-byte multiple */
590-
*(int *) &gopt.opt_data = bpf_htonl(0xdeadbeef);
589+
__builtin_memset(gopt, 0x0, sizeof(local_gopt));
590+
gopt->opt_class = bpf_htons(0x102); /* Open Virtual Networking (OVN) */
591+
gopt->type = 0x08;
592+
gopt->r1 = 0;
593+
gopt->r2 = 0;
594+
gopt->r3 = 0;
595+
gopt->length = 2; /* 4-byte multiple */
596+
*(int *) &gopt->opt_data = bpf_htonl(0xdeadbeef);
591597

592598
ret = bpf_skb_set_tunnel_key(skb, &key, sizeof(key),
593599
BPF_F_ZERO_CSUM_TX);
@@ -596,7 +602,7 @@ int geneve_set_tunnel(struct __sk_buff *skb)
596602
return TC_ACT_SHOT;
597603
}
598604

599-
ret = bpf_skb_set_tunnel_opt(skb, &gopt, sizeof(gopt));
605+
ret = bpf_skb_set_tunnel_opt(skb, gopt, sizeof(local_gopt));
600606
if (ret < 0) {
601607
log_err(ret);
602608
return TC_ACT_SHOT;
@@ -631,7 +637,8 @@ SEC("tc")
631637
int ip6geneve_set_tunnel(struct __sk_buff *skb)
632638
{
633639
struct bpf_tunnel_key key;
634-
struct geneve_opt gopt;
640+
struct local_geneve_opt local_gopt;
641+
struct geneve_opt *gopt = (struct geneve_opt *) &local_gopt;
635642
int ret;
636643

637644
__builtin_memset(&key, 0x0, sizeof(key));
@@ -647,16 +654,16 @@ int ip6geneve_set_tunnel(struct __sk_buff *skb)
647654
return TC_ACT_SHOT;
648655
}
649656

650-
__builtin_memset(&gopt, 0x0, sizeof(gopt));
651-
gopt.opt_class = bpf_htons(0x102); /* Open Virtual Networking (OVN) */
652-
gopt.type = 0x08;
653-
gopt.r1 = 0;
654-
gopt.r2 = 0;
655-
gopt.r3 = 0;
656-
gopt.length = 2; /* 4-byte multiple */
657-
*(int *) &gopt.opt_data = bpf_htonl(0xfeedbeef);
657+
__builtin_memset(gopt, 0x0, sizeof(local_gopt));
658+
gopt->opt_class = bpf_htons(0x102); /* Open Virtual Networking (OVN) */
659+
gopt->type = 0x08;
660+
gopt->r1 = 0;
661+
gopt->r2 = 0;
662+
gopt->r3 = 0;
663+
gopt->length = 2; /* 4-byte multiple */
664+
*(int *) &gopt->opt_data = bpf_htonl(0xfeedbeef);
658665

659-
ret = bpf_skb_set_tunnel_opt(skb, &gopt, sizeof(gopt));
666+
ret = bpf_skb_set_tunnel_opt(skb, gopt, sizeof(gopt));
660667
if (ret < 0) {
661668
log_err(ret);
662669
return TC_ACT_SHOT;

0 commit comments

Comments
 (0)