Commit 36b5d471 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Daniel Borkmann
Browse files

selftests/bpf: samples/bpf: Split off legacy stuff from bpf_helpers.h 



Split off few legacy things from bpf_helpers.h into separate
bpf_legacy.h file:
- load_{byte|half|word};
- remove extra inner_idx and numa_node fields from bpf_map_def and
  introduce bpf_map_def_legacy for use in samples;
- move BPF_ANNOTATE_KV_PAIR into bpf_legacy.h.

Adjust samples and selftests accordingly by either including
bpf_legacy.h and using bpf_map_def_legacy, or switching to BTF-defined
maps altogether.

Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20191008175942.1769476-3-andriin@fb.com
parent cf0e9718

samples/bpf/hbm_kern.h

+12 −15
Original line number Diff line number Diff line
@@ -59,21 +59,18 @@ 
#define BYTES_PER_NS(delta, rate) ((((u64)(delta)) * (rate)) >> 20)

#define BYTES_TO_NS(bytes, rate) div64_u64(((u64)(bytes)) << 20, (u64)(rate))



struct bpf_map_def SEC("maps") queue_state = {

	.type = BPF_MAP_TYPE_CGROUP_STORAGE,

	.key_size = sizeof(struct bpf_cgroup_storage_key),

	.value_size = sizeof(struct hbm_vqueue),

};

BPF_ANNOTATE_KV_PAIR(queue_state, struct bpf_cgroup_storage_key,

		     struct hbm_vqueue);



struct bpf_map_def SEC("maps") queue_stats = {

	.type = BPF_MAP_TYPE_ARRAY,

	.key_size = sizeof(u32),

	.value_size = sizeof(struct hbm_queue_stats),

	.max_entries = 1,

};

BPF_ANNOTATE_KV_PAIR(queue_stats, int, struct hbm_queue_stats);

struct {

	__uint(type, BPF_MAP_TYPE_CGROUP_STORAGE);

	__type(key, struct bpf_cgroup_storage_key);

	__type(value, struct hbm_vqueue);

} queue_state SEC(".maps");



struct {

	__uint(type, BPF_MAP_TYPE_ARRAY);

	__uint(max_entries, 1);

	__type(key, u32);

	__type(value, struct hvm_queue_stats);

} queue_stats SEC(".maps");



struct hbm_pkt_info {

	int	cwnd;

samples/bpf/map_perf_test_kern.c

+12 −11
Original line number Diff line number Diff line
@@ -9,25 +9,26 @@ 
#include <linux/version.h>

#include <uapi/linux/bpf.h>

#include "bpf_helpers.h"

#include "bpf_legacy.h"



#define MAX_ENTRIES 1000

#define MAX_NR_CPUS 1024



struct bpf_map_def SEC("maps") hash_map = {

struct bpf_map_def_legacy SEC("maps") hash_map = {

	.type = BPF_MAP_TYPE_HASH,

	.key_size = sizeof(u32),

	.value_size = sizeof(long),

	.max_entries = MAX_ENTRIES,

};



struct bpf_map_def SEC("maps") lru_hash_map = {

struct bpf_map_def_legacy SEC("maps") lru_hash_map = {

	.type = BPF_MAP_TYPE_LRU_HASH,

	.key_size = sizeof(u32),

	.value_size = sizeof(long),

	.max_entries = 10000,

};



struct bpf_map_def SEC("maps") nocommon_lru_hash_map = {

struct bpf_map_def_legacy SEC("maps") nocommon_lru_hash_map = {

	.type = BPF_MAP_TYPE_LRU_HASH,

	.key_size = sizeof(u32),

	.value_size = sizeof(long),
@@ -35,7 +36,7 @@ struct bpf_map_def SEC("maps") nocommon_lru_hash_map = { 
	.map_flags = BPF_F_NO_COMMON_LRU,

};



struct bpf_map_def SEC("maps") inner_lru_hash_map = {

struct bpf_map_def_legacy SEC("maps") inner_lru_hash_map = {

