|
|
@@ -2140,6 +2140,27 @@ static int resolve_lbr_callchain_sample(struct thread *thread,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static int find_prev_cpumode(struct ip_callchain *chain, struct thread *thread,
|
|
|
+ struct callchain_cursor *cursor,
|
|
|
+ struct symbol **parent,
|
|
|
+ struct addr_location *root_al,
|
|
|
+ u8 *cpumode, int ent)
|
|
|
+{
|
|
|
+ int err = 0;
|
|
|
+
|
|
|
+ while (--ent >= 0) {
|
|
|
+ u64 ip = chain->ips[ent];
|
|
|
+
|
|
|
+ if (ip >= PERF_CONTEXT_MAX) {
|
|
|
+ err = add_callchain_ip(thread, cursor, parent,
|
|
|
+ root_al, cpumode, ip,
|
|
|
+ false, NULL, NULL, 0);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return err;
|
|
|
+}
|
|
|
+
|
|
|
static int thread__resolve_callchain_sample(struct thread *thread,
|
|
|
struct callchain_cursor *cursor,
|
|
|
struct perf_evsel *evsel,
|
|
|
@@ -2246,6 +2267,12 @@ static int thread__resolve_callchain_sample(struct thread *thread,
|
|
|
}
|
|
|
|
|
|
check_calls:
|
|
|
+ if (callchain_param.order != ORDER_CALLEE) {
|
|
|
+ err = find_prev_cpumode(chain, thread, cursor, parent, root_al,
|
|
|
+ &cpumode, chain->nr - first_call);
|
|
|
+ if (err)
|
|
|
+ return (err < 0) ? err : 0;
|
|
|
+ }
|
|
|
for (i = first_call, nr_entries = 0;
|
|
|
i < chain_nr && nr_entries < max_stack; i++) {
|
|
|
u64 ip;
|
|
|
@@ -2260,9 +2287,15 @@ check_calls:
|
|
|
continue;
|
|
|
#endif
|
|
|
ip = chain->ips[j];
|
|
|
-
|
|
|
if (ip < PERF_CONTEXT_MAX)
|
|
|
++nr_entries;
|
|
|
+ else if (callchain_param.order != ORDER_CALLEE) {
|
|
|
+ err = find_prev_cpumode(chain, thread, cursor, parent,
|
|
|
+ root_al, &cpumode, j);
|
|
|
+ if (err)
|
|
|
+ return (err < 0) ? err : 0;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
|
|
|
err = add_callchain_ip(thread, cursor, parent,
|
|
|
root_al, &cpumode, ip,
|