From nobody Wed Dec 17 10:53:22 2025 Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (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 A2331250BEF for ; Mon, 24 Feb 2025 10:34:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740393300; cv=none; b=SIP7WgA98OWgI8HCdayNsL8U7WSAHQRhOfVF51sS0wE59NNhhzXLzhHsZFNfRd1/GwPQuS4UvdXeWWVT0BJLEJSwOQGBMx1TOxZ8ltppJHeDdZohuEIepiYM/MiXklrJoKMy2EwAh6UpTNVdypyHSph5K4dPkwMpnNs3h34tlNk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740393300; c=relaxed/simple; bh=u/iLxXp6y4I0dmg1MjcWvu2lVDGOhwUNjbR8NNG1ZA8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fqUoos5U525P2iFxktJafIA9or98uXZs6XK2DKRCfckogYWITfCteNMKxhBmxDDnFEh89pf3E0Q6i6R1nEAl8JYOBx9ZkcJKScrrGTtut9WQ2HslhPoSC8BtjPaYD9Pc83SDCbbPBPw+sqSXgqUxDo4J1RlElWg6xYJLOJHWKTc= 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=TIFbsBNy; arc=none smtp.client-ip=209.85.222.181 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="TIFbsBNy" Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-7c04df48a5bso431601385a.2 for ; Mon, 24 Feb 2025 02:34:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740393297; x=1740998097; 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=6Xr/sdBG76kxT89n/PMoXH6dcMTYy+77eqKmkJlTkq0=; b=TIFbsBNytDy8FcSm8lEgoSgnS01KSuCzz1ekK2ZCJodD5ZpD/ASvxPkei9Hjj/IUty zZFR4wp23HFF88tYwtYWIV34zWo1SA8yZmKYnnQZDw/JuX08w1D24+2VcgWlXyMj4Kd+ V1gbheEyudL1q1jBba4J1ZW6oAe3cdNCz0+kg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740393297; x=1740998097; 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=6Xr/sdBG76kxT89n/PMoXH6dcMTYy+77eqKmkJlTkq0=; b=ZyOeJ9ldFGlXQAWW/5eoWQ7OMPJoIGNC+5tPG86Xfw/gz8xxxrT//wSPR5A0l06qgP 0lUaFFf+KSwC3Fxm7XAkENv7BhOdCLKNs1wl9o5bnAkI1DiGyc1SrLr6TVVObJOAiLGs 5JU+F9IXUFXqjNXL+jMNw6K0u4lgEoW4/vkq1yEDpV4M2T+mPJqGdhVCs8wXN454KGQE jk6zj9xPnIExXk6gjdpz0uL1A56LlfuCUviD4fR1YCIfov5GlPmaN13YwAUK5gOQh0y3 BnFt9OsFGoipquYbKsF6aNB4hMt4bsSg2QMFon18It97qMM5XoE2Ly76yyhc2ZzPxW/V 3pOA== X-Forwarded-Encrypted: i=1; AJvYcCX0szjQu+loK5lSmv4VoMM64S4ILtOe1VR07dZthu74ZdBmudML4xuIpoh6UA4aQa1JR+2GbvCO7HY1ldM=@vger.kernel.org X-Gm-Message-State: AOJu0YyBeUNtQCD4tRUwtsE8E7+15k0Kts69vPNcz642CKXzNG0YZJwo 9euy45D/quKIbhwKxLtD64NXY1R0C5nE1fwZqmvVEC9HyLHnntHbozmVxCqxHw== X-Gm-Gg: ASbGncvP+uAfblPeOi+5E8fiVkp2JlQRS8i6vfK82dHDTpaRL8aDUT9WLzgycbpKHLV IpjK9LKme5t1qSLCr5pW/Wxo5xlejwP12dEr69F7JfrfmR3lyXbrtPIF7WlSRpQSBKkk/0hSxq2 B7dV3cFIKZGQRQokb1Myi5Vt2+AdxO6cGwLGAyljpCWHqosmJSJ7NvNe1t7PEpZ7EgSwPRglf57 j/NKYVArL7100vpnL8oDlGsHIxc5EWtknzZWiYWa9VwVeagXEPxxK1whmhOkkt8Yg/88B1Uja3l gw7eINYLfIPjqG6cRxTzBAqc/KVInGQrxYnIHUr8iQ0Doh6pW2M5NL56jDN2bUB3g8qRiK8TsQz t37E= X-Google-Smtp-Source: AGHT+IHcApxjU5Byx41ftcyJEbR4mgmWCzGNhIuoy/QmW14XpADFHvOrRwBv2j1pC15dhspgCsTEpg== X-Received: by 2002:a05:620a:1aaa:b0:7c0:8951:4c20 with SMTP id af79cd13be357-7c0ceeec50bmr1271038785a.2.1740393297607; Mon, 24 Feb 2025 02:34:57 -0800 (PST) Received: from denia.c.googlers.com (15.237.245.35.bc.googleusercontent.com. [35.245.237.15]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c0b0b7f637sm787139985a.33.2025.02.24.02.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 02:34:56 -0800 (PST) From: Ricardo Ribalda Date: Mon, 24 Feb 2025 10:34:53 +0000 Subject: [PATCH v2 1/3] media: uvcvideo: Return the number of processed controls 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: <20250224-uvc-data-backup-v2-1-de993ed9823b@chromium.org> References: <20250224-uvc-data-backup-v2-0-de993ed9823b@chromium.org> In-Reply-To: <20250224-uvc-data-backup-v2-0-de993ed9823b@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , stable@kernel.org X-Mailer: b4 0.14.1 If we let know our callers that we have not done anything, they will be able to optimize their decisions. Cc: stable@kernel.org Fixes: b4012002f3a3 ("[media] uvcvideo: Add support for control events") Reviewed-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda Reviewed-by: Hans de Goede --- drivers/media/usb/uvc/uvc_ctrl.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 4e58476d305e..f2484f6d21c1 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1846,12 +1846,17 @@ int uvc_ctrl_begin(struct uvc_video_chain *chain) return mutex_lock_interruptible(&chain->ctrl_mutex) ? -ERESTARTSYS : 0; } =20 +/* + * Returns the number of uvc controls that have been correctly set, or a + * negative number if there has been an error. + */ static int uvc_ctrl_commit_entity(struct uvc_device *dev, struct uvc_fh *handle, struct uvc_entity *entity, int rollback, struct uvc_control **err_ctrl) { + unsigned int processed_ctrls =3D 0; struct uvc_control *ctrl; unsigned int i; int ret; @@ -1886,6 +1891,9 @@ static int uvc_ctrl_commit_entity(struct uvc_device *= dev, else ret =3D 0; =20 + if (!ret) + processed_ctrls++; + if (rollback || ret < 0) memcpy(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), uvc_ctrl_data(ctrl, UVC_CTRL_DATA_BACKUP), @@ -1904,7 +1912,7 @@ static int uvc_ctrl_commit_entity(struct uvc_device *= dev, uvc_ctrl_set_handle(handle, ctrl, handle); } =20 - return 0; + return processed_ctrls; } =20 static int uvc_ctrl_find_ctrl_idx(struct uvc_entity *entity, @@ -1951,6 +1959,7 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int roll= back, =20 if (!rollback) uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count); + ret =3D 0; done: mutex_unlock(&chain->ctrl_mutex); return ret; --=20 2.48.1.601.g30ceb7b040-goog From nobody Wed Dec 17 10:53:22 2025 Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) (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 F413A255E4F for ; Mon, 24 Feb 2025 10:35:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740393302; cv=none; b=u2pMGIoMKFFDkx9qadCgABzqJvtnHhSiu5PVJUfD1yJ+uhxRy3Q52X0Q3zAuibaWgYV7NbYMngUYm7jytfZiXLzPT5uhWC40Q9uAOUwP2rrsPM2x5vMSE0/q/QvFMOEzXtaMwBFNClSW0n06AJGkWEme6yuiZEaG/uCeHv0CNSk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740393302; c=relaxed/simple; bh=sdce7IzPAWOPBlp9w7GmVc+7zDnqq6RpXhnvyRYvo7w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ISBkqsa1dYgpq3cauGYYdfKbVUNvCfBHnnJWfzKIJq+g5WtkUJLe50d5RguMmypzGZc16D+gODXUecSIpP8H8pTY2n/dNJiFQrJCatMpuecnhXGAHUDIFH8QOl4wNphtgEroqrvosJaweO1iNBlPouxo5p3kfqgRbRlu1Sbk1wA= 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=Y0TB+K5h; arc=none smtp.client-ip=209.85.219.43 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="Y0TB+K5h" Received: by mail-qv1-f43.google.com with SMTP id 6a1803df08f44-6e69db792daso36479786d6.0 for ; Mon, 24 Feb 2025 02:35:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740393300; x=1740998100; 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=LDBMWb4EY7onVf4QJeXNUmC3vcoRuBZNuT+yUekjkJQ=; b=Y0TB+K5hr1/STb/e5hixDLC2vrICvzhpRLWqDsS7X9ct86uI8l6alNgv3WjIQwa9rk eajzU9wXDek99rclw5qfcZ15aUsHvYJXy6TnLcii4nrCqi6Q42td2nP5NajYWN2JWms9 dpuGxS2ajWAjxSqrpZOG07jcwSXUh1td5VfOw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740393300; x=1740998100; 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=LDBMWb4EY7onVf4QJeXNUmC3vcoRuBZNuT+yUekjkJQ=; b=VC48YXhdsNg1zGh2tYysO4zIodjUIQf8dU3veCvLxF7xEeETm0vKSW6TXFGlPk30z8 l/6PvbESwSYd8F/PVMF8EYURoRPn+T+b6Gkt4LpE4yju4BObrc5CdOqBKjqzHASiUrJz zL8PMwYdR0VSdCVoAnjRqjYVHOHX0VuvP74HSNKfVCSo9RXiW2DGuZCiZB01/jS5fjez i4lWtMPDPWn96IsWNt6RqlO6XxGpveOMaxWZj+MMKzdGnonxc/W+ErUIymKZmkrcMQh1 dZ76p0C8lWpFIsaofwvJOm/9PFinn370zsbvuD7OkSYiPgDC79lzgEqtWiu0CFpQDk+t cM8A== X-Forwarded-Encrypted: i=1; AJvYcCVHwRJyEi+kpWNLr8YKTlnT4uTmgWn2Dl0M0nSB9qqIznPduaC346VdFBnjdYkWziOFhj006lbWC0pHjSE=@vger.kernel.org X-Gm-Message-State: AOJu0Yzxqb5beHXdtle04Or4wtJc1E7w/TPMyBVkE/oXR+jiOxlSKGgl VSTlXoHPQegzlSh9OVBVXw2M6gc7vSfNM4plq38dRJemoC8JuwtlojOgANn8Ww== X-Gm-Gg: ASbGnctdGVqz3eqme3FlPWc5SuZe98onMS572ivuTAlwxDEHSM28q91JuKl/sMU9qNd 82icPvHUs54+ptjIbnYjW+KbtLhhxrlu7BNkC0fNs+Y00Jfm4+hnqC4tl8XWbafRzAtkJ4glYPI KVSv28Bu/SAxrJMi9vMjxk2LTiJ8F9gOx5rKkOLts9WbVVkjbd1xb7d2i8YBM09TgC32QYq4696 AGJN4knJ7mGjIC+aZZPT0g6IbftA5n89EmuRVNnnmeUgk9vVKKeePnBsK5N4UmZo4Fw/EVmAxva 9uWO1NHb1YM0AUygBPJd+96J+GNClpPB/6Xifq1b7dE1TrwpJ5ZmHYAFxf9nF6w+7WX0QGM3XBA 6puc= X-Google-Smtp-Source: AGHT+IFL2G6nlS0x1tvmzLvi/Z81P9HYgn38ttQ4HgDtQAzXQAOsKOTGkfcdbCKeON5iaFKLYPwyeQ== X-Received: by 2002:a05:6214:e8c:b0:6d8:f0ba:ea92 with SMTP id 6a1803df08f44-6e6b00fca57mr166811326d6.21.1740393299864; Mon, 24 Feb 2025 02:34:59 -0800 (PST) Received: from denia.c.googlers.com (15.237.245.35.bc.googleusercontent.com. [35.245.237.15]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c0b0b7f637sm787139985a.33.2025.02.24.02.34.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 02:34:58 -0800 (PST) From: Ricardo Ribalda Date: Mon, 24 Feb 2025 10:34:54 +0000 Subject: [PATCH v2 2/3] media: uvcvideo: Send control events for partial succeeds 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: <20250224-uvc-data-backup-v2-2-de993ed9823b@chromium.org> References: <20250224-uvc-data-backup-v2-0-de993ed9823b@chromium.org> In-Reply-To: <20250224-uvc-data-backup-v2-0-de993ed9823b@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , stable@kernel.org X-Mailer: b4 0.14.1 Today, when we are applying a change to entities A, B. If A succeeds and B fails the events for A are not sent. This change changes the code so the events for A are send right after they happen. Cc: stable@kernel.org Fixes: b4012002f3a3 ("[media] uvcvideo: Add support for control events") Signed-off-by: Ricardo Ribalda Reviewed-by: Hans de Goede Reviewed-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_ctrl.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index f2484f6d21c1..7d074686eef4 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1705,7 +1705,9 @@ static bool uvc_ctrl_xctrls_has_control(const struct = v4l2_ext_control *xctrls, } =20 static void uvc_ctrl_send_events(struct uvc_fh *handle, - const struct v4l2_ext_control *xctrls, unsigned int xctrls_count) + struct uvc_entity *entity, + const struct v4l2_ext_control *xctrls, + unsigned int xctrls_count) { struct uvc_control_mapping *mapping; struct uvc_control *ctrl; @@ -1716,6 +1718,9 @@ static void uvc_ctrl_send_events(struct uvc_fh *handl= e, u32 changes =3D V4L2_EVENT_CTRL_CH_VALUE; =20 ctrl =3D uvc_find_control(handle->chain, xctrls[i].id, &mapping); + if (ctrl->entity !=3D entity) + continue; + if (ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) /* Notification will be sent from an Interrupt event. */ continue; @@ -1954,11 +1959,12 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int ro= llback, uvc_ctrl_find_ctrl_idx(entity, ctrls, err_ctrl); goto done; + } else if (ret > 0 && !rollback) { + uvc_ctrl_send_events(handle, entity, + ctrls->controls, ctrls->count); } } =20 - if (!rollback) - uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count); ret =3D 0; done: mutex_unlock(&chain->ctrl_mutex); --=20 2.48.1.601.g30ceb7b040-goog From nobody Wed Dec 17 10:53:22 2025 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (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 0057C2566E3 for ; Mon, 24 Feb 2025 10:35:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740393304; cv=none; b=NxrCA6UlmeWF5kEPAxKncFhH2KoHMiOxF/5htI7prnGVYMct0dLKo76fy64DJFscqfRU0kYXloDtNNH8ci2cIY+vszEqsfIpKahL07Ntijw+Zz8CzBv/qoQVrf80e0ov6YCWFQr81Mgqr9NDKodnDZcb8fIlnbk3avG4GnNtPAw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740393304; c=relaxed/simple; bh=7Zc4E7dry8zMPgTaB9RNF65Q6kaOmoZo78utuFPUPWQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HmHoEcZNnkBFiqukANgWU8LuuNk4hhXGBCe2Umr6TqGs4eH6LVuDxT5ObDpuGKI/C3ycvZUHqouNLAkquwlkzSZ7qGBoNI0dsbdYjdD780crbw2HMc+ECnPmXP9IiNjlN780ARU0ZW10vxqOC4IJJQit3tOMYh+muEzSoLCxSww= 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=RidrmXMN; arc=none smtp.client-ip=209.85.222.171 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="RidrmXMN" Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-7c0b9f35dc7so604194285a.2 for ; Mon, 24 Feb 2025 02:35:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740393302; x=1740998102; 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=kZ9HGsiAPNY2xJi5rKrAGJy/l6zBdXvq6ok3eL48e0k=; b=RidrmXMNZkugO0STX+FCTnSp9ABOiW/MQQiIJS6iD3bBVi0UtiVPm8amkAPy+w/58H zXSzqkAbJdVsWWnuy3+egF4XS3ks+bsCN2koSHz0kFDisFzlMFhYHok/ME+5Qb4L4xBX 4VKIxtH6hnIwKCNmG7wEbase4xhLI0qhjOV94= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740393302; x=1740998102; 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=kZ9HGsiAPNY2xJi5rKrAGJy/l6zBdXvq6ok3eL48e0k=; b=I+RpTLomDo8I8X0Hc8vk86GUG2af5KSbES6f1YzE7yOdsqtmXTsEGmIosP36C3lwV1 4vEFPGIfHlBcRs7E9YwAKcY6A11s5p2Fn07hbeEvfShnBv7COTqzfQPXPilNLUG7Il7r ncLxq8PtqScPGz5KwocpxHMqlUjGE1d+82Ocam/3Pkhc5K4Qhd37tAYeR6kMntDj9k7L 98M2odTM3muX6tODgaS67IgFJEFPTcBuQO0ZTf4chNem3/A6IwKrRvSeIk780F/me8ab pd1fFz67Uf8MEAAP9ubxO2xFhWrJ9SZrZGOx5Ik06OqdEZ8/sWs/C4td9OQvTHDX6IuZ PB8w== X-Forwarded-Encrypted: i=1; AJvYcCW03o2EHFz92lI4PPkD9knb32wYkPk8H46D9WZm79yzD0d1XRf2/ceXLxegSiPklIAadJ5j+qf7CGMJF0o=@vger.kernel.org X-Gm-Message-State: AOJu0YwxyQ8CcIOyxuP9mPr431xmKggNjctYfjlIVFNsD1GGufKckbK7 tEFu2Cdgkwnh8t4lUZvzm11gFnNPl4CIJmSYc1+17J8cHgUsBYB7uDcYR44qUg== X-Gm-Gg: ASbGncsGCp8s5oiNFUVm8+URURtaAC/0uUQbyH6sNaFH6LwSBagm1TLQSfBcm5jT9eo vF7OdgwybEnN7ZVK03lw/pZyy9Rz0rHVPFfi/VMExExcU1niVaSG9RNEVCgZNZWAlxuzMDK/Ff9 5lWd4l9PUn9EDF30txoPmKC301Ha+GKF/YkCM+EmRbN4K+TLp0qyZbiGysJ0A7wkq404InZ/PPk xb5eb5OkrrnA8Mtjzl4eX+tC1lHUM44HD5ekJ3I/v11ma3O+NssarY0R0FTyoIm+wjGTuxrMNrS T0Z4aoeOK642EdeJG40AQyPj5r2+2KFN/yp6U922Vhq6S2U2qLH5iYUQIk6arCoiNONlhWkrdD9 8lrE= X-Google-Smtp-Source: AGHT+IF8qxeqV0BNuSDxSLm5NIehmKiln3cV1c7kK29Y3BIkgHEbetBmeVYcfmb/KpA7P6ZZzKbOWg== X-Received: by 2002:a05:620a:1787:b0:7c0:a28e:4964 with SMTP id af79cd13be357-7c0ceefd400mr1339463985a.14.1740393301918; Mon, 24 Feb 2025 02:35:01 -0800 (PST) Received: from denia.c.googlers.com (15.237.245.35.bc.googleusercontent.com. [35.245.237.15]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c0b0b7f637sm787139985a.33.2025.02.24.02.34.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 02:35:00 -0800 (PST) From: Ricardo Ribalda Date: Mon, 24 Feb 2025 10:34:55 +0000 Subject: [PATCH v2 3/3] media: uvcvideo: Rollback non processed entities on error 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: <20250224-uvc-data-backup-v2-3-de993ed9823b@chromium.org> References: <20250224-uvc-data-backup-v2-0-de993ed9823b@chromium.org> In-Reply-To: <20250224-uvc-data-backup-v2-0-de993ed9823b@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , stable@kernel.org X-Mailer: b4 0.14.1 If we wail to commit an entity, we need to restore the UVC_CTRL_DATA_BACKUP for the other uncommitted entities. Otherwise the control cache and the device would be out of sync. Cc: stable@kernel.org Fixes: b4012002f3a3 ("[media] uvcvideo: Add support for control events") Reported-by: Hans de Goede Closes: https://lore.kernel.org/linux-media/fe845e04-9fde-46ee-9763-a6f0086= 7929a@redhat.com/ Signed-off-by: Ricardo Ribalda Reviewed-by: Hans de Goede Reviewed-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_ctrl.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 7d074686eef4..89b946151b16 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1864,7 +1864,7 @@ static int uvc_ctrl_commit_entity(struct uvc_device *= dev, unsigned int processed_ctrls =3D 0; struct uvc_control *ctrl; unsigned int i; - int ret; + int ret =3D 0; =20 if (entity =3D=3D NULL) return 0; @@ -1893,8 +1893,6 @@ static int uvc_ctrl_commit_entity(struct uvc_device *= dev, dev->intfnum, ctrl->info.selector, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), ctrl->info.size); - else - ret =3D 0; =20 if (!ret) processed_ctrls++; @@ -1906,10 +1904,14 @@ static int uvc_ctrl_commit_entity(struct uvc_device= *dev, =20 ctrl->dirty =3D 0; =20 - if (ret < 0) { + if (ret < 0 && !rollback) { if (err_ctrl) *err_ctrl =3D ctrl; - return ret; + /* + * If we fail to set a control, we need to rollback + * the next ones. + */ + rollback =3D 1; } =20 if (!rollback && handle && @@ -1917,6 +1919,9 @@ static int uvc_ctrl_commit_entity(struct uvc_device *= dev, uvc_ctrl_set_handle(handle, ctrl, handle); } =20 + if (ret) + return ret; + return processed_ctrls; } =20 @@ -1947,7 +1952,8 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int roll= back, struct uvc_video_chain *chain =3D handle->chain; struct uvc_control *err_ctrl; struct uvc_entity *entity; - int ret =3D 0; + int ret_out =3D 0; + int ret; =20 /* Find the control. */ list_for_each_entry(entity, &chain->entities, chain) { @@ -1958,17 +1964,23 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int ro= llback, ctrls->error_idx =3D uvc_ctrl_find_ctrl_idx(entity, ctrls, err_ctrl); - goto done; + /* + * When we fail to commit an entity, we need to + * restore the UVC_CTRL_DATA_BACKUP for all the + * controls in the other entities, otherwise our cache + * and the hardware will be out of sync. + */ + rollback =3D 1; + + ret_out =3D ret; } else if (ret > 0 && !rollback) { uvc_ctrl_send_events(handle, entity, ctrls->controls, ctrls->count); } } =20 - ret =3D 0; -done: mutex_unlock(&chain->ctrl_mutex); - return ret; + return ret_out; } =20 int uvc_ctrl_get(struct uvc_video_chain *chain, --=20 2.48.1.601.g30ceb7b040-goog