summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Yang <yangfeng@kylinos.cn>2025-02-23 15:01:06 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-04-10 14:33:37 +0200
commit6fc6fa800e5b2268c1952e269d0c26c7e12ab7eb (patch)
tree0c7a579099b7f81d7244d08e9feb68d222704bca
parent3420c271219860026e2324005712709f3d4e92ca (diff)
downloadlinux-6fc6fa800e5b2268c1952e269d0c26c7e12ab7eb.tar.gz
linux-6fc6fa800e5b2268c1952e269d0c26c7e12ab7eb.tar.bz2
linux-6fc6fa800e5b2268c1952e269d0c26c7e12ab7eb.zip
ring-buffer: Fix bytes_dropped calculation issue
[ Upstream commit c73f0b69648501978e8b3e8fa7eef7f4197d0481 ] The calculation of bytes-dropped and bytes_dropped_nested is reversed. Although it does not affect the final calculation of total_dropped, it should still be modified. Link: https://lore.kernel.org/20250223070106.6781-1-yangfeng59949@163.com Fixes: 6c43e554a2a5 ("ring-buffer: Add ring buffer startup selftest") Signed-off-by: Feng Yang <yangfeng@kylinos.cn> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--kernel/trace/ring_buffer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 0093fc56ab3a..21b7d044797e 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -5994,9 +5994,9 @@ static __init int rb_write_something(struct rb_test_data *data, bool nested)
/* Ignore dropped events before test starts. */
if (started) {
if (nested)
- data->bytes_dropped += len;
- else
data->bytes_dropped_nested += len;
+ else
+ data->bytes_dropped += len;
}
return len;
}