diff options
| author | attilio <attilio@FreeBSD.org> | 2013-11-25 07:38:45 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2013-11-25 07:38:45 +0000 |
| commit | 7ee4e910ced4b311b0194fe11c664f0c6bde3bd8 (patch) | |
| tree | e29b308276ced8b2028470c376a2a34193dc6c3c /sys/amd64/amd64 | |
| parent | 150d294dbc6b55504998d6f99781473171415f7f (diff) | |
| download | FreeBSD-src-7ee4e910ced4b311b0194fe11c664f0c6bde3bd8.zip FreeBSD-src-7ee4e910ced4b311b0194fe11c664f0c6bde3bd8.tar.gz | |
- For kernel compiled only with KDTRACE_HOOKS and not any lock debugging
option, unbreak the lock tracing release semantic by embedding
calls to LOCKSTAT_PROFILE_RELEASE_LOCK() direclty in the inlined
version of the releasing functions for mutex, rwlock and sxlock.
Failing to do so skips the lockstat_probe_func invokation for
unlocking.
- As part of the LOCKSTAT support is inlined in mutex operation, for
kernel compiled without lock debugging options, potentially every
consumer must be compiled including opt_kdtrace.h.
Fix this by moving KDTRACE_HOOKS into opt_global.h and remove the
dependency by opt_kdtrace.h for all files, as now only KDTRACE_FRAMES
is linked there and it is only used as a compile-time stub [0].
[0] immediately shows some new bug as DTRACE-derived support for debug
in sfxge is broken and it was never really tested. As it was not
including correctly opt_kdtrace.h before it was never enabled so it
was kept broken for a while. Fix this by using a protection stub,
leaving sfxge driver authors the responsibility for fixing it
appropriately [1].
Sponsored by: EMC / Isilon storage division
Discussed with: rstone
[0] Reported by: rstone
[1] Discussed with: philip
Diffstat (limited to 'sys/amd64/amd64')
| -rw-r--r-- | sys/amd64/amd64/exception.S | 1 | ||||
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 1 | ||||
| -rw-r--r-- | sys/amd64/amd64/trap.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index a714281..d4e58b1 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -37,7 +37,6 @@ #include "opt_atpic.h" #include "opt_compat.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include <machine/asmacros.h> #include <machine/psl.h> diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index f578a7d..31614f7 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include "opt_perfmon.h" #include "opt_platform.h" #include "opt_sched.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/proc.h> diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 3d319cd..f7d0afd 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_isa.h" #include "opt_kdb.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/bus.h> |
