From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
stable@vger.kernel.org, Divya Indi <divya.indi@oracle.com>,
Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [for-linus][PATCH 07/17] sample-trace-array: Fix sleeping function called from invalid context
Date: Thu, 18 Jun 2020 19:56:03 -0400 [thread overview]
Message-ID: <20200618235640.203943939@goodmis.org> (raw)
In-Reply-To: 20200618235556.451120786@goodmis.org
From: Kefeng Wang <wangkefeng.wang@huawei.com>
BUG: sleeping function called from invalid context at kernel/locking/mutex.c:935
in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 0, name: swapper/5
1 lock held by swapper/5/0:
#0: ffff80001002bd90 (samples/ftrace/sample-trace-array.c:38){+.-.}-{0:0}, at: call_timer_fn+0x8/0x3e0
CPU: 5 PID: 0 Comm: swapper/5 Not tainted 5.7.0+ #8
Hardware name: QEMU QEMU Virtual Machine, BIOS 0.0.0 02/06/2015
Call trace:
dump_backtrace+0x0/0x1a0
show_stack+0x20/0x30
dump_stack+0xe4/0x150
___might_sleep+0x160/0x200
__might_sleep+0x58/0x90
__mutex_lock+0x64/0x948
mutex_lock_nested+0x3c/0x58
__ftrace_set_clr_event+0x44/0x88
trace_array_set_clr_event+0x24/0x38
mytimer_handler+0x34/0x40 [sample_trace_array]
mutex_lock() will be called in interrupt context, using workqueue to fix it.
Link: https://lkml.kernel.org/r/20200610011244.2209486-1-wangkefeng.wang@huawei.com
Cc: stable@vger.kernel.org
Fixes: 89ed42495ef4 ("tracing: Sample module to demonstrate kernel access to Ftrace instances.")
Reviewed-by: Divya Indi <divya.indi@oracle.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
samples/ftrace/sample-trace-array.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/samples/ftrace/sample-trace-array.c b/samples/ftrace/sample-trace-array.c
index d523450d73eb..9e437f930280 100644
--- a/samples/ftrace/sample-trace-array.c
+++ b/samples/ftrace/sample-trace-array.c
@@ -6,6 +6,7 @@
#include <linux/timer.h>
#include <linux/err.h>
#include <linux/jiffies.h>
+#include <linux/workqueue.h>
/*
* Any file that uses trace points, must include the header.
@@ -20,6 +21,16 @@ struct trace_array *tr;
static void mytimer_handler(struct timer_list *unused);
static struct task_struct *simple_tsk;
+static void trace_work_fn(struct work_struct *work)
+{
+ /*
+ * Disable tracing for event "sample_event".
+ */
+ trace_array_set_clr_event(tr, "sample-subsystem", "sample_event",
+ false);
+}
+static DECLARE_WORK(trace_work, trace_work_fn);
+
/*
* mytimer: Timer setup to disable tracing for event "sample_event". This
* timer is only for the purposes of the sample module to demonstrate access of
@@ -29,11 +40,7 @@ static DEFINE_TIMER(mytimer, mytimer_handler);
static void mytimer_handler(struct timer_list *unused)
{
- /*
- * Disable tracing for event "sample_event".
- */
- trace_array_set_clr_event(tr, "sample-subsystem", "sample_event",
- false);
+ schedule_work(&trace_work);
}
static void simple_thread_func(int count)
@@ -76,6 +83,7 @@ static int simple_thread(void *arg)
simple_thread_func(count++);
del_timer(&mytimer);
+ cancel_work_sync(&trace_work);
/*
* trace_array_put() decrements the reference counter associated with
--
2.26.2
next prev parent reply other threads:[~2020-06-18 23:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-18 23:55 [for-linus][PATCH 00/17] tracing: Updates for 5.8 Steven Rostedt
2020-06-18 23:55 ` [for-linus][PATCH 01/17] recordmcount: support >64k sections Steven Rostedt
2020-06-18 23:55 ` [for-linus][PATCH 02/17] kprobes: Suppress the suspicious RCU warning on kprobes Steven Rostedt
2020-06-18 23:55 ` [for-linus][PATCH 03/17] kprobes: Use non RCU traversal APIs on kprobe_tables if possible Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 04/17] kprobes: Fix to protect kick_kprobe_optimizer() by kprobe_mutex Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 05/17] kprobes: Remove redundant arch_disarm_kprobe() call Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 06/17] kretprobe: Prevent triggering kretprobe from within kprobe_flush_task Steven Rostedt
2020-06-18 23:56 ` Steven Rostedt [this message]
2020-06-18 23:56 ` [for-linus][PATCH 08/17] sample-trace-array: Remove trace_array sample-instance Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 09/17] tracing: Make ftrace packed events have align of 1 Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 10/17] trace: Fix typo in allocate_ftrace_ops()s comment Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 11/17] tracing/probe: Fix memleak in fetch_op_data operations Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 12/17] tracing: Remove unused event variable in tracing_iter_reset Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 13/17] proc/bootconfig: Fix to use correct quotes for value Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 14/17] tools/bootconfig: " Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 15/17] tools/bootconfig: Fix to return 0 if succeeded to show the bootconfig Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 16/17] tools/bootconfig: Add testcase for show-command and quotes test Steven Rostedt
2020-06-18 23:56 ` [for-linus][PATCH 17/17] ftrace: Fix maybe-uninitialized compiler warning Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200618235640.203943939@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=divya.indi@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=stable@vger.kernel.org \
--cc=wangkefeng.wang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox