Lubancat2/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: rockchip: mpp: Fix deinit failure memory leak

Browse Source 
The dmabuf allocated by video will leaked when media process exit
abnormal, this patch changes the deinit for mpp driver to fix it.

Tested on RK3588 Debian:
step1:
GST_DEBUG=fpsdisplaysink:6 gst-play-1.0 /data/1.mp4 --use-playbin3 \
	--audiosink=fakesink --videosink="fpsdisplaysink \
	video-sink=waylandsink signal-fps-measurements=true"
step2:
ctrl + c to kill process
step3:
cat /proc/rk_dmabuf/dev to check dmabuf stat

Tested-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Ia3906b3a0bb5ec6511fc8d8abefadc37d6287c89
This commit is contained in:
Herman Chen
2022-05-05 18:04:05 +08:00
committed by Yandong Lin
parent 6613771ca0
commit 1029ff5aee
3 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
drivers/video/rockchip/mpp/mpp_common.c
View File

@ -230,8 +230,7 @@ int mpp_power_off(struct mpp_dev *mpp)
return 0;
}
static int mpp_session_clear(struct mpp_dev *mpp,
struct mpp_session *session)
static int mpp_session_clear_pending(struct mpp_session *session)
{
struct mpp_task *task = NULL, *n;
@ -250,6 +249,49 @@ static int mpp_session_clear(struct mpp_dev *mpp,
return 0;
}
void mpp_session_cleanup_detach(struct mpp_taskqueue *queue, struct kthread_work *work)
{
struct mpp_session *session, *n;
if (!atomic_read(&queue->detach_count))
return;
mutex_lock(&queue->session_lock);
list_for_each_entry_safe(session, n, &queue->session_detach, session_link) {
s32 task_count = atomic_read(&session->task_count);
if (!task_count) {
list_del_init(&session->session_link);
atomic_dec(&queue->detach_count);
}
mutex_unlock(&queue->session_lock);
if (task_count) {
mpp_dbg_session("session %d:%d task not finished %d\n",
session->pid, session->index,
atomic_read(&queue->detach_count));
mpp_session_clear_pending(session);
} else {
mpp_dbg_session("queue detach %d\n",
atomic_read(&queue->detach_count));
mpp_session_deinit(session);
}
mutex_lock(&queue->session_lock);
}
mutex_unlock(&queue->session_lock);
if (atomic_read(&queue->detach_count)) {
mpp_dbg_session("queue detach %d again\n",
atomic_read(&queue->detach_count));
kthread_queue_work(&queue->worker, work);
}
}
static struct mpp_session *mpp_session_init(void)
{
struct mpp_session *session = kzalloc(sizeof(*session), GFP_KERNEL);
@ -279,7 +321,7 @@ static void mpp_session_deinit_default(struct mpp_session *session)
if (mpp->dev_ops->free_session)
mpp->dev_ops->free_session(session);
mpp_session_clear(mpp, session);
mpp_session_clear_pending(session);
if (session->dma) {
mpp_iommu_down_read(mpp->iommu_info);
@ -300,14 +342,10 @@ static void mpp_session_deinit_default(struct mpp_session *session)
list_del_init(&session->session_link);
}
int mpp_session_deinit(struct mpp_session *session)
void mpp_session_deinit(struct mpp_session *session)
{
u32 task_count = atomic_read(&session->task_count);
mpp_dbg_session("session %p:%d task %d release\n",
session, session->index, task_count);
if (task_count)
return -1;
mpp_dbg_session("session %d:%d task %d deinit\n", session->pid,
session->index, atomic_read(&session->task_count));
if (likely(session->deinit))
session->deinit(session);
@ -317,13 +355,12 @@ int mpp_session_deinit(struct mpp_session *session)
mpp_dbg_session("session %p:%d deinit\n", session, session->index);
kfree(session);
return 0;
}
static void mpp_session_attach_workqueue(struct mpp_session *session,
struct mpp_taskqueue *queue)
{
mpp_dbg_session("session %p:%d attach\n", session, session->index);
mpp_dbg_session("session %d:%d attach\n", session->pid, session->index);
mutex_lock(&queue->session_lock);
list_add_tail(&session->session_link, &queue->session_attach);
mutex_unlock(&queue->session_lock);
@ -337,14 +374,14 @@ static void mpp_session_detach_workqueue(struct mpp_session *session)
if (!session->mpp || !session->mpp->queue)
return;
mpp_dbg_session("session %p:%d detach\n", session, session->index);
mpp_dbg_session("session %d:%d detach\n", session->pid, session->index);
mpp = session->mpp;
queue = mpp->queue;
mutex_lock(&queue->session_lock);
list_del_init(&session->session_link);
list_add_tail(&session->session_link, &queue->session_detach);
queue->detach_count++;
atomic_inc(&queue->detach_count);
mutex_unlock(&queue->session_lock);
mpp_taskqueue_trigger_work(mpp);
@ -443,14 +480,14 @@ static void mpp_task_timeout_work(struct work_struct *work_s)
session = task->session;
mpp_err("session %d:%d task %d processing time out!\n",
session->device_type, session->index, task->task_index);
if (!session->mpp) {
mpp_err("session %p, session->mpp is null.\n", session);
mpp_err("session %d:%d, session mpp is null.\n", session->pid,
session->index);
return;
}
mpp = session->mpp;
dev_err(mpp->dev, "session %d:%d task %d state %lx processing time out!\n",
session->device_type, session->index, task->task_index, task->state);
synchronize_hardirq(mpp->irq);
if (test_and_set_bit(TASK_STATE_HANDLE, &task->state)) {
@ -783,28 +820,7 @@ get_task:
}
done:
mutex_lock(&queue->session_lock);
while (queue->detach_count) {
struct mpp_session *session = NULL;
session = list_first_entry_or_null(&queue->session_detach, struct mpp_session,
session_link);
if (session) {
list_del_init(&session->session_link);
queue->detach_count--;
}
mutex_unlock(&queue->session_lock);
if (session) {
mpp_dbg_session("%s detach count %d\n", dev_name(mpp->dev),
queue->detach_count);
mpp_session_deinit(session);
}
mutex_lock(&queue->session_lock);
}
mutex_unlock(&queue->session_lock);
mpp_session_cleanup_detach(queue, work_s);
}
static int mpp_wait_result_default(struct mpp_session *session,
@ -822,7 +838,8 @@ static int mpp_wait_result_default(struct mpp_session *session,
task = mpp_session_get_pending_task(session);
if (!task) {
mpp_err("session %p pending list is empty!\n", session);
mpp_err("session %d:%d pending list is empty!\n",
session->pid, session->index);
return -EIO;
}
@ -962,6 +979,7 @@ struct mpp_taskqueue *mpp_taskqueue_init(struct device *dev)
mutex_init(&queue->ref_lock);
atomic_set(&queue->runtime_cnt, 0);
atomic_set(&queue->detach_count, 0);
return queue;
}
@ -1208,7 +1226,7 @@ static int mpp_process_request(struct mpp_session *session,
if (!mpp)
return -EINVAL;
mpp_session_clear(mpp, session);
mpp_session_clear_pending(session);
mpp_iommu_down_write(mpp->iommu_info);
ret = mpp_dma_session_destroy(session->dma);
mpp_iommu_up_write(mpp->iommu_info);
@ -1421,7 +1439,7 @@ static int mpp_dev_release(struct inode *inode, struct file *filp)
/* wait for task all done */
atomic_inc(&session->release_request);
if (session->mpp)
if (session->mpp || atomic_read(&session->task_count))
mpp_session_detach_workqueue(session);
else
mpp_session_deinit(session);

7
drivers/video/rockchip/mpp/mpp_common.h
View File

@ -471,7 +471,7 @@ struct mpp_taskqueue {
struct list_head session_attach;
/* link to session session_link for detached sessions */
struct list_head session_detach;
u32 detach_count;
atomic_t detach_count;
/* lock for pending list */
struct mutex pending_lock;
@ -644,7 +644,10 @@ int mpp_task_dump_hw_reg(struct mpp_dev *mpp,
void mpp_task_dump_timing(struct mpp_task *task, s64 time_diff);
void mpp_reg_show(struct mpp_dev *mpp, u32 offset);
int mpp_session_deinit(struct mpp_session *session);
void mpp_session_deinit(struct mpp_session *session);
void mpp_session_cleanup_detach(struct mpp_taskqueue *queue,
struct kthread_work *work);
int mpp_dev_probe(struct mpp_dev *mpp,
struct platform_device *pdev);
int mpp_dev_remove(struct mpp_dev *mpp);

27
drivers/video/rockchip/mpp/mpp_rkvdec2_link.c
View File

@ -1636,28 +1636,7 @@ done:
rkvdec2_link_power_off(mpp);
}
mutex_lock(&queue->session_lock);
while (queue->detach_count) {
struct mpp_session *session = NULL;
session = list_first_entry_or_null(&queue->session_detach, struct mpp_session,
session_link);
if (session) {
list_del_init(&session->session_link);
queue->detach_count--;
}
mutex_unlock(&queue->session_lock);
if (session) {
mpp_dbg_session("%s detach count %d\n", dev_name(mpp->dev),
queue->detach_count);
mpp_session_deinit(session);
}
mutex_lock(&queue->session_lock);
}
mutex_unlock(&queue->session_lock);
mpp_session_cleanup_detach(queue, work_s);
}
void rkvdec2_link_session_deinit(struct mpp_session *session)
@ -1670,9 +1649,9 @@ void rkvdec2_link_session_deinit(struct mpp_session *session)
if (session->dma) {
mpp_dbg_session("session %d destroy dma\n", session->index);
mpp_iommu_down_read(mpp->iommu_info);
mpp_iommu_down_write(mpp->iommu_info);
mpp_dma_session_destroy(session->dma);
mpp_iommu_up_read(mpp->iommu_info);
mpp_iommu_up_write(mpp->iommu_info);
session->dma = NULL;
}
if (session->srv) {