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

Merge "dsp-kernel: Handle the spinlock recursion"

Browse Source
This commit is contained in:
qctecmdr
2024-06-18 15:23:17 -07:00
committed by Gerrit - the friendly Code Review server
parent 91e7a6d3a6 3463a894b8
commit e5f9d3ac0f
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dsp/adsprpc.c
View File

@@ -5991,6 +5991,7 @@ skip_dmainvoke_wait:
spin_lock_irqsave(&fl->apps->hlock, irq_flags); spin_lock_irqsave(&fl->apps->hlock, irq_flags);
is_locked = true; is_locked = true;
} }
hlist_del_init(&fl->hn);
fl->is_dma_invoke_pend = false; fl->is_dma_invoke_pend = false;
fl->dsp_process_state = PROCESS_CREATE_DEFAULT; fl->dsp_process_state = PROCESS_CREATE_DEFAULT;
is_locked = false; is_locked = false;
@@ -6102,7 +6103,6 @@ static int fastrpc_device_release(struct inode *inode, struct file *file)
struct fastrpc_file *fl = (struct fastrpc_file *)file->private_data; struct fastrpc_file *fl = (struct fastrpc_file *)file->private_data;
struct fastrpc_apps *me = &gfa; struct fastrpc_apps *me = &gfa;
unsigned int ii; unsigned int ii;
unsigned long irq_flags = 0;
if (!fl) if (!fl)
return 0; return 0;
@@ -6115,9 +6115,6 @@ static int fastrpc_device_release(struct inode *inode, struct file *file)
} }
} }
debugfs_remove(fl->debugfs_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); fastrpc_file_put(fl);
file->private_data = NULL; file->private_data = NULL;
@@ -6508,7 +6505,6 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp)
fl->exit_async = false; fl->exit_async = false;
fl->multi_session_support = false; fl->multi_session_support = false;
fl->set_session_info = false; fl->set_session_info = false;
init_completion(&fl->work);
init_completion(&fl->dma_invoke); init_completion(&fl->dma_invoke);
fl->file_close = FASTRPC_PROCESS_DEFAULT_STATE; fl->file_close = FASTRPC_PROCESS_DEFAULT_STATE;
filp->private_data = fl; filp->private_data = fl;
@@ -7733,7 +7729,7 @@ static void fastrpc_print_debug_data(int cid)
struct hlist_node *n = NULL; struct hlist_node *n = NULL;
struct smq_invoke_ctx *ictx = NULL; struct smq_invoke_ctx *ictx = NULL;
struct fastrpc_tx_msg *tx_msg = NULL; struct fastrpc_tx_msg *tx_msg = NULL;
struct fastrpc_buf *buf = NULL; struct fastrpc_buf *buf = NULL, *iter = NULL;
struct fastrpc_mmap *map = NULL; struct fastrpc_mmap *map = NULL;
unsigned long irq_flags = 0; unsigned long irq_flags = 0;
@@ -7759,15 +7755,10 @@ static void fastrpc_print_debug_data(int cid)
tx_index = chan->gmsg_log.tx_index; tx_index = chan->gmsg_log.tx_index;
rx_index = chan->gmsg_log.rx_index; rx_index = chan->gmsg_log.rx_index;
} }
spin_lock_irqsave(&me->hlock, irq_flags);
hlist_for_each_entry_safe(fl, n, &me->drivers, hn) { hlist_for_each_entry_safe(iter, n, &chan->initmems, hn_init) {
err = fastrpc_file_get(fl); fl = iter->fl;
if (err) { if ( fl && (fl->cid == cid)) {
spin_unlock_irqrestore(&me->hlock, irq_flags);
ADSPRPC_ERR("Failed to get user process reference for fl (%pK)\n", fl);
goto free_buf;
}
if (fl->cid == cid) {
scnprintf(mini_dump_buff + scnprintf(mini_dump_buff +
strlen(mini_dump_buff), strlen(mini_dump_buff),
MINI_DUMP_DBG_SIZE - MINI_DUMP_DBG_SIZE -
@@ -7795,6 +7786,7 @@ static void fastrpc_print_debug_data(int cid)
MINI_DUMP_DBG_SIZE - MINI_DUMP_DBG_SIZE -
strlen(mini_dump_buff), strlen(mini_dump_buff),
"\nSession Maps\n"); "\nSession Maps\n");
spin_lock_irqsave(&me->hlock, irq_flags);
hlist_for_each_entry_safe(map, n, &me->maps, hn) { hlist_for_each_entry_safe(map, n, &me->maps, hn) {
fastrpc_print_map(map, mini_dump_buff); fastrpc_print_map(map, mini_dump_buff);
} }
@@ -7804,7 +7796,6 @@ static void fastrpc_print_debug_data(int cid)
fastrpc_print_map(map, mini_dump_buff); fastrpc_print_map(map, mini_dump_buff);
} }
mutex_unlock(&fl->map_mutex); mutex_unlock(&fl->map_mutex);
spin_lock_irqsave(&me->hlock, irq_flags);
spin_lock(&fl->hlock); spin_lock(&fl->hlock);
scnprintf(mini_dump_buff + strlen(mini_dump_buff), scnprintf(mini_dump_buff + strlen(mini_dump_buff),
MINI_DUMP_DBG_SIZE - strlen(mini_dump_buff), MINI_DUMP_DBG_SIZE - strlen(mini_dump_buff),
@@ -7864,9 +7855,7 @@ static void fastrpc_print_debug_data(int cid)
} }
spin_unlock(&fl->hlock); spin_unlock(&fl->hlock);
} }
fastrpc_file_put(fl);
} }
spin_unlock_irqrestore(&me->hlock, irq_flags);
spin_lock_irqsave(&chan->gmsg_log.lock, flags); spin_lock_irqsave(&chan->gmsg_log.lock, flags);
if (rx_index) { if (rx_index) {
for (i = rx_index, count = 0, len = 0 ; i > 0 && for (i = rx_index, count = 0, len = 0 ; i > 0 &&

2
dsp/adsprpc_shared.h
View File

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