From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D27C2C433DB for ; Mon, 22 Mar 2021 07:19:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A67A161924 for ; Mon, 22 Mar 2021 07:19:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230071AbhCVHS7 (ORCPT ); Mon, 22 Mar 2021 03:18:59 -0400 Received: from lb1-smtp-cloud9.xs4all.net ([194.109.24.22]:54491 "EHLO lb1-smtp-cloud9.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229696AbhCVHSv (ORCPT ); Mon, 22 Mar 2021 03:18:51 -0400 Received: from cust-b5b5937f ([IPv6:fc0c:c16d:66b8:757f:c639:739b:9d66:799d]) by smtp-cloud9.xs4all.net with ESMTPA id OEpqldNkkGEYcOEptlWHRT; Mon, 22 Mar 2021 08:18:49 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s2; t=1616397529; bh=bexmQns4btTMW/eVicoq8Y3stX6XUh82RWqajqWg9ag=; h=Subject:To:From:Message-ID:Date:MIME-Version:Content-Type:From: Subject; b=slGQ916oig1OntUeXaSt26TtJwOc1lFVWdzf7ChNuGqu7+3i9Xv8Bf0ZXdp22Jz3D VY/KL8V7znF5i0Lvtixn3Nqrw9VZq3rTor9oYFGJKUoXmnuFI6vk/2P72bkyI5oZwF LQ3vSWmQhTrhLFafWxYILI4MS9DfMy8M86IqGq5glwOFmfLLG6LxlWXZHQqRh7Y5xQ EKCFVV65jaxfkvm/7UOyqsohzPPWH4DFMmNn1tV9qt1T+XH1jGHnpYfpBV1+OTsxYh GkR20/GWgHodVWGWRPJ+9GcRWq9cjX5HqLfOXL27XRWZZauLPuUQ7X7o8hypVG031p eb6vdA5EqzhLg== Subject: Re: [PATCH 7/8] videobuf2: handle V4L2_FLAG_MEMORY_NON_COHERENT flag To: Sergey Senozhatsky , Tomasz Figa Cc: Christoph Hellwig , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org References: <20210302004624.31294-1-senozhatsky@chromium.org> <20210302004624.31294-8-senozhatsky@chromium.org> From: Hans Verkuil Message-ID: <7910170e-f611-31e4-6bed-140e0929dc19@xs4all.nl> Date: Mon, 22 Mar 2021 08:18:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210302004624.31294-8-senozhatsky@chromium.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfMB7HeQfSmwoHqFlQ1SzCPu9KzzpSaWXNVkmkdIrsvmAAF1yTR6JjkK/xk202dh9Am/mjrwBTPKKgPkepoTj6Izd5Ex+xxJSURdxgZ/X7X9CYxbPm7ap xG3Ss1TctEB68P44n1wRRt+cOja2Bu5NNmCnxSqZ5dOJOJKAq73gdkn0eOwW2faFF9O7ed/zuXZz7O7TDcp+zqk7bmQI5rN0L8YMe3WtXat0GQTRspOMvwyw Sw1ilxIgWSu5iwpvxia0aCnt145vzDEbRT9zmRFoOqBWtMIdF8zLP/kgC7xrGma0prJkoVxLgZ5oyokRumlmnlPeEb0wn8jBNd/j/3UQuZOEHCk0HAEMEpoq waL1ZG/a Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 02/03/2021 01:46, Sergey Senozhatsky wrote: > This patch lets user-space to request a non-coherent memory > allocation during CREATE_BUFS and REQBUFS ioctl calls. > > = CREATE_BUFS > > struct v4l2_create_buffers has seven 4-byte reserved areas, > so reserved[0] is renamed to ->flags. The struct, thus, now > has six reserved 4-byte regions. > > = CREATE_BUFS32 > > struct v4l2_create_buffers32 has seven 4-byte reserved areas, > so reserved[0] is renamed to ->flags. The struct, thus, now > has six reserved 4-byte regions. > > = REQBUFS > > We use one bit of a ->reserved[1] member of struct v4l2_requestbuffers, > which is now renamed to ->flags. Unlike v4l2_create_buffers, struct > v4l2_requestbuffers does not have enough reserved room. Therefore for > backward compatibility ->reserved and ->flags were put into anonymous > union. > > Signed-off-by: Sergey Senozhatsky > --- > .../media/v4l/vidioc-create-bufs.rst | 7 ++++++- > .../media/v4l/vidioc-reqbufs.rst | 11 +++++++++-- > .../media/common/videobuf2/videobuf2-core.c | 6 ++++++ > .../media/common/videobuf2/videobuf2-v4l2.c | 19 ++++++++++++++++--- > drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 9 ++++++++- > drivers/media/v4l2-core/v4l2-ioctl.c | 5 +---- > include/uapi/linux/videodev2.h | 11 +++++++++-- > 7 files changed, 55 insertions(+), 13 deletions(-) > > diff --git a/Documentation/userspace-api/media/v4l/vidioc-create-bufs.rst b/Documentation/userspace-api/media/v4l/vidioc-create-bufs.rst > index b06e5b528e11..132c8b612a94 100644 > --- a/Documentation/userspace-api/media/v4l/vidioc-create-bufs.rst > +++ b/Documentation/userspace-api/media/v4l/vidioc-create-bufs.rst > @@ -113,7 +113,12 @@ than the number requested. > ``V4L2_MEMORY_MMAP`` and ``format.type`` to the buffer type. > > * - __u32 > - - ``reserved``\ [7] > + - ``flags`` > + - Specifies additional buffer management attributes. > + See :ref:`memory-flags`. > + > + * - __u32 > + - ``reserved``\ [6] > - A place holder for future extensions. Drivers and applications > must set the array to zero. > > diff --git a/Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst b/Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst > index 950e7ec1aac5..80ea48acea84 100644 > --- a/Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst > +++ b/Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst > @@ -104,10 +104,17 @@ aborting or finishing any DMA in progress, an implicit > ``V4L2_MEMORY_MMAP`` and ``type`` set to the buffer type. This will > free any previously allocated buffers, so this is typically something > that will be done at the start of the application. > + * - union { > + - (anonymous) > + * - __u32 > + - ``flags`` > + - Specifies additional buffer management attributes. > + See :ref:`memory-flags`. > * - __u32 > - ``reserved``\ [1] > - - A place holder for future extensions. Drivers and applications > - must set the array to zero. > + - Kept for backwards compatibility. Use ``flags`` instead. > + * - } > + - > > .. tabularcolumns:: |p{6.1cm}|p{2.2cm}|p{8.7cm}| > > diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c > index 7040b7f47133..5906a48e7757 100644 > --- a/drivers/media/common/videobuf2/videobuf2-core.c > +++ b/drivers/media/common/videobuf2/videobuf2-core.c > @@ -768,6 +768,9 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory, > unsigned int i; > int ret; > > + if (flags & V4L2_FLAG_MEMORY_NON_COHERENT) > + coherent_mem = false; > + I think it is better if this is done at the bool coherent_mem declaration: bool coherent_mem = !(flags & V4L2_FLAG_MEMORY_NON_COHERENT); > if (q->streaming) { > dprintk(q, 1, "streaming active\n"); > return -EBUSY; > @@ -911,6 +914,9 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory, > bool coherent_mem = true; > int ret; > > + if (flags & V4L2_FLAG_MEMORY_NON_COHERENT) > + coherent_mem = false; > + Ditto. Regards, Hans > if (q->num_buffers == VB2_MAX_FRAME) { > dprintk(q, 1, "maximum number of buffers already allocated\n"); > return -ENOBUFS; > diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c > index 1166d5a9291a..f6a8dcc1b5c6 100644 > --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c > +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c > @@ -692,12 +692,22 @@ static void fill_buf_caps(struct vb2_queue *q, u32 *caps) > #endif > } > > +static void validate_coherency_flags(struct vb2_queue *q, > + int memory, > + unsigned int *flags) > +{ > + if (!q->allow_cache_hints || memory != V4L2_MEMORY_MMAP) > + *flags &= ~V4L2_FLAG_MEMORY_NON_COHERENT; > +} > + > int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req) > { > int ret = vb2_verify_memory_type(q, req->memory, req->type); > > fill_buf_caps(q, &req->capabilities); > - return ret ? ret : vb2_core_reqbufs(q, req->memory, 0, &req->count); > + validate_coherency_flags(q, req->memory, &req->flags); > + return ret ? ret : vb2_core_reqbufs(q, req->memory, > + req->flags, &req->count); > } > EXPORT_SYMBOL_GPL(vb2_reqbufs); > > @@ -729,6 +739,7 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create) > unsigned i; > > fill_buf_caps(q, &create->capabilities); > + validate_coherency_flags(q, create->memory, &create->flags); > create->index = q->num_buffers; > if (create->count == 0) > return ret != -EBUSY ? ret : 0; > @@ -772,7 +783,7 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create) > if (requested_sizes[i] == 0) > return -EINVAL; > return ret ? ret : vb2_core_create_bufs(q, create->memory, > - 0, > + create->flags, > &create->count, > requested_planes, > requested_sizes); > @@ -957,11 +968,12 @@ int vb2_ioctl_reqbufs(struct file *file, void *priv, > int res = vb2_verify_memory_type(vdev->queue, p->memory, p->type); > > fill_buf_caps(vdev->queue, &p->capabilities); > + validate_coherency_flags(vdev->queue, p->memory, &p->flags); > if (res) > return res; > if (vb2_queue_is_busy(vdev, file)) > return -EBUSY; > - res = vb2_core_reqbufs(vdev->queue, p->memory, 0, &p->count); > + res = vb2_core_reqbufs(vdev->queue, p->memory, p->flags, &p->count); > /* If count == 0, then the owner has released all buffers and he > is no longer owner of the queue. Otherwise we have a new owner. */ > if (res == 0) > @@ -979,6 +991,7 @@ int vb2_ioctl_create_bufs(struct file *file, void *priv, > > p->index = vdev->queue->num_buffers; > fill_buf_caps(vdev->queue, &p->capabilities); > + validate_coherency_flags(vdev->queue, p->memory, &p->flags); > /* > * If count == 0, then just check if memory and type are valid. > * Any -EBUSY result from vb2_verify_memory_type can be mapped to 0. > diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c > index 0ca75f6784c5..1aa9ca3b6ca4 100644 > --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c > +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c > @@ -126,6 +126,9 @@ struct v4l2_format32 { > * @memory: buffer memory type > * @format: frame format, for which buffers are requested > * @capabilities: capabilities of this buffer type. > + * @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). > * @reserved: future extensions > */ > struct v4l2_create_buffers32 { > @@ -134,7 +137,8 @@ struct v4l2_create_buffers32 { > __u32 memory; /* enum v4l2_memory */ > struct v4l2_format32 format; > __u32 capabilities; > - __u32 reserved[7]; > + __u32 flags; > + __u32 reserved[6]; > }; > > static int get_v4l2_format32(struct v4l2_format *p64, > @@ -182,6 +186,8 @@ static int get_v4l2_create32(struct v4l2_create_buffers *p64, > if (copy_from_user(p64, p32, > offsetof(struct v4l2_create_buffers32, format))) > return -EFAULT; > + if (copy_from_user(&p64->flags, &p32->flags, sizeof(p32->flags))) > + return -EFAULT; > return get_v4l2_format32(&p64->format, &p32->format); > } > > @@ -227,6 +233,7 @@ static int put_v4l2_create32(struct v4l2_create_buffers *p64, > if (copy_to_user(p32, p64, > offsetof(struct v4l2_create_buffers32, format)) || > put_user(p64->capabilities, &p32->capabilities) || > + put_user(p64->flags, &p32->flags) || > copy_to_user(p32->reserved, p64->reserved, sizeof(p64->reserved))) > return -EFAULT; > return put_v4l2_format32(&p64->format, &p32->format); > diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c > index 31d1342e61e8..f8d38a3cd1e0 100644 > --- a/drivers/media/v4l2-core/v4l2-ioctl.c > +++ b/drivers/media/v4l2-core/v4l2-ioctl.c > @@ -2045,9 +2045,6 @@ static int v4l_reqbufs(const struct v4l2_ioctl_ops *ops, > > if (ret) > return ret; > - > - CLEAR_AFTER_FIELD(p, capabilities); > - > return ops->vidioc_reqbufs(file, fh, p); > } > > @@ -2087,7 +2084,7 @@ static int v4l_create_bufs(const struct v4l2_ioctl_ops *ops, > if (ret) > return ret; > > - CLEAR_AFTER_FIELD(create, capabilities); > + CLEAR_AFTER_FIELD(create, flags); > > v4l_sanitize_format(&create->format); > > diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h > index b1d4171fe50b..85d2681e73b6 100644 > --- a/include/uapi/linux/videodev2.h > +++ b/include/uapi/linux/videodev2.h > @@ -951,7 +951,10 @@ struct v4l2_requestbuffers { > __u32 type; /* enum v4l2_buf_type */ > __u32 memory; /* enum v4l2_memory */ > __u32 capabilities; > - __u32 reserved[1]; > + union { > + __u32 flags; > + __u32 reserved[1]; > + }; > }; > > #define V4L2_FLAG_MEMORY_NON_COHERENT (1 << 0) > @@ -2473,6 +2476,9 @@ struct v4l2_dbg_chip_info { > * @memory: enum v4l2_memory; buffer memory type > * @format: frame format, for which buffers are requested > * @capabilities: capabilities of this buffer type. > + * @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). > * @reserved: future extensions > */ > struct v4l2_create_buffers { > @@ -2481,7 +2487,8 @@ struct v4l2_create_buffers { > __u32 memory; > struct v4l2_format format; > __u32 capabilities; > - __u32 reserved[7]; > + __u32 flags; > + __u32 reserved[6]; > }; > > /* >