[3.11.y.z extended stable] Patch "trace: module: Maintain a valid user count" has been added to staging queue
luis.henriques at canonical.com
Wed May 14 14:57:52 UTC 2014
This is a note to let you know that I have just added a patch titled
trace: module: Maintain a valid user count
to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree
which can be found at:
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.11.y.z tree, see
>From 2781c249977344e46c2e66ab8d4ad6f9c643de54 Mon Sep 17 00:00:00 2001
From: Romain Izard <romain.izard.pro at gmail.com>
Date: Tue, 4 Mar 2014 10:09:39 +0100
Subject: trace: module: Maintain a valid user count
commit 098507ae3ec2331476fb52e85d4040c1cc6d0ef4 upstream.
The replacement of the 'count' variable by two variables 'incs' and
'decs' to resolve some race conditions during module unloading was done
in parallel with some cleanup in the trace subsystem, and was integrated
as a merge.
Unfortunately, the formula for this replacement was wrong in the tracing
code, and the refcount in the traces was not usable as a result.
Use 'count = incs - decs' to compute the user count.
Acked-by: Ingo Molnar <mingo at kernel.org>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Cc: Frederic Weisbecker <fweisbec at gmail.com>
Fixes: c1ab9cab7509 "merge conflict resolution"
Signed-off-by: Romain Izard <romain.izard.pro at gmail.com>
Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
include/trace/events/module.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/trace/events/module.h b/include/trace/events/module.h
index 1619327..ca298c7 100644
@@ -78,7 +78,7 @@ DECLARE_EVENT_CLASS(module_refcnt,
__entry->ip = ip;
- __entry->refcnt = __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs);
+ __entry->refcnt = __this_cpu_read(mod->refptr->incs) - __this_cpu_read(mod->refptr->decs);
More information about the kernel-team