From patchwork Wed Nov 22 11:45:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 16927 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1260740vqb; Wed, 22 Nov 2023 03:47:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IERami6DSBC8Ifwe6lIhCpPLjZV6d7FzkYU4uFDnofdxtuL3kw5CKxR0ditj/cx6zGySiyr X-Received: by 2002:a17:90b:3884:b0:285:1398:d1a0 with SMTP id mu4-20020a17090b388400b002851398d1a0mr2181210pjb.25.1700653661484; Wed, 22 Nov 2023 03:47:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700653661; cv=none; d=google.com; s=arc-20160816; b=YuyHrw649sEvFLI7k4qxHHd13kkbHJ7CJ9aJgeW/QFkR0WJWKam3W7HGpFAojEEjV5 GO+t3FQaLOIQSqIFhlNcxWQi3YcFeqMXdV3wCi2xniR2GGvVOuG2MQYYH5abyitr4bmz BiUOKx43YUVQfcUNq/SnWtmNmzsVfHsttUle1RhFW5s1OOvDAxWaqDBN2F4dmbp5r96C 1rs5iuRvzQ0GC2AN1s9rTE/ipXMOuRGxeVogdsl/KG5u2SPwp7JHbSbE2KajeGR7WoO9 oHG7e1inhqjBx0O4fwbzdGx1XWD6PGBO9uoEsXdoQFSrYlxV67UvKM89Uwzg96vEr9RE 7H9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:content-transfer-encoding:mime-version :message-id:date:subject:from:dkim-signature; bh=n31djRAaV6tjpTqEszH4BC9BC0zt3h2aG6InVmgkwt4=; fh=BBrIiO5SemNqSOtHicrWTltXeND4ko/H3LGs6+7OtHc=; b=bcNfWDbzFaR5aMwh7qWtVr6sAyHbHeQ8Mqim4DkP9mcFQCNv7bMx0NxOS0nbznm06P 65ATxRuBROKnVjTxSdgVZY/Ep7k0Qm8ojp3gWLQqVq3lTeLrxstk78FiLYLYhDn0JwiV kMwXZt5+l0oBP7C2XB+wt12XjEjdhPoi3hr48GnYIDvbAzTIIZgJEwdjJihVTGvvxIKN kXH+DJRcKTxF0MoKmOdhPJh46gucDY6oK1oAPG+MKccnufWhDGrpFlP9cu4UaEGMTpz8 irGE6y5elT21ncLs9p9swLUICWiQBdrnNrgT6nfAbKtD3LQVnw+P3hlYFqNnL2ytFS0e 4RdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="Qx/CRIhs"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id e5-20020a17090a804500b002803c462793si1294687pjw.152.2023.11.22.03.47.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 03:47:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="Qx/CRIhs"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 6B73681C09BF; Wed, 22 Nov 2023 03:45:57 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343577AbjKVLp4 (ORCPT + 99 others); Wed, 22 Nov 2023 06:45:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230051AbjKVLpy (ORCPT ); Wed, 22 Nov 2023 06:45:54 -0500 Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2297119E for ; Wed, 22 Nov 2023 03:45:51 -0800 (PST) Received: by mail-qt1-x830.google.com with SMTP id d75a77b69052e-41cda69486eso39217921cf.3 for ; Wed, 22 Nov 2023 03:45:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1700653550; x=1701258350; darn=vger.kernel.org; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=n31djRAaV6tjpTqEszH4BC9BC0zt3h2aG6InVmgkwt4=; b=Qx/CRIhsarK6zkmlADP3tyfJ0R5aEUfiGZGpmEm9Ehx1zblg11WbKUJTXy3RLdY9p4 8tznEU27t123wWfUcbLAA2E0GKtJ6ofQBpMmefY8kbM2ZO2lART+Xw7jWyrdfXD6S3Lt V/CTSZjxWy7vpL5aIJk3k1jH8978M0Qr+bUQk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700653550; x=1701258350; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=n31djRAaV6tjpTqEszH4BC9BC0zt3h2aG6InVmgkwt4=; b=b8L7eLkx7nj/odhE1ZB+rE7nnLFuRbO+/Ii69XMbBX9NIsklZy8wQrsx3u3E0upd0W xAKn64xNZA9vuqrmz90n5nA4xk8uwUVbt6wCT3hBl/E5DPPrPtKLFgprtz3QYJN+xLt/ jBPxUqmfhc2eXfDJDhxv0nOn+8qskQylsQHO/UeZ1NeesbfSowT7koL6EVPBblX4mXw9 bOMBaiJlCY0CuNVS33HQ/7ZR+vySn0cvjJdZM7Bbax762pbJPmYuO9tzVEHCdwA5Uci7 c9ngJcTJjws18x6CI+AHLM2K4oQhQ6iEZWcoQc58rAVLtKKyE/a4XjMWczLKa2/dolcI ndZg== X-Gm-Message-State: AOJu0YwfIdcu73iujBg1H/swWYIAiTamx9quonffRLK9e/BXEvz/03Lq T2Qr7tdkTV62MWOGZBFMKeLxDw== X-Received: by 2002:ac8:4e51:0:b0:41e:1b18:f4a2 with SMTP id e17-20020ac84e51000000b0041e1b18f4a2mr2331132qtw.36.1700653550098; Wed, 22 Nov 2023 03:45:50 -0800 (PST) Received: from denia.c.googlers.com (228.221.150.34.bc.googleusercontent.com. [34.150.221.228]) by smtp.gmail.com with ESMTPSA id h3-20020ac85143000000b00419732075b4sm4357790qtn.84.2023.11.22.03.45.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 03:45:49 -0800 (PST) From: Ricardo Ribalda Subject: [PATCH v5 0/3] uvcvideo: Attempt N to land UVC race conditions fixes Date: Wed, 22 Nov 2023 11:45:46 +0000 Message-Id: <20231122-guenter-mini-v5-0-15d8cd8ed74f@chromium.org> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAOvpXWUC/33NwQrCMAwG4FcZPVtp2q6unnwP8dC1cSu4Dlo3E Nm7GzyIjOkp/AnfnycrmCMWdqyeLOMcSxwThXpXMd+71CGPgTKTQiqhhOXdhOmOmQ8xRd7YxkA rGo1XYERaV5C32SXfE0rT7UbLPpb7mB/vFzPQOP9om4ELbuQhgPBXg9acfJ/HIU7Dfswdu1DXL P95SR6NBhFqK4JWG159PICElVfkQ+NqdEh32W54/e3lymvyKliNgEoHDyu/LMsLPvAj8XABAAA = To: Mauro Carvalho Chehab Cc: Guenter Roeck , Tomasz Figa , Laurent Pinchart , Alan Stern , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sean Paul , Ricardo Ribalda , Sakari Ailus , Sergey Senozhatsky , Sakari Ailus X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 22 Nov 2023 03:45:57 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783259097530342043 X-GMAIL-MSGID: 1783264613445735831 Back in 2020 Guenter published a set of patches to fix some race conditions on UVC. https://lore.kernel.org/all/20200917022547.198090-5-linux@roeck-us.net/ That kind of race conditions are not only seen on UVC, but are a common sin on almost all the kernel, so this is what it was decided back then that we should try to fix them at higher levels. After that. A lot of video_is_registered() were added to the core: ``` ribalda@alco:~/work/linux$ git grep is_registered drivers/media/v4l2-core/ drivers/media/v4l2-core/v4l2-compat-ioctl32.c: if (!video_is_registered(vdev)) drivers/media/v4l2-core/v4l2-dev.c: if (video_is_registered(vdev)) drivers/media/v4l2-core/v4l2-dev.c: if (video_is_registered(vdev)) drivers/media/v4l2-core/v4l2-dev.c: if (video_is_registered(vdev)) { drivers/media/v4l2-core/v4l2-dev.c: if (video_is_registered(vdev)) drivers/media/v4l2-core/v4l2-dev.c: if (!video_is_registered(vdev)) drivers/media/v4l2-core/v4l2-dev.c: if (video_is_registered(vdev)) drivers/media/v4l2-core/v4l2-dev.c: if (vdev == NULL || !video_is_registered(vdev)) { drivers/media/v4l2-core/v4l2-dev.c: if (video_is_registered(vdev)) drivers/media/v4l2-core/v4l2-dev.c: if (!vdev || !video_is_registered(vdev)) drivers/media/v4l2-core/v4l2-ioctl.c: if (!video_is_registered(vfd)) { drivers/media/v4l2-core/v4l2-subdev.c: if (video_is_registered(vdev)) { ``` And recently Sakari is trying to land: https://lore.kernel.org/linux-media/20230201214535.347075-1-sakari.ailus@linux.intel.com/ Which will make obsolete a lot of (all?) of the video_is_registered() checks on Guenter's patches. Besides those checks, there were some other valid races fixed on his patches. This series is just a rebase of what I think is missing on UVC even if we fixed v4l2/core with all the video_is_register() checks removed. I have tested the series with lockdep and a loop of authorize/de-authorize while steaming. Thanks! Signed-off-by: Ricardo Ribalda --- Changes in v5: - Some code from 2/3 ended in 3/3... Sorry about that. - Link to v4: https://lore.kernel.org/r/20231122-guenter-mini-v4-0-3d94e1e34dc1@chromium.org Changes in v4 Thanks Sergey!: - Reorder patches - Improve commit messages - Do not process async work on exit. - Link to v3: https://lore.kernel.org/r/20231121-guenter-mini-v3-0-d8a5eae2312b@chromium.org Changes in v3: - Introduce media: uvcvideo: Do not halt the device after disconnect - Introduce media: uvcvideo: Always use uvc_status_stop() - Link to v2: https://lore.kernel.org/r/20230309-guenter-mini-v2-0-e6410d590d43@chromium.org Changes in v2: - Actually send the series to the ML an not only to individuals. - Link to v1: https://lore.kernel.org/r/20230309-guenter-mini-v1-0-627d10cf6e96@chromium.org --- Guenter Roeck (1): media: uvcvideo: Lock video streams and queues while unregistering Ricardo Ribalda (2): media: uvcvideo: Always use uvc_status_stop() media: uvcvideo: Do not use usb_* functions after .disconnect drivers/media/usb/uvc/uvc_ctrl.c | 4 ---- drivers/media/usb/uvc/uvc_driver.c | 13 ++++++++++- drivers/media/usb/uvc/uvc_status.c | 8 +++---- drivers/media/usb/uvc/uvc_v4l2.c | 2 +- drivers/media/usb/uvc/uvc_video.c | 45 ++++++++++++++++++++++++-------------- drivers/media/usb/uvc/uvcvideo.h | 4 +++- 6 files changed, 48 insertions(+), 28 deletions(-) --- base-commit: 98b1cc82c4affc16f5598d4fa14b1858671b2263 change-id: 20230309-guenter-mini-89861b084ef1 Best regards,