| Message ID | 20231003080704.43911-1-benjamin.gaignard@collabora.com |
|---|---|
| Headers | show |
| Series | Add DELETE_BUF ioctl | expand |
Hi Benjamin, On Tue, Oct 03, 2023 at 10:06:10AM +0200, Benjamin Gaignard wrote: > Change how offset 'cookie' field value is computed to make possible > to use more buffers. > The maximum number of buffers depends of PAGE_SHIFT value and can > go up to 0x7fff when PAGE_SHIFT = 12. > With this encoding pattern we know the maximum number that a queue > could store so we can check it at queue init time. > It also make easier and faster to find buffer and plane from using > the offset field. > Change __find_plane_by_offset() prototype to return the video buffer > itself rather than it index. > > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> > --- > changes in version 10: > - Make BUFFER_INDEX_MASK definition more readable. > - Correct typo. > > .../media/common/videobuf2/videobuf2-core.c | 72 +++++++++---------- > 1 file changed, 33 insertions(+), 39 deletions(-) > > diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c > index 27aee92f3eea..5591ac830668 100644 > --- a/drivers/media/common/videobuf2/videobuf2-core.c > +++ b/drivers/media/common/videobuf2/videobuf2-core.c > @@ -31,6 +31,11 @@ > > #include <trace/events/vb2.h> > > +#define PLANE_INDEX_SHIFT (PAGE_SHIFT + 3) > +#define PLANE_INDEX_MASK 0x7 > +#define MAX_BUFFER_INDEX BIT_MASK(30 - PLANE_INDEX_SHIFT) > +#define BUFFER_INDEX_MASK (MAX_BUFFER_INDEX - 1) > + > static int debug; > module_param(debug, int, 0644); > > @@ -358,21 +363,24 @@ static void __setup_offsets(struct vb2_buffer *vb) > unsigned int plane; > unsigned long off = 0; > > - if (vb->index) { > - struct vb2_buffer *prev = q->bufs[vb->index - 1]; > - struct vb2_plane *p = &prev->planes[prev->num_planes - 1]; > - > - off = PAGE_ALIGN(p->m.offset + p->length); > - } > + /* > + * Offsets cookies value have the following constraints: > + * - a buffer can have up to 8 planes. > + * - v4l2 mem2mem uses bit 30 to distinguish between source and destination buffers. Long line. Shouldn't this be OUTPUT and CAPTURE? > + * - must be page aligned > + * That led to this bit mapping when PAGE_SHIFT = 12: > + * |30 |29 15|14 12|11 0| > + * |DST_QUEUE_OFF_BASE|buffer index|plane index| 0 | > + * where there are 15 bits to store the buffer index. > + * Depending on PAGE_SHIFT value we can have fewer bits to store the buffer index. Here, too... > + */ > + off = vb->index << PLANE_INDEX_SHIFT; > > for (plane = 0; plane < vb->num_planes; ++plane) { > - vb->planes[plane].m.offset = off; > + vb->planes[plane].m.offset = off + (plane << PAGE_SHIFT); > > dprintk(q, 3, "buffer %d, plane %d offset 0x%08lx\n", > vb->index, plane, off); > - > - off += vb->planes[plane].length; > - off = PAGE_ALIGN(off); > } > } > > @@ -2185,13 +2193,12 @@ int vb2_core_streamoff(struct vb2_queue *q, unsigned int type) > EXPORT_SYMBOL_GPL(vb2_core_streamoff); > > /* > - * __find_plane_by_offset() - find plane associated with the given offset off > + * __find_plane_by_offset() - find video buffer and plane associated with the given offset off > */ > static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off, > - unsigned int *_buffer, unsigned int *_plane) > + struct vb2_buffer **vb, unsigned int *plane) > { > - struct vb2_buffer *vb; > - unsigned int buffer, plane; > + unsigned int buffer; > > /* > * Sanity checks to ensure the lock is held, MEMORY_MMAP is > @@ -2209,24 +2216,15 @@ static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off, > return -EBUSY; > } > > - /* > - * Go over all buffers and their planes, comparing the given offset > - * with an offset assigned to each plane. If a match is found, > - * return its buffer and plane numbers. > - */ > - for (buffer = 0; buffer < q->num_buffers; ++buffer) { > - vb = q->bufs[buffer]; > + /* Get buffer and plane from the offset */ > + buffer = (off >> PLANE_INDEX_SHIFT) & BUFFER_INDEX_MASK; > + *plane = (off >> PAGE_SHIFT) & PLANE_INDEX_MASK; > > - for (plane = 0; plane < vb->num_planes; ++plane) { > - if (vb->planes[plane].m.offset == off) { > - *_buffer = buffer; > - *_plane = plane; > - return 0; > - } > - } > - } > + if (buffer >= q->num_buffers || *plane >= q->bufs[buffer]->num_planes) > + return -EINVAL; > > - return -EINVAL; > + *vb = q->bufs[buffer]; > + return 0; > } > > int vb2_core_expbuf(struct vb2_queue *q, int *fd, unsigned int type, > @@ -2306,7 +2304,7 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma) > { > unsigned long off = vma->vm_pgoff << PAGE_SHIFT; > struct vb2_buffer *vb; > - unsigned int buffer = 0, plane = 0; > + unsigned int plane = 0; > int ret; > unsigned long length; > > @@ -2335,12 +2333,10 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma) > * Find the plane corresponding to the offset passed by userspace. This > * will return an error if not MEMORY_MMAP or file I/O is in progress. > */ > - ret = __find_plane_by_offset(q, off, &buffer, &plane); > + ret = __find_plane_by_offset(q, off, &vb, &plane); > if (ret) > goto unlock; > > - vb = q->bufs[buffer]; > - > /* > * MMAP requires page_aligned buffers. > * The buffer length was page_aligned at __vb2_buf_mem_alloc(), > @@ -2368,7 +2364,7 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma) > if (ret) > return ret; > > - dprintk(q, 3, "buffer %d, plane %d successfully mapped\n", buffer, plane); > + dprintk(q, 3, "buffer %u, plane %d successfully mapped\n", vb->index, plane); > return 0; > } > EXPORT_SYMBOL_GPL(vb2_mmap); > @@ -2382,7 +2378,7 @@ unsigned long vb2_get_unmapped_area(struct vb2_queue *q, > { > unsigned long off = pgoff << PAGE_SHIFT; > struct vb2_buffer *vb; > - unsigned int buffer, plane; > + unsigned int plane; > void *vaddr; > int ret; > > @@ -2392,12 +2388,10 @@ unsigned long vb2_get_unmapped_area(struct vb2_queue *q, > * Find the plane corresponding to the offset passed by userspace. This > * will return an error if not MEMORY_MMAP or file I/O is in progress. > */ > - ret = __find_plane_by_offset(q, off, &buffer, &plane); > + ret = __find_plane_by_offset(q, off, &vb, &plane); > if (ret) > goto unlock; > > - vb = q->bufs[buffer]; > - > vaddr = vb2_plane_vaddr(vb, plane); > mutex_unlock(&q->mmap_lock); > return vaddr ? (unsigned long)vaddr : -EINVAL;
Unlike when resolution change on keyframes, dynamic resolution change on inter frames doesn't allow to do a stream off/on sequence because it is need to keep all previous references alive to decode inter frames. This constraint have two main problems: - more memory consumption. - more buffers in use. To solve these issue this series introduce DELETE_BUFS ioctl and remove the 32 buffers limit per queue. VP9 conformance tests using fluster give a score of 210/305. The 24 resize inter tests (vp90-2-21-resize_inter_* files) are ok but require to use postprocessor. Kernel branch is available here: https://gitlab.collabora.com/benjamin.gaignard/for-upstream/-/commits/remove_vb2_queue_limit_v10 GStreamer branch to use DELETE_BUF ioctl and testing dynamic resolution change is here: https://gitlab.freedesktop.org/benjamin.gaignard1/gstreamer/-/commits/VP9_drc changes in version 10: - Make BUFFER_INDEX_MASK definition more readable - Rebase on media_stage/master branch and add a patch for nuvoton driver. - Fix issue on patch 13 changes in version 9: - BUFFER_INDEX_MASK now depends on PAGE_SHIFT value to match architectures requirements. - Correctly initialize max_num_buffers in vb2_core_queue_init() - run 'test-media -kmemleak mc' on top of the series and on patches 1 to 47 without failures. - fix compilation issue in patch 50 changes in version 8: - Add V4L2_BUF_CAP_SUPPORTS_SET_MAX_BUFS and new 'max_buffers' field in v4l2_create_buffers structure to report the maximum number of buffers that a queue could allocate. - Add V4L2_BUF_CAP_SUPPORTS_DELETE_BUFS to indicate that a queue support DELETE_BUFS ioctl. - Make some test drivers use more than 32 buffers and DELETE_BUFS ioctl. - Fix remarks done by Hans - Move "media: core: Rework how create_buf index returned value is computed" patch to the top of the serie. changes in version 7: - Use a bitmap to know which entries are valid in queue bufs array. The number of buffers in the queue could must calculated from the bitmap so num_buffers becomes useless. This led to add quite few patches to remove it from all the drivers. Note: despiste my attention I may have miss some calls to num_buffers... - Split patches to make them more readable. - Run v4l2-compliance with additional delete-bufs tests. - Run ./test-media -kmemleak vivid and no more failures. Note: I had to remove USERPTR streaming test because they to much frequentely hit get_framevec bug. It is not related to my series since this happens all the time on master branch. - Fix Hans remarks on v6 changes in version 6: - Get a patch per driver to use vb2_get_buffer() instead of directly access to queue buffers array. - Add lock in vb2_core_delete_buf() - Use vb2_buffer instead of index - Fix various comments - Change buffer index name to BUFFER_INDEX_MASK - Stop spamming kernel log with unbalanced counters Regards, Benjamin Benjamin Gaignard (54): media: videobuf2: Rework offset 'cookie' encoding pattern media: videobuf2: Stop spamming kernel log with all queue counter media: videobuf2: Use vb2_buffer instead of index media: amphion: Use vb2_get_buffer() instead of directly access to buffers array media: mediatek: jpeg: Use vb2_get_buffer() instead of directly access to buffers array media: mediatek: vdec: Remove useless loop media: sti: hva: Use vb2_get_buffer() instead of directly access to buffers array media: visl: Use vb2_get_buffer() instead of directly access to buffers array media: atomisp: Use vb2_get_buffer() instead of directly access to buffers array media: dvb-core: Use vb2_get_buffer() instead of directly access to buffers array media: videobuf2: Access vb2_queue bufs array through helper functions media: videobuf2: Be more flexible on the number of queue stored buffers media: Report the maximum possible number of buffers for the queue media: test-drivers: vivid: Increase max supported buffers for capture queues media: test-drivers: vicodec: Increase max supported capture queue buffers media: verisilicon: Refactor postprocessor to store more buffers media: verisilicon: Store chroma and motion vectors offset media: verisilicon: g2: Use common helpers to compute chroma and mv offsets media: verisilicon: vp9: Allow to change resolution while streaming media: Remove duplicated index vs q->num_buffers check media: core: Add helper to get queue number of buffers media: dvb-core: Do not initialize twice queue num_buffer field media: dvb-frontends: rtl2832_srd: Use queue min_buffers_needed field media: video-i2c: Set min_buffers_needed to 2 media: pci: cx18: Set correct value to min_buffers_needed field media: pci: dt3155: Remove useless check media: pci: netup_unidvb: Remove useless number of buffers check media: pci: tw68: Stop direct calls to queue num_buffers field media: pci: tw686x: Set min_buffers_needed to 3 media: amphion: Stop direct calls to queue num_buffers field media: coda: Stop direct calls to queue num_buffers field media: mediatek: vcodec: Stop direct calls to queue num_buffers field media: nxp: Stop direct calls to queue num_buffers field media: renesas: Set min_buffers_needed to 16 media: ti: Use queue min_buffers_needed field to set the min number of buffers media: verisilicon: Stop direct calls to queue num_buffers field media: test-drivers: Stop direct calls to queue num_buffers field media: usb: airspy: Set min_buffers_needed to 8 media: usb: cx231xx: Set min_buffers_needed to CX231XX_MIN_BUF media: usb: hackrf: Set min_buffers_needed to 8 media: usb: usbtv: Set min_buffers_needed to 2 media: atomisp: Stop direct calls to queue num_buffers field media: imx: Stop direct calls to queue num_buffers field media: meson: vdec: Stop direct calls to queue num_buffers field touchscreen: sur40: Stop direct calls to queue num_buffers field sample: v4l: Stop direct calls to queue num_buffers field media: cedrus: Stop direct calls to queue num_buffers field media: nuvoton: Stop direct calls to queue num_buffers field media: core: Rework how create_buf index returned value is computed media: core: Add bitmap manage bufs array entries media: core: Free range of buffers media: v4l2: Add DELETE_BUFS ioctl media: v4l2: Add mem2mem helpers for DELETE_BUFS ioctl media: test-drivers: Use helper for DELETE_BUFS ioctl .../userspace-api/media/v4l/user-func.rst | 1 + .../media/v4l/vidioc-create-bufs.rst | 8 +- .../media/v4l/vidioc-delete-bufs.rst | 80 +++ .../media/v4l/vidioc-reqbufs.rst | 2 + drivers/input/touchscreen/sur40.c | 5 +- .../media/common/videobuf2/videobuf2-core.c | 554 +++++++++++------- .../media/common/videobuf2/videobuf2-v4l2.c | 118 +++- drivers/media/dvb-core/dvb_vb2.c | 17 +- drivers/media/dvb-frontends/rtl2832_sdr.c | 9 +- drivers/media/i2c/video-i2c.c | 5 +- drivers/media/pci/cx18/cx18-streams.c | 13 +- drivers/media/pci/dt3155/dt3155.c | 2 - .../pci/netup_unidvb/netup_unidvb_core.c | 4 +- drivers/media/pci/tw68/tw68-video.c | 6 +- drivers/media/pci/tw686x/tw686x-video.c | 13 +- drivers/media/platform/amphion/vpu_dbg.c | 30 +- drivers/media/platform/amphion/vpu_v4l2.c | 4 +- .../media/platform/chips-media/coda-common.c | 2 +- .../platform/mediatek/jpeg/mtk_jpeg_core.c | 7 +- .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 9 +- .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 2 +- drivers/media/platform/nuvoton/npcm-video.c | 2 +- drivers/media/platform/nxp/imx7-media-csi.c | 7 +- drivers/media/platform/renesas/rcar_drif.c | 8 +- drivers/media/platform/st/sti/hva/hva-v4l2.c | 9 +- .../media/platform/ti/am437x/am437x-vpfe.c | 7 +- drivers/media/platform/ti/cal/cal-video.c | 5 +- .../media/platform/ti/davinci/vpif_capture.c | 5 +- .../media/platform/ti/davinci/vpif_display.c | 5 +- drivers/media/platform/ti/omap/omap_vout.c | 5 +- drivers/media/platform/verisilicon/hantro.h | 9 +- .../media/platform/verisilicon/hantro_drv.c | 5 +- .../media/platform/verisilicon/hantro_g2.c | 14 + .../platform/verisilicon/hantro_g2_hevc_dec.c | 18 +- .../platform/verisilicon/hantro_g2_vp9_dec.c | 28 +- .../media/platform/verisilicon/hantro_hw.h | 7 +- .../platform/verisilicon/hantro_postproc.c | 93 ++- .../media/platform/verisilicon/hantro_v4l2.c | 27 +- .../media/test-drivers/vicodec/vicodec-core.c | 3 + drivers/media/test-drivers/vim2m.c | 2 + .../media/test-drivers/vimc/vimc-capture.c | 2 + drivers/media/test-drivers/visl/visl-dec.c | 32 +- drivers/media/test-drivers/visl/visl-video.c | 2 + drivers/media/test-drivers/vivid/vivid-core.c | 14 + .../media/test-drivers/vivid/vivid-meta-cap.c | 3 - .../media/test-drivers/vivid/vivid-meta-out.c | 5 +- .../test-drivers/vivid/vivid-touch-cap.c | 5 +- .../media/test-drivers/vivid/vivid-vbi-cap.c | 5 +- .../media/test-drivers/vivid/vivid-vbi-out.c | 5 +- .../media/test-drivers/vivid/vivid-vid-cap.c | 5 +- .../media/test-drivers/vivid/vivid-vid-out.c | 5 +- drivers/media/usb/airspy/airspy.c | 9 +- drivers/media/usb/cx231xx/cx231xx-417.c | 4 +- drivers/media/usb/cx231xx/cx231xx-video.c | 4 +- drivers/media/usb/hackrf/hackrf.c | 9 +- drivers/media/usb/usbtv/usbtv-video.c | 3 +- drivers/media/v4l2-core/v4l2-dev.c | 1 + drivers/media/v4l2-core/v4l2-ioctl.c | 21 +- drivers/media/v4l2-core/v4l2-mem2mem.c | 20 + .../staging/media/atomisp/pci/atomisp_ioctl.c | 4 +- drivers/staging/media/imx/imx-media-capture.c | 7 +- drivers/staging/media/meson/vdec/vdec.c | 13 +- .../staging/media/sunxi/cedrus/cedrus_h264.c | 8 +- .../staging/media/sunxi/cedrus/cedrus_h265.c | 9 +- include/media/v4l2-ioctl.h | 4 + include/media/v4l2-mem2mem.h | 12 + include/media/videobuf2-core.h | 65 +- include/media/videobuf2-v4l2.h | 13 + include/uapi/linux/videodev2.h | 24 +- samples/v4l/v4l2-pci-skeleton.c | 5 +- 70 files changed, 966 insertions(+), 502 deletions(-) create mode 100644 Documentation/userspace-api/media/v4l/vidioc-delete-bufs.rst