This is the mail archive of the
systemtap@sourceware.org
mailing list for the systemtap project.
[SYSTEMTAP/PATCH v3 5/9] stp: rt: replace utrace_struct lock to stp style raw lock
- From: Santosh Shukla <sshukla at mvista dot com>
- To: fche at redhat dot com, dsmith at redhat dot com, jistone at redhat dot com
- Cc: systemtap at sourceware dot org, Santosh Shukla <sshukla at mvista dot com>
- Date: Mon, 22 Sep 2014 12:56:58 +0530
- Subject: [SYSTEMTAP/PATCH v3 5/9] stp: rt: replace utrace_struct lock to stp style raw lock
- Authentication-results: sourceware.org; auth=none
- References: <1411370822-8707-1-git-send-email-sshukla at mvista dot com>
Patch fixes below bug_on for -rt mode kernel:
[ 3375.430085] [<ffffffff815de469>] __schedule+0x5a9/0x700
[ 3375.430090] [<ffffffff815da3a4>] dump_stack+0x19/0x1b
[ 3375.430094] [<ffffffff815de5ea>] schedule+0x2a/0x90
[ 3375.430098] [<ffffffff815d49d7>] __schedule_bug+0xa0/0xae
[ 3375.430102] [<ffffffff815df525>] rt_spin_lock_slowlock+0xe5/0x2e0
[ 3375.430107] [<ffffffff815de469>] __schedule+0x5a9/0x700
[ 3375.430110] [<ffffffff815df935>] rt_spin_lock+0x25/0x30
[ 3375.430116] [<ffffffff815de5ea>] schedule+0x2a/0x90
[ 3375.430125] [<ffffffffa2f5ed5e>] task_utrace_struct+0x1e/0x40 [stap_eb141ade124ccb17a233482e6996651f_15664]
[ 3375.430131] [<ffffffff815df525>] rt_spin_lock_slowlock+0xe5/0x2e0
[ 3375.430138] [<ffffffffa2f6204b>] utrace_report_syscall_exit+0x4b/0x110 [stap_eb141ade124ccb17a233482e6996651f_15664]
[ 3375.430143] [<ffffffff815df935>] rt_spin_lock+0x25/0x30
[ 3375.430148] [<ffffffff810ea646>] ? __audit_syscall_exit+0x1f6/0x2a0
[ 3375.430156] [<ffffffffa2f5ed5e>] task_utrace_struct+0x1e/0x40 [stap_eb141ade124ccb17a233482e6996651f_15664]
[ 3375.430161] [<ffffffff81021d56>] syscall_trace_leave+0xd6/0xf0
[ 3375.430168] [<ffffffffa2f6204b>] utrace_report_syscall_exit+0x4b/0x110 [stap_eb141ade124ccb17a233482e6996651f_15664]
[ 3375.430173] [<ffffffff815e7af0>] int_check_syscall_exit_work+0x34/0x3d
[ 3375.430178] [<ffffffff810ea646>] ? __audit_syscall_exit+0x1f6/0x2a0
[ 3375.430184] [<ffffffff81021d56>] syscall_trace_leave+0xd6/0xf0
[ 3375.430191] [<ffffffff815e7af0>] int_check_syscall_exit_work+0x34/0x3d
Signed-off-by: Santosh Shukla <sshukla@mvista.com>
---
runtime/stp_utrace.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/runtime/stp_utrace.c b/runtime/stp_utrace.c
index e5d6d55..c69dec1 100644
--- a/runtime/stp_utrace.c
+++ b/runtime/stp_utrace.c
@@ -85,7 +85,7 @@ struct utrace {
static struct hlist_head task_utrace_table[TASK_UTRACE_TABLE_SIZE];
//DEFINE_MUTEX(task_utrace_mutex); /* Protects task_utrace_table */
-static DEFINE_SPINLOCK(task_utrace_lock); /* Protects task_utrace_table */
+static STP_DEFINE_SPINLOCK(task_utrace_lock); /* Protects task_utrace_table */
static struct kmem_cache *utrace_cachep;
static struct kmem_cache *utrace_engine_cachep;
@@ -468,7 +468,7 @@ static void utrace_shutdown(void)
#ifdef STP_TF_DEBUG
printk(KERN_ERR "%s:%d - freeing task-specific\n", __FUNCTION__, __LINE__);
#endif
- spin_lock(&task_utrace_lock);
+ stp_spin_lock(&task_utrace_lock);
for (i = 0; i < TASK_UTRACE_TABLE_SIZE; i++) {
head = &task_utrace_table[i];
stap_hlist_for_each_entry_safe(utrace, node, node2, head,
@@ -477,7 +477,7 @@ static void utrace_shutdown(void)
utrace_cleanup(utrace);
}
}
- spin_unlock(&task_utrace_lock);
+ stp_spin_unlock(&task_utrace_lock);
#ifdef STP_TF_DEBUG
printk(KERN_ERR "%s:%d - done\n", __FUNCTION__, __LINE__);
#endif
@@ -524,7 +524,7 @@ static bool utrace_task_alloc(struct task_struct *task)
stp_init_task_work(&utrace->work, &utrace_resume);
stp_init_task_work(&utrace->report_work, &utrace_report_work);
- spin_lock(&task_utrace_lock);
+ stp_spin_lock(&task_utrace_lock);
u = __task_utrace_struct(task);
if (u == NULL) {
hlist_add_head(&utrace->hlist,
@@ -533,7 +533,7 @@ static bool utrace_task_alloc(struct task_struct *task)
else {
kmem_cache_free(utrace_cachep, utrace);
}
- spin_unlock(&task_utrace_lock);
+ stp_spin_unlock(&task_utrace_lock);
return true;
}
@@ -552,9 +552,9 @@ static void utrace_free(struct utrace *utrace)
/* Remove this utrace from the mapping list of tasks to
* struct utrace. */
- spin_lock(&task_utrace_lock);
+ stp_spin_lock(&task_utrace_lock);
hlist_del(&utrace->hlist);
- spin_unlock(&task_utrace_lock);
+ stp_spin_unlock(&task_utrace_lock);
/* Free the utrace struct. */
stp_spin_lock(&utrace->lock);
@@ -595,9 +595,9 @@ static struct utrace *task_utrace_struct(struct task_struct *task)
{
struct utrace *utrace;
- spin_lock(&task_utrace_lock);
+ stp_spin_lock(&task_utrace_lock);
utrace = __task_utrace_struct(task);
- spin_unlock(&task_utrace_lock);
+ stp_spin_unlock(&task_utrace_lock);
return utrace;
}
--
1.8.3.1