From 1eca7a502a243dba171ccd74994004581bcda28b Mon Sep 17 00:00:00 2001 From: wanghao-free Date: Tue, 14 Sep 2021 23:35:56 -0700 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3OsLockDepCheckIn?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E4=B8=AD=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E9=94=81=E5=B5=8C=E5=A5=97=E8=B0=83=E7=94=A8=20=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=AD=BB=E9=94=81=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E5=B8=B8=E8=BE=93=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 主干存在该问题，修改同步release分支 新增加异常信息打印输出函数，用局部数组保存输出信息，避免锁嵌套问题 Close #I457ZZ Signed-off-by: wanghao-free --- kernel/base/mp/los_lockdep.c | 63 +++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 18 deletions(-) diff --git a/kernel/base/mp/los_lockdep.c b/kernel/base/mp/los_lockdep.c index 3f52964b..604f3cd3 100644 --- a/kernel/base/mp/los_lockdep.c +++ b/kernel/base/mp/los_lockdep.c @@ -44,6 +44,8 @@ extern "C" { #if (LOSCFG_KERNEL_SMP_LOCKDEP == YES) +#define PRINT_BUF_SIZE 256 + #define LOCKDEP_GET_NAME(lockDep, index) (((SPIN_LOCK_S *)((lockDep)->heldLocks[(index)].lockPtr))->name) #define LOCKDEP_GET_ADDR(lockDep, index) ((lockDep)->heldLocks[(index)].lockAddr) @@ -107,6 +109,31 @@ WEAK VOID OsLockDepPanic(enum LockDepErrType errType) while (1) {} } +STATIC VOID OsLockDepPrint(const CHAR *fmt, va_list ap) +{ + UINT32 len; + CHAR buf[PRINT_BUF_SIZE] = {0}; + + len = vsnprintf_s(buf, PRINT_BUF_SIZE, PRINT_BUF_SIZE - 1, fmt, ap); + if ((len == -1) && (*buf == '\0')) { + /* parameter is illegal or some features in fmt dont support */ + UartPuts("OsLockDepPrint is error\n", strlen("OsLockDepPrint is error\n") + 1, 0); + return; + } + + *(buf + len) = '\0'; + + UartPuts(buf, len, 0); +} + +STATIC VOID OsPrintLockDepInfo(const CHAR *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + OsLockDepPrint(fmt, ap); + va_end(ap); +} + STATIC VOID OsLockDepDumpLock(const LosTaskCB *task, const SPIN_LOCK_S *lock, const VOID *requestAddr, enum LockDepErrType errType) { @@ -114,24 +141,24 @@ STATIC VOID OsLockDepDumpLock(const LosTaskCB *task, const SPIN_LOCK_S *lock, const LockDep *lockDep = &task->lockDep; const LosTaskCB *temp = task; - PrintExcInfo("lockdep check failed\n"); - PrintExcInfo("error type : %s\n", OsLockDepErrorStringGet(errType)); - PrintExcInfo("request addr : 0x%x\n", requestAddr); + OsPrintLockDepInfo("lockdep check failed\n"); + OsPrintLockDepInfo("error type : %s\n", OsLockDepErrorStringGet(errType)); + OsPrintLockDepInfo("request addr : 0x%x\n", requestAddr); while (1) { - PrintExcInfo("task name : %s\n", temp->taskName); - PrintExcInfo("task id : %u\n", temp->taskID); - PrintExcInfo("cpu num : %u\n", temp->currCpu); - PrintExcInfo("start dumping lockdep infomation\n"); + OsPrintLockDepInfo("task name : %s\n", temp->taskName); + OsPrintLockDepInfo("task id : %u\n", temp->taskID); + OsPrintLockDepInfo("cpu num : %u\n", temp->currCpu); + OsPrintLockDepInfo("start dumping lockdep infomation\n"); for (i = 0; i < lockDep->lockDepth; i++) { if (lockDep->heldLocks[i].lockPtr == lock) { - PrintExcInfo("[%d] %s <-- addr:0x%x\n", i, LOCKDEP_GET_NAME(lockDep, i), + OsPrintLockDepInfo("[%d] %s <-- addr:0x%x\n", i, LOCKDEP_GET_NAME(lockDep, i), LOCKDEP_GET_ADDR(lockDep, i)); } else { - PrintExcInfo("[%d] %s \n", i, LOCKDEP_GET_NAME(lockDep, i)); + OsPrintLockDepInfo("[%d] %s \n", i, LOCKDEP_GET_NAME(lockDep, i)); } } - PrintExcInfo("[%d] %s <-- now\n", i, lock->name); + OsPrintLockDepInfo("[%d] %s <-- now\n", i, lock->name); if (errType == LOCKDEP_ERR_DEAD_LOCK) { temp = lock->owner; @@ -144,7 +171,6 @@ STATIC VOID OsLockDepDumpLock(const LosTaskCB *task, const SPIN_LOCK_S *lock, } } - OsLockDepPanic(errType); } STATIC BOOL OsLockDepCheckDependancy(const LosTaskCB *current, LosTaskCB *lockOwner) @@ -172,7 +198,7 @@ VOID OsLockDepCheckIn(SPIN_LOCK_S *lock) { UINT32 intSave; enum LockDepErrType checkResult = LOCKDEP_SUCEESS; - VOID *requestAddr = (VOID *)__builtin_return_address(0); + VOID *requestAddr = (VOID *)__builtin_return_address(1); LosTaskCB *current = OsCurrTaskGet(); LockDep *lockDep = ¤t->lockDep; LosTaskCB *lockOwner = NULL; @@ -211,11 +237,12 @@ OUT: lockDep->waitLock = lock; lockDep->heldLocks[lockDep->lockDepth].lockAddr = requestAddr; lockDep->heldLocks[lockDep->lockDepth].waitTime = OsLockDepGetCycles(); /* start time */ - } else { - OsLockDepDumpLock(current, lock, requestAddr, checkResult); + OsLockDepRelease(intSave); + return; } - + OsLockDepDumpLock(current, lock, requestAddr, checkResult); OsLockDepRelease(intSave); + OsLockDepPanic(checkResult); } VOID OsLockDepRecord(SPIN_LOCK_S *lock) @@ -253,7 +280,7 @@ VOID OsLockDepCheckOut(SPIN_LOCK_S *lock) UINT32 intSave; INT32 depth; enum LockDepErrType checkResult = LOCKDEP_SUCEESS; - VOID *requestAddr = (VOID *)__builtin_return_address(0); + VOID *requestAddr = (VOID *)__builtin_return_address(1); LosTaskCB *current = OsCurrTaskGet(); LosTaskCB *owner = NULL; LockDep *lockDep = NULL; @@ -265,7 +292,8 @@ VOID OsLockDepCheckOut(SPIN_LOCK_S *lock) if (owner == SPINLOCK_OWNER_INIT) { checkResult = LOCKDEP_ERR_UNLOCK_WITOUT_LOCK; OsLockDepDumpLock(current, lock, requestAddr, checkResult); - goto OUT; + OsLockDepRelease(intSave); + OsLockDepPanic(checkResult); } lockDep = &owner->lockDep; @@ -294,7 +322,6 @@ VOID OsLockDepCheckOut(SPIN_LOCK_S *lock) lock->cpuid = (UINT32)(-1); lock->owner = SPINLOCK_OWNER_INIT; -OUT: OsLockDepRelease(intSave); }