Commit 0ce6cf53db5b ("perf inject: Set ordering_requires_timestamps before creating session") initialized ordered_events and ordering_requires_timestamps on inject.tool before creating delegate tools and the session, but omitted inject.aslr. Also set ordering_requires_timestamps on aslr->tool.tool alongside ordered_events in aslr_tool__init() so --aslr orders MMAP and sample events by timestamp consistently. Fixes: febea9ec382f ("perf inject/aslr: Add ASLR tool infrastructure and MMAP tracking") Signed-off-by: Ian Rogers --- tools/perf/builtin-inject.c | 4 ++-- tools/perf/util/aslr.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 3f3108fd3981..b887a4398f96 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -2810,7 +2810,7 @@ int cmd_inject(int argc, const char **argv) data.path = inject.input_name; - ordered_events = inject.jit_mode || inject.sched_stat || + ordered_events = inject.jit_mode || inject.sched_stat || inject.aslr || inject.itrace_synth_opts.vm_time_correlation || inject.itrace_synth_opts.set || inject.guest_session.perf_data_file || @@ -2861,7 +2861,7 @@ int cmd_inject(int argc, const char **argv) inject.tool.schedstat_domain = perf_event__repipe_op2_synth; inject.tool.dont_split_sample_group = true; inject.tool.merge_deferred_callchains = false; - if (inject.jit_mode || + if (inject.jit_mode || inject.aslr || inject.itrace_synth_opts.vm_time_correlation || inject.itrace_synth_opts.set || inject.guest_session.perf_data_file || diff --git a/tools/perf/util/aslr.c b/tools/perf/util/aslr.c index e365f807b021..dee077cca5fe 100644 --- a/tools/perf/util/aslr.c +++ b/tools/perf/util/aslr.c @@ -1273,6 +1273,7 @@ static int aslr_tool__init(struct aslr_tool *aslr, struct perf_tool *delegate) { delegate_tool__init(&aslr->tool, delegate); aslr->tool.tool.ordered_events = true; + aslr->tool.tool.ordering_requires_timestamps = true; if (machines__init(&aslr->machines, /*session=*/NULL)) return -ENOMEM; -- 2.56.1.703.gf848ed807c-goog