From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C88B1F03FB; Wed, 30 Apr 2025 07:22:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745997748; cv=none; b=IIEPohCSPwK1S7nTFzFnuW4PD7EKWlQy5dsKLet1wlrhW6QpOaJbEaPZ/CHFwmzUHmmZdMkdAbyk86X0o7/VBvXXe2f6n21b1j0tCD8d5oNYWQOcHhIRLty2+eeczAHSk8y/GEwjY+iTvTkt7dM5sCyzS28wOUHHVx83Qf/t9Ds= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745997748; c=relaxed/simple; bh=ED5M+XMr6sd1ffXjvdC3S9QDusOPxQT1RfvD+UzN0oQ=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=TXqcmmuF31d/tViE/ZYxiKVXi6SaHX+fw4X9/I5mIYdbWim8G3GNQzb7s1Hw+imi7RmWI1ronvUwwdboIV40r7hLyx79H0CE3poMPfVWDMgCKIxyMc7+pzjZVVxu3jB1O5tSG+41YlE2LJlamrul8flPIKzz0IUIjDeKLOCulJI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=mQeQOqvm; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="mQeQOqvm" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53TLaVQ3012269; Wed, 30 Apr 2025 07:22:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= cmHbdxz2WTDbW7aj8JbortVTW8La21RceHQfeYKZQZI=; b=mQeQOqvmezMI7H46 hODWxKF/GTjlwE+sIf0R1AGKGCndCzLAIe8qRv7cHM2g7WZzdAfy2q/DM5KsnIk2 4ekulLiXOL52XpviNIoD8NuRLtEd7/MumEDoyPzYk0DcKQeLQHM1xX6PdrBqbhvA LE29hKGATnIdQGl6k1q/Z9VwjCgoO6UWIkIiBghwX1lMpD69yZzG2pELhiq0PjkP TKV9RvmZWGhVH6IBtWbEGS97onvUhcEod0fJeRqyIs6TapJfkYjGxslQOKpbkE4u KB1CI/oVqbayjIDX9ZXsMjyn7WinaJrOefcK7bf87kdcTKc1yIYzIZrXcQrzAaeC SZbLtA== Received: from nasanppmta04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46b6u3s6bw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Apr 2025 07:22:19 +0000 (GMT) Received: from nasanex01a.na.qualcomm.com (nasanex01a.na.qualcomm.com [10.52.223.231]) by NASANPPMTA04.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 53U7MIil000538 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Apr 2025 07:22:18 GMT Received: from [10.50.41.127] (10.80.80.8) by nasanex01a.na.qualcomm.com (10.52.223.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 30 Apr 2025 00:22:09 -0700 Message-ID: <50f12fea-fbc9-8880-5e34-3d3a49d9ca65@quicinc.com> Date: Wed, 30 Apr 2025 12:52:03 +0530 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [PATCH v2 01/23] media: iris: Skip destroying internal buffer if not dequeued Content-Language: en-US To: Dikshita Agarwal , Nicolas Dufresne , Abhinav Kumar , Mauro Carvalho Chehab , Stefan Schmidt , Hans Verkuil , "Bjorn Andersson" , Konrad Dybcio , "Rob Herring" , Krzysztof Kozlowski , "Conor Dooley" CC: Bryan O'Donoghue , Dmitry Baryshkov , Neil Armstrong , , , , , References: <20250428-qcom-iris-hevc-vp9-v2-0-3a6013ecb8a5@quicinc.com> <20250428-qcom-iris-hevc-vp9-v2-1-3a6013ecb8a5@quicinc.com> <32379a29-ab58-95b3-77f9-d1ada61e5359@quicinc.com> From: Vikash Garodia In-Reply-To: <32379a29-ab58-95b3-77f9-d1ada61e5359@quicinc.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01a.na.qualcomm.com (10.52.223.231) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Authority-Analysis: v=2.4 cv=Bv6dwZX5 c=1 sm=1 tr=0 ts=6811cfab cx=c_pps a=JYp8KDb2vCoCEuGobkYCKw==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=GEpy-HfZoHoA:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=VwQbUJbxAAAA:8 a=COk6AnOGAAAA:8 a=5XAp0Sb-NG9feswOWF0A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: oCPAJPRVQu2ogoIyRBQ57nCYQG8G_XyV X-Proofpoint-ORIG-GUID: oCPAJPRVQu2ogoIyRBQ57nCYQG8G_XyV X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDMwMDA1MCBTYWx0ZWRfX04guIh6fDqeV dzeTuUbYm2X0O1hCVbXdxTQemnE+sJCYneLW+FsrI3Rv2rtId/SX6tyQSI7WDfUkpryQrEg39ML pr34A7uRlJJELjicGiyg/QWBPaFzHrJO+sRH0EDc7v5u9BDiNkBkAFyFrF2Cz83KsMIFx5Zoe/T 9NB05cxqow2Abm7lH0+VdkUjiNP0FXsjVFMZ644nQXd+km0fuIw8Zg0GoKlL3IZnZrInCTIXiSy 6+h0qTjqHIo6gdWLgF9U57bt554tPXnuIpaJzUbVQ1f60vfx1kULXwsaLfTE8n0e11H8HqUWwub 9RDIkBksSdaWCW1RE4hzqxHOoTzpSvoEWZrdqEOGVQTBcTuKT/xXHdfxJphIkQMVMnTTK0+RyID 7LUc3RByEV4YwI2q6DxdFPU5/BZ9Ghz3Le16PtmYwCoJ2qxSDvUF4k7ZR3OKNvqlt5Euo/tx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-30_02,2025-04-24_02,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 mlxlogscore=999 phishscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0 malwarescore=0 priorityscore=1501 suspectscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504300050 On 4/30/2025 11:08 AM, Dikshita Agarwal wrote: > > > On 4/29/2025 6:17 PM, Nicolas Dufresne wrote: >> Not mine to review, but wanted to highlight some best practices, >> >> comment below... >> >> Le lundi 28 avril 2025 à 14:58 +0530, Dikshita Agarwal a écrit : >>> Firmware might hold the DPB buffers for reference in case of sequence >>> change, so skip destroying buffers for which QUEUED flag is not removed. >>> Also, make sure that all buffers are released during streamoff. >>> >>> Cc: stable@vger.kernel.org >>> Fixes: 73702f45db81 ("media: iris: allocate, initialize and queue internal buffers") >>> Signed-off-by: Dikshita Agarwal >>> --- >>>  drivers/media/platform/qcom/iris/iris_buffer.c | 37 +++++++++++++++++++++++++- >>>  drivers/media/platform/qcom/iris/iris_buffer.h |  3 ++- >>>  drivers/media/platform/qcom/iris/iris_vdec.c   |  4 +-- >>>  drivers/media/platform/qcom/iris/iris_vidc.c   |  6 +++-- >>>  4 files changed, 44 insertions(+), 6 deletions(-) >>> >>> diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c >>> index e5c5a564fcb8..606d76b10be2 100644 >>> --- a/drivers/media/platform/qcom/iris/iris_buffer.c >>> +++ b/drivers/media/platform/qcom/iris/iris_buffer.c >>> @@ -376,7 +376,7 @@ int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffer *buf >>>   return 0; >>>  } >>>   >>> -int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane) >>> +int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane, bool force) >> >> Its always tempting to just glue a boolean at the end of a parameter >> list. But this has huge downside in code readability, see below... >> >>>  { >>>   const struct iris_platform_data *platform_data = inst->core->iris_platform_data; >>>   struct iris_buffer *buf, *next; >>> @@ -396,6 +396,14 @@ int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane) >>>   for (i = 0; i < len; i++) { >>>   buffers = &inst->buffers[internal_buf_type[i]]; >>>   list_for_each_entry_safe(buf, next, &buffers->list, list) { >>> + /* >>> + * during stream on, skip destroying internal(DPB) buffer >>> + * if firmware did not return it. >>> + * during close, destroy all buffers irrespectively. >>> + */ >>> + if (!force && buf->attr & BUF_ATTR_QUEUED) >>> + continue; >>> + >>>   ret = iris_destroy_internal_buffer(inst, buf); >>>   if (ret) >>>   return ret; >>> @@ -446,6 +454,33 @@ static int iris_release_input_internal_buffers(struct iris_inst *inst) >>>   return 0; >>>  } >>>   >>> +void iris_get_num_queued_internal_buffers(struct iris_inst *inst, u32 plane) >>> +{ >>> + const struct iris_platform_data *platform_data = inst->core->iris_platform_data; >>> + struct iris_buffer *buf, *next; >>> + struct iris_buffers *buffers; >>> + const u32 *internal_buf_type; >>> + u32 internal_buffer_count, i; >>> + u32 count = 0; >>> + >>> + if (V4L2_TYPE_IS_OUTPUT(plane)) { >>> + internal_buf_type = platform_data->dec_ip_int_buf_tbl; >>> + internal_buffer_count = platform_data->dec_ip_int_buf_tbl_size; >>> + } else { >>> + internal_buf_type = platform_data->dec_op_int_buf_tbl; >>> + internal_buffer_count = platform_data->dec_op_int_buf_tbl_size; >>> + } >>> + >>> + for (i = 0; i < internal_buffer_count; i++) { >>> + buffers = &inst->buffers[internal_buf_type[i]]; >>> + list_for_each_entry_safe(buf, next, &buffers->list, list) >>> + count++; >>> + if (count) >>> + dev_err(inst->core->dev, "%d buffer of type %d not released", >>> + count, internal_buf_type[i]); >>> + } >>> +} >>> + >>>  int iris_alloc_and_queue_persist_bufs(struct iris_inst *inst) >>>  { >>>   struct iris_buffers *buffers = &inst->buffers[BUF_PERSIST]; >>> diff --git a/drivers/media/platform/qcom/iris/iris_buffer.h b/drivers/media/platform/qcom/iris/iris_buffer.h >>> index c36b6347b077..03a32b91cf21 100644 >>> --- a/drivers/media/platform/qcom/iris/iris_buffer.h >>> +++ b/drivers/media/platform/qcom/iris/iris_buffer.h >>> @@ -106,7 +106,8 @@ void iris_get_internal_buffers(struct iris_inst *inst, u32 plane); >>>  int iris_create_internal_buffers(struct iris_inst *inst, u32 plane); >>>  int iris_queue_internal_buffers(struct iris_inst *inst, u32 plane); >>>  int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffer *buffer); >>> -int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane); >>> +int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane, bool force); >>> +void iris_get_num_queued_internal_buffers(struct iris_inst *inst, u32 plane); >>>  int iris_alloc_and_queue_persist_bufs(struct iris_inst *inst); >>>  int iris_alloc_and_queue_input_int_bufs(struct iris_inst *inst); >>>  int iris_queue_buffer(struct iris_inst *inst, struct iris_buffer *buf); >>> diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c >>> index 4143acedfc57..2c1a7162d2da 100644 >>> --- a/drivers/media/platform/qcom/iris/iris_vdec.c >>> +++ b/drivers/media/platform/qcom/iris/iris_vdec.c >>> @@ -408,7 +408,7 @@ int iris_vdec_streamon_input(struct iris_inst *inst) >>>   >>>   iris_get_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); >>>   >>> - ret = iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); >>> + ret = iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, false); >>>   if (ret) >>>   return ret; >>>   >>> @@ -496,7 +496,7 @@ int iris_vdec_streamon_output(struct iris_inst *inst) >>>   >>>   iris_get_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); >>>   >>> - ret = iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); >>> + ret = iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, false); >> >> If I was reviewing some changes (or even debugging) this specific C >> file, I would not be able to understanding what this "false" means. I >> would have to spend extra time, opening the declaration, going back and >> forth, and breaking the flow. >> >> An alternative approach is to keep the boolean parameter in a static >> function (c local), and then add two function wrappers that have >> explicit names. >> > Sure, I can implement the alternative approach, if recommended. > > If I understand correctly, you are suggesting to have one static helper and > two wrappers around this. like: > > static int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane, > bool force) > { > ... > list_for_each_entry_safe(buf, next, &buffers->list, list) { > if (!force && buf->attr & BUF_ATTR_QUEUED) > continue; > ... > } > ... > } > > //called during stream on > int iris_destroy_dequeued_internal_buffers(struct iris_inst *inst, u32 plane) Name this iris_force_destroy...That way, it is easy for caller to understand without the need to interpret the boolean. Regards, Vikash > { > return iris_destroy_internal_buffers(inst, plane, false) > } > > //called during close > int iris_destroy_all_internal_buffers(struct iris_inst *inst, u32 plane) > { > return iris_destroy_internal_buffers(inst, plane, true) > } > > Thanks, > Dikshita >> regards, >> Nicolas >> >>>   if (ret) >>>   return ret; >>>   >>> diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c >>> index ca0f4e310f77..56531a7f0dfe 100644 >>> --- a/drivers/media/platform/qcom/iris/iris_vidc.c >>> +++ b/drivers/media/platform/qcom/iris/iris_vidc.c >>> @@ -233,8 +233,10 @@ int iris_close(struct file *filp) >>>   iris_session_close(inst); >>>   iris_inst_change_state(inst, IRIS_INST_DEINIT); >>>   iris_v4l2_fh_deinit(inst); >>> - iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); >>> - iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); >>> + iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, true); >>> + iris_destroy_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, true); >>> + iris_get_num_queued_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); >>> + iris_get_num_queued_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); >>>   iris_remove_session(inst); >>>   mutex_unlock(&inst->lock); >>>   mutex_destroy(&inst->ctx_q_lock); >>