From patchwork Tue Nov 21 19:53:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 167915 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp877958vqb; Tue, 21 Nov 2023 11:53:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IHdVGJ1qn/l4T+HFSqcEHr7b9dqwBLVdP/XGJnvAy7YvjnipZtAnMUCwYiMGVs0WewrPukl X-Received: by 2002:a17:902:c1c4:b0:1cf:6967:ec70 with SMTP id c4-20020a170902c1c400b001cf6967ec70mr208986plc.31.1700596438384; Tue, 21 Nov 2023 11:53:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700596438; cv=none; d=google.com; s=arc-20160816; b=cB9QZdHEx2l0DN5Lk2qebV2r7vVe5u3cLXr87T5e0KTV0nkkh8lIdOg9Ko/z3yOTUJ DJS8sius65O10lCusfwooEvT53kkd/VrPohEFB5PxrPxq+cB9hURYhpVmImujI7yFITU eLDEPaoNeczKkGPRyt6LlnxvD+Nprxdt+KIzFPMtjTyvWMzAI9O7gNrhQspLcvhP5ngI 1EO57mbFrXBUD7hovvW3PDbA8Lu+Yf67rPuzTWdNfi0dP3B20ImPMnBu0blpoOFhxk5L JI/C/pcK+oXxLOuZDs/A34M3eiKre2rPj5kqR8vnAWrcgEtw22UI3P1dhS9jo32/MU04 3uUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=dDCQx2svTZtfCmrCU69fY87fRl7Sd0hrHJUJrOpUR1s=; fh=Olmnw9EiPOHXl6tXYk5T9PPwqL+0H7V+IoxB1uD1V0I=; b=CycOsZ6ZHzns/d1szLDbucfW8FlzpG94uFtFdAMEVizW2cX2y51V+DdwklEpD47KDH x4dm2loWO6/RVeJTJ/zQgxO5rcRBi9pOxU1McVmK6DD+WKI2DmYgpFCxkjzn7iZbXrpF 03amR2LlaZ31zg3KF75o49x0KXe1zFfoWFAMWyxKMhisNe09aJVn+A6wsI7AQRM90QIs tpNOzFZiAdNvnaACbRi4wBAL03BBP4Yro1SOZlG1sYNbD1yVA1r1TXr/DGM/jhfg202u 6xiNmFkQA7UGVp3JuCh8tcnZxZqpYlLXJUwukgulGHGljSVHM8VQY/R2cE7Fd2SgYQVx NCnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=XF7p33qx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id o18-20020a170902d4d200b001cf75b042fesi717736plg.52.2023.11.21.11.53.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 11:53:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=XF7p33qx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 25836811F103; Tue, 21 Nov 2023 11:53:57 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232326AbjKUTx5 (ORCPT + 99 others); Tue, 21 Nov 2023 14:53:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229634AbjKUTx4 (ORCPT ); Tue, 21 Nov 2023 14:53:56 -0500 Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5D6B18E for ; Tue, 21 Nov 2023 11:53:52 -0800 (PST) Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-6711dd6595fso18849026d6.3 for ; Tue, 21 Nov 2023 11:53:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1700596432; x=1701201232; 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=dDCQx2svTZtfCmrCU69fY87fRl7Sd0hrHJUJrOpUR1s=; b=XF7p33qxwVcMCafNsYpOaqKk78Gm78d+4D54vMFD+yOprNN92MfBt03qzL5+F2jlz8 XWsvUjZ+hC/cHjadbCHNFi0qTjjg0IyjFvZDviirZnOF019Ew2SdDdTp8UyKPtg2efZV 1QM2scZ8t/DiL/HnvY62F/XIiPMfAdlzGjMQQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700596432; x=1701201232; 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=dDCQx2svTZtfCmrCU69fY87fRl7Sd0hrHJUJrOpUR1s=; b=kXj/h/3tLpFhnzR4t0rLE1wxn8C2xpTZo/AHQI7oDwgWmtD6qXzliHX00uC4zfwXNP QZkSqbCnuorgLBNJFJ90Z2niXrxjsdMM0U8EpicHD/eCuqIPEOhBWWdIs3S1Y4sWw6A0 5JsJLMJ/7X02HxT3M0mYsNO1VSHhDLShVhWJfxAWqzGueIfccR4ahdGTb6s6Y4hSL57B oMKhI3j1NLJJHJxvvqr4d3zc65soM6PUx0DqTQFzbORgjE3AJ0cMPEJWYzxfJTLgKTKj eL0x3eyD8Ni/MG0C6R0tDTGh81jYhua8x+diXv3kfW8v3haMDlftfRQTlmEr6xLVbwGC vHDQ== X-Gm-Message-State: AOJu0Ywy1HkEBxkfNPbf3eT3gvkGe8ANh0zzrlIG5mB4wtH2sVor2kgb j4dC++ZfvkuKFjqZhmepEwtczg== X-Received: by 2002:a05:6214:21e2:b0:66d:2d07:eab4 with SMTP id p2-20020a05621421e200b0066d2d07eab4mr51485qvj.42.1700596431833; Tue, 21 Nov 2023 11:53:51 -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 ct2-20020a056214178200b0065b0d9b4ee7sm4199409qvb.20.2023.11.21.11.53.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 11:53:51 -0800 (PST) From: Ricardo Ribalda Date: Tue, 21 Nov 2023 19:53:48 +0000 Subject: [PATCH v3 1/3] media: uvcvideo: Always use uvc_status_stop() MIME-Version: 1.0 Message-Id: <20231121-guenter-mini-v3-1-d8a5eae2312b@chromium.org> References: <20231121-guenter-mini-v3-0-d8a5eae2312b@chromium.org> In-Reply-To: <20231121-guenter-mini-v3-0-d8a5eae2312b@chromium.org> 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 X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Tue, 21 Nov 2023 11:53:57 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783204611055307490 X-GMAIL-MSGID: 1783204611055307490 uvc_status_stop() handles properly the race conditions with the asynchronous worker. Let's use uvc_status_stop() for all the code paths that require stopping it. Signed-off-by: Ricardo Ribalda Reviewed-by: Sakari Ailus --- drivers/media/usb/uvc/uvc_ctrl.c | 4 ---- drivers/media/usb/uvc/uvc_status.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index e59a463c2761..8e22a07e3e7b 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2765,10 +2765,6 @@ void uvc_ctrl_cleanup_device(struct uvc_device *dev) struct uvc_entity *entity; unsigned int i; - /* Can be uninitialized if we are aborting on probe error. */ - if (dev->async_ctrl.work.func) - cancel_work_sync(&dev->async_ctrl.work); - /* Free controls and control mappings for all entities. */ list_for_each_entry(entity, &dev->entities, list) { for (i = 0; i < entity->ncontrols; ++i) { diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c index a78a88c710e2..0208612a9f12 100644 --- a/drivers/media/usb/uvc/uvc_status.c +++ b/drivers/media/usb/uvc/uvc_status.c @@ -292,7 +292,7 @@ int uvc_status_init(struct uvc_device *dev) void uvc_status_unregister(struct uvc_device *dev) { - usb_kill_urb(dev->int_urb); + uvc_status_stop(dev); uvc_input_unregister(dev); } From patchwork Tue Nov 21 19:53:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 167917 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp878083vqb; Tue, 21 Nov 2023 11:54:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IFUGP1IMocsNvMmKuAl9sBtFgZ7+A5RH7AARTZ9EOr81HHN9jVnKsYMvJfHCUtLrtmmUIKd X-Received: by 2002:a17:90b:3508:b0:280:5e66:a1e2 with SMTP id ls8-20020a17090b350800b002805e66a1e2mr255138pjb.22.1700596452359; Tue, 21 Nov 2023 11:54:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700596452; cv=none; d=google.com; s=arc-20160816; b=a0BNQPBamG/D/Z9y/mBhLueOSWcr44tSby/dTNPggdLDJAWguVKO/7oZK+aXc6BRn0 iVTnQuUsPmdBaBTp35ImpCgSnCaWMDTj8tbbAlTbbCg2UirBxP7D0hwH9tfVSwNhaPF+ tuI54U01qHtgHhq5bT/EwGMmAnOkZ8fiocPIkj+SD5vdFSM7tQYILtX6YlJ+mgzbyh2u SWRapAhGcxJe4fZ+yX0DANP1iZSbat9M6x4JhZvOt5i9hEmPYJylKqyn6RmcAiEN335G zjeqlmRWzuConub7k21QxxqRYVhyC2JAPvdmUjSF6Y8cOA507ucUrFXpZwh56gOyS6JB 4Xvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=b3dKWWo3LzCAEQiNhkIr0MWg5E8+oPU3fVyqu1x1TiE=; fh=Olmnw9EiPOHXl6tXYk5T9PPwqL+0H7V+IoxB1uD1V0I=; b=ZhmLGb/OXtOyZZmyH5277ZYZ+A7DUirB8TWDCNXNFYUjXK4dBvjdkJiMcnU4Iyuu58 bqLkOJXroJLveuhcB1adrQUz4og1ngpjhCv19V6smx5k5ILb+L9YToFaRdWQZ5pqbC1z +qxd3/L8qyWGYo4j+jIEi+3lJJDlSvcC1u8USOTWn/FO4rPRobII6DIyWxfbHV34oSID 4wavTZRhhM4z1caF5+TJzVfoLpTwHmlaKeOMe0e/gvxNa56NwVs2yPMVIYClZi0wtqGU hszKRPdfjdRFKHdFmERMGYaOuka+bLb+LyGHHzXhvYWpyK9mF52UbH8Py/NWWB7BkfZw uuXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Crb37cSy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id il9-20020a17090b164900b002839c04c026si10274007pjb.100.2023.11.21.11.54.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 11:54:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Crb37cSy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id C6DF28160388; Tue, 21 Nov 2023 11:54:00 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233681AbjKUTx7 (ORCPT + 99 others); Tue, 21 Nov 2023 14:53:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231335AbjKUTx5 (ORCPT ); Tue, 21 Nov 2023 14:53:57 -0500 Received: from mail-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C73BE18E for ; Tue, 21 Nov 2023 11:53:53 -0800 (PST) Received: by mail-qv1-xf33.google.com with SMTP id 6a1803df08f44-677f832d844so20608406d6.2 for ; Tue, 21 Nov 2023 11:53:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1700596433; x=1701201233; 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=b3dKWWo3LzCAEQiNhkIr0MWg5E8+oPU3fVyqu1x1TiE=; b=Crb37cSysZk6ssFT2wZzBeAY6UFXgEeq++bTqg3NCWi0s9fVENA2fd0ArX7nF9/fIB GaVviUbqaOP8xOkiA3MtM4K3BvGwMY4jxhVBuzkC91ri27vfI8jUpOdj+zD4ICeMCin7 y6rO7sThVd/sf6pl3ZVRfF0TukWq6UzT/rVXw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700596433; x=1701201233; 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=b3dKWWo3LzCAEQiNhkIr0MWg5E8+oPU3fVyqu1x1TiE=; b=LX7lZsRSf4lFqZIqRFoU0kn9J0HQqVmh4xhngeP3lsVG1lUjKl1pk0qMiJbWNibURV SXbA7xyulvQKEFoSBe0kXfkhX2tJSO3bG0D/EQNFLFhqBOVWset6uIfh4YKhxFeTG5U+ UDp+wwMZ3r1XQUqJIqYKeC3N9kr3jImsdwgyIHr0seSmv4SvJJrCJ/mM5WMCpFS6o+/o sNVznPynq/lgaRYoJnZJeEEyoD755idBru8JEPIE0QzaSRgenbDC8IMjF85qcI7j2XVa iDkiTu2u2V8KVGFLPrxFeRzs4oGoWgnNw3sF9UwJUpX9/F7yB1nyafcU+g3EZoZhtyb6 nasA== X-Gm-Message-State: AOJu0YyzdkPUwJM21r3oegdqwS4hAt6EvTez+O0YCVzsh/EEAA5VKM/O ZuROUvgZ/qyNJmSD2GwTnelOpA== X-Received: by 2002:a05:6214:2341:b0:675:65d6:d0f3 with SMTP id hu1-20020a056214234100b0067565d6d0f3mr77672qvb.24.1700596432960; Tue, 21 Nov 2023 11:53:52 -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 ct2-20020a056214178200b0065b0d9b4ee7sm4199409qvb.20.2023.11.21.11.53.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 11:53:52 -0800 (PST) From: Ricardo Ribalda Date: Tue, 21 Nov 2023 19:53:49 +0000 Subject: [PATCH v3 2/3] media: uvcvideo: Do not halt the device after disconnect MIME-Version: 1.0 Message-Id: <20231121-guenter-mini-v3-2-d8a5eae2312b@chromium.org> References: <20231121-guenter-mini-v3-0-d8a5eae2312b@chromium.org> In-Reply-To: <20231121-guenter-mini-v3-0-d8a5eae2312b@chromium.org> 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 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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Tue, 21 Nov 2023 11:54:01 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783204625315578743 X-GMAIL-MSGID: 1783204625315578743 usb drivers should not call to any usb_() function after the .disconnect() callback has been triggered. If the camera is streaming, the uvc driver will call usb_set_interface or usb_clear_halt once the device is being released. Let's fix this issue. This is probably not the only driver affected with this kind of bug, but until there is a better way to do it in the core this is the way to solve this issue. When/if a different mechanism is implemented in the core to solve the lifetime of devices we will adopt it in uvc. Trace: [ 1065.389723] drivers/media/usb/uvc/uvc_driver.c:2248 uvc_disconnect enter [ 1065.390160] drivers/media/usb/uvc/uvc_driver.c:2264 uvc_disconnect exit [ 1065.433956] drivers/media/usb/uvc/uvc_v4l2.c:659 uvc_v4l2_release enter [ 1065.433973] drivers/media/usb/uvc/uvc_video.c:2274 uvc_video_stop_streaming enter [ 1065.434560] drivers/media/usb/uvc/uvc_video.c:2285 uvc_video_stop_streaming exit [ 1065.435154] drivers/media/usb/uvc/uvc_v4l2.c:680 uvc_v4l2_release exit [ 1065.435188] drivers/media/usb/uvc/uvc_driver.c:2248 uvc_disconnect enter Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 2 ++ drivers/media/usb/uvc/uvc_video.c | 45 ++++++++++++++++++++++++-------------- drivers/media/usb/uvc/uvcvideo.h | 2 ++ 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 08fcd2ffa727..413c32867617 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2257,6 +2257,8 @@ static void uvc_disconnect(struct usb_interface *intf) return; uvc_unregister_video(dev); + /* Barrier needed to synchronize with uvc_video_stop_streaming(). */ + smp_store_release(&dev->disconnected, true); kref_put(&dev->ref, uvc_delete); } diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 28dde08ec6c5..032b44e45b22 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -2243,28 +2243,39 @@ int uvc_video_start_streaming(struct uvc_streaming *stream) return ret; } -void uvc_video_stop_streaming(struct uvc_streaming *stream) +static void uvc_video_halt(struct uvc_streaming *stream) { - uvc_video_stop_transfer(stream, 1); + unsigned int epnum; + unsigned int pipe; + unsigned int dir; if (stream->intf->num_altsetting > 1) { usb_set_interface(stream->dev->udev, stream->intfnum, 0); - } else { - /* - * UVC doesn't specify how to inform a bulk-based device - * when the video stream is stopped. Windows sends a - * CLEAR_FEATURE(HALT) request to the video streaming - * bulk endpoint, mimic the same behaviour. - */ - unsigned int epnum = stream->header.bEndpointAddress - & USB_ENDPOINT_NUMBER_MASK; - unsigned int dir = stream->header.bEndpointAddress - & USB_ENDPOINT_DIR_MASK; - unsigned int pipe; - - pipe = usb_sndbulkpipe(stream->dev->udev, epnum) | dir; - usb_clear_halt(stream->dev->udev, pipe); + return; } + /* + * UVC doesn't specify how to inform a bulk-based device + * when the video stream is stopped. Windows sends a + * CLEAR_FEATURE(HALT) request to the video streaming + * bulk endpoint, mimic the same behaviour. + */ + epnum = stream->header.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK; + dir = stream->header.bEndpointAddress & USB_ENDPOINT_DIR_MASK; + pipe = usb_sndbulkpipe(stream->dev->udev, epnum) | dir; + usb_clear_halt(stream->dev->udev, pipe); +} + +void uvc_video_stop_streaming(struct uvc_streaming *stream) +{ + uvc_video_stop_transfer(stream, 1); + + /* + * Barrier needed to synchronize with uvc_disconnect(). + * We cannot call usb_* functions on a disconnected USB device. + */ + if (!smp_load_acquire(&stream->dev->disconnected)) + uvc_video_halt(stream); + uvc_video_clock_cleanup(stream); } diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 6fb0a78b1b00..4318ce8e31db 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -559,6 +559,8 @@ struct uvc_device { unsigned int users; atomic_t nmappings; + bool disconnected; + /* Video control interface */ #ifdef CONFIG_MEDIA_CONTROLLER struct media_device mdev; From patchwork Tue Nov 21 19:53:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 167916 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp878049vqb; Tue, 21 Nov 2023 11:54:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IFXzYlITRysV6Azcu6cAsDQJvo8OlY/ibZx/ePhTnKMm0HZZnmdm9UNvPyR005GepI48jqS X-Received: by 2002:a05:6a00:1910:b0:6cb:68d7:b1bc with SMTP id y16-20020a056a00191000b006cb68d7b1bcmr172477pfi.30.1700596449398; Tue, 21 Nov 2023 11:54:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700596449; cv=none; d=google.com; s=arc-20160816; b=elqyF0fi2CGKNrVenizFlkB4FqPoSE9jTRrny9RUO+QC2tdeoWYEE2ek5pNYhRqKkj NTHuBCigQvzeyRRcMkVAhJn1AS7JY4dUBQllyExDED2fJhj3m2df73EdNZG57oXc+THX RkqiL2BrGl5t9q1nekeUy7MSxNsCzxVr0htNbdkRokb6ryLMEMbMP7sgWwsxdKodxc7t T7Va2Qpkfmjja7NuCsMmo2mqgUaW/87HDZ1yBLlUrY0vt/aQZKtq62elw9wFrJlTvap2 4BS4TBWQpANsnCwFZG49D7Dc98W5ZAYVy16EfOmfNm9NGRWHpqZonyKR84VuK6nkIai8 KC8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=vBBR3Lb8+qLiLMbc/jEnU4Lx/0wS0LihO+fwyf1YUqQ=; fh=Olmnw9EiPOHXl6tXYk5T9PPwqL+0H7V+IoxB1uD1V0I=; b=GgYjN4ORcZ/zhYoTgtGT/A2Y8X0s9mgwTRopcyoTYim3W90UN1ZJU6P6GFA36kHYk+ PDxOqcn4Rlg4QPCKr3FepCkqMKWPkunNRFWo5E04EhhvcP2qwwVvAiRZXRyPuho9v4ya ADjNL7wQKEH6/u0fwlbOylGSwMDSIqE/ILzFGet2fDn8pqAiWxlAanYQ31P4DlRer2SB r5cKrDhxsFpZVWSM7MjGlEYnk4R9Oj9a4zAOm26E1bEc3pY5tRCFN2OhTaunesyuCTvi xlhPV1KSGWSwZebKA2WEXn7pEzw02kasbH8nTUGy8sw1PaeIHOtuLfxHT43D4Aa8kINN XHHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=mVJnvzEg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id s34-20020a056a0017a200b006c6a9c10e15si11148464pfg.46.2023.11.21.11.54.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 11:54:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=mVJnvzEg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 3EC09811F137; Tue, 21 Nov 2023 11:54:08 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233952AbjKUTyB (ORCPT + 99 others); Tue, 21 Nov 2023 14:54:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233504AbjKUTx6 (ORCPT ); Tue, 21 Nov 2023 14:53:58 -0500 Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 998791A2 for ; Tue, 21 Nov 2023 11:53:54 -0800 (PST) Received: by mail-ot1-x32d.google.com with SMTP id 46e09a7af769-6d7e3be2614so494746a34.2 for ; Tue, 21 Nov 2023 11:53:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1700596434; x=1701201234; 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=vBBR3Lb8+qLiLMbc/jEnU4Lx/0wS0LihO+fwyf1YUqQ=; b=mVJnvzEgvHgTXvGHTkIA53uO+Ifdo3TgXxNPsUo7sb4BRl2+BghrRSdPx5Itbp8EVF 7FdkBg+7JcCw+Y8PTu4vxCcF5ADjPPRslOEWwgdAcjDBEJBlzSse6WWJPzoIzemABcgC HRuV09zfPV86dCbLDhPqVwHSd5tzUb70pWu4w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700596434; x=1701201234; 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=vBBR3Lb8+qLiLMbc/jEnU4Lx/0wS0LihO+fwyf1YUqQ=; b=BYJYB4+e2RkHuN0z7nlLwYEiISd2XHM9w2/CsD0LuzPe+tmpNRsLsebxmm3c5RQ+wE 6JVyM2ivK8PHMWLZ7qB5YKXiHH0PVWUqLsrIUJ6Y4giPwzZ9TxsRFX6SEyYOam9q5oM3 TDCUeEagoV9Ywu3C1I8rXF7/9E0IjRUcllbzWrQZjrL5d5hS9rVQXRJjPLzH1/mhDTGY TPMVikNkjoj2NFVtrK/b0DFfCYbTc+xiQidrOdADheImER5F3WTK6imPbiAW+kl2Ftut QY9baKB1mSE73p6fma1bLuTd5e2YYbgpB+NS2RI0uTTYkUn+sll8GLkhwLx8KaOX10bC 0ItQ== X-Gm-Message-State: AOJu0YxXclhUeKUyZ2XCTHENWEIXu1zi2bV6vDqVNa7Afze/8zjtYrmD 1Kf0/ruBc8dSevjx5TeHP/0egA== X-Received: by 2002:a05:6830:39cc:b0:6d6:4c25:5a56 with SMTP id bt12-20020a05683039cc00b006d64c255a56mr325498otb.12.1700596433867; Tue, 21 Nov 2023 11:53:53 -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 ct2-20020a056214178200b0065b0d9b4ee7sm4199409qvb.20.2023.11.21.11.53.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 11:53:53 -0800 (PST) From: Ricardo Ribalda Date: Tue, 21 Nov 2023 19:53:50 +0000 Subject: [PATCH v3 3/3] media: uvcvideo: Lock video streams and queues while unregistering MIME-Version: 1.0 Message-Id: <20231121-guenter-mini-v3-3-d8a5eae2312b@chromium.org> References: <20231121-guenter-mini-v3-0-d8a5eae2312b@chromium.org> In-Reply-To: <20231121-guenter-mini-v3-0-d8a5eae2312b@chromium.org> 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 X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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 lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Tue, 21 Nov 2023 11:54:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783204622535991348 X-GMAIL-MSGID: 1783204622535991348 From: Guenter Roeck The call to uvc_disconnect() is not protected by any mutex. This means it can and will be called while other accesses to the video device are in progress. This can cause all kinds of race conditions, including crashes such as the following. usb 1-4: USB disconnect, device number 3 BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP PTI CPU: 0 PID: 5633 Comm: V4L2CaptureThre Not tainted 4.19.113-08536-g5d29ca36db06 #1 Hardware name: GOOGLE Edgar, BIOS Google_Edgar.7287.167.156 03/25/2019 RIP: 0010:usb_ifnum_to_if+0x29/0x40 Code: <...> RSP: 0018:ffffa46f42a47a80 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff904a396c9000 RDX: ffff904a39641320 RSI: 0000000000000001 RDI: 0000000000000000 RBP: ffffa46f42a47a80 R08: 0000000000000002 R09: 0000000000000000 R10: 0000000000009975 R11: 0000000000000009 R12: 0000000000000000 R13: ffff904a396b3800 R14: ffff904a39e88000 R15: 0000000000000000 FS: 00007f396448e700(0000) GS:ffff904a3ba00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 000000016cb46000 CR4: 00000000001006f0 Call Trace: usb_hcd_alloc_bandwidth+0x1ee/0x30f usb_set_interface+0x1a3/0x2b7 uvc_video_start_transfer+0x29b/0x4b8 [uvcvideo] uvc_video_start_streaming+0x91/0xdd [uvcvideo] uvc_start_streaming+0x28/0x5d [uvcvideo] vb2_start_streaming+0x61/0x143 [videobuf2_common] vb2_core_streamon+0xf7/0x10f [videobuf2_common] uvc_queue_streamon+0x2e/0x41 [uvcvideo] uvc_ioctl_streamon+0x42/0x5c [uvcvideo] __video_do_ioctl+0x33d/0x42a video_usercopy+0x34e/0x5ff ? video_ioctl2+0x16/0x16 v4l2_ioctl+0x46/0x53 do_vfs_ioctl+0x50a/0x76f ksys_ioctl+0x58/0x83 __x64_sys_ioctl+0x1a/0x1e do_syscall_64+0x54/0xde usb_set_interface() should not be called after the USB device has been unregistered. However, in the above case the disconnect happened after v4l2_ioctl() was called, but before the call to usb_ifnum_to_if(). Acquire various mutexes in uvc_unregister_video() to fix the majority (maybe all) of the observed race conditions. The uvc_device lock prevents races against suspend and resume calls and the poll function. The uvc_streaming lock prevents races against stream related functions; for the most part, those are ioctls. This lock also requires other functions using this lock to check if a video device is still registered after acquiring it. For example, it was observed that the video device was already unregistered by the time the stream lock was acquired in uvc_ioctl_streamon(). The uvc_queue lock prevents races against queue functions, Most of those are already protected by the uvc_streaming lock, but some are called directly. This is done as added protection; an actual race was not (yet) observed. Cc: Laurent Pinchart Cc: Alan Stern Cc: Hans Verkuil Reviewed-by: Tomasz Figa Reviewed-by: Sean Paul Signed-off-by: Guenter Roeck Signed-off-by: Ricardo Ribalda Reviewed-by: Sergey Senozhatsky --- drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 413c32867617..3408b865d346 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1907,14 +1907,22 @@ static void uvc_unregister_video(struct uvc_device *dev) { struct uvc_streaming *stream; + mutex_lock(&dev->lock); + list_for_each_entry(stream, &dev->streams, list) { if (!video_is_registered(&stream->vdev)) continue; + mutex_lock(&stream->mutex); + mutex_lock(&stream->queue.mutex); + video_unregister_device(&stream->vdev); video_unregister_device(&stream->meta.vdev); uvc_debugfs_cleanup_stream(stream); + + mutex_unlock(&stream->queue.mutex); + mutex_unlock(&stream->mutex); } uvc_status_unregister(dev); @@ -1925,6 +1933,7 @@ static void uvc_unregister_video(struct uvc_device *dev) if (media_devnode_is_registered(dev->mdev.devnode)) media_device_unregister(&dev->mdev); #endif + mutex_unlock(&dev->lock); } int uvc_register_video_device(struct uvc_device *dev,