8f638f9366
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.91 Remove upstreamed patches: - airoha/patches-6.12/017-v6.13-net-airoha-Implement-BQL-support.patch[1] - airoha/patches-6.12/138-v7.1-net-airoha-Add-missing-RX_CPU_IDX-configuration-in-a.patch[2] - airoha/patches-6.12/149-v7.1-net-airoha-Move-ndesc-initialization-at-end-of-airoh.patch[3] - generic/backport-6.12/940-v7.1-net-dsa-realtek-rtl8365mb-fix-mode-mask-calculation.patch[5] Manually rebased patches: - airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch[1] - ath79/patches-6.12/800-leds-add-reset-controller-based-driver.patch[4] - bcm27xx/patches-6.12/950-0122-bcmgenet-Better-coalescing-parameter-defaults.patch[6] We also backported four patches to fix perf tool regression: - generic/backport-6.12/216-01-revert-perf-cgroup-update-metric-leader-in-evlist__e.patch - generic/backport-6.12/216-02-revert-perf-tool_pmu-fix-aggregation-on-duration_tim.patch - generic/backport-6.12/216-03-revert-perf-python-add-parse_events-function.patch - generic/backport-6.12/216-04-revert-perf-tool_pmu-factor-tool-events-into-their-o.patch All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=ca24fcac1daaa5e8a667981d81986a3eb4b9fb04 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=f00037a99bc2332ef59dc85298b98b20af165904 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=d36be272adda7f313e39dd118086955d993bf6a7 [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=07d3611389ba7d78b80ea360a42ce32ab2521fbc [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=3354d6c62fd4baa7b32cbd80cc5a8aa3f2bd0656 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=b84351dcc359667bc952131c1424b692ec83dce2 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/23444 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
75 lines
2.2 KiB
Diff
75 lines
2.2 KiB
Diff
From 5c9ceee75a90cd5db0d38d9dbfde6659194a9b5b Mon Sep 17 00:00:00 2001
|
|
From: Sasha Levin <sashal@kernel.org>
|
|
Date: Sun, 24 May 2026 10:29:50 -0400
|
|
Subject: Revert "perf cgroup: Update metric leader in evlist__expand_cgroup"
|
|
|
|
This reverts commit d26e31446c0fa96feca0b7701243b42447225d33.
|
|
|
|
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
|
---
|
|
tools/perf/util/cgroup.c | 30 +++++++-----------------------
|
|
1 file changed, 7 insertions(+), 23 deletions(-)
|
|
|
|
--- a/tools/perf/util/cgroup.c
|
|
+++ b/tools/perf/util/cgroup.c
|
|
@@ -417,6 +417,7 @@ int evlist__expand_cgroup(struct evlist
|
|
struct rblist *metric_events, bool open_cgroup)
|
|
{
|
|
struct evlist *orig_list, *tmp_list;
|
|
+ struct evsel *pos, *evsel, *leader;
|
|
struct rblist orig_metric_events;
|
|
struct cgroup *cgrp = NULL;
|
|
struct cgroup_name *cn;
|
|
@@ -455,7 +456,6 @@ int evlist__expand_cgroup(struct evlist
|
|
goto out_err;
|
|
|
|
list_for_each_entry(cn, &cgroup_list, list) {
|
|
- struct evsel *pos;
|
|
char *name;
|
|
|
|
if (!cn->used)
|
|
@@ -471,37 +471,21 @@ int evlist__expand_cgroup(struct evlist
|
|
if (cgrp == NULL)
|
|
continue;
|
|
|
|
- /* copy the list and set to the new cgroup. */
|
|
+ leader = NULL;
|
|
evlist__for_each_entry(orig_list, pos) {
|
|
- struct evsel *evsel = evsel__clone(/*dest=*/NULL, pos);
|
|
-
|
|
+ evsel = evsel__clone(/*dest=*/NULL, pos);
|
|
if (evsel == NULL)
|
|
goto out_err;
|
|
|
|
- /* stash the copy during the copying. */
|
|
- pos->priv = evsel;
|
|
cgroup__put(evsel->cgrp);
|
|
evsel->cgrp = cgroup__get(cgrp);
|
|
|
|
- evlist__add(tmp_list, evsel);
|
|
- }
|
|
- /* update leader information using stashed pointer to copy. */
|
|
- evlist__for_each_entry(orig_list, pos) {
|
|
- struct evsel *evsel = pos->priv;
|
|
-
|
|
- if (evsel__leader(pos))
|
|
- evsel__set_leader(evsel, evsel__leader(pos)->priv);
|
|
-
|
|
- if (pos->metric_leader)
|
|
- evsel->metric_leader = pos->metric_leader->priv;
|
|
+ if (evsel__is_group_leader(pos))
|
|
+ leader = evsel;
|
|
+ evsel__set_leader(evsel, leader);
|
|
|
|
- if (pos->first_wildcard_match)
|
|
- evsel->first_wildcard_match = pos->first_wildcard_match->priv;
|
|
+ evlist__add(tmp_list, evsel);
|
|
}
|
|
- /* the stashed copy is no longer used. */
|
|
- evlist__for_each_entry(orig_list, pos)
|
|
- pos->priv = NULL;
|
|
-
|
|
/* cgroup__new() has a refcount, release it here */
|
|
cgroup__put(cgrp);
|
|
nr_cgroups++;
|