samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dsp-kernel: Dequeue the CMA mini dump node to avoid infinite loop

Browse Source 
Currently, the CMA mini dump node is not being dequeued, leading to an
infinite loop. Dequeue the CMA mini dump node as well along with all
the init mems.

Signed-off-by: Abhishek Singh <quic_abhishes@quicinc.com>
Change-Id: Ie5c24ee4ce43c798ed40a8d766371449bcf27b68
(cherry picked from commit 74775598d4)
This commit is contained in:
Abhishek Singh
2024-05-08 16:29:49 +05:30
committed by Mohit Sharma
parent 9133607ddd
commit 8d872e2880
2 changed files with 31 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
dsp/adsprpc.c
View File

@@ -2153,7 +2153,7 @@ static void fastrpc_notif_find_process(int domain, struct smq_notif_rspv3 *notif
is_process_found = true;
err = fastrpc_file_get(fl);
if (err) {
ADSPRPC_ERR("Failed to get user process reference\n");
ADSPRPC_ERR("Failed to get user process reference for fl (%pK)\n", fl);
is_process_found = false;
}
break;
@@ -2277,14 +2277,19 @@ static void fastrpc_update_ramdump_status(int cid)
struct fastrpc_apps *me = &gfa;
struct fastrpc_channel_ctx *chan = &me->channel[cid];
unsigned long irq_flags = 0;
int ret = 0;
spin_lock_irqsave(&me->hlock, irq_flags);
hlist_for_each_entry_safe(fl, n, &me->drivers, hn) {
if (fl->cid == cid && fl->init_mem &&
fl->file_close < FASTRPC_PROCESS_DSP_EXIT_COMPLETE &&
fl->dsp_proc_init) {
ret = fastrpc_file_get(fl);
if (ret) {
ADSPRPC_ERR("Failed to get user process reference for fl (%pK)\n", fl);
continue;
}
hlist_add_head(&fl->init_mem->hn_init, &chan->initmems);
fl->is_ramdump_pend = true;
}
}
if (chan->buf)
@@ -2301,7 +2306,6 @@ static void fastrpc_ramdump_collection(int cid)
struct qcom_dump_segment ramdump_entry;
struct fastrpc_buf *buf = NULL;
int ret = 0;
unsigned long irq_flags = 0;
struct list_head head;
hlist_for_each_entry_safe(buf, n, &chan->initmems, hn_init) {
@@ -2313,12 +2317,6 @@ static void fastrpc_ramdump_collection(int cid)
INIT_LIST_HEAD(&head);
list_add(&ramdump_entry.node, &head);
if (fl) {
ret = fastrpc_file_get(fl);
if (ret) {
ADSPRPC_ERR("Failed to get user process reference\n");
continue;
}
if (fl && fl->sctx && fl->sctx->smmu.dev) {
ret = qcom_elf_dump(&head, fl->sctx->smmu.dev, ELF_CLASS);
} else {
@@ -2328,19 +2326,11 @@ static void fastrpc_ramdump_collection(int cid)
if (ret < 0)
ADSPRPC_ERR("adsprpc: %s: unable to dump PD memory (err %d)\n",
__func__, ret);
hlist_del_init(&buf->hn_init);
if (fl) {
spin_lock_irqsave(&me->hlock, irq_flags);
if (fl->file_close)
complete(&fl->work);
fl->is_ramdump_pend = false;
spin_unlock_irqrestore(&me->hlock, irq_flags);
if (fl)
fastrpc_file_put(fl);
}
}
}
}
static void fastrpc_notify_drivers(struct fastrpc_apps *me, int cid)
{
@@ -3570,10 +3560,6 @@ read_async_job:
VERIFY(err, 0 == (err = interrupted));
if (err)
goto bail;
if (err) {
ADSPRPC_ERR("Failed to get user process reference\n");
goto bail;
}
spin_lock_irqsave(&fl->aqlock, flags);
hlist_for_each_entry_safe(ictx, n, &fl->clst.async_queue, asyncn) {
hlist_del_init(&ictx->asyncn);
@@ -3663,11 +3649,6 @@ read_notif_status:
VERIFY(err, 0 == (err = interrupted));
if (err)
goto bail;
if (err) {
ADSPRPC_ERR("Failed to get user process reference\n");
goto bail;
}
spin_lock_irqsave(&fl->proc_state_notif.nqlock, flags);
list_for_each_entry_safe(inotif, n, &fl->clst.notif_queue, notifn) {
list_del_init(&inotif->notifn);
@@ -5980,8 +5961,10 @@ void fastrpc_file_free(struct kref *ref)
struct fastrpc_buf *init_mem = NULL;
fl = container_of(ref, struct fastrpc_file, refcount);
if (!fl)
if (!fl) {
ADSPRPC_ERR("%s Invalid fl", __func__);
return;
}
cid = fl->cid;
spin_lock_irqsave(&me->hlock, irq_flags);
@@ -6010,19 +5993,6 @@ skip_dmainvoke_wait:
spin_lock_irqsave(&fl->apps->hlock, irq_flags);
is_locked = true;
}
if (!fl->is_ramdump_pend)
goto skip_dump_wait;
is_locked = false;
spin_unlock_irqrestore(&fl->apps->hlock, irq_flags);
wait_for_completion(&fl->work);
skip_dump_wait:
if (!is_locked) {
spin_lock_irqsave(&fl->apps->hlock, irq_flags);
is_locked = true;
}
hlist_del_init(&fl->hn);
fl->is_ramdump_pend = false;
fl->is_dma_invoke_pend = false;
fl->dsp_process_state = PROCESS_CREATE_DEFAULT;
is_locked = false;
@@ -6134,6 +6104,7 @@ static int fastrpc_device_release(struct inode *inode, struct file *file)
struct fastrpc_file *fl = (struct fastrpc_file *)file->private_data;
struct fastrpc_apps *me = &gfa;
unsigned int ii;
unsigned long irq_flags = 0;
if (!fl)
return 0;
@@ -6146,6 +6117,9 @@ static int fastrpc_device_release(struct inode *inode, struct file *file)
}
}
debugfs_remove(fl->debugfs_file);
spin_lock_irqsave(&me->hlock, irq_flags);
hlist_del_init(&fl->hn);
spin_unlock_irqrestore(&me->hlock, irq_flags);
fastrpc_file_put(fl);
file->private_data = NULL;
@@ -6247,7 +6221,7 @@ static ssize_t fastrpc_debugfs_read(struct file *filp, char __user *buffer,
} else {
ret = fastrpc_file_get(fl);
if (ret) {
ADSPRPC_ERR("Failed to get user process reference\n");
ADSPRPC_ERR("Failed to get user process reference for fl (%pK)\n", fl);
goto bail;
}
len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,
@@ -6529,7 +6503,6 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp)
fl->init_mem = NULL;
fl->qos_request = 0;
fl->dsp_proc_init = 0;
fl->is_ramdump_pend = false;
fl->dsp_process_state = PROCESS_CREATE_DEFAULT;
fl->is_unsigned_pd = false;
fl->is_compat = false;
@@ -7770,10 +7743,10 @@ static void fastrpc_print_debug_data(int cid)
err = fastrpc_file_get(fl);
if (err) {
spin_unlock_irqrestore(&me->hlock, irq_flags);
ADSPRPC_ERR("Failed to get user process reference\n");
ADSPRPC_ERR("Failed to get user process reference for fl (%pK)\n", fl);
goto free_buf;
}
if (fl->cid == cid && fl->is_ramdump_pend) {
if (fl->cid == cid) {
scnprintf(mini_dump_buff +
strlen(mini_dump_buff),
MINI_DUMP_DBG_SIZE -
@@ -7872,8 +7845,8 @@ static void fastrpc_print_debug_data(int cid)
cid, mini_dump_buff);
}
spin_unlock(&fl->hlock);
fastrpc_file_put(fl);
}
fastrpc_file_put(fl);
}
spin_unlock_irqrestore(&me->hlock, irq_flags);
spin_lock_irqsave(&chan->gmsg_log.lock, flags);
@@ -8690,7 +8663,7 @@ long fastrpc_dev_map_dma(struct fastrpc_device *dev, unsigned long invoke_param)
spin_unlock_irqrestore(&me->hlock, irq_flags);
err = fastrpc_file_get(fl);
if (err) {
ADSPRPC_ERR("Failed to get user process reference\n");
ADSPRPC_ERR("Failed to get user process reference for fl (%pK)\n", fl);
goto bail;
}
reftaken = 1;
@@ -8767,7 +8740,7 @@ long fastrpc_dev_unmap_dma(struct fastrpc_device *dev, unsigned long invoke_para
spin_unlock_irqrestore(&me->hlock, irq_flags);
err = fastrpc_file_get(fl);
if (err) {
ADSPRPC_ERR("Failed to get user process reference\n");
ADSPRPC_ERR("Failed to get user process reference for fl (%pK)\n", fl);
goto bail;
}
reftaken = 1;

2
dsp/adsprpc_shared.h
View File

@@ -900,8 +900,6 @@ struct fastrpc_file {
struct fastrpc_device *device;
/* Process kill will wait on work when ram dump collection in progress */
struct completion work;
/* Flag to indicate ram dump collection status*/
bool is_ramdump_pend;
/* Process kill will wait on bus driver invoke thread to complete its process */
struct completion dma_invoke;
/* Flag to indicate invoke pending */