perf header: Avoid hybrid PMU list in write_pmu_caps
Avoid perf_pmu__for_each_hybrid_pmu by iterating all PMUs are dumping the core ones. This will eventually allow removal of the hybrid PMU list. 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/20230527072210.2900565-21-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
5d9fb66676
commit
178ddf3bad
|
@ -51,7 +51,6 @@
|
||||||
#include "bpf-event.h"
|
#include "bpf-event.h"
|
||||||
#include "bpf-utils.h"
|
#include "bpf-utils.h"
|
||||||
#include "clockid.h"
|
#include "clockid.h"
|
||||||
#include "pmu-hybrid.h"
|
|
||||||
|
|
||||||
#include <linux/ctype.h>
|
#include <linux/ctype.h>
|
||||||
#include <internal/lib.h>
|
#include <internal/lib.h>
|
||||||
|
@ -1605,17 +1604,21 @@ static int write_pmu_caps(struct feat_fd *ff,
|
||||||
* Write hybrid pmu caps first to maintain compatibility with
|
* Write hybrid pmu caps first to maintain compatibility with
|
||||||
* older perf tool.
|
* older perf tool.
|
||||||
*/
|
*/
|
||||||
pmu = NULL;
|
if (perf_pmu__has_hybrid()) {
|
||||||
perf_pmu__for_each_hybrid_pmu(pmu) {
|
pmu = NULL;
|
||||||
ret = __write_pmu_caps(ff, pmu, true);
|
while ((pmu = perf_pmu__scan(pmu))) {
|
||||||
if (ret < 0)
|
if (!pmu->is_core)
|
||||||
return ret;
|
continue;
|
||||||
|
|
||||||
|
ret = __write_pmu_caps(ff, pmu, true);
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pmu = NULL;
|
pmu = NULL;
|
||||||
while ((pmu = perf_pmu__scan(pmu))) {
|
while ((pmu = perf_pmu__scan(pmu))) {
|
||||||
if (!pmu->name || !strcmp(pmu->name, "cpu") ||
|
if (pmu->is_core || !pmu->nr_caps)
|
||||||
!pmu->nr_caps || perf_pmu__is_hybrid(pmu->name))
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
ret = __write_pmu_caps(ff, pmu, true);
|
ret = __write_pmu_caps(ff, pmu, true);
|
||||||
|
|
Loading…
Reference in New Issue