summaryrefslogtreecommitdiff
path: root/sys/lockdoc/log.c
diff options
context:
space:
mode:
authorMerlin Scholz <merlin@scholz.ruhr>2023-03-22 14:13:18 +0100
committerMerlin Scholz <merlin@scholz.ruhr>2023-07-10 00:50:30 +0200
commit6513e5133d7abe0d198fb630bea96a759ea20bf4 (patch)
treee05828b8d168c0fc8db2ed41f84c305fcc92e0bc /sys/lockdoc/log.c
parentc41c4dd2b0c453e81e1d95f969e0a98528bad3dc (diff)
Add IRQ tracing
Diffstat (limited to 'sys/lockdoc/log.c')
-rw-r--r--sys/lockdoc/log.c52
1 files changed, 25 insertions, 27 deletions
diff --git a/sys/lockdoc/log.c b/sys/lockdoc/log.c
index 3b5b3e6ade6..db86defac17 100644
--- a/sys/lockdoc/log.c
+++ b/sys/lockdoc/log.c
@@ -7,64 +7,69 @@
struct log_action la_buffer;
+#define LOCK_TYPE "kmutex_t"
+
inline void __mutex_enter(kmutex_t * lock, const char* file, int line, const char* func) {
_mutex_enter(lock);
- lockdoc_log_lock(P_WRITE, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(P_WRITE, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
}
inline void __mutex_exit(kmutex_t * lock, const char* file, int line, const char* func) {
_mutex_exit(lock);
- lockdoc_log_lock(V_WRITE, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(V_WRITE, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
}
inline void __mutex_spin_enter(kmutex_t * lock, const char* file, int line, const char* func) {
_mutex_spin_enter(lock);
- lockdoc_log_lock(P_WRITE, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(P_WRITE, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
}
inline void __mutex_spin_exit(kmutex_t * lock, const char* file, int line, const char* func) {
_mutex_spin_exit(lock);
- lockdoc_log_lock(V_WRITE, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(V_WRITE, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
}
inline int __mutex_tryenter(kmutex_t * lock, const char* file, int line, const char* func) {
int enter = _mutex_tryenter(lock);
if(enter != 0) {
- lockdoc_log_lock(P_WRITE, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(P_WRITE, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
}
return enter;
}
+#undef LOCK_TYPE
+#define LOCK_TYPE "krwlock_t"
+
inline int __rw_tryupgrade(krwlock_t * lock, const char* file, int line, const char* func) {
int upgrade = _rw_tryupgrade(lock);
if(upgrade != 0) {
- lockdoc_log_lock(V_READ, lock, file, line, func, LOCK_NONE);
- lockdoc_log_lock(P_WRITE, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(V_READ, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
+ lockdoc_log_lock(P_WRITE, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
}
return upgrade;
}
inline void __rw_downgrade(krwlock_t * lock, const char* file, int line, const char* func) {
_rw_downgrade(lock);
- lockdoc_log_lock(V_WRITE, lock, file, line, func, LOCK_NONE);
- lockdoc_log_lock(P_READ, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(V_WRITE, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
+ lockdoc_log_lock(P_READ, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
}
inline void __rw_enter(krwlock_t * lock, const krw_t type, const char* file, int line, const char* func) {
_rw_enter(lock, type);
if(type == RW_READER)
- lockdoc_log_lock(P_READ, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(P_READ, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
else
- lockdoc_log_lock(P_WRITE, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(P_WRITE, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
}
inline int __rw_tryenter(krwlock_t * lock, const krw_t type, const char* file, int line, const char* func) {
int enter = _rw_tryenter(lock, type);
if(enter != 0) {
if(type == RW_READER)
- lockdoc_log_lock(P_READ, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(P_READ, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
else
- lockdoc_log_lock(P_WRITE, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(P_WRITE, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
}
return enter;
}
@@ -72,10 +77,11 @@ inline int __rw_tryenter(krwlock_t * lock, const krw_t type, const char* file, i
inline void __rw_exit(krwlock_t * lock, const char* file, int line, const char* func) {
_rw_exit(lock);
if((lock->rw_owner & 0x04UL) != 0)
- lockdoc_log_lock(V_WRITE, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(V_WRITE, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
else
- lockdoc_log_lock(V_READ, lock, file, line, func, LOCK_NONE);
+ lockdoc_log_lock(V_READ, lock, file, line, func, LOCK_TYPE, LOCK_NONE);
}
+#undef LOCK_TYPE
/*
* Yet to be implemented: Check https://man.netbsd.org/locking.9 (esp. IRQ, CVlock and BKL, check issue tracker)
@@ -152,11 +158,7 @@ void trace_irqs_on(struct trapframe *frame) {
u_long cur_eflags;
cur_eflags = x86_read_flags();
if ((frame->tf_eflags & (1 << 9)) && !(cur_eflags & (1 << 9))) {
-#ifdef DEBUG_TRAPS
- lockdoc_log_lock(V_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, "dummy", frame->tf_trapno);
-#else
- lockdoc_log_lock(V_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, "dummy", LOCK_NONE);
-#endif
+ lockdoc_log_lock(V_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, "dummy", "dummy", LOCK_NONE);
}
}
@@ -164,11 +166,7 @@ void trace_irqs_off(struct trapframe *frame) {
u_long cur_eflags;
cur_eflags = x86_read_flags();
if ((frame->tf_eflags & (1 << 9)) && !(cur_eflags & (1 << 9))) {
-#ifdef DEBUG_TRAPS
- lockdoc_log_lock(P_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, "dummy", frame->tf_trapno);
-#else
- lockdoc_log_lock(P_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, "dummy", LOCK_NONE);
-#endif
+ lockdoc_log_lock(P_WRITE, (struct lock_object*)PSEUDOLOCK_ADDR_HARDIRQ, __FILE__, __LINE__, "dummy", "dummy", frame->tf_trapno);
}
}
@@ -177,7 +175,7 @@ void __x86_disable_intr(const char *file, int line, const char *func){
eflags = x86_read_flags();
if (eflags & (1 << 9)){ // Check if interrupts were enabled in the first place
- lockdoc_log_lock(P_WRITE, (void*)PSEUDOLOCK_ADDR_HARDIRQ, file, line, "dummy", LOCK_NONE);
+ lockdoc_log_lock(P_WRITE, (void*)PSEUDOLOCK_ADDR_HARDIRQ, file, line, "dummy", "dummy", LOCK_NONE);
}
lockdoc_x86_disable_intr();
}
@@ -196,7 +194,7 @@ void __x86_enable_intr(const char *file, int line, const char *func){
eflags = x86_read_flags();
if (!(eflags & (1 << 9))){ // Check if interrupts were disabled in the first place
- lockdoc_log_lock(V_WRITE, (void*)PSEUDOLOCK_ADDR_HARDIRQ, file, line, "dummy", LOCK_NONE);
+ lockdoc_log_lock(V_WRITE, (void*)PSEUDOLOCK_ADDR_HARDIRQ, file, line, "dummy", "dummy", LOCK_NONE);
}
lockdoc_x86_enable_intr();
}