[tip:perf/urgent] ring-buffer: Fix accounting of entries when removing pages

From: tip-bot for Vaibhav Nagarnaik
Date: Fri Jul 06 2012 - 07:02:44 EST

Commit-ID: 48fdc72f23ad9a9956e524a47843135d0bbc3317
Gitweb: http://git.kernel.org/tip/48fdc72f23ad9a9956e524a47843135d0bbc3317
Author: Vaibhav Nagarnaik <vnagarnaik@xxxxxxxxxx>
AuthorDate: Fri, 29 Jun 2012 12:31:41 -0700
Committer: Steven Rostedt <rostedt@xxxxxxxxxxx>
CommitDate: Fri, 29 Jun 2012 16:17:17 -0400

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@xxxxxxxxxx

Cc: Justin Teravest <teravest@xxxxxxxxxx>
Cc: David Sharp <dhsharp@xxxxxxxxxx>
Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@xxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
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 ba39cba..f765465 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);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/