Unverified Commit 13f42fc4 authored Oct 17, 2023 by openeuler-ci-bot Committed by Gitee Oct 17, 2023

!2423 Revert "perf: pmu: fix set wrong filter mode for running events issue"...

!2423 Revert "perf: pmu: fix set wrong filter mode for running events issue" and "perf: hns3: default use hardware event 0 as group leader event."

Merge Pull Request from: @svishen 
 
This pr revert this two private patch：
perf: pmu: fix set wrong filter mode for running events issue
perf: hns3: default use hardware event 0 as group leader event.

reason：
（1）perf: pmu: fix set wrong filter mode for running events issue
The patch was rejected when trying to upload the mainline because there were scenarios that were not considered. So it is need to revert.
（2）perf: hns3: default use hardware event 0 as group leader event.
Because kernel 6.2 'commit 5f8f9567 ("perf evlist: Remove group option.") remove -g parameter.Add this patch to set default related event idx as 0 to share the first hardware event. But openeuler do not remove -g parameter. So revert it.

issue:
https://gitee.com/openeuler/kernel/issues/I87YZU 
 
Link:https://gitee.com/openeuler/kernel/pulls/2423

 

Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>

parents a27fd823 99790d0b

drivers/perf/hisilicon/hns3_pmu.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -804,11 +804,9 @@ static int hns3_pmu_find_related_event_idx(struct hns3_pmu *hns3_pmu,
		if (!hns3_pmu_cmp_event(sibling, event))
		continue;

		/* Related events is used in group, else we use index 0 event as related event */
		/* Related events is used in group */
		if (sibling->group_leader == event->group_leader)
		return idx;
		else
		return 0;
		}

		/* No related event and all hardware events are used up */
		@@ -1008,13 +1006,12 @@ static bool
		hns3_pmu_is_enabled_port_tc_mode(struct perf_event *event,
		struct hns3_pmu_event_attr *pmu_event)
		{
		u16 bdf = hns3_pmu_get_bdf(event);
		u8 tc_id = hns3_pmu_get_tc(event);

		if (!(pmu_event->filter_support & HNS3_PMU_FILTER_SUPPORT_PORT_TC))
		return false;

		return (tc_id != HNS3_PMU_FILTER_ALL_TC) && (!bdf);
		return tc_id != HNS3_PMU_FILTER_ALL_TC;
		}

		static bool