From: Benjamin Gaignard <benjamin.gaignard@collabora.com>
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 <benjamin.gaignard@collabora.com>
Subject: [PATCH v8 12/53] media: videobuf2: Be more flexible on the number of queue stored buffers
Date: Wed, 27 Sep 2023 17:35:17 +0200 [thread overview]
Message-ID: <20230927153558.159278-13-benjamin.gaignard@collabora.com> (raw)
In-Reply-To: <20230927153558.159278-1-benjamin.gaignard@collabora.com>
Add 'max_num_buffers' field in vb2_queue struct to let drivers decide
how many buffers could be stored in a queue.
This require 'bufs' array to be allocated at queue init time and freed
when releasing the queue.
By default VB2_MAX_FRAME remains the limit.
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
.../media/common/videobuf2/videobuf2-core.c | 41 +++++++++++++++----
.../media/common/videobuf2/videobuf2-v4l2.c | 4 +-
include/media/videobuf2-core.h | 4 +-
3 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
index 17b0dafacaab..023e00aa4848 100644
--- a/drivers/media/common/videobuf2/videobuf2-core.c
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
@@ -415,7 +415,7 @@ static void init_buffer_cache_hints(struct vb2_queue *q, struct vb2_buffer *vb)
*/
static void vb2_queue_add_buffer(struct vb2_queue *q, struct vb2_buffer *vb, unsigned int index)
{
- WARN_ON(index >= VB2_MAX_FRAME || q->bufs[index]);
+ WARN_ON(index >= q->max_num_buffers || q->bufs[index]);
q->bufs[index] = vb;
vb->index = index;
@@ -447,9 +447,9 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum vb2_memory memory,
struct vb2_buffer *vb;
int ret;
- /* Ensure that q->num_buffers+num_buffers is below VB2_MAX_FRAME */
+ /* Ensure that the number of already queue + num_buffers is below q->max_num_buffers */
num_buffers = min_t(unsigned int, num_buffers,
- VB2_MAX_FRAME - q->num_buffers);
+ q->max_num_buffers - q->num_buffers);
for (buffer = 0; buffer < num_buffers; ++buffer) {
/* Allocate vb2 buffer structures */
@@ -808,7 +808,7 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory,
unsigned plane_sizes[VB2_MAX_PLANES] = { };
bool non_coherent_mem = flags & V4L2_MEMORY_FLAG_NON_COHERENT;
unsigned int i;
- int ret;
+ int ret = 0;
if (q->streaming) {
dprintk(q, 1, "streaming active\n");
@@ -852,17 +852,22 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory,
/*
* Make sure the requested values and current defaults are sane.
*/
- WARN_ON(q->min_buffers_needed > VB2_MAX_FRAME);
num_buffers = max_t(unsigned int, *count, q->min_buffers_needed);
- num_buffers = min_t(unsigned int, num_buffers, VB2_MAX_FRAME);
+ num_buffers = min_t(unsigned int, num_buffers, q->max_num_buffers);
memset(q->alloc_devs, 0, sizeof(q->alloc_devs));
/*
* Set this now to ensure that drivers see the correct q->memory value
* in the queue_setup op.
*/
mutex_lock(&q->mmap_lock);
+ if (!q->bufs)
+ q->bufs = kcalloc(q->max_num_buffers, sizeof(*q->bufs), GFP_KERNEL);
+ if (!q->bufs)
+ ret = -ENOMEM;
q->memory = memory;
mutex_unlock(&q->mmap_lock);
+ if (ret)
+ return ret;
set_queue_coherency(q, non_coherent_mem);
/*
@@ -968,9 +973,9 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory,
unsigned plane_sizes[VB2_MAX_PLANES] = { };
bool non_coherent_mem = flags & V4L2_MEMORY_FLAG_NON_COHERENT;
bool no_previous_buffers = !q->num_buffers;
- int ret;
+ int ret = 0;
- if (q->num_buffers == VB2_MAX_FRAME) {
+ if (q->num_buffers == q->max_num_buffers) {
dprintk(q, 1, "maximum number of buffers already allocated\n");
return -ENOBUFS;
}
@@ -987,7 +992,13 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory,
*/
mutex_lock(&q->mmap_lock);
q->memory = memory;
+ if (!q->bufs)
+ q->bufs = kcalloc(q->max_num_buffers, sizeof(*q->bufs), GFP_KERNEL);
+ if (!q->bufs)
+ ret = -ENOMEM;
mutex_unlock(&q->mmap_lock);
+ if (ret)
+ return ret;
q->waiting_for_buffers = !q->is_output;
set_queue_coherency(q, non_coherent_mem);
} else {
@@ -999,7 +1010,7 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory,
return -EINVAL;
}
- num_buffers = min(*count, VB2_MAX_FRAME - q->num_buffers);
+ num_buffers = min(*count, q->max_num_buffers - q->num_buffers);
if (requested_planes && requested_sizes) {
num_planes = requested_planes;
@@ -2467,6 +2478,10 @@ int vb2_core_queue_init(struct vb2_queue *q)
WARN_ON(!q->ops->buf_queue))
return -EINVAL;
+ if (WARN_ON(q->max_num_buffers > BUFFER_INDEX_MASK + 1) ||
+ WARN_ON(q->min_buffers_needed > q->max_num_buffers))
+ return -EINVAL;
+
if (WARN_ON(q->requires_requests && !q->supports_requests))
return -EINVAL;
@@ -2489,6 +2504,12 @@ int vb2_core_queue_init(struct vb2_queue *q)
q->memory = VB2_MEMORY_UNKNOWN;
+ if (!q->max_num_buffers)
+ q->max_num_buffers = VB2_MAX_FRAME;
+
+ /* The maximum is limited by offset cookie encoding pattern */
+ q->max_num_buffers = min_t(unsigned int, q->max_num_buffers, BUFFER_INDEX_MASK + 1);
+
if (q->buf_struct_size == 0)
q->buf_struct_size = sizeof(struct vb2_buffer);
@@ -2513,6 +2534,8 @@ void vb2_core_queue_release(struct vb2_queue *q)
__vb2_queue_cancel(q);
mutex_lock(&q->mmap_lock);
__vb2_queue_free(q, q->num_buffers);
+ kfree(q->bufs);
+ q->bufs = NULL;
mutex_unlock(&q->mmap_lock);
}
EXPORT_SYMBOL_GPL(vb2_core_queue_release);
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
index 3395e702ad1f..278ea1107b01 100644
--- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
+++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
@@ -1156,7 +1156,7 @@ int _vb2_fop_release(struct file *file, struct mutex *lock)
if (lock)
mutex_lock(lock);
- if (file->private_data == vdev->queue->owner) {
+ if (!vdev->queue->owner || file->private_data == vdev->queue->owner) {
vb2_queue_release(vdev->queue);
vdev->queue->owner = NULL;
}
@@ -1284,7 +1284,7 @@ void vb2_video_unregister_device(struct video_device *vdev)
*/
get_device(&vdev->dev);
video_unregister_device(vdev);
- if (vdev->queue && vdev->queue->owner) {
+ if (vdev->queue) {
struct mutex *lock = vdev->queue->lock ?
vdev->queue->lock : vdev->lock;
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index cd3ff1cd759d..1d6d68e8a711 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -558,6 +558,7 @@ struct vb2_buf_ops {
* @dma_dir: DMA mapping direction.
* @bufs: videobuf2 buffer structures
* @num_buffers: number of allocated/used buffers
+ * @max_num_buffers: upper limit of number of allocated/used buffers
* @queued_list: list of buffers currently queued from userspace
* @queued_count: number of buffers queued and ready for streaming.
* @owned_by_drv_count: number of buffers owned by the driver
@@ -619,8 +620,9 @@ struct vb2_queue {
struct mutex mmap_lock;
unsigned int memory;
enum dma_data_direction dma_dir;
- struct vb2_buffer *bufs[VB2_MAX_FRAME];
+ struct vb2_buffer **bufs;
unsigned int num_buffers;
+ unsigned int max_num_buffers;
struct list_head queued_list;
unsigned int queued_count;
--
2.39.2
next prev parent reply other threads:[~2023-09-27 15:36 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-27 15:35 [PATCH v8 00/53] Add DELETE_BUF ioctl Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 01/53] media: videobuf2: Rework offset 'cookie' encoding pattern Benjamin Gaignard
2023-09-30 8:52 ` Hans Verkuil
2023-09-27 15:35 ` [PATCH v8 02/53] media: videobuf2: Stop spamming kernel log with all queue counter Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 03/53] media: videobuf2: Use vb2_buffer instead of index Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 04/53] media: amphion: Use vb2_get_buffer() instead of directly access to buffers array Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 05/53] media: mediatek: jpeg: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 06/53] media: mediatek: vdec: Remove useless loop Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 07/53] media: sti: hva: Use vb2_get_buffer() instead of directly access to buffers array Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 08/53] media: visl: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 09/53] media: atomisp: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 10/53] media: dvb-core: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 11/53] media: videobuf2: Access vb2_queue bufs array through helper functions Benjamin Gaignard
2023-09-27 15:35 ` Benjamin Gaignard [this message]
2023-09-27 15:35 ` [PATCH v8 13/53] media: Report the maximum possible number of buffers for the queue Benjamin Gaignard
2023-10-02 13:37 ` Hans Verkuil
2023-10-02 13:46 ` Benjamin Gaignard
2023-10-02 13:49 ` Hans Verkuil
2023-09-27 15:35 ` [PATCH v8 14/53] media: test-drivers: vivid: Increase max supported buffers for capture queues Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 15/53] media: test-drivers: vicodec: Increase max supported capture queue buffers Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 16/53] media: verisilicon: Refactor postprocessor to store more buffers Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 17/53] media: verisilicon: Store chroma and motion vectors offset Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 18/53] media: verisilicon: g2: Use common helpers to compute chroma and mv offsets Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 19/53] media: verisilicon: vp9: Allow to change resolution while streaming Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 20/53] media: Remove duplicated index vs q->num_buffers check Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 21/53] media: core: Add helper to get queue number of buffers Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 22/53] media: dvb-core: Do not initialize twice queue num_buffer field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 23/53] media: dvb-frontends: rtl2832_srd: Use queue min_buffers_needed field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 24/53] media: video-i2c: Set min_buffers_needed to 2 Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 25/53] media: pci: cx18: Set correct value to min_buffers_needed field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 26/53] media: pci: dt3155: Remove useless check Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 27/53] media: pci: netup_unidvb: Remove useless number of buffers check Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 28/53] media: pci: tw68: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 29/53] media: pci: tw686x: Set min_buffers_needed to 3 Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 30/53] media: amphion: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 31/53] media: coda: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 32/53] media: mediatek: vcodec: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 33/53] media: nxp: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 34/53] media: renesas: Set min_buffers_needed to 16 Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 35/53] media: ti: Use queue min_buffers_needed field to set the min number of buffers Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 36/53] media: verisilicon: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 37/53] media: test-drivers: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 38/53] media: usb: airspy: Set min_buffers_needed to 8 Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 39/53] media: usb: cx231xx: Set min_buffers_needed to CX231XX_MIN_BUF Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 40/53] media: usb: hackrf: Set min_buffers_needed to 8 Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 41/53] media: usb: usbtv: Set min_buffers_needed to 2 Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 42/53] media: atomisp: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 43/53] media: imx: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 44/53] media: meson: vdec: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 45/53] touchscreen: sur40: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 46/53] sample: v4l: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 47/53] media: cedrus: " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 48/53] media: core: Rework how create_buf index returned value is computed Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 49/53] media: core: Add bitmap manage bufs array entries Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 50/53] media: core: Free range of buffers Benjamin Gaignard
2023-09-30 5:09 ` kernel test robot
2023-09-27 15:35 ` [PATCH v8 51/53] media: v4l2: Add DELETE_BUFS ioctl Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 52/53] media: v4l2: Add mem2mem helpers for " Benjamin Gaignard
2023-09-27 15:35 ` [PATCH v8 53/53] media: test-drivers: Use helper " Benjamin Gaignard
2023-09-28 13:04 ` [PATCH v8 00/53] Add DELETE_BUF ioctl Hans Verkuil
2023-09-28 13:16 ` Benjamin Gaignard
2023-09-29 11:44 ` Benjamin Gaignard
2023-09-29 13:17 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230927153558.159278-13-benjamin.gaignard@collabora.com \
--to=benjamin.gaignard@collabora.com \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=kernel@collabora.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-staging@lists.linux.dev \
--cc=m.szyprowski@samsung.com \
--cc=mchehab@kernel.org \
--cc=ming.qian@nxp.com \
--cc=nicolas.dufresne@collabora.com \
--cc=p.zabel@pengutronix.de \
--cc=tfiga@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox