This is a note to let you know that I've just added the patch titled
perf inject: Fix itrace space allowed for new attributes
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-inject-fix-itrace-space-allowed-for-new-attributes.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Wed Dec 15 02:59:52 PM CET 2021
From: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Date: Mon, 13 Dec 2021 17:45:41 +0200
Subject: perf inject: Fix itrace space allowed for new attributes
To: stable@xxxxxxxxxxxxxxx
Message-ID: <20211213154548.122728-2-adrian.hunter@xxxxxxxxx>
From: Adrian Hunter <adrian.hunter@xxxxxxxxx>
commit c29d9792607e67ed8a3f6e9db0d96836d885a8c5 upstream.
The space allowed for new attributes can be too small if existing header
information is large. That can happen, for example, if there are very
many CPUs, due to having an event ID per CPU per event being stored in the
header information.
Fix by adding the existing header.data_offset. Also increase the extra
space allowed to 8KiB and align to a 4KiB boundary for neatness.
Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Link: http://lore.kernel.org/lkml/20211125071457.2066863-1-adrian.hunter@xxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
[Adrian: Backport to v5.10]
Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/perf/builtin-inject.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -752,7 +752,7 @@ static int __cmd_inject(struct perf_inje
inject->tool.ordered_events = true;
inject->tool.ordering_requires_timestamps = true;
/* Allow space in the header for new attributes */
- output_data_offset = 4096;
+ output_data_offset = roundup(8192 + session->header.data_offset, 4096);
if (inject->strip)
strip_init(inject);
}
Patches currently in stable-queue which might be from adrian.hunter@xxxxxxxxx are
queue-5.10/perf-intel-pt-fix-some-pge-packet-generation-enable-control-flow-packets-usage.patch
queue-5.10/perf-intel-pt-fix-intel_pt_fup_event-assumptions-about-setting-state-type.patch
queue-5.10/perf-intel-pt-fix-next-err-value-walking-trace.patch
queue-5.10/perf-intel-pt-fix-error-timestamp-setting-on-the-decoder-error-path.patch
queue-5.10/perf-intel-pt-fix-state-setting-when-receiving-overflow-ovf-packet.patch
queue-5.10/perf-intel-pt-fix-sync-state-when-a-psb-synchronization-packet-is-found.patch
queue-5.10/perf-inject-fix-itrace-space-allowed-for-new-attributes.patch
queue-5.10/perf-intel-pt-fix-missing-instruction-events-with-q-option.patch
