From nobody Thu Nov 14 16:58:56 2024 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (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 94AA612B17C; Tue, 6 Feb 2024 08:02:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707206558; cv=none; b=P/AnnclQnRdkzNmCqhTRxKe21N+N8rta4EongstFNVs5I/wN7K+3+/aFx4trVd08Qd5HlBSFRaiugxGA8+cynI82T3urhwxDqPiFGPEU1P9vPgxsmRzrZ594HWTGEc7GF7LaZ7qU4tlYsbgLM/Ky6rl8BhoMJWafEIQIQO9k0Uc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707206558; c=relaxed/simple; bh=xBHj61ms77yh6TofIx3mWpzyvQ5wa//86PofqFg3BeI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VhyejyJA4QgE+/liEIyvQNwzUgqoA2rukgid2gTcMteJf73+8O5oiAzxJFQY8Z7H3RUni+U3TtD0IMope4OsmeD8s0/U2L9syAtdYpI+O7qFKuUCjcpgTIgQD03aZd2lBe7RsXL+RTm5CYaSqczWC+mRio1LgnM65cgxZOjF4HU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=2boi32CX; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="2boi32CX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1707206548; bh=xBHj61ms77yh6TofIx3mWpzyvQ5wa//86PofqFg3BeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2boi32CXtzJYVxlJLb+Ke7oBE0hDseg31wgBH0T2ypsbwgQUna2tKNBlXJw07LxLU /xt5UOPDztGLhXFBMm5dvcuePmw3+xV24ukmI+S3vTAQ/A38E9bY85tBVJPZkOHQz1 F8KLfKWKfNwgfhrljLFaueEo+snG+bqGBlp4GK6wYJRSHoPxvZcrLV2ZceQ6Inpqgx MjPCU5TT7recpEXz8tXnoa5gVvHUje+Blh73PhygC5u6xD4MMYpyhpj2MCVvPGADln grLZCOkcRJ8tzlAq1VMw7OHyPCraF3IhCKbCd8BONsXQ35Tq7eahXXxCI9ng93e8L9 ojoDW18ppoSCQ== Received: from benjamin-XPS-13-9310.. (cola.collaboradmins.com [195.201.22.229]) (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 madrid.collaboradmins.com (Postfix) with ESMTPSA id 8370E378207E; Tue, 6 Feb 2024 08:02:28 +0000 (UTC) From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v19 6/9] media: core: Free range of buffers Date: Tue, 6 Feb 2024 09:02:16 +0100 Message-Id: <20240206080219.11951-7-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240206080219.11951-1-benjamin.gaignard@collabora.com> References: <20240206080219.11951-1-benjamin.gaignard@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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. Introduce starting index to be flexible on range and change the loops according to this parameter. Signed-off-by: Benjamin Gaignard --- .../media/common/videobuf2/videobuf2-core.c | 56 +++++++++---------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/medi= a/common/videobuf2/videobuf2-core.c index ec81426d4d79..009cea95d662 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -540,17 +540,16 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enu= m vb2_memory memory, } =20 /* - * __vb2_free_mem() - release all video buffer memory for a given queue + * __vb2_free_mem() - release video buffer memory for a given range of + * buffers in 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; + unsigned int i; struct vb2_buffer *vb; - unsigned int q_num_buffers =3D vb2_get_num_buffers(q); =20 - for (buffer =3D q_num_buffers - buffers; buffer < q_num_buffers; - ++buffer) { - vb =3D vb2_get_buffer(q, buffer); + for (i =3D start; i < start + count; i++) { + vb =3D vb2_get_buffer(q, i); if (!vb) continue; =20 @@ -565,35 +564,33 @@ static void __vb2_free_mem(struct vb2_queue *q, unsig= ned int buffers) } =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; - unsigned int q_num_buffers =3D vb2_get_num_buffers(q); + unsigned int i; =20 lockdep_assert_held(&q->mmap_lock); =20 /* Call driver-provided cleanup function for each buffer, if provided */ - for (buffer =3D q_num_buffers - buffers; buffer < q_num_buffers; - ++buffer) { - struct vb2_buffer *vb =3D vb2_get_buffer(q, buffer); + for (i =3D start; i < start + count; i++) { + struct vb2_buffer *vb =3D vb2_get_buffer(q, i); =20 if (vb && vb->planes[0].mem_priv) call_void_vb_qop(vb, buf_cleanup, vb); } =20 /* Release video buffer memory */ - __vb2_free_mem(q, buffers); + __vb2_free_mem(q, start, count); =20 #ifdef CONFIG_VIDEO_ADV_DEBUG /* * Check that all the calls were balanced during the life-time of this * queue. If not then dump the counters to the kernel log. */ - if (q_num_buffers) { + if (vb2_get_num_buffers(q)) { bool unbalanced =3D q->cnt_start_streaming !=3D q->cnt_stop_streaming || q->cnt_prepare_streaming !=3D q->cnt_unprepare_streaming || q->cnt_wait_prepare !=3D q->cnt_wait_finish; @@ -619,8 +616,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 < vb2_get_num_buffers(q); buffer++) { - struct vb2_buffer *vb =3D vb2_get_buffer(q, buffer); + for (i =3D start; i < start + count; i++) { + struct vb2_buffer *vb =3D vb2_get_buffer(q, i); bool unbalanced; =20 if (!vb) @@ -637,7 +634,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); @@ -671,9 +668,8 @@ static void __vb2_queue_free(struct vb2_queue *q, unsig= ned int buffers) #endif =20 /* Free vb2 buffers */ - for (buffer =3D q_num_buffers - buffers; buffer < q_num_buffers; - ++buffer) { - struct vb2_buffer *vb =3D vb2_get_buffer(q, buffer); + for (i =3D start; i < start + count; i++) { + struct vb2_buffer *vb =3D vb2_get_buffer(q, i); =20 if (!vb) continue; @@ -713,7 +709,7 @@ EXPORT_SYMBOL(vb2_buffer_in_use); static bool __buffers_in_use(struct vb2_queue *q) { unsigned int buffer; - for (buffer =3D 0; buffer < vb2_get_num_buffers(q); ++buffer) { + for (buffer =3D 0; buffer < q->max_num_buffers; ++buffer) { struct vb2_buffer *vb =3D vb2_get_buffer(q, buffer); =20 if (!vb) @@ -899,7 +895,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->max_num_buffers); mutex_unlock(&q->mmap_lock); =20 q->is_busy =3D 0; @@ -1001,7 +997,7 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_mem= ory 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; } @@ -1126,7 +1122,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; } @@ -1741,7 +1737,7 @@ static int vb2_start_streaming(struct vb2_queue *q) * Forcefully reclaim buffers if the driver did not * correctly return them to vb2. */ - for (i =3D 0; i < vb2_get_num_buffers(q); ++i) { + for (i =3D 0; i < q->max_num_buffers; ++i) { vb =3D vb2_get_buffer(q, i); =20 if (!vb) @@ -2147,7 +2143,7 @@ static void __vb2_queue_cancel(struct vb2_queue *q) * to vb2 in stop_streaming(). */ if (WARN_ON(atomic_read(&q->owned_by_drv_count))) { - for (i =3D 0; i < vb2_get_num_buffers(q); i++) { + for (i =3D 0; i < q->max_num_buffers; i++) { struct vb2_buffer *vb =3D vb2_get_buffer(q, i); =20 if (!vb) @@ -2191,7 +2187,7 @@ static void __vb2_queue_cancel(struct vb2_queue *q) * call to __fill_user_buffer() after buf_finish(). That order can't * be changed, so we can't move the buf_finish() to __vb2_dqbuf(). */ - for (i =3D 0; i < vb2_get_num_buffers(q); i++) { + for (i =3D 0; i < q->max_num_buffers; i++) { struct vb2_buffer *vb; struct media_request *req; =20 @@ -2618,7 +2614,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, vb2_get_num_buffers(q)); + __vb2_queue_free(q, 0, q->max_num_buffers); vb2_core_free_buffers_storage(q); q->is_busy =3D 0; mutex_unlock(&q->mmap_lock); --=20 2.40.1