samples/bpf: use vmlinux.h instead of implicit headers in BPF test program

Bugzilla: https://bugzilla.redhat.com/2178930

commit e8acf8f47a5d58a00fbfa0f3592bbaaff557cec3
Author: Daniel T. Lee <danieltimlee@gmail.com>
Date:   Sun Jan 15 16:16:12 2023 +0900

    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 <danieltimlee@gmail.com>
    Link: https://lore.kernel.org/r/20230115071613.125791-10-danieltimlee@gmail.com
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>

Signed-off-by: Viktor Malik <vmalik@redhat.com>
This commit is contained in:
Viktor Malik 2023-05-04 13:22:44 +02:00 committed by Felix Maurer
parent a2fd922eed
commit 1d64c8ca79
8 changed files with 12 additions and 29 deletions

View File

@ -10,10 +10,7 @@
* General Public License for more details.
*/
#include <uapi/linux/bpf.h>
#include <uapi/linux/if_ether.h>
#include <uapi/linux/ip.h>
#include <uapi/linux/in.h>
#include "vmlinux.h"
#include <bpf/bpf_helpers.h>
struct {

View File

@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "vmlinux.h"
#include "net_shared.h"
#include <uapi/linux/bpf.h>
#include <linux/net.h>
#include <uapi/linux/in.h>
#include <uapi/linux/in6.h>
#include <bpf/bpf_helpers.h>
SEC("cgroup/sock")

View File

@ -5,9 +5,8 @@
* License as published by the Free Software Foundation.
*/
#define KBUILD_MODNAME "foo"
#include "vmlinux.h"
#include "net_shared.h"
#include <uapi/linux/ipv6.h>
#include <uapi/linux/bpf.h>
#include <bpf/bpf_helpers.h>
/* copy of 'struct ethhdr' without __packed */

View File

@ -10,17 +10,8 @@
* General Public License for more details.
*/
#include "vmlinux.h"
#include "net_shared.h"
#include <stdint.h>
#include <stddef.h>
#include <linux/bpf.h>
#include <linux/ip.h>
#include <linux/in.h>
#include <linux/in6.h>
#include <linux/tcp.h>
#include <linux/udp.h>
#include <linux/icmpv6.h>
#include <linux/if_ether.h>
#include <bpf/bpf_helpers.h>
#include <string.h>

View File

@ -6,16 +6,17 @@
* License as published by the Free Software Foundation.
*/
#define KBUILD_MODNAME "foo"
#include <linux/ptrace.h>
#include "vmlinux.h"
#include <linux/version.h>
#include <uapi/linux/bpf.h>
#include <uapi/linux/in6.h>
#include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h>
#include <bpf/bpf_core_read.h>
#define MAX_NR_PORTS 65536
#define EINVAL 22
#define ENOENT 2
/* map #0 */
struct inner_a {
__uint(type, BPF_MAP_TYPE_ARRAY);

View File

@ -4,10 +4,8 @@
* modify it under the terms of version 2 of the GNU General Public
* License as published by the Free Software Foundation.
*/
#include "vmlinux.h"
#include <linux/version.h>
#include <linux/ptrace.h>
#include <linux/sched.h>
#include <uapi/linux/bpf.h>
#include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h>

View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2018 Facebook */
#include <uapi/linux/bpf.h>
#include "vmlinux.h"
#include <bpf/bpf_helpers.h>
SEC("raw_tracepoint/task_rename")

View File

@ -4,8 +4,7 @@
* modify it under the terms of version 2 of the GNU General Public
* License as published by the Free Software Foundation.
*/
#include <linux/sched.h>
#include <uapi/linux/bpf.h>
#include "vmlinux.h"
#include <bpf/bpf_helpers.h>
/* from /sys/kernel/debug/tracing/events/task/task_rename/format */