diff options
| author | Alexei Starovoitov <ast@plumgrid.com> | 2015-10-20 20:02:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-22 06:42:13 -0700 |
| commit | fa128e6a148a0a58355bd6814c6283515bbd028a (patch) | |
| tree | 015a7fb2d5aa4f31ed6cbd134e9628cce864053f /kernel | |
| parent | 63b11e757d6dae570bc22450ec58a5b68cdf5c3c (diff) | |
| download | linux-fa128e6a148a0a58355bd6814c6283515bbd028a.tar.gz linux-fa128e6a148a0a58355bd6814c6283515bbd028a.tar.bz2 linux-fa128e6a148a0a58355bd6814c6283515bbd028a.zip | |
perf: pad raw data samples automatically
Instead of WARN_ON in perf_event_output() on unpaded raw samples,
pad them automatically.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index b11756f9b6dc..64754bfecd70 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5286,9 +5286,15 @@ void perf_output_sample(struct perf_output_handle *handle, if (sample_type & PERF_SAMPLE_RAW) { if (data->raw) { - perf_output_put(handle, data->raw->size); - __output_copy(handle, data->raw->data, - data->raw->size); + u32 raw_size = data->raw->size; + u32 real_size = round_up(raw_size + sizeof(u32), + sizeof(u64)) - sizeof(u32); + u64 zero = 0; + + perf_output_put(handle, real_size); + __output_copy(handle, data->raw->data, raw_size); + if (real_size - raw_size) + __output_copy(handle, &zero, real_size - raw_size); } else { struct { u32 size; @@ -5420,8 +5426,7 @@ void perf_prepare_sample(struct perf_event_header *header, else size += sizeof(u32); - WARN_ON_ONCE(size & (sizeof(u64)-1)); - header->size += size; + header->size += round_up(size, sizeof(u64)); } if (sample_type & PERF_SAMPLE_BRANCH_STACK) { |