perf kwork: Fix incorrect and missing free atom in work_push_atom()
authorYang Jihong <yangjihong1@huawei.com>
Sat, 12 Aug 2023 08:49:02 +0000 (08:49 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:59:24 +0000 (11:59 +0100)
[ Upstream commit d39710088d82ef100b33cdf4a9de3546fb0bb5df ]

1. Atoms are managed in page mode and should be released using atom_free()
   instead of free().
2. When the event does not match, the atom needs to free.

Fixes: f98919ec4fccdacf ("perf kwork: Implement 'report' subcommand")
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Yang Jihong <yangjihong1@huawei.com>
Link: https://lore.kernel.org/r/20230812084917.169338-2-yangjihong1@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/perf/builtin-kwork.c

index 14bf7a8..73b5dc0 100644 (file)
@@ -406,12 +406,14 @@ static int work_push_atom(struct perf_kwork *kwork,
 
        work = work_findnew(&class->work_root, &key, &kwork->cmp_id);
        if (work == NULL) {
-               free(atom);
+               atom_free(atom);
                return -1;
        }
 
-       if (!profile_event_match(kwork, work, sample))
+       if (!profile_event_match(kwork, work, sample)) {
+               atom_free(atom);
                return 0;
+       }
 
        if (dst_type < KWORK_TRACE_MAX) {
                dst_atom = list_last_entry_or_null(&work->atom_list[dst_type],