Commit ec20920d authored Feb 23, 2024 by Junhao He Committed by Slim6882 May 22, 2024

drivers/perf: hisi_pcie: Merge find_related_event() and get_event_idx()

mainline inclusion
from mainline-v6.9-rc1
commit 7da377059ee653dd4ddcc126fd26c9c78f7bc4e7
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9HCSA
CVE: NA

Reference: https://lore.kernel.org/all/20240223103359.18669-1-yangyicong@huawei.com/



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

The function xxx_find_related_event() scan all working events to find
related events. During this process, we also can find the idle counters.
If not found related events, return the first idle counter to simplify
the code.

Signed-off-by: Junhao He <hejunhao3@huawei.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20240223103359.18669-8-yangyicong@huawei.com


Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Slim6882 <yangjunshuo@huawei.com>

parent 86758bb8

drivers/perf/hisilicon/hisi_pcie_pmu.c

+19 −32

Original line number	Diff line number	Diff line
		@@ -404,16 +404,24 @@ static u64 hisi_pcie_pmu_read_counter(struct perf_event *event)
		return hisi_pcie_pmu_readq(pcie_pmu, event->hw.event_base, idx);
		}

		static int hisi_pcie_pmu_find_related_event(struct hisi_pcie_pmu *pcie_pmu,
		/*
		* Check all work events, if a relevant event is found then we return it
		* first, otherwise return the first idle counter (need to reset).
		*/
		static int hisi_pcie_pmu_get_event_idx(struct hisi_pcie_pmu *pcie_pmu,
		struct perf_event *event)
		{
		int first_idle = -EAGAIN;
		struct perf_event *sibling;
		int idx;

		for (idx = 0; idx < HISI_PCIE_MAX_COUNTERS; idx++) {
		sibling = pcie_pmu->hw_events[idx];
		if (!sibling)
		if (!sibling) {
		if (first_idle == -EAGAIN)
		first_idle = idx;
		continue;
		}

		/* Related events must be used in group */
		if (hisi_pcie_pmu_cmp_event(sibling, event) &&
		@@ -421,19 +429,7 @@ static int hisi_pcie_pmu_find_related_event(struct hisi_pcie_pmu *pcie_pmu,
		return idx;
		}

		return idx;
		}

		static int hisi_pcie_pmu_get_event_idx(struct hisi_pcie_pmu *pcie_pmu)
		{
		int idx;

		for (idx = 0; idx < HISI_PCIE_MAX_COUNTERS; idx++) {
		if (!pcie_pmu->hw_events[idx])
		return idx;
		}

		return -EINVAL;
		return first_idle;
		}

		static void hisi_pcie_pmu_event_update(struct perf_event *event)
		@@ -559,27 +555,18 @@ static int hisi_pcie_pmu_add(struct perf_event *event, int flags)

		hwc->state = PERF_HES_STOPPED \| PERF_HES_UPTODATE;

		/* Check all working events to find a related event. */
		idx = hisi_pcie_pmu_find_related_event(pcie_pmu, event);
		idx = hisi_pcie_pmu_get_event_idx(pcie_pmu, event);
		if (idx < 0)
		return idx;

		/* Current event shares an enabled counter with the related event */
		if (idx < HISI_PCIE_MAX_COUNTERS) {
		hwc->idx = idx;
		goto start_count;
		}

		idx = hisi_pcie_pmu_get_event_idx(pcie_pmu);
		if (idx < 0)
		return idx;

		hwc->idx = idx;
		pcie_pmu->hw_events[idx] = event;
		/* Reset Counter to avoid previous statistic interference. */
		/* No enabled counter found with related event, reset it */
		if (!pcie_pmu->hw_events[idx]) {
		hisi_pcie_pmu_reset_counter(pcie_pmu, idx);
		pcie_pmu->hw_events[idx] = event;
		}

		start_count:
		if (flags & PERF_EF_START)
		hisi_pcie_pmu_start(event, PERF_EF_RELOAD);