openharmony/developtools_profiler
1
0
Fork 0
mirror of https://gitee.com/openharmony/developtools_profiler synced 2024-11-23 06:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1967 修复协程fp回栈问题

Browse Source 
Merge pull request !1967 from zhangyixin/master
This commit is contained in:
openharmony_ci 2024-10-16 06:39:31 +00:00 committed by Gitee
commit fc44d3b35a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 33 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
device/plugins/native_hook/BUILD.gn
View File

@ -65,7 +65,6 @@ ohos_source_set("native_hook_source") {
}
external_deps = [
"bounds_checking_function:libsec_shared",
"ffrt:libffrt",
"hitrace:libhitracechain",
"init:libbegetutil",
"zlib:libz",

135
device/plugins/native_hook/src/hook_client.cpp
View File

@ -25,7 +25,6 @@
#include <unordered_map>
#include <unordered_set>
#include "dfx_regs_get.h"
#include "c/executor_task.h"
#include "common.h"
#include "hook_common.h"
#include "hook_socket_client.h"
@ -330,8 +329,7 @@ bool FilterStandardSoIp(uint64_t ip)
}
#if defined(__aarch64__)
static int inline __attribute__((always_inline)) FpUnwind(int maxDepth, uint64_t* ip, int stackSize,
const char* startPtr, const char* endPtr)
static int inline __attribute__((always_inline)) FpUnwind(int maxDepth, uint64_t* ip, int stackSize)
{
void** startfp = (void**)__builtin_frame_address(0);
void** fp = startfp;
@ -339,9 +337,6 @@ static int inline __attribute__((always_inline)) FpUnwind(int maxDepth, uint64_t
int count = 0;
uint64_t tempIp = 0;
while (depth < maxDepth) {
if (fp < (void**)startPtr || (fp + 1) >= (void**)endPtr) {
break;
}
void** nextFp = (void**)*fp;
if (nextFp <= fp) {
break;
@ -431,18 +426,10 @@ void* hook_malloc(void* (*fn)(size_t), size_t size)
if (g_ClientConfig.fpunwind) {
#ifdef __aarch64__
void* stackAddr = nullptr;
size_t coroutineStackSize = 0;
if (ffrt_get_current_coroutine_stack(&stackAddr, &coroutineStackSize)) {
stackSize = static_cast<int>(coroutineStackSize);
stackptr = reinterpret_cast<const char*>(stackAddr);
stackendptr = stackptr + coroutineStackSize;
} else {
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
}
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize, stackptr, stackendptr);
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize);
stackSize = 0;
rawdata.jsChainId = getJsChainId();
#endif
@ -536,18 +523,10 @@ void* hook_aligned_alloc(void* (*fn)(size_t, size_t), size_t align, size_t len)
if (g_ClientConfig.fpunwind) {
#ifdef __aarch64__
void* stackAddr = nullptr;
size_t coroutineStackSize = 0;
if (ffrt_get_current_coroutine_stack(&stackAddr, &coroutineStackSize)) {
stackSize = static_cast<int>(coroutineStackSize);
stackptr = reinterpret_cast<const char*>(stackAddr);
stackendptr = stackptr + coroutineStackSize;
} else {
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
}
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize, stackptr, stackendptr);
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize);
stackSize = 0;
rawdata.jsChainId = getJsChainId();
#endif
@ -641,18 +620,10 @@ void* hook_calloc(void* (*fn)(size_t, size_t), size_t number, size_t size)
if (g_ClientConfig.fpunwind) {
#ifdef __aarch64__
void* stackAddr = nullptr;
size_t coroutineStackSize = 0;
if (ffrt_get_current_coroutine_stack(&stackAddr, &coroutineStackSize)) {
stackSize = static_cast<int>(coroutineStackSize);
stackptr = reinterpret_cast<const char*>(stackAddr);
stackendptr = stackptr + coroutineStackSize;
} else {
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
}
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize, stackptr, stackendptr);
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize);
stackSize = 0;
rawdata.jsChainId = getJsChainId();
#endif
@ -751,18 +722,10 @@ void* hook_realloc(void* (*fn)(void*, size_t), void* ptr, size_t size)
if (g_ClientConfig.fpunwind) {
#ifdef __aarch64__
void* stackAddr = nullptr;
size_t coroutineStackSize = 0;
if (ffrt_get_current_coroutine_stack(&stackAddr, &coroutineStackSize)) {
stackSize = static_cast<int>(coroutineStackSize);
stackptr = reinterpret_cast<const char*>(stackAddr);
stackendptr = stackptr + coroutineStackSize;
} else {
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
}
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize, stackptr, stackendptr);
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize);
stackSize = 0;
if (g_ClientConfig.freeStackData) {
(void)memcpy_s(freeData.ip, sizeof(freeData.ip) / sizeof(uint64_t),
@ -889,18 +852,10 @@ void hook_free(void (*free_func)(void*), void* p)
if (g_ClientConfig.freeStackData) {
if (g_ClientConfig.fpunwind) {
#ifdef __aarch64__
void* stackAddr = nullptr;
size_t coroutineStackSize = 0;
if (ffrt_get_current_coroutine_stack(&stackAddr, &coroutineStackSize)) {
stackSize = static_cast<int>(coroutineStackSize);
stackptr = reinterpret_cast<const char*>(stackAddr);
stackendptr = stackptr + coroutineStackSize;
} else {
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
}
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize, stackptr, stackendptr);
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize);
stackSize = 0;
rawdata.jsChainId = getJsChainId();
#endif
@ -1007,18 +962,10 @@ void* hook_mmap(void*(*fn)(void*, size_t, int, int, int, off_t),
if (g_ClientConfig.fpunwind) {
#ifdef __aarch64__
void* stackAddr = nullptr;
size_t coroutineStackSize = 0;
if (ffrt_get_current_coroutine_stack(&stackAddr, &coroutineStackSize)) {
stackSize = static_cast<int>(coroutineStackSize);
stackptr = reinterpret_cast<const char*>(stackAddr);
stackendptr = stackptr + coroutineStackSize;
} else {
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
}
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize, stackptr, stackendptr);
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize);
stackSize = 0;
rawdata.jsChainId = getJsChainId();
#endif
@ -1110,18 +1057,10 @@ int hook_munmap(int(*fn)(void*, size_t), void* addr, size_t length)
if (g_ClientConfig.munmapStackData) {
if (g_ClientConfig.fpunwind) {
#ifdef __aarch64__
void* stackAddr = nullptr;
size_t coroutineStackSize = 0;
if (ffrt_get_current_coroutine_stack(&stackAddr, &coroutineStackSize)) {
stackSize = static_cast<int>(coroutineStackSize);
stackptr = reinterpret_cast<const char*>(stackAddr);
stackendptr = stackptr + coroutineStackSize;
} else {
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
}
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize, stackptr, stackendptr);
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize);
stackSize = 0;
rawdata.jsChainId = getJsChainId();
#endif
@ -1233,18 +1172,10 @@ void hook_memtrace(void* addr, size_t size, const char* tag, bool isUsing)
if (isUsing) {
if (g_ClientConfig.fpunwind) {
#ifdef __aarch64__
void* stackAddr = nullptr;
size_t coroutineStackSize = 0;
if (ffrt_get_current_coroutine_stack(&stackAddr, &coroutineStackSize)) {
stackSize = static_cast<int>(coroutineStackSize);
stackptr = reinterpret_cast<const char*>(stackAddr);
stackendptr = stackptr + coroutineStackSize;
} else {
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
}
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize, stackptr, stackendptr);
stackptr = reinterpret_cast<const char*>(__builtin_frame_address(0));
GetRuntimeStackEnd(stackptr, &stackendptr, g_hookPid, GetCurThreadId()); // stack end pointer
stackSize = stackendptr - stackptr;
fpStackDepth = FpUnwind(g_ClientConfig.maxStackDepth, rawdata.ip, stackSize);
stackSize = 0;
rawdata.jsChainId = getJsChainId();
#endif

1
device/plugins/native_hook/src/hook_socket_client.cpp
View File

@ -125,7 +125,6 @@ bool HookSocketClient::ProtocolProc(SocketContext &context, uint32_t pnum, const
std::string smbName = "hooknativesmb_" + std::to_string(pid_);
stackWriter_ = std::make_shared<StackWriter>(smbName, config_->shareMemorySize,
smbFd_, eventFd_, config_->isBlocked);
struct mallinfo2 mi = mallinfo2();
nmdType_ = config_->nmdType;
if (nmdType_ == 0) {
SendNmdInfo();