Merge: perf: Fix broken module probing

emmil · emmil · commit cc47a2674f4e · 2024-11-28T20:19:08.000Z
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5813 JIRA: https://issues.redhat.com/browse/RHEL-62198 Signed-off-by: Michael Petlan <mpetlan@redhat.com> Approved-by: Chris von Recklinghausen <crecklin@redhat.com> Approved-by: Jerome Marchand <jmarchan@redhat.com> Approved-by: vmolnaro <vmolnaro@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
@@ -1342,7 +1342,7 @@ static int maps__set_module_path(struct maps *maps, const char *path, struct kmo
 	 * we need to update the symtab_type if needed.
 	 */
 	if (m->comp && is_kmod_dso(dso)) {
-		dso__set_symtab_type(dso, dso__symtab_type(dso));
+		dso__set_symtab_type(dso, dso__symtab_type(dso)+1);
 		dso__set_comp(dso, m->comp);
 	}
 	map__put(map);

Original file line number	Diff line number	Diff line change
`@@ -1342,7 +1342,7 @@ static int maps__set_module_path(struct maps maps, const char path, struct kmo`
`1342`	`1342`	`* we need to update the symtab_type if needed.`
`1343`	`1343`	`*/`
`1344`	`1344`	`if (m->comp && is_kmod_dso(dso)) {`
`1345`		`- dso__set_symtab_type(dso, dso__symtab_type(dso));`
	`1345`	`+ dso__set_symtab_type(dso, dso__symtab_type(dso)+1);`
`1346`	`1346`	`dso__set_comp(dso, m->comp);`
`1347`	`1347`	`}`
`1348`	`1348`	`map__put(map);`