ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/spdk_top: fix SEGV on unknown address

Browse Source 
The index of g_thread_info is equals to the thread ID.
When the thread ID is not continuous, but index of ABC is continuous,
so some elements of g_thread_info array will be empty.

fixes #1899

Signed-off-by: ChengqiangMeng <chengqiangx.meng@intel.com>
Change-Id: Ib90a26dcc2d47792a098b163746906f34043453a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7493
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Krzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
ChengqiangMeng 2021-04-20 15:25:04 +08:00 committed by Jim Harris
parent 7db06707f5
commit dbef0cfd02
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/spdk_top/spdk_top.c
View File

@ -557,6 +557,7 @@ get_data(void)
} }
/* Decode json */ /* Decode json */
memset(&g_threads_stats, 0, sizeof(g_threads_stats));
if (spdk_json_decode_object(json_resp->result, rpc_threads_stats_decoders, if (spdk_json_decode_object(json_resp->result, rpc_threads_stats_decoders,
SPDK_COUNTOF(rpc_threads_stats_decoders), &g_threads_stats)) { SPDK_COUNTOF(rpc_threads_stats_decoders), &g_threads_stats)) {
rc = -EINVAL; rc = -EINVAL;
@ -799,6 +800,16 @@ sort_threads(const void *p1, const void *p2)
const struct rpc_thread_info *thread_info2 = *(struct rpc_thread_info **)p2; const struct rpc_thread_info *thread_info2 = *(struct rpc_thread_info **)p2;
uint64_t count1, count2; uint64_t count1, count2;
/* thread IDs may not be allocated contiguously, so we need
* to account for NULL thread_info pointers */
if (thread_info1 == NULL && thread_info2 == NULL) {
return 0;
} else if (thread_info1 == NULL) {
return 1;
} else if (thread_info2 == NULL) {
return -1;
}
switch (g_current_sort_col[THREADS_TAB]) { switch (g_current_sort_col[THREADS_TAB]) {
case 0: /* Sort by name */ case 0: /* Sort by name */
return strcmp(thread_info1->name, thread_info2->name); return strcmp(thread_info1->name, thread_info2->name);
@ -878,10 +889,15 @@ refresh_threads_tab(uint8_t current_page)
g_last_threads_count = threads_count; g_last_threads_count = threads_count;
} }
/* Thread IDs starts from '1', so we have to take this into account when copying. /* From g_thread_info copy to thread_info without null elements.
* TODO: In future we can have gaps in ID list, so we will need to change the way we * The index of g_thread_info equals to Thread IDs, so it starts from '1'. */
* handle copying threads list below */ for (i = 0, j = 1; i < g_threads_stats.threads.threads_count; i++) {
memcpy(thread_info, &g_thread_info[1], sizeof(struct rpc_thread_info *) * threads_count); while (g_thread_info[j] == NULL) {
j++;
}
memcpy(&thread_info[i], &g_thread_info[j], sizeof(struct rpc_thread_info *));
j++;
}
if (last_page != current_page) { if (last_page != current_page) {
for (i = 0; i < threads_count; i++) { for (i = 0; i < threads_count; i++) {