From nobody Fri Sep 20 11:44:17 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0432EE784B3 for ; Mon, 2 Oct 2023 12:08:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237039AbjJBMI6 (ORCPT ); Mon, 2 Oct 2023 08:08:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237173AbjJBMHF (ORCPT ); Mon, 2 Oct 2023 08:07:05 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEE4ACC3; Mon, 2 Oct 2023 05:06:52 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:9537:67ca:c85e:d0ae]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: benjamin.gaignard) by madras.collabora.co.uk (Postfix) with ESMTPSA id 3CB2F6607395; Mon, 2 Oct 2023 13:06:51 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1696248411; bh=xNwpnkBcVLj30pw8lyVYd9bN7x+vY+ofwKdCBF1FVjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YpeFIL7JIK2sBuiBJeqIUMq/T9mu7AuXzYTMmA75Z5f2Fya2e9eGYxNE8pNtaNgfD /mVaov7mfwbWb+gqfHA9kUc54+FLKV4BrdYfRERvkQoEFl1lPTFmiilAQD3OIaG3no DyeHnE+HweP4yu+l7kqW8FAl5OR3DI2Uhjg40cOVx87hvops7xP9usNmrz02JqIgEq Vs6GJJpsc4g4Sy7hDjQl3USFwVErKbaAkMP/xpvNuZEA0W98Y+2zZgxDJ+KKqmwCmQ qXhV7fECtGdwOEouKJhgYYx77tRFUHTXtv0vuOfSufuIVC5trEhFMxsr0qZlAwJUCw Be/99JakqD3Bg== From: Benjamin Gaignard To: mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, ming.qian@nxp.com, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, hverkuil-cisco@xs4all.nl, nicolas.dufresne@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v9 50/53] media: core: Free range of buffers Date: Mon, 2 Oct 2023 14:06:14 +0200 Message-Id: <20231002120617.119602-51-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231002120617.119602-1-benjamin.gaignard@collabora.com> References: <20231002120617.119602-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Improve __vb2_queue_free() and __vb2_free_mem() to free range of buffers and not only the last few buffers. Intoduce starting index to be flexible on range and change the loops according to this parameters. Signed-off-by: Benjamin Gaignard --- version 9: - fix compilation issue .../media/common/videobuf2/videobuf2-core.c | 40 ++++++++----------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/medi= a/common/videobuf2/videobuf2-core.c index 4cbc17e8b53e..b9b8a44b378c 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -515,13 +515,12 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enu= m vb2_memory memory, /* * __vb2_free_mem() - release all video buffer memory for a given queue */ -static void __vb2_free_mem(struct vb2_queue *q, unsigned int buffers) +static void __vb2_free_mem(struct vb2_queue *q, unsigned int start, unsign= ed int count) { - unsigned int buffer =3D 0; - long i =3D q->max_num_buffers; + unsigned int i; struct vb2_buffer *vb; =20 - for (i =3D q->max_num_buffers; i >=3D 0 && buffer < buffers; i--) { + for (i =3D start; i < q->max_num_buffers && i < start + count; i++) { vb =3D vb2_get_buffer(q, i); if (!vb) continue; @@ -533,36 +532,32 @@ static void __vb2_free_mem(struct vb2_queue *q, unsig= ned int buffers) __vb2_buf_dmabuf_put(vb); else __vb2_buf_userptr_put(vb); - buffer++; } } =20 /* - * __vb2_queue_free() - free buffers at the end of the queue - video memor= y and + * __vb2_queue_free() - free count buffers from start index of the queue -= video memory and * related information, if no buffers are left return the queue to an * uninitialized state. Might be called even if the queue has already been= freed. */ -static void __vb2_queue_free(struct vb2_queue *q, unsigned int buffers) +static void __vb2_queue_free(struct vb2_queue *q, unsigned int start, unsi= gned int count) { - unsigned int buffer; - long i =3D q->max_num_buffers; + unsigned int i; =20 lockdep_assert_held(&q->mmap_lock); =20 /* Call driver-provided cleanup function for each buffer, if provided */ - for (i =3D q->max_num_buffers, buffer =3D 0; i >=3D 0 && buffer < buffers= ; i--) { + for (i =3D start; i < q->max_num_buffers && i < start + count; i++) { struct vb2_buffer *vb =3D vb2_get_buffer(q, i); =20 if (!vb) continue; - if (vb->planes[0].mem_priv) { + if (vb->planes[0].mem_priv) call_void_vb_qop(vb, buf_cleanup, vb); - buffer++; - } } =20 /* Release video buffer memory */ - __vb2_free_mem(q, buffers); + __vb2_free_mem(q, start, count); =20 #ifdef CONFIG_VIDEO_ADV_DEBUG /* @@ -595,8 +590,8 @@ static void __vb2_queue_free(struct vb2_queue *q, unsig= ned int buffers) q->cnt_stop_streaming =3D 0; q->cnt_unprepare_streaming =3D 0; } - for (buffer =3D 0; buffer < q->max_num_buffers; buffer++) { - struct vb2_buffer *vb =3D vb2_get_buffer(q, buffer); + for (i =3D 0; i < q->max_num_buffers; i++) { + struct vb2_buffer *vb =3D vb2_get_buffer(q, i); bool unbalanced; =20 if (!vb) @@ -613,7 +608,7 @@ static void __vb2_queue_free(struct vb2_queue *q, unsig= ned int buffers) =20 if (unbalanced) { pr_info("unbalanced counters for queue %p, buffer %d:\n", - q, buffer); + q, i); if (vb->cnt_buf_init !=3D vb->cnt_buf_cleanup) pr_info(" buf_init: %u buf_cleanup: %u\n", vb->cnt_buf_init, vb->cnt_buf_cleanup); @@ -647,7 +642,7 @@ static void __vb2_queue_free(struct vb2_queue *q, unsig= ned int buffers) #endif =20 /* Free vb2 buffers */ - for (i =3D q->max_num_buffers, buffer =3D 0; i >=3D 0 && buffer < buffers= ; i--) { + for (i =3D start; i < q->max_num_buffers && i < start + count; i++) { struct vb2_buffer *vb =3D vb2_get_buffer(q, i); =20 if (!vb) @@ -655,7 +650,6 @@ static void __vb2_queue_free(struct vb2_queue *q, unsig= ned int buffers) =20 vb2_queue_remove_buffer(vb); kfree(vb); - buffer++; } =20 if (!vb2_get_num_buffers(q)) { @@ -849,7 +843,7 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memo= ry memory, * queued without ever calling STREAMON. */ __vb2_queue_cancel(q); - __vb2_queue_free(q, q_num_bufs); + __vb2_queue_free(q, 0, q_num_bufs); mutex_unlock(&q->mmap_lock); =20 /* @@ -959,7 +953,7 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memo= ry memory, * from already queued buffers and it will reset q->memory to * VB2_MEMORY_UNKNOWN. */ - __vb2_queue_free(q, allocated_buffers); + __vb2_queue_free(q, first_index, allocated_buffers); mutex_unlock(&q->mmap_lock); return ret; } @@ -1099,7 +1093,7 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb= 2_memory memory, * from already queued buffers and it will reset q->memory to * VB2_MEMORY_UNKNOWN. */ - __vb2_queue_free(q, allocated_buffers); + __vb2_queue_free(q, *first_index, allocated_buffers); mutex_unlock(&q->mmap_lock); return -ENOMEM; } @@ -2565,7 +2559,7 @@ void vb2_core_queue_release(struct vb2_queue *q) __vb2_cleanup_fileio(q); __vb2_queue_cancel(q); mutex_lock(&q->mmap_lock); - __vb2_queue_free(q, q->max_num_buffers); + __vb2_queue_free(q, 0, q->max_num_buffers); kfree(q->bufs); q->bufs =3D NULL; bitmap_free(q->bufs_bitmap); --=20 2.39.2