Commit 18845e00 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by PvsNarasimha
Browse files

perf env: Conditionally compile BPF support code on having HAVE_LIBBPF_SUPPORT 

mainline inclusion
from mainline-v5.11-rc1
commit ef0580ec
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAU6ZD

Reference: https://github.com/torvalds/linux/commit/ef0580ecd8b0306acf09b7a7508d72cafc67896d



--------------------------------

commit ef0580ec upstream

If libbpf isn't selected, no need for a bunch of related code, that were
not even being used, as code using these perf_env methods was also
enclosed in HAVE_LIBBPF_SUPPORT.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarMalathi A <arunagiri.malathi@amd.com>
Signed-off-by: default avatarPvsNarasimha <PVS.NarasimhaRao@amd.com>
parent d13648e5

tools/perf/util/dso.c

+10 −4
Original line number Diff line number Diff line
@@ -11,8 +11,10 @@ 
#include <errno.h>

#include <fcntl.h>

#include <stdlib.h>

#ifdef HAVE_LIBBPF_SUPPORT

#include <bpf/libbpf.h>

#include "bpf-event.h"

#endif

#include "compress.h"

#include "env.h"

#include "namespaces.h"
@@ -728,6 +730,7 @@ bool dso__data_status_seen(struct dso *dso, enum dso_data_status_seen by) 
	return false;

}



#ifdef HAVE_LIBBPF_SUPPORT

static ssize_t bpf_read(struct dso *dso, u64 offset, char *data)

{

	struct bpf_prog_info_node *node;
@@ -765,6 +768,7 @@ static int bpf_size(struct dso *dso) 
	dso->data.file_size = node->info_linear->info.jited_prog_len;

	return 0;

}

#endif // HAVE_LIBBPF_SUPPORT



static void

dso_cache__free(struct dso *dso)
@@ -894,10 +898,12 @@ static struct dso_cache *dso_cache__populate(struct dso *dso, 
		*ret = -ENOMEM;

		return NULL;

	}



#ifdef HAVE_LIBBPF_SUPPORT

	if (dso->binary_type == DSO_BINARY_TYPE__BPF_PROG_INFO)

		*ret = bpf_read(dso, cache_offset, cache->data);

	else if (dso->binary_type == DSO_BINARY_TYPE__OOL)

	else

#endif

	if (dso->binary_type == DSO_BINARY_TYPE__OOL)

		*ret = DSO__DATA_CACHE_SIZE;

	else

		*ret = file_read(dso, machine, cache_offset, cache->data);
@@ -1018,10 +1024,10 @@ int dso__data_file_size(struct dso *dso, struct machine *machine) 


	if (dso->data.status == DSO_DATA_STATUS_ERROR)

		return -1;



#ifdef HAVE_LIBBPF_SUPPORT

	if (dso->binary_type == DSO_BINARY_TYPE__BPF_PROG_INFO)

		return bpf_size(dso);



#endif

	return file_size(dso, machine);

}

tools/perf/util/env.c

+12 −3
Original line number Diff line number Diff line
@@ -5,17 +5,19 @@ 
#include "util/header.h"

#include <linux/ctype.h>

#include <linux/zalloc.h>

#include "bpf-event.h"

#include "cgroup.h"

#include <errno.h>

#include <sys/utsname.h>

#include <bpf/libbpf.h>

#include <stdlib.h>

#include <string.h>

#include "strbuf.h"



struct perf_env perf_env;



#ifdef HAVE_LIBBPF_SUPPORT

#include "bpf-event.h"

#include <bpf/libbpf.h>



void perf_env__insert_bpf_prog_info(struct perf_env *env,

				    struct bpf_prog_info_node *info_node)

{
@@ -182,6 +184,11 @@ static void perf_env__purge_bpf(struct perf_env *env) 


	up_write(&env->bpf_progs.lock);

}

#else // HAVE_LIBBPF_SUPPORT

static void perf_env__purge_bpf(struct perf_env *env __maybe_unused)

{

}

#endif // HAVE_LIBBPF_SUPPORT



void perf_env__exit(struct perf_env *env)

{
@@ -218,11 +225,13 @@ void perf_env__exit(struct perf_env *env) 
	zfree(&env->memory_nodes);

}



void perf_env__init(struct perf_env *env)

void perf_env__init(struct perf_env *env __maybe_unused)

