Commit f1d1ceb3 authored by Adrian Hunter's avatar Adrian Hunter Committed by Junhao He
Browse files

perf auxtrace: Remove auxtrace_mmap_params__set_idx() per_cpu parameter 

mainline inclusion
from mainline-v5.19-rc1
commit 84bd5aba
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I7HI80
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=84bd5aba88af7b6ec46ea88e01588f93c6aa782f



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

Remove ->idx() per_cpu parameter because it isn't needed.
Remove auxtrace_mmap_params__set_idx() per_cpu parameter because it isn't
needed.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Link: https://lore.kernel.org/r/20220524075436.29144-4-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
parent 19c15696

tools/perf/util/auxtrace.c

+3 −2
Original line number Diff line number Diff line
@@ -177,9 +177,10 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp, 


void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,

				   struct evlist *evlist,

				   struct evsel *evsel, int idx,

				   bool per_cpu)

				   struct evsel *evsel, int idx)

{

	bool per_cpu = !perf_cpu_map__empty(evlist->core.cpus);



	mp->mmap_needed = evsel->needs_auxtrace_mmap;



	if (!mp->mmap_needed)

tools/perf/util/auxtrace.h

+3 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/list.h>

#include <linux/perf_event.h>

#include <linux/types.h>

#include <perf/cpumap.h>

#include <asm/bitsperlong.h>

#include <asm/barrier.h>
@@ -498,8 +499,7 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp, 
				bool auxtrace_overwrite);

void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,

				   struct evlist *evlist,

				   struct evsel *evsel, int idx,

				   bool per_cpu);

				   struct evsel *evsel, int idx);



typedef int (*process_auxtrace_t)(struct perf_tool *tool,

				  struct mmap *map,
@@ -830,8 +830,7 @@ void auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp, 
				bool auxtrace_overwrite);

void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,

				   struct evlist *evlist,

				   struct evsel *evsel, int idx,

				   bool per_cpu);

				   struct evsel *evsel, int idx);



#define ITRACE_HELP ""

tools/perf/util/evlist.c

+1 −2
Original line number Diff line number Diff line
@@ -727,10 +727,9 @@ perf_evlist__mmap_cb_idx(struct perf_evlist *_evlist, 
{

	struct evlist *evlist = container_of(_evlist, struct evlist, core);

	struct mmap_params *mp = container_of(_mp, struct mmap_params, core);

	bool per_cpu = !perf_cpu_map__empty(_evlist->cpus);

	struct evsel *evsel = container_of(_evsel, struct evsel, core);



	auxtrace_mmap_params__set_idx(&mp->auxtrace_mp, evlist, evsel, idx, per_cpu);

	auxtrace_mmap_params__set_idx(&mp->auxtrace_mp, evlist, evsel, idx);

}



static struct perf_mmap*

tools/perf/util/mmap.c

+1 −2
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ void __weak auxtrace_mmap_params__init(struct auxtrace_mmap_params *mp __maybe_u 
void __weak auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp __maybe_unused,

					  struct evlist *evlist __maybe_unused,

					  struct evsel *evsel __maybe_unused,

					  int idx __maybe_unused,

					  bool per_cpu __maybe_unused)

					  int idx __maybe_unused)

{

}