Commit e8acf8f4 authored by Daniel T. Lee's avatar Daniel T. Lee Committed by Alexei Starovoitov
Browse files

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: default avatarDaniel T. Lee <danieltimlee@gmail.com>
Link: https://lore.kernel.org/r/20230115071613.125791-10-danieltimlee@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent c2f4f559

samples/bpf/lwt_len_hist_kern.c

+1 −4
Original line number Diff line number Diff line
@@ -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 {

samples/bpf/sock_flags_kern.c

+2 −4
Original line number Diff line number Diff line 
// 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")

samples/bpf/test_cgrp2_tc_kern.c

+1 −2
Original line number Diff line number Diff line
@@ -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 */

samples/bpf/test_lwt_bpf.c

+1 −10
Original line number Diff line number Diff line
@@ -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>

samples/bpf/test_map_in_map_kern.c

+4 −3
Original line number Diff line number Diff line
@@ -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);