diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-02-12 14:54:51 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-02-12 14:54:58 +0300 |
| commit | 62137364e3e8afcc745846c5c67cacf943149073 (patch) | |
| tree | 42f2bdee6b16e383b6e0a94cb3abc62f335d721a /tools/perf/util/header.c | |
| parent | 6c80408a8a0360fa9223b8c21c0ab8ef42e88bfe (diff) | |
| parent | dcc0b49040c70ad827a7f3d58a21b01fdb14e749 (diff) | |
| download | linux-62137364e3e8afcc745846c5c67cacf943149073.tar.xz | |
Merge branch 'linus' into locking/core, to pick up upstream fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/header.c')
| -rw-r--r-- | tools/perf/util/header.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 062383e225a3..c4ed3dc2c8f4 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -3323,6 +3323,14 @@ int perf_session__write_header(struct perf_session *session, attr_offset = lseek(ff.fd, 0, SEEK_CUR); evlist__for_each_entry(evlist, evsel) { + if (evsel->core.attr.size < sizeof(evsel->core.attr)) { + /* + * We are likely in "perf inject" and have read + * from an older file. Update attr size so that + * reader gets the right offset to the ids. + */ + evsel->core.attr.size = sizeof(evsel->core.attr); + } f_attr = (struct perf_file_attr){ .attr = evsel->core.attr, .ids = { |