TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: ADSPRPC: Fix deadlock during SSR"

Browse Source
This commit is contained in:
qctecmdr
2021-07-12 22:35:58 -07:00
committed by Gerrit - the friendly Code Review server
parent 5347ec3264 bbdbc1380d
commit f8963e38b3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/char/adsprpc.c
View File

@@ -3198,13 +3198,18 @@ static int fastrpc_mmap_remove_ssr(struct fastrpc_file *fl)
kfree(ramdump_segments_rh); kfree(ramdump_segments_rh);
} }
} }
mutex_lock(&fl->map_mutex);
fastrpc_mmap_free(match, 0); fastrpc_mmap_free(match, 0);
mutex_unlock(&fl->map_mutex);
} }
} while (match); } while (match);
me->enable_ramdump = false; me->enable_ramdump = false;
bail: bail:
if (err && match) if (err && match) {
mutex_lock(&fl->map_mutex);
fastrpc_mmap_add(match); fastrpc_mmap_add(match);
mutex_unlock(&fl->map_mutex);
}
return err; return err;
} }
@@ -4013,13 +4018,13 @@ static int fastrpc_channel_open(struct fastrpc_file *fl)
if (cid == ADSP_DOMAIN_ID && me->channel[cid].ssrcount != if (cid == ADSP_DOMAIN_ID && me->channel[cid].ssrcount !=
me->channel[cid].prevssrcount) { me->channel[cid].prevssrcount) {
mutex_lock(&fl->map_mutex); mutex_unlock(&me->channel[cid].smd_mutex);
err = fastrpc_mmap_remove_ssr(fl); err = fastrpc_mmap_remove_ssr(fl);
if (err) if (err)
pr_warn("adsprpc: %s: %s: failed to unmap remote heap for %s (err %d)\n", pr_warn("adsprpc: %s: %s: failed to unmap remote heap for %s (err %d)\n",
__func__, current->comm, __func__, current->comm,
me->channel[cid].subsys, err); me->channel[cid].subsys, err);
mutex_unlock(&fl->map_mutex); mutex_lock(&me->channel[cid].smd_mutex);
me->channel[cid].prevssrcount = me->channel[cid].prevssrcount =
me->channel[cid].ssrcount; me->channel[cid].ssrcount;
} }