From patchwork Fri May 9 18:24:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 888959 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 56E4423D281 for ; Fri, 9 May 2025 18:24:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746815059; cv=none; b=XqnVFUxUvaXwqArOMQ6f451fXx3uA62dW9dtnXgOJI2BKhifLdsQejEvR1ZGqG1VMKVt2gNUeAk71Pcm/QmnG7ACofCvBYcu0YjDPDOweGJz7J8hZ4w/rNJM6NScxDGPKfLK4SZJOMT7oQAY1lh9AGLSsdlWAPtik7OgHvmxZbs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746815059; c=relaxed/simple; bh=zFV4u4xYrdJXQYQST/NOy93iVerYdoMEvRx9i5izrDc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=l1B5dGu4bt26BjTjCFGBoRZ8aX6jmIXAliOG70xUhuCWuF498S/65f1Lka64zMzGlaIh5sDE4lUNg5QiKk4zPK/nNBgYfx5OELp7q2FJYR+Ld4mPG7iUxt1gDCRl164jAaMlOGTmSE29RvvbNxd+XhpkcA9QA/FvMoPDQ2klUl4= 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=Kz93+UpO; arc=none smtp.client-ip=209.85.167.54 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="Kz93+UpO" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5499d2134e8so3053863e87.0 for ; Fri, 09 May 2025 11:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1746815054; x=1747419854; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Yi5XaVNppgwZ+7IG1Lz4V8UPUgu4s/f0SGWRQuuh7uw=; b=Kz93+UpOIxMebqw9iGgAs3Sdq2rhRiybIwuuUew88UCNr5zOFaNTJj73KzLLN0IN1D GJL8WUbMDlwmexHov5u0lXN5ReoDYLB/Xi36I5O7QSDoxUnB8eHWuOJWuj1BxNvmLZWE uSYQJYz5l2yDpdQ9buE+fCupqZY4j2lTD3BCY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746815054; x=1747419854; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Yi5XaVNppgwZ+7IG1Lz4V8UPUgu4s/f0SGWRQuuh7uw=; b=wZyI6E1EsSBNinmsC7xYGY1O8kyy2roiB2Q8OmQn9VwkjgJad9aOI6+CWvAXZKijEv fDi0MQ8zlunFjez2VBWuUXtLIDgbhH0wf1Xb8Jy9+9nv/8fQ5r3WFlHHRO6kY5VwaQZ9 g7Lrwd98LjvwKBpmrIjC23IIBI30JMz6pXWhwKP3jiKFbz6VflTZg5M0ID5qvqEfw5BB 33bSdnJ0oQJwhIldiTfNWTF067ooXoBMlg6UyLMoUvoN8lxVBMpFB/2pQJXk/PbxmZ62 CdagxlamUMlqlqtS/cuSXSvH/lKaQ+1MfjUX9rHWoRHSQY6BQiR7wWX9YXFkOUHKG+Fk VzxA== X-Gm-Message-State: AOJu0YxTZns7nyofkmBAlfI8Wky9EPkaWHk5fltwc4Sn9WDwGPqoVaGy kVTO+2kUqkX2HwGPlnjR2HSNE7t2ygX1voJ5f4zL4xL6XmQWNJAJOmX4AmpYQGSJFz+UYJa7Ybc = X-Gm-Gg: ASbGncuZNsLyLI2DSfVZ54Yw6WC4akwKzOJhKQhy2px8kg1ldSR4XZEPGFMoC4ALxUs qrMYkd+SFrA6dxuWYl5mSZyQMPeKPPO96xYJg0awnDLXzao+y7MFqKST007I2OSxOAxrLvonFi0 LLav9dV2WLrLJV6QAgBtYJUwsxO7PdcJmWQp6BYbiVB2AbTIvuSMGw7RwzGTdhwojE1chVqlYYp HOuMWYcG1YGGEcrboRPeWpVOvx68vr5YetK7mQGagq98JcU4iz1uPCH6/qyWnz00IHYGmh184aS /jbE9NYRBHOfGm79mWGZjnqcpH1PHmMUsRIyyoQfG9fco6AjldXPlemS0uNm2vPbKLOxAjPyBsp 1NJhj96sqsQPpug9yyh78H76++5LF+5Y= X-Google-Smtp-Source: AGHT+IHPOHJuwzRwwthAHfX0RVaD2nwsVxCj0w/t87pjwfGTdyTLGs9Grg4VR0ctezRgetwQoyhrqg== X-Received: by 2002:a05:6512:670b:b0:54e:9038:d835 with SMTP id 2adb3069b0e04-54fc67c4734mr1262503e87.20.1746815054485; Fri, 09 May 2025 11:24:14 -0700 (PDT) Received: from ribalda.c.googlers.com (228.231.88.34.bc.googleusercontent.com. [34.88.231.228]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54fc64b6bc9sm349410e87.147.2025.05.09.11.24.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 11:24:14 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 09 May 2025 18:24:13 +0000 Subject: [PATCH 1/4] media: uvcvideo: Refactor uvc_ctrl_set_handle() Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-uvc-followup-v1-1-73bcde30d2b5@chromium.org> References: <20250509-uvc-followup-v1-0-73bcde30d2b5@chromium.org> In-Reply-To: <20250509-uvc-followup-v1-0-73bcde30d2b5@chromium.org> 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 Today uvc_ctrl_set_handle() covers two use-uses: setting the handle and clearing the handle. The only common code between the two cases is the lockdep_assert_held. The code looks cleaner if we split these two usecases in two functions. We also take this opportunity to use pending_async_ctrls from ctrl where possible. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 65 +++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 44b6513c526421943bb9841fb53dc5f8e9f93f02..26be1d0a1891cf3a9a7489f60f9a2931c78d3239 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1812,48 +1812,53 @@ static void uvc_ctrl_send_slave_event(struct uvc_video_chain *chain, uvc_ctrl_send_event(chain, handle, ctrl, mapping, val, changes); } -static int uvc_ctrl_set_handle(struct uvc_fh *handle, struct uvc_control *ctrl, - struct uvc_fh *new_handle) +static int uvc_ctrl_set_handle(struct uvc_fh *handle, struct uvc_control *ctrl) { - lockdep_assert_held(&handle->chain->ctrl_mutex); - - if (new_handle) { - int ret; + int ret; - if (ctrl->handle) - dev_warn_ratelimited(&handle->stream->dev->udev->dev, - "UVC non compliance: Setting an async control with a pending operation."); + lockdep_assert_held(&handle->chain->ctrl_mutex); - if (new_handle == ctrl->handle) - return 0; + if (ctrl->handle) { + dev_warn_ratelimited(&handle->stream->dev->udev->dev, + "UVC non compliance: Setting an async control with a pending operation."); - if (ctrl->handle) { - WARN_ON(!ctrl->handle->pending_async_ctrls); - if (ctrl->handle->pending_async_ctrls) - ctrl->handle->pending_async_ctrls--; - ctrl->handle = new_handle; - handle->pending_async_ctrls++; + if (ctrl->handle == handle) return 0; - } - - ret = uvc_pm_get(handle->chain->dev); - if (ret) - return ret; - ctrl->handle = new_handle; - handle->pending_async_ctrls++; + WARN_ON(!ctrl->handle->pending_async_ctrls); + if (ctrl->handle->pending_async_ctrls) + ctrl->handle->pending_async_ctrls--; + ctrl->handle = handle; + ctrl->handle->pending_async_ctrls++; return 0; } + ret = uvc_pm_get(handle->chain->dev); + if (ret) + return ret; + + ctrl->handle = handle; + ctrl->handle->pending_async_ctrls++; + return 0; +} + +static int uvc_ctrl_clear_handle(struct uvc_fh *handle, + struct uvc_control *ctrl) +{ + lockdep_assert_held(&handle->chain->ctrl_mutex); + /* Cannot clear the handle for a control not owned by us.*/ if (WARN_ON(ctrl->handle != handle)) return -EINVAL; - ctrl->handle = NULL; - if (WARN_ON(!handle->pending_async_ctrls)) + if (WARN_ON(!ctrl->handle->pending_async_ctrls)) { + ctrl->handle = NULL; return -EINVAL; - handle->pending_async_ctrls--; + } + + ctrl->handle->pending_async_ctrls--; uvc_pm_put(handle->chain->dev); + ctrl->handle = NULL; return 0; } @@ -1871,7 +1876,7 @@ void uvc_ctrl_status_event(struct uvc_video_chain *chain, handle = ctrl->handle; if (handle) - uvc_ctrl_set_handle(handle, ctrl, NULL); + uvc_ctrl_clear_handle(handle, ctrl); list_for_each_entry(mapping, &ctrl->info.mappings, list) { s32 value; @@ -2161,7 +2166,7 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev, if (!rollback && handle && !ret && ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) - ret = uvc_ctrl_set_handle(handle, ctrl, handle); + ret = uvc_ctrl_set_handle(handle, ctrl); if (ret < 0 && !rollback) { if (err_ctrl) @@ -3271,7 +3276,7 @@ void uvc_ctrl_cleanup_fh(struct uvc_fh *handle) for (unsigned int i = 0; i < entity->ncontrols; ++i) { if (entity->controls[i].handle != handle) continue; - uvc_ctrl_set_handle(handle, &entity->controls[i], NULL); + uvc_ctrl_clear_handle(handle, &entity->controls[i]); } } From patchwork Fri May 9 18:24:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 888958 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 BA63023ED5A for ; Fri, 9 May 2025 18:24:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746815060; cv=none; b=mRfklkfx376K1cuFYfOFSjIs01VEShKgZORZ6W+D53I3kbQBwFxGL/7JNWu2yvkXJusRFhHQM4liEjYv6FlzLjU/bIJs8xthWdVg0FjpRnvBODiBIsfF0CYIWxb6nFul41i+Gd8i00Akh8iuBMwCO5ee6PwGrN8thU3Bg3cBjag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746815060; c=relaxed/simple; bh=ejqJ/gJ8wJ7SrRsxrwHX2ivbzatZEKONS8zjnjdr7Dw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Zxh2tvRlyesb/Xxq4kKf9Bz9Rq8qUAfuQLXClJlkrYz08x5PG1y7ijafSMvTZMiteEQwz6opMJG3+bRz1WvbjYbIuQnoWOHki58cuB864tqVZYrzpxGt0uLdbluVWb/d63YkkRzJR0sZB/hO5zLotetLJ36HaP0hbnTqBvH9y+w= 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=ZybcUMqd; arc=none smtp.client-ip=209.85.167.41 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="ZybcUMqd" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-54b1095625dso2755567e87.0 for ; Fri, 09 May 2025 11:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1746815056; x=1747419856; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dSG2c/BzhlxE+34h/Hi5JjSdjHGQxrAR1NJF6hxkTe4=; b=ZybcUMqd7iC0yTCtFQkcC/kiG1bJtzfLbHYbDEoiS13St8idSB5fuGB1rm52qlsnqZ 7Rgftleong3+lvy26MkUgr/wsLrutP5lNie0Zfq49EsMGZnDJz/B1GyI9IYb+5b9IddP aYwEp9e+9Pr5no5gzTiKJr2eWS0Np2PLOrui8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746815056; x=1747419856; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dSG2c/BzhlxE+34h/Hi5JjSdjHGQxrAR1NJF6hxkTe4=; b=ntKAaiwrx+UyNzwoS10t1jbSGeH8tw1U2DPxLwjrJs/gqhd5YnuXYOZBLCxXfbwVgo gq+un1ct3yEvaFhq6uwIEulUZnzpz8vgMrJ03QumKePJCX0LNusvh8YglwVx+apNzMCi nGzD4Psq12Osd2sDV/CRrTzz1eIMdJRJFqyvG8S5s3Zm8WGC6Mm5MamUQm4hbGbY6pcD hdIk/2XOEWD7JKxteGVza95Gi6E30ufPnPCSFt9TdLylK7sQI4ZKJahFYrO8a1J8qVej GMYvXqNqqk1cNJvLx3Hz4yoipCEq/y6AIfywjU9rKEUQKKgdn8w9G1eLiIeH1KzGzF1d O9EA== X-Gm-Message-State: AOJu0Yz7G3zuAaY+fX04TSL2xvGotNbp5RhAAYCnxR0KGA6xt8U2HAXb SrMy/LAk5WpoooBjmwbSK8bc+nrlT/sgeZynEo9vi7P1148WadxTvGmTpjOZzxy1+zL1fk7IM1E = X-Gm-Gg: ASbGncu3STHGjut8Y55OAu5ixdeY7f+GSQA5TH0BfA+qCQGyerv5UE8E3VSa45ZFrU5 WZAf5Sb1TyZ/gN6RJ64Lovpaj5gfVnTuj0FPT4Cgnb1kIvajUHp5xRJYPKESQcWENn8zTeXoy43 oTkmNQXBPfiQ9JyCeSit9KQ4PpsocEm6hqBuO9nmedJXqRAzO3DqdmR4Da6PAYVQw3wF6qXsIGo 6YiGvgVlwmW+RvgQ9+SHtMSqC5toJDpSShUBH7D3ZsPzcatGD4F4yFPt1VQ1q5rWtNQs8qT8qD+ Lqct+NTwCOZytw8HSaVVAzCKN8o7LZVGlXRAE5r9aF2s7jjdWGKXxlF/QDLWM1qpX/wtsKhfbtf A5uWRQC3RoYxG0zONFquH04HSawZ9TAYVckWxHXtWDw== X-Google-Smtp-Source: AGHT+IFB3hsuHxjg/fmHgXyAyLViUq48ySyQRa/Fx0lUJgNT2+8kLZlrQ1DZIwrh7vFS3Kz9c4FIAw== X-Received: by 2002:a05:6512:3996:b0:545:1049:eb44 with SMTP id 2adb3069b0e04-54fc67d6211mr1584325e87.36.1746815056100; Fri, 09 May 2025 11:24:16 -0700 (PDT) Received: from ribalda.c.googlers.com (228.231.88.34.bc.googleusercontent.com. [34.88.231.228]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54fc64b6bc9sm349410e87.147.2025.05.09.11.24.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 11:24:15 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 09 May 2025 18:24:15 +0000 Subject: [PATCH 3/4] media: uvcvideo: Refactor uvc_v4l2_compat_ioctl32 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-uvc-followup-v1-3-73bcde30d2b5@chromium.org> References: <20250509-uvc-followup-v1-0-73bcde30d2b5@chromium.org> In-Reply-To: <20250509-uvc-followup-v1-0-73bcde30d2b5@chromium.org> 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 Declaring a variable for doing automatic cleanup is not a very common pattern. Replace the cleanup macro with manual cleanup to make the code simpler. Suggested-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_v4l2.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 862b4e34e5b629cf324479a9bb59ebe8784ccd5d..fe3db03d7458eeb4b9a846ae4ed141bb60ea46eb 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -1382,11 +1382,9 @@ static int uvc_v4l2_put_xu_query(const struct uvc_xu_control_query *kp, #define UVCIOC_CTRL_MAP32 _IOWR('u', 0x20, struct uvc_xu_control_mapping32) #define UVCIOC_CTRL_QUERY32 _IOWR('u', 0x21, struct uvc_xu_control_query32) -DEFINE_FREE(uvc_pm_put, struct uvc_device *, if (_T) uvc_pm_put(_T)) static long uvc_v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) { - struct uvc_device *uvc_device __free(uvc_pm_put) = NULL; struct uvc_fh *handle = file->private_data; union { struct uvc_xu_control_mapping xmap; @@ -1399,38 +1397,37 @@ static long uvc_v4l2_compat_ioctl32(struct file *file, if (ret) return ret; - uvc_device = handle->stream->dev; - switch (cmd) { case UVCIOC_CTRL_MAP32: ret = uvc_v4l2_get_xu_mapping(&karg.xmap, up); if (ret) - return ret; + break; ret = uvc_ioctl_xu_ctrl_map(handle->chain, &karg.xmap); if (ret) - return ret; + break; ret = uvc_v4l2_put_xu_mapping(&karg.xmap, up); if (ret) - return ret; - + break; break; case UVCIOC_CTRL_QUERY32: ret = uvc_v4l2_get_xu_query(&karg.xqry, up); if (ret) - return ret; + break; ret = uvc_xu_ctrl_query(handle->chain, &karg.xqry); if (ret) - return ret; + break; ret = uvc_v4l2_put_xu_query(&karg.xqry, up); if (ret) - return ret; + break; break; default: - return -ENOIOCTLCMD; + ret = -ENOIOCTLCMD; } + uvc_pm_put(handle->stream->dev); + return ret; } #endif