Commit 40663f76 authored May 26, 2023 by Ian Rogers Committed by Yushan Wang Oct 23, 2024

perf cpumap: Add intersect function

mainline inclusion
from mainline-v6.5-rc1
commit 237d41d4
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAWKCP
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=237d41d4a2d7d45e41f5450636d1cf689cba0e8a



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

The merge function gives the union of two cpu maps. Add an intersect
function which is necessary, for example, when intersecting a PMUs
supported CPUs with user requested.

Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ali Saidi <alisaidi@amazon.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kang Minchul <tegongkang@gmail.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Ming Wang <wangming01@loongson.cn>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20230526215410.2435674-2-irogers@google.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: zhangqizhi <zhangqizhi3@h-partners.com>

parent 72fd5cd7

tools/lib/perf/cpumap.c

+35 −0

Original line number	Diff line number	Diff line
		@@ -363,3 +363,38 @@ struct perf_cpu_map perf_cpu_map__merge(struct perf_cpu_map orig,
		perf_cpu_map__put(orig);
		return merged;
		}

		struct perf_cpu_map perf_cpu_map__intersect(struct perf_cpu_map orig,
		struct perf_cpu_map *other)
		{
		struct perf_cpu *tmp_cpus;
		int tmp_len;
		int i, j, k;
		struct perf_cpu_map *merged = NULL;

		if (perf_cpu_map__is_subset(other, orig))
		return perf_cpu_map__get(orig);
		if (perf_cpu_map__is_subset(orig, other))
		return perf_cpu_map__get(other);

		tmp_len = max(orig->nr, other->nr);
		tmp_cpus = malloc(tmp_len * sizeof(struct perf_cpu));
		if (!tmp_cpus)
		return NULL;

		i = j = k = 0;
		while (i < orig->nr && j < other->nr) {
		if (orig->map[i].cpu < other->map[j].cpu)
		i++;
		else if (orig->map[i].cpu > other->map[j].cpu)
		j++;
		else {
		j++;
		tmp_cpus[k++] = orig->map[i++];
		}
		}
		if (k)
		merged = cpu_map__trim_new(k, &tmp_cpus->cpu);
		free(tmp_cpus);
		return merged;
		}

tools/lib/perf/include/perf/cpumap.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ LIBPERF_API struct perf_cpu_map perf_cpu_map__read(FILE file);
		LIBPERF_API struct perf_cpu_map perf_cpu_map__get(struct perf_cpu_map map);
		LIBPERF_API struct perf_cpu_map perf_cpu_map__merge(struct perf_cpu_map orig,
		struct perf_cpu_map *other);
		LIBPERF_API struct perf_cpu_map perf_cpu_map__intersect(struct perf_cpu_map orig,
		struct perf_cpu_map *other);
		LIBPERF_API void perf_cpu_map__put(struct perf_cpu_map *map);
		LIBPERF_API int perf_cpu_map__cpu(const struct perf_cpu_map *cpus, int idx);
		LIBPERF_API int perf_cpu_map__nr(const struct perf_cpu_map *cpus);