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

samples: bpf: update map definition to new syntax BTF-defined map 



Since, the new syntax of BTF-defined map has been introduced,
the syntax for using maps under samples directory are mixed up.
For example, some are already using the new syntax, and some are using
existing syntax by calling them as 'legacy'.

As stated at commit abd29c93 ("libbpf: allow specifying map
definitions using BTF"), the BTF-defined map has more compatablility
with extending supported map definition features.

The commit doesn't replace all of the map to new BTF-defined map,
because some of the samples still use bpf_load instead of libbpf, which
can't properly create BTF-defined map.

This will only updates the samples which uses libbpf API for loading bpf
program. (ex. bpf_prog_load_xattr)

Signed-off-by: default avatarDaniel T. Lee <danieltimlee@gmail.com>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent afbe3c27

samples/bpf/sockex1_kern.c

+6 −6
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ 
#include "bpf_helpers.h"

#include "bpf_legacy.h"



struct bpf_map_def SEC("maps") my_map = {

	.type = BPF_MAP_TYPE_ARRAY,

	.key_size = sizeof(u32),

	.value_size = sizeof(long),

	.max_entries = 256,

};

struct {

	__uint(type, BPF_MAP_TYPE_ARRAY);

	__type(key, u32);

	__type(value, long);

	__uint(max_entries, 256);

} my_map SEC(".maps");



SEC("socket1")

int bpf_prog1(struct __sk_buff *skb)

samples/bpf/sockex2_kern.c

+6 −6
Original line number Diff line number Diff line
@@ -190,12 +190,12 @@ struct pair { 
	long bytes;

};



struct bpf_map_def SEC("maps") hash_map = {

	.type = BPF_MAP_TYPE_HASH,

	.key_size = sizeof(__be32),

	.value_size = sizeof(struct pair),

	.max_entries = 1024,

};

struct {

	__uint(type, BPF_MAP_TYPE_HASH);

	__type(key, __be32);

	__type(value, struct pair);

	__uint(max_entries, 1024);

} hash_map SEC(".maps");



SEC("socket2")

int bpf_prog2(struct __sk_buff *skb)

samples/bpf/xdp1_kern.c

+6 −6
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
#include <linux/ipv6.h>

#include "bpf_helpers.h"



struct bpf_map_def SEC("maps") rxcnt = {

	.type = BPF_MAP_TYPE_PERCPU_ARRAY,

	.key_size = sizeof(u32),

	.value_size = sizeof(long),

	.max_entries = 256,

};

struct {

	__uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);

	__type(key, u32);

	__type(value, long);

	__uint(max_entries, 256);

} rxcnt SEC(".maps");



static int parse_ipv4(void *data, u64 nh_off, void *data_end)

{

samples/bpf/xdp2_kern.c

+6 −6
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
#include <linux/ipv6.h>

#include "bpf_helpers.h"



struct bpf_map_def SEC("maps") rxcnt = {

	.type = BPF_MAP_TYPE_PERCPU_ARRAY,

	.key_size = sizeof(u32),

	.value_size = sizeof(long),

	.max_entries = 256,

};

struct {

	__uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);

	__type(key, u32);

	__type(value, long);

	__uint(max_entries, 256);

} rxcnt SEC(".maps");



static void swap_src_dst_mac(void *data)

{

samples/bpf/xdp_adjust_tail_kern.c

+6 −6
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ 
/* volatile to prevent compiler optimizations */

static volatile __u32 max_pcktsz = MAX_PCKT_SIZE;



struct bpf_map_def SEC("maps") icmpcnt = {

	.type = BPF_MAP_TYPE_ARRAY,

	.key_size = sizeof(__u32),

	.value_size = sizeof(__u64),

	.max_entries = 1,

};

struct {

	__uint(type, BPF_MAP_TYPE_ARRAY);

	__type(key, __u32);

	__type(value, __u64);

	__uint(max_entries, 1);

} icmpcnt SEC(".maps");



static __always_inline void count_icmp(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE