mirror/xdp-project-bpf-examples
1
0
Fork 0
mirror of https://github.com/xdp-project/bpf-examples.git synced 2024-05-06 15:54:53 +00:00
Code Issues Projects Releases Wiki Activity

pping: Remove pinning of maps

Browse Source 
When both BPF programs are kept in the same file, no longer need to
pin the maps in order to share them between the programs.

Signed-off-by: Simon Sundberg <simon.sundberg@kau.se>
This commit is contained in:
Simon Sundberg
2021-04-23 14:16:52 +02:00
parent 9cc6b1eaab
commit 20c6dbec4c
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pping/pping.c
View File

@@ -210,15 +210,6 @@ static int set_rlimit(long int lim)
return !setrlimit(RLIMIT_MEMLOCK, &rlim) ? 0 : -errno;
}
static int bpf_obj_open(struct bpf_object **obj, const char *obj_path,
const char *map_path)
{
DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts,
.pin_root_path = map_path);
*obj = bpf_object__open_file(obj_path, map_path ? &opts : NULL);
return libbpf_get_error(*obj);
}
static int
bpf_obj_run_prog_pindir_func(struct bpf_object *obj, const char *prog_title,
const char *pin_dir,
@@ -488,8 +479,11 @@ static int load_attach_bpfprogs(struct bpf_object **obj,
struct pping_config *config, bool *tc_attached,
bool *xdp_attached)
{
int err;
// Open and load ELF file
int err = bpf_obj_open(obj, config->object_path, config->pin_dir);
*obj = bpf_object__open(config->object_path);
err = libbpf_get_error(*obj);
if (err) {
fprintf(stderr, "Failed opening object file %s: %s\n",
config->object_path, strerror(-err));
@@ -699,11 +693,6 @@ cleanup:
fprintf(stderr,
"Failed unpinning tc program from %s: %s\n",
config.pin_dir, strerror(-err));
err = bpf_object__unpin_maps(obj, NULL);
if (err)
fprintf(stderr, "Failed unpinning maps: %s\n",
strerror(-err));
}
return err != 0;

2
pping/pping_kern.c
View File

@@ -47,7 +47,6 @@ struct {
__type(key, struct packet_id);
__type(value, __u64);
__uint(max_entries, 16384);
__uint(pinning, LIBBPF_PIN_BY_NAME);
} packet_ts SEC(".maps");
struct {
@@ -55,7 +54,6 @@ struct {
__type(key, struct network_tuple);
__type(value, struct flow_state);
__uint(max_entries, 16384);
__uint(pinning, LIBBPF_PIN_BY_NAME);
} flow_state SEC(".maps");
struct {