* FAILED: patch "[PATCH] tracing/snapshot: Resize spare buffer if size changed" failed to apply to 4.4-stable tree
@ 2019-07-05 8:53 gregkh
2019-07-18 2:55 ` [PATCH for 4.4, 4.9] tracing/snapshot: Resize spare buffer if size changed Nobuhiro Iwamatsu
2019-07-18 5:18 ` Nobuhiro Iwamatsu
0 siblings, 2 replies; 6+ messages in thread
From: gregkh @ 2019-07-05 8:53 UTC (permalink / raw)
To: devel, rostedt; +Cc: stable
The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 46cc0b44428d0f0e81f11ea98217fc0edfbeab07 Mon Sep 17 00:00:00 2001
From: Eiichi Tsukata <devel@etsukata.com>
Date: Tue, 25 Jun 2019 10:29:10 +0900
Subject: [PATCH] tracing/snapshot: Resize spare buffer if size changed
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: ad909e21bbe69 ("tracing: Add internal tracing_snapshot() functions")
Signed-off-by: Eiichi Tsukata <devel@etsukata.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 4122ccde6ec2..c3aabb576fe5 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6719,11 +6719,13 @@ tracing_snapshot_write(struct file *filp, const char __user *ubuf, size_t cnt,
break;
}
#endif
- if (!tr->allocated_snapshot) {
+ if (tr->allocated_snapshot)
+ ret = resize_buffer_duplicate_size(&tr->max_buffer,
+ &tr->trace_buffer, iter->cpu_file);
+ else
ret = tracing_alloc_snapshot_instance(tr);
- if (ret < 0)
- break;
- }
+ if (ret < 0)
+ break;
local_irq_disable();
/* Now, we're going to swap */
if (iter->cpu_file == RING_BUFFER_ALL_CPUS)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH for 4.4, 4.9] tracing/snapshot: Resize spare buffer if size changed
2019-07-05 8:53 FAILED: patch "[PATCH] tracing/snapshot: Resize spare buffer if size changed" failed to apply to 4.4-stable tree gregkh
@ 2019-07-18 2:55 ` Nobuhiro Iwamatsu
2019-07-18 3:03 ` Greg KH
2019-07-18 5:18 ` Nobuhiro Iwamatsu
1 sibling, 1 reply; 6+ messages in thread
From: Nobuhiro Iwamatsu @ 2019-07-18 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, rostedt, stable, Nobuhiro Iwamatsu
From: Eiichi Tsukata <devel@etsukata.com>
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: ad909e21bbe69 ("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: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
kernel/trace/trace.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index ae00e68ceae3..add4bc4262f3 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -5406,11 +5406,15 @@ tracing_snapshot_write(struct file *filp, const char __user *ubuf, size_t cnt,
break;
}
#endif
- if (!tr->allocated_snapshot) {
+ if (!tr->allocated_snapshot)
+ ret = resize_buffer_duplicate_size(&tr->max_buffer,
+ &tr->trace_buffer, iter->cpu_file);
+ else
ret = alloc_snapshot(tr);
- if (ret < 0)
- break;
- }
+
+ if (ret < 0)
+ break;
+
local_irq_disable();
/* Now, we're going to swap */
if (iter->cpu_file == RING_BUFFER_ALL_CPUS)
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH for 4.4, 4.9] tracing/snapshot: Resize spare buffer if size changed
2019-07-18 2:55 ` [PATCH for 4.4, 4.9] tracing/snapshot: Resize spare buffer if size changed Nobuhiro Iwamatsu
@ 2019-07-18 3:03 ` Greg KH
2019-07-18 5:14 ` nobuhiro1.iwamatsu
0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2019-07-18 3:03 UTC (permalink / raw)
To: Nobuhiro Iwamatsu; +Cc: devel, rostedt, stable
On Thu, Jul 18, 2019 at 11:55:47AM +0900, Nobuhiro Iwamatsu wrote:
> From: Eiichi Tsukata <devel@etsukata.com>
>
> 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: ad909e21bbe69 ("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: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> ---
> kernel/trace/trace.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
What is the git commit id of this patch in Linus's tree?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH for 4.4, 4.9] tracing/snapshot: Resize spare buffer if size changed
2019-07-18 3:03 ` Greg KH
@ 2019-07-18 5:14 ` nobuhiro1.iwamatsu
0 siblings, 0 replies; 6+ messages in thread
From: nobuhiro1.iwamatsu @ 2019-07-18 5:14 UTC (permalink / raw)
To: gregkh; +Cc: devel, rostedt, stable
Hi,
> -----Original Message-----
> From: Greg KH [mailto:gregkh@linuxfoundation.org]
> Sent: Thursday, July 18, 2019 12:03 PM
> To: iwamatsu nobuhiro(岩松 信洋 ○ＳＷＣ□ＯＳＴ)
> <nobuhiro1.iwamatsu@toshiba.co.jp>
> Cc: devel@etsukata.com; rostedt@goodmis.org; stable@vger.kernel.org
> Subject: Re: [PATCH for 4.4, 4.9] tracing/snapshot: Resize spare buffer
> if size changed
>
> On Thu, Jul 18, 2019 at 11:55:47AM +0900, Nobuhiro Iwamatsu wrote:
> > From: Eiichi Tsukata <devel@etsukata.com>
> >
> > 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: ad909e21bbe69 ("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: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> > ---
> > kernel/trace/trace.c | 12 ++++++++----
> > 1 file changed, 8 insertions(+), 4 deletions(-)
>
> What is the git commit id of this patch in Linus's tree?
>
Oh, sorry. I forgot it.
I will resend updated patch.
Nobuhiro
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH for 4.4, 4.9] tracing/snapshot: Resize spare buffer if size changed
2019-07-05 8:53 FAILED: patch "[PATCH] tracing/snapshot: Resize spare buffer if size changed" failed to apply to 4.4-stable tree gregkh
2019-07-18 2:55 ` [PATCH for 4.4, 4.9] tracing/snapshot: Resize spare buffer if size changed Nobuhiro Iwamatsu
@ 2019-07-18 5:18 ` Nobuhiro Iwamatsu
2019-07-23 9:54 ` Greg KH
1 sibling, 1 reply; 6+ messages in thread
From: Nobuhiro Iwamatsu @ 2019-07-18 5:18 UTC (permalink / raw)
To: gregkh; +Cc: devel, rostedt, stable, Nobuhiro Iwamatsu
From: Eiichi Tsukata <devel@etsukata.com>
commit 46cc0b44428d0f0e81f11ea98217fc0edfbeab07 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: ad909e21bbe69 ("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: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
kernel/trace/trace.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index ae00e68ceae3..add4bc4262f3 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -5406,11 +5406,15 @@ tracing_snapshot_write(struct file *filp, const char __user *ubuf, size_t cnt,
break;
}
#endif
- if (!tr->allocated_snapshot) {
+ if (!tr->allocated_snapshot)
+ ret = resize_buffer_duplicate_size(&tr->max_buffer,
+ &tr->trace_buffer, iter->cpu_file);
+ else
ret = alloc_snapshot(tr);
- if (ret < 0)
- break;
- }
+
+ if (ret < 0)
+ break;
+
local_irq_disable();
/* Now, we're going to swap */
if (iter->cpu_file == RING_BUFFER_ALL_CPUS)
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH for 4.4, 4.9] tracing/snapshot: Resize spare buffer if size changed
2019-07-18 5:18 ` Nobuhiro Iwamatsu
@ 2019-07-23 9:54 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2019-07-23 9:54 UTC (permalink / raw)
To: Nobuhiro Iwamatsu; +Cc: devel, rostedt, stable
On Thu, Jul 18, 2019 at 02:18:41PM +0900, Nobuhiro Iwamatsu wrote:
> From: Eiichi Tsukata <devel@etsukata.com>
>
> commit 46cc0b44428d0f0e81f11ea98217fc0edfbeab07 upstream.
Now queued up, thanks!
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-07-23 9:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-05 8:53 FAILED: patch "[PATCH] tracing/snapshot: Resize spare buffer if size changed" failed to apply to 4.4-stable tree gregkh
2019-07-18 2:55 ` [PATCH for 4.4, 4.9] tracing/snapshot: Resize spare buffer if size changed Nobuhiro Iwamatsu
2019-07-18 3:03 ` Greg KH
2019-07-18 5:14 ` nobuhiro1.iwamatsu
2019-07-18 5:18 ` Nobuhiro Iwamatsu
2019-07-23 9:54 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).