{

#ifdef HAVE_LIBBPF_SUPPORT

	env->bpf_progs.infos = RB_ROOT;

	env->bpf_progs.btfs = RB_ROOT;

	init_rwsem(&env->bpf_progs.lock);

#endif

}



int perf_env__set_cmdline(struct perf_env *env, int argc, const char *argv[])

tools/perf/util/env.h

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct perf_env { 
	struct numa_node	*numa_nodes;

	struct memory_node	*memory_nodes;

	unsigned long long	 memory_bsize;



#ifdef HAVE_LIBBPF_SUPPORT

	/*

	 * bpf_info_lock protects bpf rbtrees. This is needed because the

	 * trees are accessed by different threads in perf-top
@@ -89,7 +89,7 @@ struct perf_env { 
		struct rb_root		btfs;

		u32			btfs_cnt;

	} bpf_progs;



#endif // HAVE_LIBBPF_SUPPORT

	/* same reason as above (for perf-top) */

	struct {

		struct rw_semaphore	lock;

tools/perf/util/header.c

+8 −13
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ 
#include <sys/utsname.h>

#include <linux/time64.h>

#include <dirent.h>

#ifdef HAVE_LIBBPF_SUPPORT

#include <bpf/libbpf.h>

#endif

#include <perf/cpumap.h>



#include "dso.h"
@@ -987,13 +989,6 @@ static int write_bpf_prog_info(struct feat_fd *ff, 
	up_read(&env->bpf_progs.lock);

	return ret;

}

#else // HAVE_LIBBPF_SUPPORT

static int write_bpf_prog_info(struct feat_fd *ff __maybe_unused,

			       struct evlist *evlist __maybe_unused)

{

	return 0;

}

#endif // HAVE_LIBBPF_SUPPORT



static int write_bpf_btf(struct feat_fd *ff,

			 struct evlist *evlist __maybe_unused)
@@ -1027,6 +1022,7 @@ static int write_bpf_btf(struct feat_fd *ff, 
	up_read(&env->bpf_progs.lock);

	return ret;

}

#endif // HAVE_LIBBPF_SUPPORT



static int cpu_cache_level__sort(const void *a, const void *b)

{
@@ -1638,6 +1634,7 @@ static void print_dir_format(struct feat_fd *ff, FILE *fp) 
	fprintf(fp, "# directory data version : %"PRIu64"\n", data->dir.version);

}



#ifdef HAVE_LIBBPF_SUPPORT

static void print_bpf_prog_info(struct feat_fd *ff, FILE *fp)

{

	struct perf_env *env = &ff->ph->env;
@@ -1683,6 +1680,7 @@ static void print_bpf_btf(struct feat_fd *ff, FILE *fp) 


	up_read(&env->bpf_progs.lock);

}

#endif // HAVE_LIBBPF_SUPPORT



static void free_event_desc(struct evsel *events)

{
@@ -2938,12 +2936,6 @@ static int process_bpf_prog_info(struct feat_fd *ff, void *data __maybe_unused) 
	up_write(&env->bpf_progs.lock);

	return err;

}

#else // HAVE_LIBBPF_SUPPORT

static int process_bpf_prog_info(struct feat_fd *ff __maybe_unused, void *data __maybe_unused)

{

	return 0;

}

#endif // HAVE_LIBBPF_SUPPORT



static int process_bpf_btf(struct feat_fd *ff, void *data __maybe_unused)

{
@@ -2990,6 +2982,7 @@ static int process_bpf_btf(struct feat_fd *ff, void *data __maybe_unused) 
	free(node);

	return err;

}

#endif // HAVE_LIBBPF_SUPPORT



static int process_compressed(struct feat_fd *ff,

			      void *data __maybe_unused)
@@ -3120,8 +3113,10 @@ const struct perf_header_feature_ops feat_ops[HEADER_LAST_FEATURE] = { 
	FEAT_OPR(MEM_TOPOLOGY,	mem_topology,	true),

	FEAT_OPR(CLOCKID,	clockid,	false),

	FEAT_OPN(DIR_FORMAT,	dir_format,	false),

#ifdef HAVE_LIBBPF_SUPPORT

	FEAT_OPR(BPF_PROG_INFO, bpf_prog_info,  false),

	FEAT_OPR(BPF_BTF,       bpf_btf,        false),

#endif

	FEAT_OPR(COMPRESSED,	compressed,	false),

	FEAT_OPR(CPU_PMU_CAPS,	cpu_pmu_caps,	false),

	FEAT_OPR(CLOCK_DATA,	clock_data,	false),