Commit 199e06fe authored by Dave Marchevsky's avatar Dave Marchevsky Committed by Andrii Nakryiko
Browse files

perf: Pull in bpf_program__get_prog_info_linear 



To prepare for impending deprecation of libbpf's
bpf_program__get_prog_info_linear, pull in the function and associated
helpers into the perf codebase and migrate existing uses to the perf
copy.

Since libbpf's deprecated definitions will still be visible to perf, it
is necessary to rename perf's definitions.

Signed-off-by: default avatarDave Marchevsky <davemarchevsky@fb.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Acked-by: default avatarQuentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20211101224357.2651181-4-davemarchevsky@fb.com
parent c59765cf

tools/perf/Documentation/perf.data-file-format.txt

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ to special needs. 


        HEADER_BPF_PROG_INFO = 25,



struct bpf_prog_info_linear, which contains detailed information about

struct perf_bpil, which contains detailed information about

a BPF program, including type, id, tag, jited/xlated instructions, etc.



        HEADER_BPF_BTF = 26,

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ endif 
perf-y += perf-hooks.o



perf-$(CONFIG_LIBBPF) += bpf-event.o

perf-$(CONFIG_LIBBPF) += bpf-utils.o



perf-$(CONFIG_CXX) += c++/

tools/perf/util/annotate.c

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "evsel.h"

#include "evlist.h"

#include "bpf-event.h"

#include "bpf-utils.h"

#include "block-range.h"

#include "string2.h"

#include "util/event.h"
@@ -1700,12 +1701,12 @@ static int symbol__disassemble_bpf(struct symbol *sym, 
{

	struct annotation *notes = symbol__annotation(sym);

	struct annotation_options *opts = args->options;

	struct bpf_prog_info_linear *info_linear;

	struct bpf_prog_linfo *prog_linfo = NULL;

	struct bpf_prog_info_node *info_node;

	int len = sym->end - sym->start;

	disassembler_ftype disassemble;

	struct map *map = args->ms.map;

	struct perf_bpil *info_linear;

	struct disassemble_info info;

	struct dso *dso = map->dso;

	int pc = 0, count, sub_id;

tools/perf/util/bpf-event.c

+20 −21
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <internal/lib.h>

#include <symbol/kallsyms.h>

#include "bpf-event.h"

#include "bpf-utils.h"

#include "debug.h"

#include "dso.h"

#include "symbol.h"
@@ -32,8 +33,6 @@ struct btf * __weak btf__load_from_kernel_by_id(__u32 id) 
       return err ? ERR_PTR(err) : btf;

}



#define ptr_to_u64(ptr)    ((__u64)(unsigned long)(ptr))



static int snprintf_hex(char *buf, size_t size, unsigned char *data, size_t len)

{

	int ret = 0;
@@ -48,9 +47,9 @@ static int machine__process_bpf_event_load(struct machine *machine, 
					   union perf_event *event,

					   struct perf_sample *sample __maybe_unused)

{

	struct bpf_prog_info_linear *info_linear;

	struct bpf_prog_info_node *info_node;

	struct perf_env *env = machine->env;

	struct perf_bpil *info_linear;

	int id = event->bpf.id;

	unsigned int i;
@@ -175,9 +174,9 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session, 
{

	struct perf_record_ksymbol *ksymbol_event = &event->ksymbol;

	struct perf_record_bpf_event *bpf_event = &event->bpf;

	struct bpf_prog_info_linear *info_linear;

	struct perf_tool *tool = session->tool;

	struct bpf_prog_info_node *info_node;

	struct perf_bpil *info_linear;

	struct bpf_prog_info *info;

	struct btf *btf = NULL;

	struct perf_env *env;
@@ -191,15 +190,15 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session, 
	 */

	env = session->data ? &session->header.env : &perf_env;



	arrays = 1UL << BPF_PROG_INFO_JITED_KSYMS;

	arrays |= 1UL << BPF_PROG_INFO_JITED_FUNC_LENS;

	arrays |= 1UL << BPF_PROG_INFO_FUNC_INFO;

	arrays |= 1UL << BPF_PROG_INFO_PROG_TAGS;

	arrays |= 1UL << BPF_PROG_INFO_JITED_INSNS;

	arrays |= 1UL << BPF_PROG_INFO_LINE_INFO;

	arrays |= 1UL << BPF_PROG_INFO_JITED_LINE_INFO;

	arrays = 1UL << PERF_BPIL_JITED_KSYMS;

	arrays |= 1UL << PERF_BPIL_JITED_FUNC_LENS;

	arrays |= 1UL << PERF_BPIL_FUNC_INFO;

	arrays |= 1UL << PERF_BPIL_PROG_TAGS;

	arrays |= 1UL << PERF_BPIL_JITED_INSNS;

	arrays |= 1UL << PERF_BPIL_LINE_INFO;

	arrays |= 1UL << PERF_BPIL_JITED_LINE_INFO;



	info_linear = bpf_program__get_prog_info_linear(fd, arrays);

	info_linear = get_bpf_prog_info_linear(fd, arrays);

	if (IS_ERR_OR_NULL(info_linear)) {

		info_linear = NULL;

		pr_debug("%s: failed to get BPF program info. aborting\n", __func__);
@@ -452,8 +451,8 @@ int perf_event__synthesize_bpf_events(struct perf_session *session, 


static void perf_env__add_bpf_info(struct perf_env *env, u32 id)

{

	struct bpf_prog_info_linear *info_linear;

	struct bpf_prog_info_node *info_node;

	struct perf_bpil *info_linear;

	struct btf *btf = NULL;

	u64 arrays;

	u32 btf_id;
@@ -463,15 +462,15 @@ static void perf_env__add_bpf_info(struct perf_env *env, u32 id) 
	if (fd < 0)

		return;



	arrays = 1UL << BPF_PROG_INFO_JITED_KSYMS;

	arrays |= 1UL << BPF_PROG_INFO_JITED_FUNC_LENS;

	arrays |= 1UL << BPF_PROG_INFO_FUNC_INFO;

	arrays |= 1UL << BPF_PROG_INFO_PROG_TAGS;

	arrays |= 1UL << BPF_PROG_INFO_JITED_INSNS;

	arrays |= 1UL << BPF_PROG_INFO_LINE_INFO;

	arrays |= 1UL << BPF_PROG_INFO_JITED_LINE_INFO;

	arrays = 1UL << PERF_BPIL_JITED_KSYMS;

	arrays |= 1UL << PERF_BPIL_JITED_FUNC_LENS;

	arrays |= 1UL << PERF_BPIL_FUNC_INFO;

	arrays |= 1UL << PERF_BPIL_PROG_TAGS;

	arrays |= 1UL << PERF_BPIL_JITED_INSNS;

	arrays |= 1UL << PERF_BPIL_LINE_INFO;

	arrays |= 1UL << PERF_BPIL_JITED_LINE_INFO;



	info_linear = bpf_program__get_prog_info_linear(fd, arrays);

	info_linear = get_bpf_prog_info_linear(fd, arrays);

	if (IS_ERR_OR_NULL(info_linear)) {

		pr_debug("%s: failed to get BPF program info. aborting\n", __func__);

		goto out;

tools/perf/util/bpf-event.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ struct evlist; 
struct target;



struct bpf_prog_info_node {

	struct bpf_prog_info_linear	*info_linear;

	struct perf_bpil		*info_linear;

	struct rb_node			rb_node;

};