v4l2-compliance: Add tests for DELETE_BUFS
v4 cover v4l2-compliance: Add tests for DELETE_BUFS
Before being able to add VIDIOC_DELETE_BUFS ioctl, it was needed to change how v4l2 queues store buffers and how many of them they can store. That led to add max_num_buffers field into v4l2_create_buffers struct.
This series add tests for this new field and VIDIOC_DELETE_BUFS ioctl.
Benjamin Gaignard (4):
v4l-utils: Add max_num_buffers field to v4l2_create_buffers struct
v4l2-compliance: Test queue maximum buffers allocation
v4l2-utils: Add VIDIOC_DELETE_BUFS ioctl
v4l2-compliance: Add a test for DELETE_BUFS ioctl
include/linux/videodev2.h | 23 +++- utils/common/cv4l-helpers.h | 5 + utils/common/v4l-helpers.h | 22 ++++ utils/common/v4l2-info.cpp | 1 + utils/v4l2-compliance/v4l2-compliance.cpp | 2 + utils/v4l2-compliance/v4l2-compliance.h | 2 + utils/v4l2-compliance/v4l2-test-buffers.cpp | 133 +++++++++++++++++++- 7 files changed, 186 insertions(+), 2 deletions(-)
Signature · 1 line
2.39.2
PATCH v4 1/4 v4l-utils: Add max_num_buffers field to v4l2_create_buffers struct
Add 'max_num_buffers' field to 'struct v4l2_create_buffers' and define V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS.
--- include/linux/videodev2.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
include/linux/videodev2.h +6 -1
@@ -991,6 +991,7 @@ struct v4l2_requestbuffers {#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)#define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 5)#define V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS (1 << 6) +#define V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS (1 << 7)/** * struct v4l2_plane - plane info for multi-planar buffers
@@ -2545,6 +2546,9 @@ struct v4l2_dbg_chip_info {* @flags: additional buffer management attributes (ignored unless the * queue has V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS capability * and configured for MMAP streaming I/O). +* @max_num_buffers: if V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS capability flag is set +* this field indicate the maximum possible number of buffers +* for this queue. * @reserved: future extensions */ struct v4l2_create_buffers {
@@ -2554,7 +2558,8 @@ struct v4l2_create_buffers {struct v4l2_format format;__u32 capabilities;__u32 flags; -__u32 reserved[6 ]; +__u32 max_num_buffers; +__u32 reserved[5 ]; };/*
Signature · 1 line
2.39.2
PATCH v4 2/4 v4l2-compliance: Test queue maximum buffers allocation
In reply to Benjamin GaignardIf V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS is set v4l2_create_buffers 'max_num_buffers' field reports the maximum number of buffers supported by the queue.
Add a test to allocate this maximum value and make sure that one more allocation is failing.
Display the flag in v4l2-ctl.
--- utils/common/cv4l-helpers.h | 1 + utils/common/v4l-helpers.h | 5 +++ utils/common/v4l2-info.cpp | 1 + utils/v4l2-compliance/v4l2-compliance.cpp | 1 + utils/v4l2-compliance/v4l2-compliance.h | 1 + utils/v4l2-compliance/v4l2-test-buffers.cpp | 42 ++++++++++++++++++++- 6 files changed, 50 insertions(+), 1 deletion(-)
utils/common/cv4l-helpers.h +1 -0
@@ -743,6 +743,7 @@ public: unsigned g_type() const { return v4l_queue_g_type(this); } unsigned g_memory() const { return v4l_queue_g_memory(this); } unsigned g_buffers() const { return v4l_queue_g_buffers(this); } + unsigned g_max_buffers() const { return v4l_queue_g_max_buffers(this); } unsigned g_num_planes() const { return v4l_queue_g_num_planes(this); } unsigned g_capabilities() const { return v4l_queue_g_capabilities(this); }unsigned g_length (unsigned plane) const {return v4l_queue_g_length (this, plane); }
utils/common/v4l-helpers.h +5 -0
@@ -1429,6 +1429,7 @@ struct v4l_queue {unsigned mappings;unsigned num_planes;unsigned capabilities; +unsigned max_buffers;__u32 lengths[VIDEO_MAX_PLANES ];__u32 mem_offsets[VIDEO_MAX_FRAME ][VIDEO_MAX_PLANES ];
@@ -1453,6 +1454,7 @@ static inline void v4l_queue_init(struct v4l_queue *q,static inline unsigned v4l_queue_g_type (const struct v4l_queue *q) {return q->type; }static inline unsigned v4l_queue_g_memory (const struct v4l_queue *q) {return q->memory; }static inline unsigned v4l_queue_g_buffers (const struct v4l_queue *q) {return q->buffers; } +static inline unsigned v4l_queue_g_max_buffers (const struct v4l_queue *q) {return q->max_buffers; }static inline unsigned v4l_queue_g_mappings (const struct v4l_queue *q) {return q->mappings; }static inline unsigned v4l_queue_g_num_planes (const struct v4l_queue *q) {return q->num_planes; }static inline unsigned v4l_queue_g_capabilities (const struct v4l_queue *q) {return q->capabilities; }
@@ -1587,6 +1589,9 @@ static inline int v4l_queue_create_bufs(struct v4l_fd *f,if (ret)return ret; q->capabilities = createbufs.capabilities; + q->max_buffers =32 ; +if (q->capabilities &V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS ) + q->max_buffers = createbufs.max_num_buffers; q->buffers += createbufs.count;return v4l_queue_querybufs (f, q, q->buffers - createbufs.count); }
utils/common/v4l2-info.cpp +1 -0
@@ -206,6 +206,7 @@ static constexpr flag_def bufcap_def[] = { { V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS, "orphaned-bufs" }, { V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF, "m2m-hold-capture-buf" }, { V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS, "mmap-cache-hints" }, + { V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS, "set-max-num-bufs" }, { 0, nullptr } };
utils/v4l2-compliance/v4l2-compliance.cpp +1 -0
@@ -1453,6 +1453,7 @@ void testNode(struct node &node, struct node &node_m2m_cap, struct node &expbuf_ printf("Buffer ioctls%s:\n", suffix); printf("\ttest VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: %s\n", ok(testReqBufs(&node))); + printf("\ttest CREATE_BUFS maximum buffers: %s\n", ok(testCreateBufsMax(&node))); // Reopen after each streaming test to reset the streaming state // in case of any errors in the preceeding test. node.reopen();
utils/v4l2-compliance/v4l2-compliance.h +1 -0
@@ -383,6 +383,7 @@ int testReqBufs(struct node *node);int testReadWrite (struct node *node);int testExpBuf (struct node *node);int testBlockingWait (struct node *node); +int testCreateBufsMax (struct node *node);// 32-bit architecture, 32/64-bit time_t tests int testTime32_64 (struct node *node);
utils/v4l2-compliance/v4l2-test-buffers.cpp +41 -1
54 lines not on this page · raw message
Signature · 1 line
2.39.2
Re: [PATCH v4 2/4] v4l2-compliance: Test queue maximum buffers allocation
Quoted 22 lines · Benjamin Gaignard
If
V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERSis setv4l2_create_buffers'max_num_buffers' field reports the maximum number of buffers supported by the queue.
Add a test to allocate this maximum value and make sure that one more allocation is failing.
Display the flag in v4l2-ctl.Signed-off-by Benjamin Gaignard <[email protected]>--- utils/common/cv4l-helpers.h | 1 + utils/common/v4l-helpers.h | 5 +++ utils/common/v4l2-info.cpp | 1 + utils/v4l2-compliance/v4l2-compliance.cpp | 1 + utils/v4l2-compliance/v4l2-compliance.h | 1 + utils/v4l2-compliance/v4l2-test-buffers.cpp | 42 ++++++++++++++++++++- 6 files changed, 50 insertions(+), 1 deletion(-)utils/common/cv4l-helpers.h +0
-0
utils/common/cv4l-helpers.h public: · line 746
Quoted 4 lines
utils/common/cv4l-helpers.h +1
-0@@ -743,6 +743,7 @@ public: unsigned g_type() const { return v4l_queue_g_type(this); } unsigned g_memory() const { return v4l_queue_g_memory(this); } unsigned g_buffers() const { return v4l_queue_g_buffers(this); } + unsigned g_max_buffers() const { return v4l_queue_g_max_buffers(this); }
Let's call this g_max_num_buffers...
utils/common/v4l-helpers.h struct v4l_queue { · line 1432
Quoted 12 lines
utils/common/cv4l-helpers.h +0
-0unsigned g_num_planes() const { return v4l_queue_g_num_planes(this); } unsigned g_capabilities() const { return v4l_queue_g_capabilities(this); }unsigned g_length (unsigned plane) const {return v4l_queue_g_length (this, plane); }utils/common/v4l-helpers.h +1
-0@@ -1429,6 +1429,7 @@ struct v4l_queue {unsigned mappings;unsigned num_planes;unsigned capabilities; +unsigned max_buffers;
...and this max_num_buffers.
No need to rename this from what videodev2.h uses.
Same elsewhere in this patch.
Quoted 26 lines
utils/common/v4l-helpers.h +4
-0__u32 lengths[VIDEO_MAX_PLANES ];__u32 mem_offsets[VIDEO_MAX_FRAME ][VIDEO_MAX_PLANES ];@@ -1453,6 +1454,7 @@ static inline void v4l_queue_init(struct v4l_queue *q,static inline unsigned v4l_queue_g_type (const struct v4l_queue *q) {return q->type; }static inline unsigned v4l_queue_g_memory (const struct v4l_queue *q) {return q->memory; }static inline unsigned v4l_queue_g_buffers (const struct v4l_queue *q) {return q->buffers; } +static inline unsigned v4l_queue_g_max_buffers (const struct v4l_queue *q) {return q->max_buffers; }static inline unsigned v4l_queue_g_mappings (const struct v4l_queue *q) {return q->mappings; }static inline unsigned v4l_queue_g_num_planes (const struct v4l_queue *q) {return q->num_planes; }static inline unsigned v4l_queue_g_capabilities (const struct v4l_queue *q) {return q->capabilities; }@@ -1587,6 +1589,9 @@ static inline int v4l_queue_create_bufs(struct v4l_fd *f,if (ret)return ret; q->capabilities = createbufs.capabilities; + q->max_buffers =32 ; +if (q->capabilities &V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS ) + q->max_buffers = createbufs.max_num_buffers; q->buffers += createbufs.count;return v4l_queue_querybufs (f, q, q->buffers - createbufs.count); }utils/common/v4l2-info.cpp +0
-0
utils/common/v4l2-info.cpp static constexpr flag_def bufcap_def[] = { · line 209
Quoted 4 lines
utils/common/v4l2-info.cpp +1
-0@@ -206,6 +206,7 @@ static constexpr flag_def bufcap_def[] = { { V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS, "orphaned-bufs" }, { V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF, "m2m-hold-capture-buf" }, { V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS, "mmap-cache-hints" }, + { V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS, "set-max-num-bufs" },
bufs -> buffers
Quoted 32 lines
utils/common/v4l2-info.cpp +0
-0{ 0, nullptr } };utils/v4l2-compliance/v4l2-compliance.cpp +1
-0@@ -1453,6 +1453,7 @@ void testNode(struct node &node, struct node &node_m2m_cap, struct node &expbuf_ printf("Buffer ioctls%s:\n", suffix); printf("\ttest VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: %s\n", ok(testReqBufs(&node))); + printf("\ttest CREATE_BUFS maximum buffers: %s\n", ok(testCreateBufsMax(&node))); // Reopen after each streaming test to reset the streaming state // in case of any errors in the preceeding test. node.reopen();utils/v4l2-compliance/v4l2-compliance.h +1
-0@@ -383,6 +383,7 @@ int testReqBufs(struct node *node);int testReadWrite (struct node *node);int testExpBuf (struct node *node);int testBlockingWait (struct node *node); +int testCreateBufsMax (struct node *node);// 32-bit architecture, 32/64-bit time_t tests int testTime32_64 (struct node *node);utils/v4l2-compliance/v4l2-test-buffers.cpp +0
-0
utils/v4l2-compliance/v4l2-test-buffers.cpp int testReqBufs(struct node *node) · line 639
Quoted 7 lines
utils/v4l2-compliance/v4l2-test-buffers.cpp +0
-1@@ -634,7 +634,6 @@ int testReqBufs(struct node *node) fail_on_test(testQueryBuf(node, i, q.g_buffers())); node->valid_memorytype |= 1 << V4L2_MEMORY_DMABUF; } - /* * It should be possible to set the same std, timings or * native size even after reqbufs was called.
Spurious deleted newline.
Quoted 8 lines
utils/v4l2-compliance/v4l2-test-buffers.cpp +4
-0@@ -761,6 +760,47 @@ int testReqBufs(struct node *node) return 0; } +int testCreateBufsMax(struct node *node) +{ + unsigned int i; + int ret;
utils/v4l2-compliance/v4l2-test-buffers.cpp int testReqBufs(struct node *node) · line 776
Quoted 10 lines
utils/v4l2-compliance/v4l2-test-buffers.cpp +10
-0+ + node->reopen(); + + cv4l_queue q(0, 0); + + for (i = 1; i <= V4L2_BUF_TYPE_LAST; i++) { + if (!(node->valid_buftypes & (1 << i))) + continue; + + q.init(i, V4L2_MEMORY_USERPTR);
There is no need to test this for all streaming modes. MMAP will suffice.
utils/v4l2-compliance/v4l2-test-buffers.cpp int testReqBufs(struct node *node) · line 785
Quoted 9 lines
utils/v4l2-compliance/v4l2-test-buffers.cpp +9
-0+ ret = q.create_bufs(node, 1); + if (!ret && (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS)) { + fail_on_test(q.create_bufs(node, q.g_max_buffers() - q.g_buffers())); + ret = q.create_bufs(node, 1); + fail_on_test(ret != ENOBUFS && (q.g_max_buffers() == q.g_buffers())); + } + + q.init(i, V4L2_MEMORY_MMAP); + ret = q.create_bufs(node, 1);
Use 0 instead of 1: CREATE_BUFS will in that case only return the capabilities without attempting to allocate anything. It is really what you want here.
utils/v4l2-compliance/v4l2-test-buffers.cpp int testReqBufs(struct node *node) · line 787
Quoted 2 lines
utils/v4l2-compliance/v4l2-test-buffers.cpp +2
-0+ if (!ret && (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS)) { + fail_on_test(q.create_bufs(node, q.g_max_buffers() - q.g_buffers()));
And in that case you can drop the '- q.g_buffers()' part as well, since no buffers will be allocated yet.
I think you want to get the return code of q.create_bufs: if it is ENOMEM you want to report a different fail message, ideally something that indicated the amount of memory that is needed for this. That's based on the current format image size and the g_max_num_buffers value.
utils/v4l2-compliance/v4l2-test-buffers.cpp int testReqBufs(struct node *node) · line 789
Quoted 2 lines
utils/v4l2-compliance/v4l2-test-buffers.cpp +2
-0+ ret = q.create_bufs(node, 1); + fail_on_test(ret != ENOBUFS && (q.g_max_buffers() == q.g_buffers()));
Wouldn't it be enough to test 'ret' here? Did you need the second part of this check?
Quoted 7 lines
utils/v4l2-compliance/v4l2-test-buffers.cpp +7
-0+ } + + q.init(i, V4L2_MEMORY_DMABUF); + ret = q.create_bufs(node, 1); + if (!ret && (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS)) { + fail_on_test(q.create_bufs(node, q.g_max_buffers() - q.g_buffers())); + ret = q.create_bufs(node, 1);
utils/v4l2-compliance/v4l2-test-buffers.cpp int testReqBufs(struct node *node) · line 806
Quoted 10 lines
utils/v4l2-compliance/v4l2-test-buffers.cpp +7
-0+ fail_on_test(ret != ENOBUFS && (q.g_max_buffers() == q.g_buffers())); + } + } + + return 0; +} + int testExpBuf(struct node *node) { bool have_expbuf = false;
Regards,
Hans
PATCH v4 3/4 v4l2-utils: Add VIDIOC_DELETE_BUFS ioctl
In reply to Benjamin GaignardAdd VIDIOC_DELETE_BUFS ioctl and it associated structure. Define V4L2_BUF_CAP_SUPPORTS_DELETE_BUFS to signal that queue support feature.
--- include/linux/videodev2.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
include/linux/videodev2.h +16 -0
@@ -992,6 +992,7 @@ struct v4l2_requestbuffers {#define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 5)#define V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS (1 << 6)#define V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS (1 << 7) +#define V4L2_BUF_CAP_SUPPORTS_DELETE_BUFS (1 << 8)/** * struct v4l2_plane - plane info for multi-planar buffers
@@ -2562,6 +2563,20 @@ struct v4l2_create_buffers {__u32 reserved[5 ]; }; +/** +* struct v4l2_delete_buffers - VIDIOC_DELETE_BUFS argument +* @index: the first buffer to be deleted +* @count: number of buffers to delete +* @type: enum v4l2_buf_type +* @reserved: future extensions +*/ +struct v4l2_delete_buffers { +__u32 index; +__u32 count; +__u32 type; +__u32 reserved[13 ]; +}; +/* * I O C T L C O D E S F O R V I D E O D E V I C E S *
@@ -2661,6 +2676,7 @@ struct v4l2_create_buffers {#define VIDIOC_DBG_G_CHIP_INFO _IOWR('V', 102, struct v4l2_dbg_chip_info)#define VIDIOC_QUERY_EXT_CTRL _IOWR('V', 103, struct v4l2_query_ext_ctrl) +#define VIDIOC_DELETE_BUFS _IOWR('V', 104, struct v4l2_delete_buffers)/* Reminder: when adding new ioctls please add support for them to drivers/media/v4l2-core/v4l2-compat-ioctl32.c as well! */
Signature · 1 line
2.39.2
PATCH v4 4/4 v4l2-compliance: Add a test for DELETE_BUFS ioctl
In reply to Benjamin GaignardAdd new test for DELETE_BUFS ioctl.
It create buffers and check if they could be removed from queue. It also check that removing non existing buffer or a queued buffer failed.
--- utils/common/cv4l-helpers.h | 4 + utils/common/v4l-helpers.h | 17 ++++ utils/v4l2-compliance/v4l2-compliance.cpp | 1 + utils/v4l2-compliance/v4l2-compliance.h | 1 + utils/v4l2-compliance/v4l2-test-buffers.cpp | 91 +++++++++++++++++++++ 5 files changed, 114 insertions(+)
utils/common/cv4l-helpers.h +4 -0
@@ -760,6 +760,10 @@ public: {return v4l_queue_reqbufs (fd->g_v4l_fd (), this, count, flags); } + int delete_bufs(cv4l_fd *fd, unsigned index = 0, unsigned count = 0) + { + return v4l_queue_delete_bufs(fd->g_v4l_fd(), this, index, count); + }bool has_create_bufs (cv4l_fd *fd) const {return v4l_queue_has_create_bufs (fd->g_v4l_fd (), this);
utils/common/v4l-helpers.h +17 -0
@@ -1510,6 +1510,23 @@ static inline void *v4l_queue_g_dataptr(const struct v4l_queue *q, unsigned indereturn v4l_queue_g_mmapping (q, index, plane); } +static inline int v4l_queue_delete_bufs (struct v4l_fd *f,struct v4l_queue *q,unsigned index,unsigned count) +{ +struct v4l2_delete_buffers deletebufs; +int ret; + +memset (&deletebufs,0 ,sizeof (deletebufs)); + deletebufs.type = q->type; + deletebufs.index = index; + deletebufs.count = count; + + ret =v4l_ioctl (f,VIDIOC_DELETE_BUFS , &deletebufs); +if (!ret) + q->buffers -= deletebufs.count; + +return ret; +} +static inline int v4l_queue_querybufs (struct v4l_fd *f,struct v4l_queue *q,unsigned from) {unsigned b, p;
utils/v4l2-compliance/v4l2-compliance.cpp +1 -0
@@ -1454,6 +1454,7 @@ void testNode(struct node &node, struct node &node_m2m_cap, struct node &expbuf_ printf("Buffer ioctls%s:\n", suffix); printf("\ttest VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: %s\n", ok(testReqBufs(&node))); printf("\ttest CREATE_BUFS maximum buffers: %s\n", ok(testCreateBufsMax(&node))); + printf("\ttest VIDIOC_DELETE_BUFS: %s\n", ok(testDeleteBufs(&node))); // Reopen after each streaming test to reset the streaming state // in case of any errors in the preceeding test. node.reopen();
utils/v4l2-compliance/v4l2-compliance.h +1 -0
@@ -384,6 +384,7 @@ int testReadWrite(struct node *node);int testExpBuf (struct node *node);int testBlockingWait (struct node *node);int testCreateBufsMax (struct node *node); +int testDeleteBufs (struct node *node);// 32-bit architecture, 32/64-bit time_t tests int testTime32_64 (struct node *node);
utils/v4l2-compliance/v4l2-test-buffers.cpp +91 -0
97 lines not on this page · raw message
Signature · 1 line
2.39.2