Eiichi Tsukata
c8790d7f76
tracing/snapshot: Resize spare buffer if size changed
commit 46cc0b4442 upstream.
Current snapshot implementation swaps two ring_buffers even though their
sizes are different from each other, that can cause an inconsistency
between the contents of buffer_size_kb file and the current buffer size.
For example:
# cat buffer_size_kb
7 (expanded: 1408)
# echo 1 > events/enable
# grep bytes per_cpu/cpu0/stats
bytes: 1441020
# echo 1 > snapshot // current:1408, spare:1408
# echo 123 > buffer_size_kb // current:123, spare:1408
# echo 1 > snapshot // current:1408, spare:123
# grep bytes per_cpu/cpu0/stats
bytes: 1443700
# cat buffer_size_kb
123 // != current:1408
And also, a similar per-cpu case hits the following WARNING:
Reproducer:
# echo 1 > per_cpu/cpu0/snapshot
# echo 123 > buffer_size_kb
# echo 1 > per_cpu/cpu0/snapshot
WARNING:
WARNING: CPU: 0 PID: 1946 at kernel/trace/trace.c:1607 update_max_tr_single.part.0+0x2b8/0x380
Modules linked in:
CPU: 0 PID: 1946 Comm: bash Not tainted 5.2.0-rc6 #20
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-2.fc30 04/01/2014
RIP: 0010:update_max_tr_single.part.0+0x2b8/0x380
Code: ff e8 dc da f9 ff 0f 0b e9 88 fe ff ff e8 d0 da f9 ff 44 89 ee bf f5 ff ff ff e8 33 dc f9 ff 41 83 fd f5 74 96 e8 b8 da f9 ff <0f> 0b eb 8d e8 af da f9 ff 0f 0b e9 bf fd ff ff e8 a3 da f9 ff 48
RSP: 0018:ffff888063e4fca0 EFLAGS: 00010093
RAX: ffff888066214380 RBX: ffffffff99850fe0 RCX: ffffffff964298a8
RDX: 0000000000000000 RSI: 00000000fffffff5 RDI: 0000000000000005
RBP: 1ffff1100c7c9f96 R08: ffff888066214380 R09: ffffed100c7c9f9b
R10: ffffed100c7c9f9a R11: 0000000000000003 R12: 0000000000000000
R13: 00000000ffffffea R14: ffff888066214380 R15: ffffffff99851060
FS: 00007f9f8173c700(0000) GS:ffff88806d000000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000714dc0 CR3: 0000000066fa6000 CR4: 00000000000006f0
Call Trace:
? trace_array_printk_buf+0x140/0x140
? __mutex_lock_slowpath+0x10/0x10
tracing_snapshot_write+0x4c8/0x7f0
? trace_printk_init_buffers+0x60/0x60
? selinux_file_permission+0x3b/0x540
? tracer_preempt_off+0x38/0x506
? trace_printk_init_buffers+0x60/0x60
__vfs_write+0x81/0x100
vfs_write+0x1e1/0x560
ksys_write+0x126/0x250
? __ia32_sys_read+0xb0/0xb0
? do_syscall_64+0x1f/0x390
do_syscall_64+0xc1/0x390
entry_SYSCALL_64_after_hwframe+0x49/0xbe
This patch adds resize_buffer_duplicate_size() to check if there is a
difference between current/spare buffer sizes and resize a spare buffer
if necessary.
Link: http://lkml.kernel.org/r/20190625012910.13109-1-devel@etsukata.com
Cc: stable@vger.kernel.org
Fixes: ad909e21bb ("tracing: Add internal tracing_snapshot() functions")
Signed-off-by: Eiichi Tsukata <devel@etsukata.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-07-10 09:53:43 +02:00
..
2019-07-03 13:14:48 +02:00
2019-07-10 09:53:39 +02:00
2019-02-12 19:47:19 +01:00
2019-01-13 09:51:05 +01:00
2019-06-22 08:15:16 +02:00
2019-05-10 17:54:10 +02:00
2019-07-10 09:53:40 +02:00
2019-05-22 07:37:34 +02:00
2019-06-11 12:20:52 +02:00
2018-11-13 11:08:48 -08:00
2019-05-31 06:46:30 -07:00
2019-06-04 08:02:34 +02:00
2019-06-19 08:18:06 +02:00
2019-07-10 09:53:43 +02:00
2019-05-31 06:46:05 -07:00
2018-08-17 09:41:28 -07:00
2019-05-31 06:46:17 -07:00
2018-08-15 10:46:54 -07:00
2018-11-13 11:08:47 -08:00
2019-07-03 13:14:46 +02:00
2018-08-22 10:52:47 -07:00
2019-06-19 08:18:00 +02:00
2019-04-05 22:33:13 +02:00
2019-05-22 07:37:41 +02:00
2018-08-06 12:35:20 +02:00
2019-05-10 17:54:11 +02:00
2019-04-20 09:16:02 +02:00
2019-05-31 06:46:19 -07:00
2019-06-04 08:02:34 +02:00
2018-08-14 19:12:29 -03:00
2018-08-02 08:06:54 +09:00
2019-02-12 19:47:20 +01:00
2019-04-27 09:36:37 +02:00
2018-08-13 11:25:07 -07:00
2019-06-19 08:18:01 +02:00
2019-01-13 09:51:04 +01:00
2019-06-04 08:02:34 +02:00
2018-12-29 13:37:57 +01:00
2019-01-13 09:51:06 +01:00
2019-07-10 09:53:41 +02:00
2018-08-06 12:35:20 +02:00
2019-03-13 14:02:35 -07:00
2019-06-09 09:17:20 +02:00
2019-02-12 19:47:25 +01:00
2018-08-03 15:52:10 +02:00
2018-08-13 11:25:07 -07:00
2019-06-15 11:54:01 +02:00
2019-06-15 11:53:59 +02:00
2018-10-17 15:35:29 -04:00
2018-11-13 11:09:00 -08:00
2018-08-22 10:52:47 -07:00
2018-08-11 02:05:53 -05:00
2018-08-30 12:56:40 +02:00
2019-04-03 06:26:29 +02:00
2019-05-02 09:58:56 +02:00