diff options
| author |   Vaibhav Nagarnaik <vnagarnaik@google.com> | 2012-06-29 12:31:41 -0700 |
|---|---|---|
| committer |   Steven Rostedt <rostedt@goodmis.org> | 2012-06-29 16:17:17 -0400 |
| commit | 48fdc72f23ad9a9956e524a47843135d0bbc3317 (patch) | |
| tree | baaec367ed2c155d35c76b6d79b7bf1eb9092af7 /kernel/trace | |
| parent | ring-buffer: Fix crash due to uninitialized new_pages list head (diff) | |
| download | linux-dev-48fdc72f23ad9a9956e524a47843135d0bbc3317.tar.xz linux-dev-48fdc72f23ad9a9956e524a47843135d0bbc3317.zip | |
ring-buffer: Fix accounting of entries when removing pages
When removing pages from the ring buffer, its state is not reset. This
means that the counters need to be correctly updated to account for the
pages removed.
Update the overrun counter to reflect the removed events from the pages.
Link: http://lkml.kernel.org/r/1340998301-1715-1-git-send-email-vnagarnaik@google.com
Cc: Justin Teravest <teravest@google.com>
Cc: David Sharp <dhsharp@google.com>
Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index ba39cbabdc9f..f765465bffe4 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1347,10 +1347,9 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages) * If something was added to this page, it was full * since it is not the tail page. So we deduct the * bytes consumed in ring buffer from here. - * No need to update overruns, since this page is - * deleted from ring buffer and its entries are - * already accounted for. + * Increment overrun to account for the lost events. */ + local_add(page_entries, &cpu_buffer->overrun); local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes); } |