* [PATCH] tracing: Update overrun counter when removing pages
@ 2012-06-29 19:31 Vaibhav Nagarnaik
2012-07-06 11:02 ` [tip:perf/urgent] ring-buffer: Fix accounting of entries " tip-bot for Vaibhav Nagarnaik
0 siblings, 1 reply; 2+ messages in thread
From: Vaibhav Nagarnaik @ 2012-06-29 19:31 UTC (permalink / raw)
To: Steven Rostedt
Cc: Justin Teravest, David Sharp, linux-kernel, Vaibhav Nagarnaik
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.
Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
---
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 96c2dd1..40862eb 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -1346,10 +1346,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);
}
--
1.7.7.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:perf/urgent] ring-buffer: Fix accounting of entries when removing pages
2012-06-29 19:31 [PATCH] tracing: Update overrun counter when removing pages Vaibhav Nagarnaik
@ 2012-07-06 11:02 ` tip-bot for Vaibhav Nagarnaik
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Vaibhav Nagarnaik @ 2012-07-06 11:02 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, vnagarnaik, hpa, mingo, rostedt, dhsharp, tglx, teravest
Commit-ID: 48fdc72f23ad9a9956e524a47843135d0bbc3317
Gitweb: http://git.kernel.org/tip/48fdc72f23ad9a9956e524a47843135d0bbc3317
Author: Vaibhav Nagarnaik <vnagarnaik@google.com>
AuthorDate: Fri, 29 Jun 2012 12:31:41 -0700
Committer: Steven Rostedt <rostedt@goodmis.org>
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@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>
---
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);
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-06 11:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-29 19:31 [PATCH] tracing: Update overrun counter when removing pages Vaibhav Nagarnaik
2012-07-06 11:02 ` [tip:perf/urgent] ring-buffer: Fix accounting of entries " tip-bot for Vaibhav Nagarnaik
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.