perf bpf_map: Remove unused code

bpf_map__fprintf is unused so delete it, the header file declaring it
and the now unused static helper functions.

Signed-off-by: Ian Rogers <irogers@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 7ff85fa90d988a2c888acac679599367849e0bd2..1c38f3d16a31ed3a784c42532b4c3808c5490534 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -21,7 +21,6 @@
 #include <bpf/libbpf.h>
 #include <bpf/btf.h>
 #endif
-#include "util/bpf_map.h"
 #include "util/rlimit.h"
 #include "builtin.h"
 #include "util/cgroup.h"

diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 89de23dec40147ab19510f261862611dab4277f8..70cc91d00804d7fac192cd3aea7584a608315727 100644 (file)
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -170,7 +170,6 @@ perf-util-y += mutex.o
 perf-util-y += sharded_mutex.o
 perf-util-y += intel-tpebs.o
 
-perf-util-$(CONFIG_LIBBPF) += bpf_map.o
 perf-util-$(CONFIG_PERF_BPF_SKEL) += bpf_counter.o
 perf-util-$(CONFIG_PERF_BPF_SKEL) += bpf_counter_cgroup.o
 perf-util-$(CONFIG_PERF_BPF_SKEL) += bpf_ftrace.o

diff --git a/tools/perf/util/bpf_map.c b/tools/perf/util/bpf_map.c
deleted file mode 100644 (file)
index 442f91b..0000000
--- a/tools/perf/util/bpf_map.c
+++ /dev/null
@@ -1,70 +0,0 @@
-// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
-
-#include "util/bpf_map.h"
-#include <bpf/bpf.h>
-#include <bpf/libbpf.h>
-#include <linux/err.h>
-#include <linux/kernel.h>
-#include <errno.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-static bool bpf_map__is_per_cpu(enum bpf_map_type type)
-{
-       return type == BPF_MAP_TYPE_PERCPU_HASH ||
-              type == BPF_MAP_TYPE_PERCPU_ARRAY ||
-              type == BPF_MAP_TYPE_LRU_PERCPU_HASH ||
-              type == BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE;
-}
-
-static void *bpf_map__alloc_value(const struct bpf_map *map)
-{
-       if (bpf_map__is_per_cpu(bpf_map__type(map)))
-               return malloc(round_up(bpf_map__value_size(map), 8) *
-                             sysconf(_SC_NPROCESSORS_CONF));
-
-       return malloc(bpf_map__value_size(map));
-}
-
-int bpf_map__fprintf(struct bpf_map *map, FILE *fp)
-{
-       void *prev_key = NULL, *key, *value;
-       int fd = bpf_map__fd(map), err;
-       int printed = 0;
-
-       if (fd < 0)
-               return fd;
-
-       err = -ENOMEM;
-       key = malloc(bpf_map__key_size(map));
-       if (key == NULL)
-               goto out;
-
-       value = bpf_map__alloc_value(map);
-       if (value == NULL)
-               goto out_free_key;
-
-       while ((err = bpf_map_get_next_key(fd, prev_key, key) == 0)) {
-               int intkey = *(int *)key;
-
-               if (!bpf_map_lookup_elem(fd, key, value)) {
-                       bool boolval = *(bool *)value;
-                       if (boolval)
-                               printed += fprintf(fp, "[%d] = %d,\n", intkey, boolval);
-               } else {
-                       printed += fprintf(fp, "[%d] = ERROR,\n", intkey);
-               }
-
-               prev_key = key;
-       }
-
-       if (err == ENOENT)
-               err = printed;
-
-       free(value);
-out_free_key:
-       free(key);
-out:
-       return err;
-}

diff --git a/tools/perf/util/bpf_map.h b/tools/perf/util/bpf_map.h
deleted file mode 100644 (file)
index c2f7c13..0000000
--- a/tools/perf/util/bpf_map.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
-#ifndef __PERF_BPF_MAP_H
-#define __PERF_BPF_MAP_H 1
-
-#include <stdio.h>
-struct bpf_map;
-
-#ifdef HAVE_LIBBPF_SUPPORT
-
-int bpf_map__fprintf(struct bpf_map *map, FILE *fp);
-
-#else
-
-#include <linux/compiler.h>
-
-static inline int bpf_map__fprintf(struct bpf_map *map __maybe_unused, FILE *fp __maybe_unused)
-{
-       return 0;
-}
-
-#endif // HAVE_LIBBPF_SUPPORT
-
-#endif // __PERF_BPF_MAP_H