	.type = BPF_MAP_TYPE_LRU_HASH,

	.key_size = sizeof(u32),

	.value_size = sizeof(long),
@@ -44,20 +45,20 @@ struct bpf_map_def SEC("maps") inner_lru_hash_map = { 
	.numa_node = 0,

};



struct bpf_map_def SEC("maps") array_of_lru_hashs = {

struct bpf_map_def_legacy SEC("maps") array_of_lru_hashs = {

	.type = BPF_MAP_TYPE_ARRAY_OF_MAPS,

	.key_size = sizeof(u32),

	.max_entries = MAX_NR_CPUS,

};



struct bpf_map_def SEC("maps") percpu_hash_map = {

struct bpf_map_def_legacy SEC("maps") percpu_hash_map = {

	.type = BPF_MAP_TYPE_PERCPU_HASH,

	.key_size = sizeof(u32),

	.value_size = sizeof(long),

	.max_entries = MAX_ENTRIES,

};



struct bpf_map_def SEC("maps") hash_map_alloc = {

struct bpf_map_def_legacy SEC("maps") hash_map_alloc = {

	.type = BPF_MAP_TYPE_HASH,

	.key_size = sizeof(u32),

	.value_size = sizeof(long),
@@ -65,7 +66,7 @@ struct bpf_map_def SEC("maps") hash_map_alloc = { 
	.map_flags = BPF_F_NO_PREALLOC,

};



struct bpf_map_def SEC("maps") percpu_hash_map_alloc = {

struct bpf_map_def_legacy SEC("maps") percpu_hash_map_alloc = {

	.type = BPF_MAP_TYPE_PERCPU_HASH,

	.key_size = sizeof(u32),

	.value_size = sizeof(long),
@@ -73,7 +74,7 @@ struct bpf_map_def SEC("maps") percpu_hash_map_alloc = { 
	.map_flags = BPF_F_NO_PREALLOC,

};



struct bpf_map_def SEC("maps") lpm_trie_map_alloc = {

struct bpf_map_def_legacy SEC("maps") lpm_trie_map_alloc = {

	.type = BPF_MAP_TYPE_LPM_TRIE,

	.key_size = 8,

	.value_size = sizeof(long),
@@ -81,14 +82,14 @@ struct bpf_map_def SEC("maps") lpm_trie_map_alloc = { 
	.map_flags = BPF_F_NO_PREALLOC,

};



struct bpf_map_def SEC("maps") array_map = {

struct bpf_map_def_legacy SEC("maps") array_map = {

	.type = BPF_MAP_TYPE_ARRAY,

	.key_size = sizeof(u32),

	.value_size = sizeof(long),

	.max_entries = MAX_ENTRIES,

};



struct bpf_map_def SEC("maps") lru_hash_lookup_map = {

struct bpf_map_def_legacy SEC("maps") lru_hash_lookup_map = {

	.type = BPF_MAP_TYPE_LRU_HASH,

	.key_size = sizeof(u32),

	.value_size = sizeof(long),

samples/bpf/parse_ldabs.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/udp.h>

#include <uapi/linux/bpf.h>

#include "bpf_helpers.h"

#include "bpf_legacy.h"



#define DEFAULT_PKTGEN_UDP_PORT	9

#define IP_MF			0x2000

samples/bpf/sockex1_kern.c

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <uapi/linux/if_packet.h>

#include <uapi/linux/ip.h>

#include "bpf_helpers.h"

#include "bpf_legacy.h"



struct bpf_map_def SEC("maps") my_map = {

	.type = BPF_MAP_TYPE_ARRAY,

samples/bpf/sockex2_kern.c

+1 −0
Original line number Diff line number Diff line 
#include <uapi/linux/bpf.h>

#include "bpf_helpers.h"

#include "bpf_legacy.h"

#include <uapi/linux/in.h>

#include <uapi/linux/if.h>

#include <uapi/linux/if_ether.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE