summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/events/core.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 6cbd701c7308..580590b0def0 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -10514,8 +10514,6 @@ struct perf_callchain_deferred_event {
struct {
struct perf_event_header header;
u64 cookie;
- u64 nr;
- u64 ips[];
} event;
};
@@ -10524,12 +10522,19 @@ static void perf_callchain_deferred_output(struct perf_event *event, void *data)
struct perf_callchain_deferred_event *deferred_event = data;
struct perf_output_handle handle;
struct perf_sample_data sample;
+ u64 nr = deferred_event->trace->nr;
+ u16 size, id_size, max_payload;
int ret;
- u16 size = sizeof(deferred_event->event) + (deferred_event->trace->nr * sizeof(u64));
if (!event->attr.defer_output)
return;
+ id_size = event->attr.sample_id_all ? event->id_header_size : 0;
+ max_payload = round_down(U16_MAX - sizeof(deferred_event->event) -
+ sizeof(u64) - id_size, sizeof(u64));
+ nr = min_t(u64, nr, max_payload / sizeof(u64));
+ size = sizeof(deferred_event->event) + sizeof(u64) + nr * sizeof(u64);
+
/* XXX do we really need sample_id_all for this ??? */
perf_event_header__init(&deferred_event->event.header, &sample,
PERF_RECORD_CALLCHAIN_DEFERRED,
@@ -10543,8 +10548,10 @@ static void perf_callchain_deferred_output(struct perf_event *event, void *data)
return;
perf_output_put(&handle, deferred_event->event);
- for (int i = 0; i < deferred_event->trace->nr; i++) {
+ perf_output_put(&handle, nr);
+ for (u64 i = 0; i < nr; i++) {
u64 entry = deferred_event->trace->entries[i];
+
perf_output_put(&handle, entry);
}
perf_event__output_id_sample(event, &handle, &sample);
@@ -10559,7 +10566,6 @@ static void perf_unwind_deferred_callback(struct unwind_work *work,
.trace = trace,
.event = {
.cookie = cookie,
- .nr = trace->nr,
},
};