From patchwork Mon Feb 24 10:34:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13987776 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 A22D0250BE7 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-7c0a1c4780bso435799485a.3 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=rJrFcsLGULcRa7nRRmmnx1HqZFUiN4T/Pc4z2qgbgUkni7691hZS2bKved7WVZ0ouc YB+hOT674ZUh678QaW9+6BjcCByljNT9ZtpDZaqcNc6AbKawhvtXFzQMXeac4R/CJezL ObwbV74TPAxMwi3k3kCpVuJZhR1MxoY8X/8/YPfa7bn4lsQIPMb6h8yeiT51ALrQjU2n UNsgBCQ4HvXilWyLDZ8JGY6MlHkeq8yVj2o+Ax0rGmWPWxLxmhpOQD727r0IIuN9VmQW r3aHoY2iysRwp6ufiO3lC+A2Dd3ONTrkX0smkH5FF8FZ1mWSzI1FHoQ+Pd5tZ6fG8nvu dLYw== X-Gm-Message-State: AOJu0Yx92hOhOU5/fRZxneYM0ae5M68ydIbCmr3t0/SYqiZjMRdzEfSq rNp48Tb5Lt5qCpwT2guTKeJEX3C7yASGSIzxufKhcMOgpP1bxQiw7mgwjnffUg== X-Gm-Gg: ASbGnctd95NWYc7IlEMBmz+Fc6+3ZaO6VAwCCR0a0XRQEE6RHndOveyjx6qkqNLJ6Xh sEDAfWO1+lNOUptE0LtZA8dHBPFVG+m3nfcdbl03lewO7+KrmMgmtsdZvkoNLIOq1LsG+m3E3wu AmCPXRpsI4dwNqKwAXYuaj48HRr+HY45WIl8PZjBgzOTVRYee+ObJpQVgSzEzEEOnAXT8hQ7jEC Yzr32c/LUeaetYYtZXjDAUDMtk1OyIdtZkpAkE151Xv8urmKZ4T14efIZYvE/KYCGm/mV7eP6G3 wachZK1+xIWjcyT+ptc93WXLuEP/u472/3Fiamr94bCvNVz5XMKohc84SgkulWcaJvWm93EGq16 FvRw= 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-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- 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_ctrl.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; } +/* + * 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 = 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 = 0; + 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); } - return 0; + return processed_ctrls; } static int uvc_ctrl_find_ctrl_idx(struct uvc_entity *entity, @@ -1951,6 +1959,7 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, if (!rollback) uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count); + ret = 0; done: mutex_unlock(&chain->ctrl_mutex); return ret; From patchwork Mon Feb 24 10:34:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13987777 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.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 F2D4C255E4E for ; Mon, 24 Feb 2025 10:35:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740393302; cv=none; b=QcoDz6CVjrB14qEG0oAWzdSmf1JwChdD6AtmlRRi5MG3RJTqHjyQEhs0xnVI+pFrbjkZJnMrmafFUlA5qA5hyKck965TWywG5/U9+Pp9lQzCWwEr5APcI/XT7FvLooMeuSBsUpfVt63HlvMqnqubUQUbjjmhjH0SBvtUHxveH/4= 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.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="Y0TB+K5h" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-6dd0d09215aso29384716d6.2 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=jEUGl5Vn37EUyn0v0EF6Lycdxfp3VH0PLFeZOVoBm3XcmMA+mWen+Y3f9TUU64Lqct XO9P969QjM/NZuyVuPVgDCXJo3WSu2Mu6ihqsiBKsLErI6ErfBnefduHN/drYkgRtl1S qoZ4iHY9AHNU4Csg+RXrHSTOhixg3BjBhPNrdn2pbBw6DEwK3L6hh/iWLiHXxwFn3ySi go4ViEULMwRxsJHHsZRQUs3/jNUFX9ZJqdDj7SCH/96BaPi7KkW4eye9shxEwKW/Sq69 TTpkBRg8TQJYzmldcNJFVS5ypr4zMBUMvOCXZvuTfGcyMBDuqQwQgT7BlzImDbDBv7nq ZKYQ== X-Gm-Message-State: AOJu0Yx+wSpp0I9DWOja/mJ5z9F6zGvirZzs6CGXVaIkA6rQS/EQQQYE gZus1T64wtsRPRA6XFHrxkBn0Btkit+6Oau3vUqYvVyp5Sgd124IWSq3vCQ91w== X-Gm-Gg: ASbGncvdQ9DSvJRcq3zGC+uutVilMdQElFt3ZcvGY3CYdCdgg9dG0M4Ev3Cj8eIc/r0 WlS6CvvTFQtgwzhtsue93fKmnamQbAWa3TMnYdf/YsnoKLkTolDtz0iKN1AtJM35dKLHsVv2zLt 8P+u5zl4Zshh+r1cxz2XnYwGcO7m5/a9fTd9K1+aYyJzeO+MvyV8nlAmUMszmwDcDg2G7nHp5AK 5E/MXs66Mp+YHXe+O3DePzs0BOL89pU0EEDhWSo+hoVi4Y6hLHa0VTKESfPFMBddj5b9UWoxuy3 R8nP3SBXNZBsVQp3DSYZ0qT5480OVu2SC5t2zCXyECeV13LaG8Emh0vY3EbfDwaMrd6GMFhDWrc Esi8= 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-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- 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_ctrl.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, } 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 *handle, u32 changes = V4L2_EVENT_CTRL_CH_VALUE; ctrl = uvc_find_control(handle->chain, xctrls[i].id, &mapping); + if (ctrl->entity != 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 rollback, 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); } } - if (!rollback) - uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count); ret = 0; done: mutex_unlock(&chain->ctrl_mutex); From patchwork Mon Feb 24 10:34:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13987778 Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (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 09ACE2566EA for ; Mon, 24 Feb 2025 10:35:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740393304; cv=none; b=Pzn2/4xiVUee0UbLE7Qyshc0mQFKBJirN/hmAknI6m2+xsHcGEdFETnwP7NqePm7zdKK4YLttA0VsUoRYwdU/rSnL6hPIbrWxL2pCjMufOVneWriNr1awJ/zM5bhG3BLI8gCpEauYiLFCZq9qYEOOtan/AsnceyyaChsl9TTrMA= 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.178 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-f178.google.com with SMTP id af79cd13be357-7c0892e4b19so513416685a.3 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=lz6dApLa7BON94IL1u8guYywqXbjmCvXKtsyFAwzoAxF9ghuoQtPAFKGpsnRz16mF0 7BBksoOWIlY5bjUnxYb82O1na23UK3JaDSyKBLHQA8EVxT0MikhhEDg4MhKVqfAL3WmX ipSTON5cXqrjq3hqUjexqjUvJuzD1lTbecKTr1gBwoif7A0nFuVwH+xWDVG5ZGZjgcPI LtulLsxoiMkg1Kl5ttNnYwGp3ls7HT5SkZHAe5ckAE8It2Pp65pGNCoZnkguAF3dvP/9 r9ylMMiRcMLBFh8JSwFrpIObrLesekW21+I+XGDb8wkKUC/hIoEllqlJmBGv9ASTmLrT 6j/g== X-Gm-Message-State: AOJu0Yw5WJdBwx9+gPGDz/D18qiJ0PhGTR4+EJlPSbaZF+MNIttERf2G 9Ofez5Q4m0Ez8JW6pS40YYGNUW814pmetj2t3u9XC3oHpIQruFn5qdwA7NwWWg== X-Gm-Gg: ASbGnctZZvjeB34T2G5dYK7JDfyI2YOmrhdWlJe3ty0f7LkgP7RmPzSxaETztoQ24id ZSG/Flg9PydgjOEd008GRr1r8XSEqQiXS6Db1VoJTUYRe18cFFbw4Y8rt9A4WcusqKElpDgJdzS 5SJRBA/OcAHvDi2szCQe3Sc1wu7MiDBxYlusdK7kjOiMxV+NoXGfCe6fmcDXBIw0TljofuET9wz eidMCKAmtQKiBgmMRIalwgoh6uHTLRtydIKAY5gs84UVgph4n///MWIkK0KpOkfyTqFWzZUrJHO e/gUdL4crhqPUHH1Lp0znzb3z+TO7PGMneu9nh3FO6u66PLqzsGHfWAVhwr7bDck5Q7FGkYKFZw wm2Q= 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-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-a6f00867929a@redhat.com/ Signed-off-by: Ricardo Ribalda --- 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_ctrl.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 = 0; struct uvc_control *ctrl; unsigned int i; - int ret; + int ret = 0; if (entity == 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 = 0; if (!ret) processed_ctrls++; @@ -1906,10 +1904,14 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev, ctrl->dirty = 0; - if (ret < 0) { + if (ret < 0 && !rollback) { if (err_ctrl) *err_ctrl = ctrl; - return ret; + /* + * If we fail to set a control, we need to rollback + * the next ones. + */ + rollback = 1; } if (!rollback && handle && @@ -1917,6 +1919,9 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev, uvc_ctrl_set_handle(handle, ctrl, handle); } + if (ret) + return ret; + return processed_ctrls; } @@ -1947,7 +1952,8 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, struct uvc_video_chain *chain = handle->chain; struct uvc_control *err_ctrl; struct uvc_entity *entity; - int ret = 0; + int ret_out = 0; + int ret; /* Find the control. */ list_for_each_entry(entity, &chain->entities, chain) { @@ -1958,17 +1964,23 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback, ctrls->error_idx = 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 = 1; + + ret_out = ret; } else if (ret > 0 && !rollback) { uvc_ctrl_send_events(handle, entity, ctrls->controls, ctrls->count); } } - ret = 0; -done: mutex_unlock(&chain->ctrl_mutex); - return ret; + return ret_out; } int uvc_ctrl_get(struct uvc_video_chain *chain,