mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
perf callchain: Use pthread keys for tls callchain_cursor
Pthread keys are more portable than __thread and allow the association of a destructor with the key. Use the destructor to clean up TLS callchain cursors to aid understanding memory leaks. Committer notes: Had to fixup a series of unconverted places and also check for the return of get_tls_callchain_cursor() as it may fail and return NULL. In that unlikely case we now either print something to a file, if the caller was expecting to print a callchain, or return an error code to state that resolving the callchain isn't possible. In some cases this was made easier because thread__resolve_callchain() already can fail for other reasons, so this new one (cursor == NULL) can be added and the callers don't have to explicitely check for this new condition. Signed-off-by: Ian Rogers <irogers@google.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ali Saidi <alisaidi@amazon.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Cc: Brian Robbins <brianrob@linux.microsoft.com> Cc: Changbin Du <changbin.du@huawei.com> Cc: Dmitrii Dolgov <9erthalion6@gmail.com> Cc: Fangrui Song <maskray@google.com> Cc: German Gomez <german.gomez@arm.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Ivan Babrou <ivan@cloudflare.com> Cc: James Clark <james.clark@arm.com> Cc: Jing Zhang <renyu.zj@linux.alibaba.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Garry <john.g.garry@oracle.com> Cc: K Prateek Nayak <kprateek.nayak@amd.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Liam Howlett <liam.howlett@oracle.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Miguel Ojeda <ojeda@kernel.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Sean Christopherson <seanjc@google.com> Cc: Steinar H. Gunderson <sesse@google.com> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Wenyu Liu <liuwenyu7@huawei.com> Cc: Will Deacon <will@kernel.org> Cc: Yang Jihong <yangjihong1@huawei.com> Cc: Ye Xingchen <ye.xingchen@zte.com.cn> Cc: Yuan Can <yuancan@huawei.com> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https://lore.kernel.org/r/20230608232823.4027869-25-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
committed by
Arnaldo Carvalho de Melo
parent
d7ba60a4e5
commit
8ab12a2038
@@ -215,6 +215,7 @@ static struct call_path *call_path_from_sample(struct db_export *dbe,
|
||||
u64 kernel_start = machine__kernel_start(machine);
|
||||
struct call_path *current = &dbe->cpr->call_path;
|
||||
enum chain_order saved_order = callchain_param.order;
|
||||
struct callchain_cursor *cursor;
|
||||
int err;
|
||||
|
||||
if (!symbol_conf.use_callchain || !sample->callchain)
|
||||
@@ -226,13 +227,14 @@ static struct call_path *call_path_from_sample(struct db_export *dbe,
|
||||
* the callchain starting with the root node and ending with the leaf.
|
||||
*/
|
||||
callchain_param.order = ORDER_CALLER;
|
||||
err = thread__resolve_callchain(thread, &callchain_cursor, evsel,
|
||||
cursor = get_tls_callchain_cursor();
|
||||
err = thread__resolve_callchain(thread, cursor, evsel,
|
||||
sample, NULL, NULL, PERF_MAX_STACK_DEPTH);
|
||||
if (err) {
|
||||
callchain_param.order = saved_order;
|
||||
return NULL;
|
||||
}
|
||||
callchain_cursor_commit(&callchain_cursor);
|
||||
callchain_cursor_commit(cursor);
|
||||
|
||||
while (1) {
|
||||
struct callchain_cursor_node *node;
|
||||
@@ -240,7 +242,7 @@ static struct call_path *call_path_from_sample(struct db_export *dbe,
|
||||
u64 dso_db_id = 0, sym_db_id = 0, offset = 0;
|
||||
|
||||
|
||||
node = callchain_cursor_current(&callchain_cursor);
|
||||
node = callchain_cursor_current(cursor);
|
||||
if (!node)
|
||||
break;
|
||||
|
||||
@@ -265,7 +267,7 @@ static struct call_path *call_path_from_sample(struct db_export *dbe,
|
||||
al.sym, node->ip,
|
||||
kernel_start);
|
||||
|
||||
callchain_cursor_advance(&callchain_cursor);
|
||||
callchain_cursor_advance(cursor);
|
||||
addr_location__exit(&al);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user