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

Video: Driver: Move inst_lock to v4l2 layer during q_buf

Browse Source 
[1] If request_fd enabled, msm_vb2_buf_queue() is not called
  from v4l2_qbuf. Instead it's called as part of
  msm_v4l2_request_queue(). Hence inst lock should be acquired
  in common function i.e msm_vb2_buf_queue, to handle both
  requests and non-request scenarios.
[2] If request_fd is disabled, inst_lock can be acquired in
  v4l2_qbuf() call. Acquiring inst_lock from here will
  ensure RO list insertion and updation i.e. attach/map will
  happen under lock.

Currently, request_fd is disabled. Therefore, acquire inst_lock
from this function to ensure RO list insertion/updation is under
lock to avoid stability usecase.

Change-Id: I3cc1d4b8b5547fd5e34ce5eb06480380cb9200cc
Signed-off-by: Vedang Nagar <quic_vnagar@quicinc.com>
This commit is contained in:
Vedang Nagar
2023-07-05 13:55:24 +05:30
parent b941cfd415
commit 326254549b
4 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
driver/platform/kalama/src/msm_vidc_kalama.c
View File

@@ -321,7 +321,7 @@ static struct msm_platform_core_capability core_data_kalama[] = {
{DEVICE_CAPS, V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_META_CAPTURE | {DEVICE_CAPS, V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_META_CAPTURE |
V4L2_CAP_STREAMING}, V4L2_CAP_STREAMING},
{SUPPORTS_SYNX_FENCE, 0}, {SUPPORTS_SYNX_FENCE, 0},
{SUPPORTS_REQUESTS, 1}, {SUPPORTS_REQUESTS, 0},
}; };
static struct msm_platform_inst_capability instance_cap_data_kalama[] = { static struct msm_platform_inst_capability instance_cap_data_kalama[] = {

2
driver/platform/pineapple/src/msm_vidc_pineapple.c
View File

@@ -323,7 +323,7 @@ static struct msm_platform_core_capability core_data_pineapple[] = {
{DEVICE_CAPS, V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_META_CAPTURE | {DEVICE_CAPS, V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_META_CAPTURE |
V4L2_CAP_STREAMING}, V4L2_CAP_STREAMING},
{SUPPORTS_SYNX_FENCE, 1}, {SUPPORTS_SYNX_FENCE, 1},
{SUPPORTS_REQUESTS, 1}, {SUPPORTS_REQUESTS, 0},
}; };
static int msm_vidc_set_ring_buffer_count_pineapple(void *instance, static int msm_vidc_set_ring_buffer_count_pineapple(void *instance,

37
driver/vidc/src/msm_vidc_v4l2.c
View File

@@ -505,18 +505,33 @@ int msm_v4l2_qbuf(struct file *filp, void *fh,
} }
/* /*
* do not acquire inst lock here. acquire it in msm_vb2_buf_queue. * [1] If request_fd enabled, msm_vb2_buf_queue() is not called from here.
* for requests, msm_vb2_buf_queue() is not called from here. * instead it's called as part of msm_v4l2_request_queue().
* instead it's called as part of msm_v4l2_request_queue(). * Hence inst lock should be acquired in common function i.e
* hence acquire the inst lock in common function i.e * msm_vb2_buf_queue, to handle both requests and non-request
* msm_vb2_buf_queue, to handle both requests and non-request * scenarios.
* scenarios. * [2] If request_fd is disabled, inst_lock can be acquired here.
* Acquiring inst_lock from here will ensure RO list insertion
* and deletion i.e. attach/map will happen under lock.
* Currently, request_fd is disabled. Therefore, acquire inst_lock
* from this function to ensure RO list insertion/updation is under
* lock to avoid stability usecase.
*/ */
client_lock(inst, __func__);
inst_lock(inst, __func__);
if (is_session_error(inst)) {
i_vpr_e(inst, "%s: inst in error state\n", __func__);
rc = -EINVAL;
goto exit;
}
rc = msm_vidc_qbuf(inst, vdev->v4l2_dev->mdev, b); rc = msm_vidc_qbuf(inst, vdev->v4l2_dev->mdev, b);
if (rc) if (rc)
goto exit; goto exit;
exit: exit:
inst_unlock(inst, __func__);
client_unlock(inst, __func__);
put_inst(inst); put_inst(inst);
return rc; return rc;
@@ -560,11 +575,21 @@ int msm_v4l2_streamon(struct file *filp, void *fh,
return -EINVAL; return -EINVAL;
} }
client_lock(inst, __func__);
inst_lock(inst, __func__);
if (is_session_error(inst)) {
i_vpr_e(inst, "%s: inst in error state\n", __func__);
rc = -EBUSY;
goto exit;
}
rc = msm_vidc_streamon((void *)inst, i); rc = msm_vidc_streamon((void *)inst, i);
if (rc) if (rc)
goto exit; goto exit;
exit: exit:
inst_unlock(inst, __func__);
client_unlock(inst, __func__);
put_inst(inst); put_inst(inst);
return rc; return rc;

79
driver/vidc/src/msm_vidc_vb2.c
View File

@@ -369,32 +369,19 @@ int msm_vb2_start_streaming(struct vb2_queue *q, unsigned int count)
return -EINVAL; return -EINVAL;
} }
inst = q->drv_priv; inst = q->drv_priv;
inst = get_inst_ref(g_core, inst);
if (!inst || !inst->core) { if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__); d_vpr_e("%s: invalid params\n", __func__);
return -EINVAL; return -EINVAL;
} }
client_lock(inst, __func__);
inst_lock(inst, __func__);
if (is_session_error(inst)) {
i_vpr_e(inst, "%s: inst in error state\n", __func__);
rc = -EBUSY;
goto unlock;
}
rc = inst->event_handle(inst, MSM_VIDC_STREAMON, q); rc = inst->event_handle(inst, MSM_VIDC_STREAMON, q);
if (rc) { if (rc) {
i_vpr_e(inst, "Streamon: %s failed\n", v4l2_type_name(q->type)); i_vpr_e(inst, "Streamon: %s failed\n", v4l2_type_name(q->type));
msm_vidc_change_state(inst, MSM_VIDC_ERROR, __func__); msm_vidc_change_state(inst, MSM_VIDC_ERROR, __func__);
goto unlock; goto exit;
} }
unlock: exit:
inst_unlock(inst, __func__);
client_unlock(inst, __func__);
put_inst(inst);
return rc; return rc;
} }
@@ -577,6 +564,7 @@ void msm_vb2_buf_queue(struct vb2_buffer *vb2)
{ {
int rc = 0; int rc = 0;
struct msm_vidc_inst *inst; struct msm_vidc_inst *inst;
struct msm_vidc_core *core;
u64 timestamp_us = 0; u64 timestamp_us = 0;
u64 ktime_ns = ktime_get_ns(); u64 ktime_ns = ktime_get_ns();
@@ -586,16 +574,11 @@ void msm_vb2_buf_queue(struct vb2_buffer *vb2)
} }
inst = vb2_get_drv_priv(vb2->vb2_queue); inst = vb2_get_drv_priv(vb2->vb2_queue);
if (!inst) { if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__); d_vpr_e("%s: invalid params\n", __func__);
return; return;
} }
core = inst->core;
inst = get_inst_ref(g_core, inst);
if (!inst) {
d_vpr_e("%s: invalid instance\n", __func__);
return;
}
/* /*
* As part of every qbuf initalise request to true. * As part of every qbuf initalise request to true.
@@ -605,29 +588,24 @@ void msm_vb2_buf_queue(struct vb2_buffer *vb2)
* If the buffer does not have any requests with it, then * If the buffer does not have any requests with it, then
* v4l2_ctrl_request_setup() will return 0. * v4l2_ctrl_request_setup() will return 0.
*/ */
inst->request = true; if (core->capabilities[SUPPORTS_REQUESTS].value) {
rc = v4l2_ctrl_request_setup(vb2->req_obj.req, /*
&inst->ctrl_handler); * If Request API is enabled:
inst->request = false; * Call request_setup and request_complete without acquiring lock
v4l2_ctrl_request_complete(vb2->req_obj.req, &inst->ctrl_handler); * to avoid deadlock issues because request_setup or request_complete
/* * would call .s_ctrl and .g_volatile_ctrl respectively which acquire
* call request_setup and request_complete without acquiring lock * lock too.
* to avoid deadlock issues because request_setup or request_complete */
* would call .s_ctrl and .g_volatile_ctrl respectively which acquire inst->request = true;
* lock too. rc = v4l2_ctrl_request_setup(vb2->req_obj.req,
*/ &inst->ctrl_handler);
client_lock(inst, __func__); inst->request = false;
inst_lock(inst, __func__); v4l2_ctrl_request_complete(vb2->req_obj.req, &inst->ctrl_handler);
if (rc) { if (rc) {
i_vpr_e(inst, "%s: request setup failed, error %d\n", i_vpr_e(inst, "%s: request setup failed, error %d\n",
__func__, rc); __func__, rc);
goto unlock; goto exit;
} }
if (is_session_error(inst)) {
i_vpr_e(inst, "%s: inst in error state\n", __func__);
rc = -EINVAL;
goto unlock;
} }
if (!vb2->planes[0].bytesused) { if (!vb2->planes[0].bytesused) {
@@ -636,7 +614,7 @@ void msm_vb2_buf_queue(struct vb2_buffer *vb2)
i_vpr_e(inst, i_vpr_e(inst,
"%s: zero bytesused input buffer not supported\n", __func__); "%s: zero bytesused input buffer not supported\n", __func__);
rc = -EINVAL; rc = -EINVAL;
goto unlock; goto exit;
} }
if ((vb2->type == OUTPUT_META_PLANE && is_any_meta_tx_out_enabled(inst)) || if ((vb2->type == OUTPUT_META_PLANE && is_any_meta_tx_out_enabled(inst)) ||
(vb2->type == INPUT_META_PLANE && is_any_meta_tx_inp_enabled(inst))) { (vb2->type == INPUT_META_PLANE && is_any_meta_tx_inp_enabled(inst))) {
@@ -659,7 +637,7 @@ void msm_vb2_buf_queue(struct vb2_buffer *vb2)
if (vb2->type == INPUT_MPLANE) { if (vb2->type == INPUT_MPLANE) {
rc = msm_vidc_update_input_rate(inst, div_u64(ktime_ns, 1000)); rc = msm_vidc_update_input_rate(inst, div_u64(ktime_ns, 1000));
if (rc) if (rc)
goto unlock; goto exit;
} }
if (is_decode_session(inst)) if (is_decode_session(inst))
@@ -670,17 +648,14 @@ void msm_vb2_buf_queue(struct vb2_buffer *vb2)
rc = -EINVAL; rc = -EINVAL;
if (rc) { if (rc) {
print_vb2_buffer("failed vb2-qbuf", inst, vb2); print_vb2_buffer("failed vb2-qbuf", inst, vb2);
goto unlock; goto exit;
} }
unlock: exit:
if (rc) { if (rc) {
msm_vidc_change_state(inst, MSM_VIDC_ERROR, __func__); msm_vidc_change_state(inst, MSM_VIDC_ERROR, __func__);
vb2_buffer_done(vb2, VB2_BUF_STATE_ERROR); vb2_buffer_done(vb2, VB2_BUF_STATE_ERROR);
} }
inst_unlock(inst, __func__);
client_unlock(inst, __func__);
put_inst(inst);
} }
int msm_vb2_buf_out_validate(struct vb2_buffer *vb) int msm_vb2_buf_out_validate(struct vb2_buffer *vb)