Venus - Handle race conditions in concurrency
Subsystems (4)
cover Venus - Handle race conditions in concurrency
The intenstion of this patchset is to handle race
conditions during concurrency usecase.
Mansur Alisha Shaik (3):
venus: core: handle race condititon for core ops
venus: core: cancel pending work items in workqueue
venus: handle use after free for iommu_map/iommu_unmap
drivers/media/platform/qcom/venus/core.c | 6 +++++- drivers/media/platform/qcom/venus/firmware.c | 17 +++++++++++++---- drivers/media/platform/qcom/venus/hfi.c | 5 ++++- 3 files changed, 22 insertions(+), 6 deletions(-)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH 1/3 venus: core: handle race condititon for core ops
For core ops we are having only write protect but
there is no read protect, because of this in mult
-threading and concurrency, one CPU core is readi
-ing without waiting which is causing the NULL
pointer dereferece crash.
one such scenario is as show below, where in one
core core->ops becoming NULL and in another core
calling core->ops->session_init().
CPU: 7(core): Call trace: hfi_session_init+0x180/0x1dc [venus_core] vdec_queue_setup+0x9c/0x364 [venus_dec] vb2_core_reqbufs+0x1e4/0x368 [videobuf2_common] vb2_reqbufs+0x4c/0x64 [videobuf2_v4l2] v4l2_m2m_reqbufs+0x50/0x84 [v4l2_mem2mem] v4l2_m2m_ioctl_reqbufs+0x2c/0x38 [v4l2_mem2mem] v4l_reqbufs+0x4c/0x5c __video_do_ioctl+0x2b0/0x39c CPU: 0(core): Call trace: venus_shutdown+0x98/0xfc [venus_core] venus_sys_error_handler+0x64/0x148 [venus_core] process_one_work+0x210/0x3d0 worker_thread+0x248/0x3f4 kthread+0x11c/0x12c
--- drivers/media/platform/qcom/venus/core.c | 2 +- drivers/media/platform/qcom/venus/hfi.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/venus/core.c +1 -1
@@ -64,8 +64,8 @@ static void venus_sys_error_handler(struct work_struct *work)pm_runtime_get_sync (core->dev);hfi_core_deinit (core, true); -hfi_destroy (core);mutex_lock (&core->lock); +hfi_destroy (core);venus_shutdown (core);pm_runtime_put_sync (core->dev);
drivers/media/platform/qcom/venus/hfi.c +4 -1
@@ -195,7 +195,7 @@ EXPORT_SYMBOL_GPL(hfi_session_create);int hfi_session_init (struct venus_inst *inst,u32 pixfmt) {struct venus_core *core = inst->core; -const struct hfi_ops *ops = core->ops; +const struct hfi_ops *ops;int ret;if (inst->state !=INST_UNINIT )
@@ -204,10 +204,13 @@ int hfi_session_init(struct venus_inst *inst, u32 pixfmt) inst->hfi_codec =to_codec_type (pixfmt);reinit_completion (&inst->done); +mutex_lock (&core->lock); + ops = core->ops; ret = ops->session_init (inst, inst->session_type, inst->hfi_codec);if (ret)return ret; +mutex_unlock (&core->lock); ret =wait_session_msg (inst);if (ret)return ret;
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/3 venus: core: cancel pending work items in workqueue
In reply to Mansur Alisha ShaikIn concurrency usecase and reboot scenario we are
observing race condition and seeing NULL pointer
dereference crash.when workqueue is in progress
to handle system recovery and at same when device
happends, in bothe paths we are trying to destryo
the same mutex hence seeing the crash.
So this is hadled by protecting hfi_destroy in
remove by mutext variable and cancel a delayed
work items before reboot.
Below is the call trace for the crash
Call trace: venus_remove+0xdc/0xec [venus_core] venus_core_shutdown+0x1c/0x34 [venus_core] platform_drv_shutdown+0x28/0x34 device_shutdown+0x154/0x1fc kernel_restart_prepare+0x40/0x4c kernel_restart+0x1c/0x64 Call trace: mutex_lock+0x34/0x60 venus_hfi_destroy+0x28/0x98 [venus_core] hfi_destroy+0x1c/0x28 [venus_core] venus_sys_error_handler+0x60/0x14c [venus_core] process_one_work+0x210/0x3d0 worker_thread+0x248/0x3f4 kthread+0x11c/0x12c ret_from_fork+0x10/0x18
--- drivers/media/platform/qcom/venus/core.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/platform/qcom/venus/core.c +4 -0
@@ -312,6 +312,8 @@ static int venus_remove(struct platform_device *pdev)struct device *dev = core->dev;int ret; +cancel_delayed_work_sync (&core->work); + ret =pm_runtime_get_sync (dev);WARN_ON (ret <0 );
@@ -329,7 +331,9 @@ static int venus_remove(struct platform_device *pdev)if (pm_ops->core_put) pm_ops->core_put (dev); +mutex_lock (&core->lock);hfi_destroy (core); +mutex_unlock (&core->lock);icc_put (core->video_path);icc_put (core->cpucfg_path);
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH 3/3 venus: handle use after free for iommu_map/iommu_unmap
In reply to Mansur Alisha ShaikIn concurrency usecase and reboot scenario we are trying to map fw.iommu_domain which is already unmapped during shutdown. This is causing NULL pointer dereference crash.
This case is handled by necesassary check before unmappin.
Call trace: __iommu_map+0x4c/0x348 iommu_map+0x5c/0x70 venus_boot+0x184/0x230 [venus_core] venus_sys_error_handler+0xa0/0x14c [venus_core] process_one_work+0x210/0x3d0 worker_thread+0x248/0x3f4 kthread+0x11c/0x12c ret_from_fork+0x10/0x18
--- drivers/media/platform/qcom/venus/firmware.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/media/platform/qcom/venus/firmware.c +13 -4
@@ -171,9 +171,14 @@ static int venus_shutdown_no_tz(struct venus_core *core) iommu = core->fw.iommu_domain; - unmapped =iommu_unmap (iommu,VENUS_FW_START_ADDR , mapped); -if (unmapped != mapped) -dev_err (dev,"failed to unmap firmware\n" ); +if (core->fw.mapped_mem_size && iommu) { + unmapped =iommu_unmap (iommu,VENUS_FW_START_ADDR , mapped); + +if (unmapped != mapped) +dev_err (dev,"failed to unmap firmware\n" ); +else + core->fw.mapped_mem_size =0 ; + }return 0 ; }
@@ -288,7 +293,11 @@ void venus_firmware_deinit(struct venus_core *core) iommu = core->fw.iommu_domain;iommu_detach_device (iommu, core->fw.dev); -iommu_domain_free (iommu); + +if (core->fw.iommu_domain) { +iommu_domain_free (iommu); + core->fw.iommu_domain =NULL ; + }platform_device_unregister (to_platform_device (core->fw.dev)); }
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation