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: Minor cleanup/refactor

Browse Source 
Remove some out-commented code. Also use bpf_object__unpin_maps
instead of manually unpinning the ts_start map. Additionally, change
map_ipv4_to_ipv6 to use clearer implementation (that now also works
for tc due to always using libbpf to load program).

Signed-off-by: Simon Sundberg <simon.sundberg@kau.se>
This commit is contained in:
Simon Sundberg
2021-03-09 12:21:39 +01:00
parent 3bd3333c69
commit 5204cd1e3c
2 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pping/pping.c
View File

@@ -78,21 +78,6 @@ static int set_rlimit(long int lim)
return !setrlimit(RLIMIT_MEMLOCK, &rlim) ? 0 : -errno; return !setrlimit(RLIMIT_MEMLOCK, &rlim) ? 0 : -errno;
} }
/* static int mkdir_if_noexist(const char *path) */
/* { */
/* int ret; */
/* struct stat st = { 0 }; */
/* ret = stat(path, &st); */
/* if (ret) { */
/* if (errno != ENOENT) */
/* return -errno; */
/* return mkdir(path, 0700) ? -errno : 0; */
/* } */
/* return S_ISDIR(st.st_mode) ? 0 : -EEXIST; */
/* } */
static int bpf_obj_open(struct bpf_object **obj, const char *obj_path, static int bpf_obj_open(struct bpf_object **obj, const char *obj_path,
char *map_path) char *map_path)
{ {
@@ -285,11 +270,9 @@ int main(int argc, char *argv[])
int ifindex = 0; int ifindex = 0;
bool xdp_attached = false; bool xdp_attached = false;
bool tc_attached = false; bool tc_attached = false;
char path_buffer[MAX_PATH_LEN];
struct bpf_object *xdp_obj = NULL; struct bpf_object *xdp_obj = NULL;
struct bpf_object *tc_obj = NULL; struct bpf_object *tc_obj = NULL;
struct bpf_map *map = NULL;
pthread_t tid; pthread_t tid;
struct map_cleanup_args clean_args; struct map_cleanup_args clean_args;
@@ -454,23 +437,11 @@ cleanup:
PINNED_DIR, strerror(-err)); PINNED_DIR, strerror(-err));
} }
/*
* Could use bpf_obj__unpin_maps(obj, PINNED_DIR) if it only tried
* unpinning pinned maps. But as it also attempts (and fails) to unpin
* maps that aren't pinned, will instead manually unpin the one pinned
* map for now.
*/
if (xdp_obj) { if (xdp_obj) {
if ((map = bpf_object__find_map_by_name(xdp_obj, TS_MAP)) && err = bpf_object__unpin_maps(xdp_obj, NULL);
bpf_map__is_pinned(map)) {
snprintf(path_buffer, sizeof(path_buffer), "%s/%s",
PINNED_DIR, TS_MAP);
err = bpf_map__unpin(map, path_buffer);
if (err) if (err)
fprintf(stderr, fprintf(stderr, "Failed unpinning maps: %s\n",
"Failed unpinning map from %s: %s\n", strerror(-err));
path_buffer, strerror(-err));
}
} }
return err != 0; return err != 0;

4
pping/pping_helpers.h
View File

@@ -46,8 +46,8 @@ struct {
*/ */
static void map_ipv4_to_ipv6(__be32 ipv4, struct in6_addr *ipv6) static void map_ipv4_to_ipv6(__be32 ipv4, struct in6_addr *ipv6)
{ {
__builtin_memset(&ipv6->in6_u.u6_addr8[0], 0x00, 10); __u16 ipv4_prefix[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0xffff };
__builtin_memset(&ipv6->in6_u.u6_addr8[10], 0xff, 2); __builtin_memcpy(ipv6, ipv4_prefix, sizeof(ipv4_prefix));
ipv6->in6_u.u6_addr32[3] = ipv4; ipv6->in6_u.u6_addr32[3] = ipv4;
} }