Message ID | 20231121-guenter-mini-v3-2-d8a5eae2312b@chromium.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> 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 <rfc822;ouuuleilei@gmail.com> + 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 <rfc822;linux-kernel@vger.kernel.org>); 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 <linux-kernel@vger.kernel.org>; Tue, 21 Nov 2023 11:53:53 -0800 (PST) Received: by mail-qv1-xf33.google.com with SMTP id 6a1803df08f44-677f832d844so20608406d6.2 for <linux-kernel@vger.kernel.org>; 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 <ribalda@chromium.org> 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 <mchehab@kernel.org> Cc: Guenter Roeck <linux@roeck-us.net>, Tomasz Figa <tfiga@chromium.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Alan Stern <stern@rowland.harvard.edu>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sean Paul <seanpaul@chromium.org>, Ricardo Ribalda <ribalda@chromium.org>, Sakari Ailus <sakari.ailus@linux.intel.com> 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: <linux-kernel.vger.kernel.org> 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 |
Series |
uvcvideo: Attempt N to land UVC race conditions fixes
|
|
Commit Message
Ricardo Ribalda
Nov. 21, 2023, 7:53 p.m. UTC
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 <ribalda@chromium.org>
---
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(-)
Comments
On (23/11/21 19:53), Ricardo Ribalda wrote: > 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); > } [..] > +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); > } Can the following happen? CPU0 CPU1 uvc_disconnect() uvc_video_stop_streaming() usb_set_intfdata() uvc_unregister_video() if (!smp_load(&dev->disconnected)) uvc_video_halt() smp_store_release(&dev->disconnected, true); kref_put(&dev->ref, uvc_delete);
On (23/11/22 16:47), Sergey Senozhatsky wrote: > Can the following happen? Consider the following case (when CPU1 experienced a delay, a preemption or anything): > CPU0 CPU1 > uvc_disconnect() > uvc_video_stop_streaming() > usb_set_intfdata() > uvc_unregister_video() > > if (!smp_load(&dev->disconnected)) > > smp_store_release(&dev->disconnected, true); > > kref_put(&dev->ref, uvc_delete); > uvc_video_halt() That uvc_video_halt() cannot be legal, right?
Hi Sergey On Wed, 22 Nov 2023 at 09:01, Sergey Senozhatsky <senozhatsky@chromium.org> wrote: > > On (23/11/22 16:47), Sergey Senozhatsky wrote: > > Can the following happen? > > Consider the following case (when CPU1 experienced a delay, a preemption > or anything): > > > CPU0 CPU1 > > uvc_disconnect() > > uvc_video_stop_streaming() > > usb_set_intfdata() > > uvc_unregister_video() > > > > if (!smp_load(&dev->disconnected)) > > > > smp_store_release(&dev->disconnected, true); > > > > kref_put(&dev->ref, uvc_delete); > > > uvc_video_halt() > > That uvc_video_halt() cannot be legal, right? This patch only takes care of calls to uvc_video_stop_streaming() after .disconnect. Guenter's patch from this series should take care of the concurrent calls. I will resend making it explicit. Thanks!
Hi Ricardo, Thank you for the patch. On Tue, Nov 21, 2023 at 07:53:49PM +0000, Ricardo Ribalda wrote: > 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 <ribalda@chromium.org> > --- > 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) { Doesn't this imply the device is using isochronous mode? > 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 Then this comment doesn't look right. What about the code? This isn't mentioned in the commit message either. > + * 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; >
Hi Sakari On Wed, 22 Nov 2023 at 11:25, Sakari Ailus <sakari.ailus@iki.fi> wrote: > > Hi Ricardo, > > Thank you for the patch. > > On Tue, Nov 21, 2023 at 07:53:49PM +0000, Ricardo Ribalda wrote: > > 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 <ribalda@chromium.org> > > --- > > 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) { > > Doesn't this imply the device is using isochronous mode? I haven't changed the behaviour for halt, it is just that git diff is being a bit too creative here: Basically it is doing: void video_halt() { if (is_isoc()) { usb_set_interface(stream->dev->udev, stream->intfnum, 0); return; } usb_clear_halt(); } instead of the old: void video_halt() { if (is_isoc()) { usb_set_interface(stream->dev->udev, stream->intfnum, 0); } else { usb_clear_halt(); } } Thanks! > > > 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 > > Then this comment doesn't look right. What about the code? This isn't > mentioned in the commit message either. > > > + * 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; > > > > -- > Kind regards, > > Sakari Ailus
Hi Ricardo, On Wed, Nov 22, 2023 at 11:32:16AM +0100, Ricardo Ribalda wrote: > Hi Sakari > > On Wed, 22 Nov 2023 at 11:25, Sakari Ailus <sakari.ailus@iki.fi> wrote: > > > > Hi Ricardo, > > > > Thank you for the patch. > > > > On Tue, Nov 21, 2023 at 07:53:49PM +0000, Ricardo Ribalda wrote: > > > 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 <ribalda@chromium.org> > > > --- > > > 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) { > > > > Doesn't this imply the device is using isochronous mode? > > I haven't changed the behaviour for halt, it is just that git diff is > being a bit too creative here: > > Basically it is doing: > > void video_halt() { > if (is_isoc()) { > usb_set_interface(stream->dev->udev, stream->intfnum, 0); > return; > } > usb_clear_halt(); > } > > instead of the old: > > void video_halt() { > if (is_isoc()) { > usb_set_interface(stream->dev->udev, stream->intfnum, 0); > } else { > usb_clear_halt(); > } > } > > Thanks! Oops. I missed the removal of the else branch altogether while reading the patch. Shouldn't you also ensure the disconnect callback won't return until the streaming has been stopped here? > > > > > 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 > > > > Then this comment doesn't look right. What about the code? This isn't > > mentioned in the commit message either. > > > > > + * 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;
Hi On Wed, 22 Nov 2023 at 12:04, Sakari Ailus <sakari.ailus@iki.fi> wrote: > > Hi Ricardo, > > On Wed, Nov 22, 2023 at 11:32:16AM +0100, Ricardo Ribalda wrote: > > Hi Sakari > > > > On Wed, 22 Nov 2023 at 11:25, Sakari Ailus <sakari.ailus@iki.fi> wrote: > > > > > > Hi Ricardo, > > > > > > Thank you for the patch. > > > > > > On Tue, Nov 21, 2023 at 07:53:49PM +0000, Ricardo Ribalda wrote: > > > > 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 <ribalda@chromium.org> > > > > --- > > > > 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) { > > > > > > Doesn't this imply the device is using isochronous mode? > > > > I haven't changed the behaviour for halt, it is just that git diff is > > being a bit too creative here: > > > > Basically it is doing: > > > > void video_halt() { > > if (is_isoc()) { > > usb_set_interface(stream->dev->udev, stream->intfnum, 0); > > return; > > } > > usb_clear_halt(); > > } > > > > instead of the old: > > > > void video_halt() { > > if (is_isoc()) { > > usb_set_interface(stream->dev->udev, stream->intfnum, 0); > > } else { > > usb_clear_halt(); > > } > > } > > > > Thanks! > > Oops. I missed the removal of the else branch altogether while reading the > patch. > > Shouldn't you also ensure the disconnect callback won't return until the > streaming has been stopped here? This patch is just for calls after .disconnect. It will not protect for concurrent calls. I have sent a v4 making this explicit. We still need: media: uvcvideo: Lock video streams and queues while unregistering or similar. Thanks! > > > > > > > > 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 > > > > > > Then this comment doesn't look right. What about the code? This isn't > > > mentioned in the commit message either. > > > > > > > + * 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; > > -- > Kind regards, > > Sakari Ailus
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;