| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <bdf227fa-c171-4bc7-a4c0-518afaec94d4@kernel.org>
Date: Mon, 16 Jun 2025 15:42:57 +0200
From: Hans de Goede <hansg@...nel.org>
To: Ricardo Ribalda <ribalda@...omium.org>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Hans Verkuil <hans@...erkuil.nl>, Mauro Carvalho Chehab <mchehab@...nel.org>
Cc: linux-media@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3 5/5] media: uvcvideo: Remove stream->is_streaming field
Hi Ricardo,
On 2-Jun-25 18:06, Ricardo Ribalda wrote:
> The is_streaming field is used by modular PM to know if the device is
> currently streaming or not.
>
> With the transition to vb2 and fop helpers, we can use vb2 functions for
> the same functionality. The great benefit is that vb2 already takes
> track of the streaming state for us.
>
> Signed-off-by: Ricardo Ribalda <ribalda@...omium.org>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hansg@...nel.org>
Regards,
Hans
> ---
> drivers/media/usb/uvc/uvc_queue.c | 9 +++++++
> drivers/media/usb/uvc/uvc_v4l2.c | 51 ++-------------------------------------
> drivers/media/usb/uvc/uvcvideo.h | 1 -
> 3 files changed, 11 insertions(+), 50 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
> index 3f357c2d48cfd258c26f0342007d1d12f1e01007..6e845705b3286348a60650eb262e620dc6039d60 100644
> --- a/drivers/media/usb/uvc/uvc_queue.c
> +++ b/drivers/media/usb/uvc/uvc_queue.c
> @@ -175,12 +175,18 @@ static int uvc_start_streaming_video(struct vb2_queue *vq, unsigned int count)
>
> lockdep_assert_irqs_enabled();
>
> + ret = uvc_pm_get(stream->dev);
> + if (ret)
> + return ret;
> +
> queue->buf_used = 0;
>
> ret = uvc_video_start_streaming(stream);
> if (ret == 0)
> return 0;
>
> + uvc_pm_put(stream->dev);
> +
> uvc_queue_return_buffers(queue, UVC_BUF_STATE_QUEUED);
>
> return ret;
> @@ -189,11 +195,14 @@ static int uvc_start_streaming_video(struct vb2_queue *vq, unsigned int count)
> static void uvc_stop_streaming_video(struct vb2_queue *vq)
> {
> struct uvc_video_queue *queue = vb2_get_drv_priv(vq);
> + struct uvc_streaming *stream = uvc_queue_to_stream(queue);
>
> lockdep_assert_irqs_enabled();
>
> uvc_video_stop_streaming(uvc_queue_to_stream(queue));
>
> + uvc_pm_put(stream->dev);
> +
> uvc_queue_return_buffers(queue, UVC_BUF_STATE_ERROR);
> }
>
> diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
> index 7a5ecbefa32c0a6b74c85d7f77a25b433598471e..d4bee0d4334b764c0cf02363b573b55fb44eb228 100644
> --- a/drivers/media/usb/uvc/uvc_v4l2.c
> +++ b/drivers/media/usb/uvc/uvc_v4l2.c
> @@ -617,9 +617,6 @@ static int uvc_v4l2_release(struct file *file)
>
> uvc_ctrl_cleanup_fh(handle);
>
> - if (handle->is_streaming)
> - uvc_pm_put(stream->dev);
> -
> /* Release the file handle. */
> vb2_fop_release(file);
> file->private_data = NULL;
> @@ -677,50 +674,6 @@ static int uvc_ioctl_try_fmt(struct file *file, void *fh,
> return uvc_v4l2_try_format(stream, fmt, &probe, NULL, NULL);
> }
>
> -static int uvc_ioctl_streamon(struct file *file, void *fh,
> - enum v4l2_buf_type type)
> -{
> - struct uvc_fh *handle = fh;
> - struct uvc_streaming *stream = handle->stream;
> - int ret;
> -
> - if (handle->is_streaming)
> - return 0;
> -
> - ret = uvc_pm_get(stream->dev);
> - if (ret)
> - return ret;
> -
> - ret = vb2_ioctl_streamon(file, fh, type);
> - if (ret) {
> - uvc_pm_put(stream->dev);
> - return ret;
> - }
> -
> - handle->is_streaming = true;
> -
> - return 0;
> -}
> -
> -static int uvc_ioctl_streamoff(struct file *file, void *fh,
> - enum v4l2_buf_type type)
> -{
> - struct uvc_fh *handle = fh;
> - struct uvc_streaming *stream = handle->stream;
> - int ret;
> -
> - ret = vb2_ioctl_streamoff(file, fh, type);
> - if (ret)
> - return ret;
> -
> - if (handle->is_streaming) {
> - handle->is_streaming = false;
> - uvc_pm_put(stream->dev);
> - }
> -
> - return 0;
> -}
> -
> static int uvc_ioctl_enum_input(struct file *file, void *fh,
> struct v4l2_input *input)
> {
> @@ -1323,8 +1276,8 @@ const struct v4l2_ioctl_ops uvc_ioctl_ops = {
> .vidioc_expbuf = vb2_ioctl_expbuf,
> .vidioc_dqbuf = vb2_ioctl_dqbuf,
> .vidioc_create_bufs = vb2_ioctl_create_bufs,
> - .vidioc_streamon = uvc_ioctl_streamon,
> - .vidioc_streamoff = uvc_ioctl_streamoff,
> + .vidioc_streamon = vb2_ioctl_streamon,
> + .vidioc_streamoff = vb2_ioctl_streamoff,
> .vidioc_enum_input = uvc_ioctl_enum_input,
> .vidioc_g_input = uvc_ioctl_g_input,
> .vidioc_s_input = uvc_ioctl_s_input,
> diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
> index 3ddbf065a2cbae40ee48cb06f84ca8f0052990c4..f895f690f7cdc1af942d5f3a5f10e9dd1c956a35 100644
> --- a/drivers/media/usb/uvc/uvcvideo.h
> +++ b/drivers/media/usb/uvc/uvcvideo.h
> @@ -626,7 +626,6 @@ struct uvc_fh {
> struct uvc_video_chain *chain;
> struct uvc_streaming *stream;
> unsigned int pending_async_ctrls;
> - bool is_streaming;
> };
>
> /* ------------------------------------------------------------------------
>
Powered by blists - more mailing lists