| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1340046722-11477-1-git-send-email-vnagarnaik@google.com> Date: Mon, 18 Jun 2012 12:12:02 -0700 From: Vaibhav Nagarnaik <vnagarnaik@...gle.com> To: Steven Rostedt <rostedt@...dmis.org> Cc: Justin Teravest <teravest@...gle.com>, David Sharp <dhsharp@...gle.com>, linux-kernel@...r.kernel.org, Vaibhav Nagarnaik <vnagarnaik@...gle.com> Subject: [PATCH] tracing: Update entries counter 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 entries counter to reflect the removed events from the pages just like entries_bytes counter. Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@...gle.com> --- kernel/trace/ring_buffer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 96c2dd1..a2bec4c 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1346,10 +1346,10 @@ 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. + * No need to update overruns, since updating + * 'entries' accounts for that. */ + local_sub(page_entries, &cpu_buffer->entries); local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes); } -- 1.7.7.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists