From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from lb2-smtp-cloud8.xs4all.net ([194.109.24.25]:48056 "EHLO lb2-smtp-cloud8.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728530AbeKSWqP (ORCPT ); Mon, 19 Nov 2018 17:46:15 -0500 Subject: [PATCHv2.1 2/4] vivid: use per-queue mutexes instead of one global mutex. To: linux-media@vger.kernel.org Cc: Tomasz Figa , Marek Szyprowski , Sakari Ailus References: <20181119110903.24383-1-hverkuil@xs4all.nl> <20181119110903.24383-3-hverkuil@xs4all.nl> From: Hans Verkuil Message-ID: Date: Mon, 19 Nov 2018 13:22:44 +0100 MIME-Version: 1.0 In-Reply-To: <20181119110903.24383-3-hverkuil@xs4all.nl> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: >>From d15ccd98e557a8cef1362cb591eb3011a6d8e1fd Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 16 Nov 2018 12:14:31 +0100 Subject: [PATCH 2/4] vivid: use per-queue mutexes instead of one global mutex. This avoids having to unlock the queue lock in stop_streaming. Signed-off-by: Hans Verkuil Reported-by: syzbot+736c3aae4af7b50d9683@syzkaller.appspotmail.com --- Changes since v2: - add mutex_destroy() --- drivers/media/platform/vivid/vivid-core.c | 26 +++++++++++++++---- drivers/media/platform/vivid/vivid-core.h | 5 ++++ .../media/platform/vivid/vivid-kthread-cap.c | 2 -- .../media/platform/vivid/vivid-kthread-out.c | 2 -- drivers/media/platform/vivid/vivid-sdr-cap.c | 2 -- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c index 626e2b24a403..9a548eea75cd 100644 --- a/drivers/media/platform/vivid/vivid-core.c +++ b/drivers/media/platform/vivid/vivid-core.c @@ -624,6 +624,17 @@ static void vivid_dev_release(struct v4l2_device *v4l2_dev) vfree(dev->bitmap_out); tpg_free(&dev->tpg); kfree(dev->query_dv_timings_qmenu); + if (dev->has_vid_cap) + mutex_destroy(&dev->vb_vid_cap_q_lock); + if (dev->has_vid_out) + mutex_destroy(&dev->vb_vid_out_q_lock); + if (dev->has_vbi_cap) + mutex_destroy(&dev->vb_vbi_cap_q_lock); + if (dev->has_vbi_out) + mutex_destroy(&dev->vb_vbi_out_q_lock); + if (dev->has_sdr_cap) + mutex_destroy(&dev->vb_sdr_cap_q_lock); + mutex_destroy(&dev->mutex); kfree(dev); } @@ -1075,7 +1086,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) q->mem_ops = vivid_mem_ops[allocator]; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->min_buffers_needed = 2; - q->lock = &dev->mutex; + mutex_init(&dev->vb_vid_cap_q_lock); + q->lock = &dev->vb_vid_cap_q_lock; q->dev = dev->v4l2_dev.dev; q->supports_requests = true; @@ -1096,7 +1108,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) q->mem_ops = vivid_mem_ops[allocator]; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->min_buffers_needed = 2; - q->lock = &dev->mutex; + mutex_init(&dev->vb_vid_out_q_lock); + q->lock = &dev->vb_vid_out_q_lock; q->dev = dev->v4l2_dev.dev; q->supports_requests = true; @@ -1117,7 +1130,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) q->mem_ops = vivid_mem_ops[allocator]; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->min_buffers_needed = 2; - q->lock = &dev->mutex; + mutex_init(&dev->vb_vbi_cap_q_lock); + q->lock = &dev->vb_vbi_cap_q_lock; q->dev = dev->v4l2_dev.dev; q->supports_requests = true; @@ -1138,7 +1152,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) q->mem_ops = vivid_mem_ops[allocator]; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->min_buffers_needed = 2; - q->lock = &dev->mutex; + mutex_init(&dev->vb_vbi_out_q_lock); + q->lock = &dev->vb_vbi_out_q_lock; q->dev = dev->v4l2_dev.dev; q->supports_requests = true; @@ -1158,7 +1173,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) q->mem_ops = vivid_mem_ops[allocator]; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->min_buffers_needed = 8; - q->lock = &dev->mutex; + mutex_init(&dev->vb_sdr_cap_q_lock); + q->lock = &dev->vb_sdr_cap_q_lock; q->dev = dev->v4l2_dev.dev; q->supports_requests = true; diff --git a/drivers/media/platform/vivid/vivid-core.h b/drivers/media/platform/vivid/vivid-core.h index 1891254c8f0b..337ccb563f9b 100644 --- a/drivers/media/platform/vivid/vivid-core.h +++ b/drivers/media/platform/vivid/vivid-core.h @@ -385,8 +385,10 @@ struct vivid_dev { struct v4l2_rect compose_cap; struct v4l2_rect crop_bounds_cap; struct vb2_queue vb_vid_cap_q; + struct mutex vb_vid_cap_q_lock; struct list_head vid_cap_active; struct vb2_queue vb_vbi_cap_q; + struct mutex vb_vbi_cap_q_lock; struct list_head vbi_cap_active; /* thread for generating video capture stream */ @@ -413,8 +415,10 @@ struct vivid_dev { struct v4l2_rect compose_out; struct v4l2_rect compose_bounds_out; struct vb2_queue vb_vid_out_q; + struct mutex vb_vid_out_q_lock; struct list_head vid_out_active; struct vb2_queue vb_vbi_out_q; + struct mutex vb_vbi_out_q_lock; struct list_head vbi_out_active; /* video loop precalculated rectangles */ @@ -459,6 +463,7 @@ struct vivid_dev { /* SDR capture */ struct vb2_queue vb_sdr_cap_q; + struct mutex vb_sdr_cap_q_lock; struct list_head sdr_cap_active; u32 sdr_pixelformat; /* v4l2 format id */ unsigned sdr_buffersize; diff --git a/drivers/media/platform/vivid/vivid-kthread-cap.c b/drivers/media/platform/vivid/vivid-kthread-cap.c index eebfff2126be..d8bb59e9bcc7 100644 --- a/drivers/media/platform/vivid/vivid-kthread-cap.c +++ b/drivers/media/platform/vivid/vivid-kthread-cap.c @@ -927,8 +927,6 @@ void vivid_stop_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming) /* shutdown control thread */ vivid_grab_controls(dev, false); - mutex_unlock(&dev->mutex); kthread_stop(dev->kthread_vid_cap); dev->kthread_vid_cap = NULL; - mutex_lock(&dev->mutex); } diff --git a/drivers/media/platform/vivid/vivid-kthread-out.c b/drivers/media/platform/vivid/vivid-kthread-out.c index 5a14810eeb69..8b864cb0ed52 100644 --- a/drivers/media/platform/vivid/vivid-kthread-out.c +++ b/drivers/media/platform/vivid/vivid-kthread-out.c @@ -298,8 +298,6 @@ void vivid_stop_generating_vid_out(struct vivid_dev *dev, bool *pstreaming) /* shutdown control thread */ vivid_grab_controls(dev, false); - mutex_unlock(&dev->mutex); kthread_stop(dev->kthread_vid_out); dev->kthread_vid_out = NULL; - mutex_lock(&dev->mutex); } diff --git a/drivers/media/platform/vivid/vivid-sdr-cap.c b/drivers/media/platform/vivid/vivid-sdr-cap.c index dcdc80e272c2..5dfb598af742 100644 --- a/drivers/media/platform/vivid/vivid-sdr-cap.c +++ b/drivers/media/platform/vivid/vivid-sdr-cap.c @@ -305,10 +305,8 @@ static void sdr_cap_stop_streaming(struct vb2_queue *vq) } /* shutdown control thread */ - mutex_unlock(&dev->mutex); kthread_stop(dev->kthread_sdr_cap); dev->kthread_sdr_cap = NULL; - mutex_lock(&dev->mutex); } static void sdr_cap_buf_request_complete(struct vb2_buffer *vb) -- 2.19.1