Skip to content

Commit e8acf8f

Browse files
DanielTimLeeAlexei Starovoitov
authored and
Alexei Starovoitov
committed
samples/bpf: use vmlinux.h instead of implicit headers in BPF test program
This commit applies vmlinux.h to BPF functionality testing program. Macros that were not defined despite migration to "vmlinux.h" were defined separately in individual files. Signed-off-by: Daniel T. Lee <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent c2f4f55 commit e8acf8f

8 files changed

+12
-29
lines changed

samples/bpf/lwt_len_hist_kern.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
* General Public License for more details.
1111
*/
1212

13-
#include <uapi/linux/bpf.h>
14-
#include <uapi/linux/if_ether.h>
15-
#include <uapi/linux/ip.h>
16-
#include <uapi/linux/in.h>
13+
#include "vmlinux.h"
1714
#include <bpf/bpf_helpers.h>
1815

1916
struct {

samples/bpf/sock_flags_kern.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
#include "vmlinux.h"
13
#include "net_shared.h"
2-
#include <uapi/linux/bpf.h>
3-
#include <linux/net.h>
4-
#include <uapi/linux/in.h>
5-
#include <uapi/linux/in6.h>
64
#include <bpf/bpf_helpers.h>
75

86
SEC("cgroup/sock")

samples/bpf/test_cgrp2_tc_kern.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
* License as published by the Free Software Foundation.
66
*/
77
#define KBUILD_MODNAME "foo"
8+
#include "vmlinux.h"
89
#include "net_shared.h"
9-
#include <uapi/linux/ipv6.h>
10-
#include <uapi/linux/bpf.h>
1110
#include <bpf/bpf_helpers.h>
1211

1312
/* copy of 'struct ethhdr' without __packed */

samples/bpf/test_lwt_bpf.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,8 @@
1010
* General Public License for more details.
1111
*/
1212

13+
#include "vmlinux.h"
1314
#include "net_shared.h"
14-
#include <stdint.h>
15-
#include <stddef.h>
16-
#include <linux/bpf.h>
17-
#include <linux/ip.h>
18-
#include <linux/in.h>
19-
#include <linux/in6.h>
20-
#include <linux/tcp.h>
21-
#include <linux/udp.h>
22-
#include <linux/icmpv6.h>
23-
#include <linux/if_ether.h>
2415
#include <bpf/bpf_helpers.h>
2516
#include <string.h>
2617

samples/bpf/test_map_in_map_kern.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@
66
* License as published by the Free Software Foundation.
77
*/
88
#define KBUILD_MODNAME "foo"
9-
#include <linux/ptrace.h>
9+
#include "vmlinux.h"
1010
#include <linux/version.h>
11-
#include <uapi/linux/bpf.h>
12-
#include <uapi/linux/in6.h>
1311
#include <bpf/bpf_helpers.h>
1412
#include <bpf/bpf_tracing.h>
1513
#include <bpf/bpf_core_read.h>
1614

1715
#define MAX_NR_PORTS 65536
1816

17+
#define EINVAL 22
18+
#define ENOENT 2
19+
1920
/* map #0 */
2021
struct inner_a {
2122
__uint(type, BPF_MAP_TYPE_ARRAY);

samples/bpf/test_overhead_kprobe_kern.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
* modify it under the terms of version 2 of the GNU General Public
55
* License as published by the Free Software Foundation.
66
*/
7+
#include "vmlinux.h"
78
#include <linux/version.h>
8-
#include <linux/ptrace.h>
9-
#include <linux/sched.h>
10-
#include <uapi/linux/bpf.h>
119
#include <bpf/bpf_helpers.h>
1210
#include <bpf/bpf_tracing.h>
1311

samples/bpf/test_overhead_raw_tp_kern.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/* Copyright (c) 2018 Facebook */
3-
#include <uapi/linux/bpf.h>
3+
#include "vmlinux.h"
44
#include <bpf/bpf_helpers.h>
55

66
SEC("raw_tracepoint/task_rename")

samples/bpf/test_overhead_tp_kern.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
* modify it under the terms of version 2 of the GNU General Public
55
* License as published by the Free Software Foundation.
66
*/
7-
#include <linux/sched.h>
8-
#include <uapi/linux/bpf.h>
7+
#include "vmlinux.h"
98
#include <bpf/bpf_helpers.h>
109

1110
/* from /sys/kernel/debug/tracing/events/task/task_rename/format */

0 commit comments

Comments
 (0)