From nobody Mon Oct 6 20:57:11 2025 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 092F7263F5E for ; Thu, 17 Jul 2025 07:56:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752739011; cv=none; b=OZFK78fuDayQHQEEmK283f3dfGjvxQLGcwUcIc/OoyjAGZ/UAFgEsG/UuD65gtrwcqKW3DH8t/f8NZqF9vsmncJVTi0JlCSVw82Y4P8iBtw2cEQMF1rB9mVQwxG8GDXCfLuncJE6Pw+Y3FafQPHEaqb+MwduQmQkAX4lyl7mtiE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752739011; c=relaxed/simple; bh=ivftYy165sS8mvKEBHuADgPv+nDQA+lt7mqET/+JXhE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=XwOFbGkBMhAReZvYnZSPN8H41j2cqgNGDGSya0KHmT7ufEA7xj6gMZvIrFsQVRrI1MUbrrfyGYQQHwyW7WMbKJLM+xiW0JsMo9qUIcSSJfNFL33cyLQYU0gE+HjjDp0XF5ysqgRzSbFg4tH82YRzv2Yn9VvEiEReJQ7nrwCdobk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=JUcH0Xdw; arc=none smtp.client-ip=209.85.208.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="JUcH0Xdw" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-32f1aaf0d60so6672651fa.1 for ; Thu, 17 Jul 2025 00:56:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1752739007; x=1753343807; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=TPNshWzmBQZhfeU9vekXY/PZSb0CpR11Ox+v95g7FJI=; b=JUcH0XdwyQlS0QoypOAQuPedy39cfqBLgOljsVdo6nooTWfgBoLmJKgzSIti12uBuD 3wTY29xN85UD3whrVKFoxnGRb5aViL4pYAxtZC5T5tPEWxZ3WTu9reAlDKbm4VR95dCX tju2DdPYWdfiCGG9o0DTLcqR5/JFBG4pdPmrY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752739007; x=1753343807; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TPNshWzmBQZhfeU9vekXY/PZSb0CpR11Ox+v95g7FJI=; b=o8AxKb+FGlfLNpATad+fiwBO6pBNEOt+i3Af9exFmMQasRm3y6BU3jThzAVbrY5Z/F tw92bEfyLrYPW3WndhADnYyIvLeFD7By8iGX7HRtx8954+kvNoM5aN/rXB8NjS2qy5ky Ha0kV8Pa42KbsqNy2XPvn1KHNTGkLM5LTdEebH/UKOBdQBTmwi8IHv4UzH64ju2WZi4y 9pw8zhJMNUeRioh4wZom3+ke3XqdL3GO/2Vjmoke0XMXad8GMrL0dq+lP6yyad521hZc T/2RKuNQc+8f33uHvVOR826x26wrDDbd422DfiH+O+Li4IY38Rtdby8v/QLqm/ueml4S xQIg== X-Forwarded-Encrypted: i=1; AJvYcCXVz9M7f7QxvT93G9bggjDWtVOX7lVPGOX+lrJXZVBdLZGsaRc/mkjdFlBmPn4K89VMeu4h6tryMmqiHng=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0S5LOixjgWqiynLtwIxAMuQfQQH4uGwpiDmvx2ilhcQLwYk4N nC/ljPS+IBE3vMqMo6cGNrZSdZu0AFybMGvgkqasvqEpTpFqSoTlViWGlObR/mhOXC9JxsGBtE3 H7JatYg== X-Gm-Gg: ASbGnctojT8gFMcfYy4zBOYyYVYYPQSkR01fU1npt7Z0VuKROjYxlkYC5+5piuwoP9A A/llOnu9Foroh8v25PSg3SzXmR1RBCXuWfBGPa6bAuXeDmtMTYOaVa4Q2LhEnPAKYJqQuqJjQVC Bg1ZtufKZ0FSVgXf93Ic1uaWey6+qrYM94iz2Limz4y6j3OP94UEWFQzl+d6VfdskzHW41ipFgX 75695/9D7/QpQ5yXf7x7L8yajW8D83MZ5JJeL2lSc9rc0/+wS6DAYaRdqAFmnp4S8n1hyMsDVrd tLn7q2xWUHiSaR0p4VDQh4rFtn0eETZz1Dxn96/IKUdwTjbbe32iRuMpHl6cEF4TZCB9qGGMq/z ifICJ/KcZqfUb5G7aRYk8zHVH1cQdgF+O8X7OfLinbMbWi46BTgxwSb753RvTxkbYOgooLo7O2r hdSg== X-Google-Smtp-Source: AGHT+IG06381e/XP3pvYOmH/KQ/Oit/WV10yQDnuk2mTQyO3rjInyzCk9SnbTz/7ZYm0a3ZsMWLAiw== X-Received: by 2002:a05:6512:3f25:b0:553:2dce:3aad with SMTP id 2adb3069b0e04-55a2958fc26mr503739e87.7.1752739006659; Thu, 17 Jul 2025 00:56:46 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5593c7bbb21sm2946272e87.31.2025.07.17.00.56.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 00:56:46 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 17 Jul 2025 07:56:45 +0000 Subject: [PATCH] media: uvcvideo: Drop stream->mutex Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250717-uvc-onelocksless-v1-1-91a1b834186a@chromium.org> X-B4-Tracking: v=1; b=H4sIALyseGgC/x3MTQqAIBBA4avIrBM00H6uEi3KphoSDYckiO6et PwW7z3AmAgZevFAwkxMMRToSoDbp7ChpKUYalUb1Wgrr+xkDOijO9gjs5yttaZFpde2g5KdCVe 6/+Uwvu8HbzXi5mIAAAA= X-Change-ID: 20250716-uvc-onelocksless-b66658e01f89 To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 Since commit c93d73c9c2cf ("media: uvcvideo: Use vb2 ioctl and fop helpers"), the IOCTLs are serialized. Due to this there is no more need to protect ctrl, cur_format or cur_frame from concurrent access. Drop stream->mutex after thanking it for years of good service. Use this opportunity to do fix some CodeStyle. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 4 ---- drivers/media/usb/uvc/uvc_metadata.c | 8 ++------ drivers/media/usb/uvc/uvc_v4l2.c | 39 ++++++++------------------------= ---- drivers/media/usb/uvc/uvcvideo.h | 6 ------ 4 files changed, 10 insertions(+), 47 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index 775bede0d93d9b3e5391914aa395326d3de6a3b1..3039e6a533b82dd917050d416c9= ced8756d69170 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -183,8 +183,6 @@ static void uvc_stream_delete(struct uvc_streaming *str= eam) if (stream->async_wq) destroy_workqueue(stream->async_wq); =20 - mutex_destroy(&stream->mutex); - usb_put_intf(stream->intf); =20 kfree(stream->formats); @@ -201,8 +199,6 @@ static struct uvc_streaming *uvc_stream_new(struct uvc_= device *dev, if (stream =3D=3D NULL) return NULL; =20 - mutex_init(&stream->mutex); - stream->dev =3D dev; stream->intf =3D usb_get_intf(intf); stream->intfnum =3D intf->cur_altsetting->desc.bInterfaceNumber; diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/u= vc_metadata.c index 229e08ff323eed9129d835b24ea2e8085bb713b8..d1d4fade634bd3f8b12bbaa7538= 8db42aecc25ea 100644 --- a/drivers/media/usb/uvc/uvc_metadata.c +++ b/drivers/media/usb/uvc/uvc_metadata.c @@ -100,14 +100,10 @@ static int uvc_meta_v4l2_set_format(struct file *file= , void *fh, * Metadata buffers would still be perfectly parseable, but it's more * consistent and cleaner to disallow that. */ - mutex_lock(&stream->mutex); - if (vb2_is_busy(&stream->meta.queue.queue)) - ret =3D -EBUSY; - else - stream->meta.format =3D fmt->dataformat; + return -EBUSY; =20 - mutex_unlock(&stream->mutex); + stream->meta.format =3D fmt->dataformat; =20 return ret; } diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v= 4l2.c index 160f9cf6e6dbdbf39e3eff56a5d5ea1d977fbe22..d7be4d59f0c73b983aa01321f4a= cc8f8bf6e83ef 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -329,14 +329,12 @@ static int uvc_v4l2_try_format(struct uvc_streaming *= stream, * developers test their webcams with the Linux driver as well as with * the Windows driver). */ - mutex_lock(&stream->mutex); if (stream->dev->quirks & UVC_QUIRK_PROBE_EXTRAFIELDS) probe->dwMaxVideoFrameSize =3D stream->ctrl.dwMaxVideoFrameSize; =20 /* Probe the device. */ ret =3D uvc_probe_video(stream, probe); - mutex_unlock(&stream->mutex); if (ret < 0) return ret; =20 @@ -395,19 +393,15 @@ static int uvc_ioctl_g_fmt(struct file *file, void *f= h, struct uvc_streaming *stream =3D handle->stream; const struct uvc_format *format; const struct uvc_frame *frame; - int ret =3D 0; =20 if (fmt->type !=3D stream->type) return -EINVAL; =20 - mutex_lock(&stream->mutex); format =3D stream->cur_format; frame =3D stream->cur_frame; =20 - if (format =3D=3D NULL || frame =3D=3D NULL) { - ret =3D -EINVAL; - goto done; - } + if (!format || !frame) + return -EINVAL; =20 fmt->fmt.pix.pixelformat =3D format->fcc; fmt->fmt.pix.width =3D frame->wWidth; @@ -419,9 +413,7 @@ static int uvc_ioctl_g_fmt(struct file *file, void *fh, fmt->fmt.pix.xfer_func =3D format->xfer_func; fmt->fmt.pix.ycbcr_enc =3D format->ycbcr_enc; =20 -done: - mutex_unlock(&stream->mutex); - return ret; + return 0; } =20 static int uvc_ioctl_s_fmt(struct file *file, void *fh, @@ -441,19 +433,14 @@ static int uvc_ioctl_s_fmt(struct file *file, void *f= h, if (ret < 0) return ret; =20 - mutex_lock(&stream->mutex); - if (vb2_is_busy(&stream->queue.queue)) { - ret =3D -EBUSY; - goto done; - } + if (vb2_is_busy(&stream->queue.queue)) + return -EBUSY; =20 stream->ctrl =3D probe; stream->cur_format =3D format; stream->cur_frame =3D frame; =20 -done: - mutex_unlock(&stream->mutex); - return ret; + return 0; } =20 static int uvc_ioctl_g_parm(struct file *file, void *fh, @@ -466,9 +453,7 @@ static int uvc_ioctl_g_parm(struct file *file, void *fh, if (parm->type !=3D stream->type) return -EINVAL; =20 - mutex_lock(&stream->mutex); numerator =3D stream->ctrl.dwFrameInterval; - mutex_unlock(&stream->mutex); =20 denominator =3D 10000000; v4l2_simplify_fraction(&numerator, &denominator, 8, 333); @@ -519,12 +504,9 @@ static int uvc_ioctl_s_parm(struct file *file, void *f= h, uvc_dbg(stream->dev, FORMAT, "Setting frame interval to %u/%u (%u)\n", timeperframe.numerator, timeperframe.denominator, interval); =20 - mutex_lock(&stream->mutex); =20 - if (uvc_queue_streaming(&stream->queue)) { - mutex_unlock(&stream->mutex); + if (uvc_queue_streaming(&stream->queue)) return -EBUSY; - } =20 format =3D stream->cur_format; frame =3D stream->cur_frame; @@ -556,14 +538,11 @@ static int uvc_ioctl_s_parm(struct file *file, void *= fh, =20 /* Probe the device with the new settings. */ ret =3D uvc_probe_video(stream, &probe); - if (ret < 0) { - mutex_unlock(&stream->mutex); + if (ret < 0) return ret; - } =20 stream->ctrl =3D probe; stream->cur_frame =3D frame; - mutex_unlock(&stream->mutex); =20 /* Return the actual frame period. */ timeperframe.numerator =3D probe.dwFrameInterval; @@ -941,10 +920,8 @@ static int uvc_ioctl_g_selection(struct file *file, vo= id *fh, =20 sel->r.left =3D 0; sel->r.top =3D 0; - mutex_lock(&stream->mutex); sel->r.width =3D stream->cur_frame->wWidth; sel->r.height =3D stream->cur_frame->wHeight; - mutex_unlock(&stream->mutex); =20 return 0; } diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 757254fc4fe930ae61c9d0425f04d4cd074a617e..86765b9d7935f0888476249c3fb= 826cd7f36b35c 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -469,12 +469,6 @@ struct uvc_streaming { const struct uvc_format *cur_format; const struct uvc_frame *cur_frame; =20 - /* - * Protect access to ctrl, cur_format, cur_frame and hardware video - * probe control. - */ - struct mutex mutex; - /* Buffers queue. */ unsigned int frozen : 1; struct uvc_video_queue queue; --- base-commit: d968e50b5c26642754492dea23cbd3592bde62d8 change-id: 20250716-uvc-onelocksless-b66658e01f89 Best regards, --=20 Ricardo Ribalda