| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20260207082428.1742209-5-irogers@google.com>
Date: Sat, 7 Feb 2026 00:24:27 -0800
From: Ian Rogers <irogers@...gle.com>
To: Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>,
Arnaldo Carvalho de Melo <acme@...nel.org>, Namhyung Kim <namhyung@...nel.org>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Jiri Olsa <jolsa@...nel.org>,
Ian Rogers <irogers@...gle.com>, Adrian Hunter <adrian.hunter@...el.com>,
James Clark <james.clark@...aro.org>, Eric Biggers <ebiggers@...nel.org>,
Palmer Dabbelt <palmer@...belt.com>, Stephen Brennan <stephen.s.brennan@...cle.com>,
Haibo Xu <haibo1.xu@...el.com>, linux-kernel@...r.kernel.org,
linux-perf-users@...r.kernel.org
Subject: [PATCH v1 4/5] 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@...gle.com>
---
tools/perf/builtin-trace.c | 1 -
tools/perf/util/Build | 1 -
tools/perf/util/bpf_map.c | 70 --------------------------------------
tools/perf/util/bpf_map.h | 23 -------------
4 files changed, 95 deletions(-)
delete mode 100644 tools/perf/util/bpf_map.c
delete mode 100644 tools/perf/util/bpf_map.h
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 311d9da9896a..2aaa3ff452ac 100644
--- 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 89de23dec401..70cc91d00804 100644
--- 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
index 442f91b4e8e1..000000000000
--- 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
index c2f7c13cba23..000000000000
--- 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
--
2.53.0.239.g8d8fc8a987-goog
Powered by blists - more mailing lists