korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-03 00:54:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf bpf: check perf_attr_map is compatible with the perf binary

Browse Source 
perf_attr_map could be shared among different version of perf binary. Add
bperf_attr_map_compatible() to check whether the existing attr_map is
compatible with current perf binary.

Signed-off-by: Song Liu <song@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: kernel-team@fb.com
Link: https://lore.kernel.org/r/20210425214333.1090950-3-song@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Song Liu 2021-04-25 14:43:30 -07:00 committed by Arnaldo Carvalho de Melo
parent ec8149fba6
commit fe3dd8263b
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/perf/util/bpf_counter.c
View File

@ -312,6 +312,20 @@ static __u32 bpf_map_get_id(int fd)
return map_info.id; return map_info.id;
} }
static bool bperf_attr_map_compatible(int attr_map_fd)
{
struct bpf_map_info map_info = {0};
__u32 map_info_len = sizeof(map_info);
int err;
err = bpf_obj_get_info_by_fd(attr_map_fd, &map_info, &map_info_len);
if (err)
return false;
return (map_info.key_size == sizeof(struct perf_event_attr)) &&
(map_info.value_size == sizeof(struct perf_event_attr_map_entry));
}
static int bperf_lock_attr_map(struct target *target) static int bperf_lock_attr_map(struct target *target)
{ {
char path[PATH_MAX]; char path[PATH_MAX];
@ -346,6 +360,11 @@ static int bperf_lock_attr_map(struct target *target)
return -1; return -1;
} }
if (!bperf_attr_map_compatible(map_fd)) {
close(map_fd);
return -1;
}
err = flock(map_fd, LOCK_EX); err = flock(map_fd, LOCK_EX);
if (err) { if (err) {
close(map_fd); close(map_fd);