瀏覽代碼

ring-buffer: Make benchmark handle missed events

With the addition of the "missed events" flags that is stored in the
commit field of the ring buffer page, the ring_buffer_benchmark
was not updated to handle this. If events are missed, then the
missed events flag is set in the ring buffer page, the benchmark
will count that flag as part of the size of the page and will hit the BUG()
when it tries to read beyond the page.

The solution is simply to have the ring buffer benchmark mask off
the extra bits.

Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Steven Rostedt 15 年之前
父節點
當前提交
a838b2e634
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      kernel/trace/ring_buffer_benchmark.c

+ 2 - 1
kernel/trace/ring_buffer_benchmark.c

@@ -113,7 +113,8 @@ static enum event_status read_page(int cpu)
 	ret = ring_buffer_read_page(buffer, &bpage, PAGE_SIZE, cpu, 1);
 	ret = ring_buffer_read_page(buffer, &bpage, PAGE_SIZE, cpu, 1);
 	if (ret >= 0) {
 	if (ret >= 0) {
 		rpage = bpage;
 		rpage = bpage;
-		commit = local_read(&rpage->commit);
+		/* The commit may have missed event flags set, clear them */
+		commit = local_read(&rpage->commit) & 0xfffff;
 		for (i = 0; i < commit && !kill_test; i += inc) {
 		for (i = 0; i < commit && !kill_test; i += inc) {
 
 
 			if (i >= (PAGE_SIZE - offsetof(struct rb_page, data))) {
 			if (i >= (PAGE_SIZE - offsetof(struct rb_page, data))) {