From patchwork Mon Oct 30 20:22:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avichal Rakesh X-Patchwork-Id: 159869 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp2485264vqb; Mon, 30 Oct 2023 13:22:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHzJmHxaKLE9Ak0gSpKIqN5FXjJGrspv2fWJGla8saTMlGmbB/U8NhmpJnHBUS7m52US+md X-Received: by 2002:a05:6a20:da8f:b0:17b:1f76:86ee with SMTP id iy15-20020a056a20da8f00b0017b1f7686eemr1043524pzb.16.1698697376248; Mon, 30 Oct 2023 13:22:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698697376; cv=none; d=google.com; s=arc-20160816; b=YRQ4P1PBSEdqMBWYYkjn+UaXYDRrBxTw6qbqzB3Jq/6EBooKCk2ROJ0W6+ZiNu7bPP 228s3P1V4f1x2tWLSu4Q9vVGr9gGbpFBFI2ygSFRu6OSMIf6tuYJOwDAIMEqtOk8eUbD xgE9ZLKrs18qYheSuP6bq22zCauscNAoerujwRLKbWTET4NPxrS5M29QagvtSR0HXA4E p01smICucDNjWPLVe7UokrubJD7Fd1rSbd8499H0QZ8Em42Xfi2s+d0DPzvhStPhva75 w1ne0d87bLcrWE4aYA97kjcKZadfhnKogHQFwAeG0hxb7zOxhd2Qs2LT4eiK0IKAiSY0 6i9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=RZbkFdW7n25fZk9cwmO7qLQnmgnKAK5eU70WepjOvI4=; fh=p+LYTnSpNzrqEe7IwOmRmqfbsNd6xnlNPhpiE7PelQI=; b=UEis9b9JnDRkKnLQJ2nV1qhTsOIfvNNeEEqzwlf4pdAGVhZwarmK0GChnmiYVgvUhb uNIWovejUBGtDiKZ49bUH2NtMbIDK+JbSOPzKUiWqnkZD0zUIugFJUhvItChIcZxvNOr fXNYyaZkrQAg9M9SnESOm+Ghd685zMYeiOPkCNsiVaRO7uQ4GCBgt4w2DM3lwT8Bs0h+ O5dyAavroVPtn58UMU7UFoXfX12kfTlwIgPmRXF972L42usgWcYUpHFr5LeG1eNstceq R1/B9XcmQ1xgaEC1aXQnRfpBRlgO7wvCwHs00j6d6ZjasJEvH3KoDB7ZVTT69kW+ALAq PhIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=gvKoH2W+; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id s18-20020a056a0008d200b006c128a7f813si1352276pfu.177.2023.10.30.13.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 13:22:56 -0700 (PDT) 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=@google.com header.s=20230601 header.b=gvKoH2W+; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 7D6F48048C2D; Mon, 30 Oct 2023 13:22:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229891AbjJ3UWm (ORCPT + 32 others); Mon, 30 Oct 2023 16:22:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229485AbjJ3UWl (ORCPT ); Mon, 30 Oct 2023 16:22:41 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF086101 for ; Mon, 30 Oct 2023 13:22:35 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5b0e9c78309so26108727b3.1 for ; Mon, 30 Oct 2023 13:22:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698697355; x=1699302155; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=RZbkFdW7n25fZk9cwmO7qLQnmgnKAK5eU70WepjOvI4=; b=gvKoH2W+4/t9QzFXL/8SBkeGxP72e1Uh7PRT3YaKNFyI9XhOQXxrbi9hMH0/4bXW01 lSH3qMwzNs3Mc7eqCdM/xYPdZCtDJn7aUV4IEV0iR5yHICJCzuym0/NMucWIoY3hGKYA RoYdCfWGHXnr5OUyZTdMVYKi2peejmR+KcoTZATUERIXZ5Icx8ZFnsQuFWuJG1i5vf/v MC0Vsl26d9JzeYjT4nYzFYSQEQ7iqeqv2I0kCFIAPtkcxbcemu+RazEDR2fcLolI5RU0 ZvhrHgMdXAVCnNg5DKHOWcQBl/f+x7qtCZj7UXvRQTDiKABaeoTEi1anPTN6uJF/9GaV /5Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698697355; x=1699302155; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RZbkFdW7n25fZk9cwmO7qLQnmgnKAK5eU70WepjOvI4=; b=BWhdEbW8NkLjnKbNB48rZOn9sMchjyrARIG0P5HBqV2IlZyvU4Nl3rR6NruEy9cSfQ JBQABXrUvtq03X8HqGrJs1seeM8cW4lrXJzylM0K9a3IRD8QRDGnWOWXo9ET7N8Nyv+V bM23FcIzVK7YWOVl3+4hxO0g3zFlccCnUyqSjmR3g9jOq8e9ln4EfUAdd2ofJmbBfCSc oCjvbVVIOY0TgCwRkrq3oCalJ9csc3OvOLar/jccWyJm8s3uRQSAzNjA63Yhh5CE9AdP w/LEv3wRqE/CocXLL7ZAPxzrIyi9t1qDicmeSrupxcBv0WKKKkMvN4eFU/PwoaQPrz+u ChuA== X-Gm-Message-State: AOJu0YzKj0te1mNb1h5nsOCTgKbPkOyYv58e5vXAG9zVCejHoqbgdSKn 87lrIAHtAuvMaltjUfc/DNznxf5rLBBq X-Received: from hi-h2o-specialist.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:3cef]) (user=arakesh job=sendgmr) by 2002:a81:920b:0:b0:59b:f3a2:cd79 with SMTP id j11-20020a81920b000000b0059bf3a2cd79mr219783ywg.8.1698697355197; Mon, 30 Oct 2023 13:22:35 -0700 (PDT) Date: Mon, 30 Oct 2023 13:22:28 -0700 In-Reply-To: <73309396-3856-43a2-9a6f-81a40ed594db@google.com> Mime-Version: 1.0 References: <73309396-3856-43a2-9a6f-81a40ed594db@google.com> X-Mailer: git-send-email 2.42.0.820.g83a721a137-goog Message-ID: <20231030202231.3263253-1-arakesh@google.com> Subject: [PATCH v10 1/4] usb: gadget: uvc: prevent use of disabled endpoint From: Avichal Rakesh To: arakesh@google.com, dan.scally@ideasonboard.com Cc: etalvala@google.com, gregkh@linuxfoundation.org, jchowdhary@google.com, laurent.pinchart@ideasonboard.com, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, m.grzeschik@pengutronix.de X-Spam-Status: No, score=-5.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SORTED_RECIPS,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=no 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]); Mon, 30 Oct 2023 13:22:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780941353830649923 X-GMAIL-MSGID: 1781213299742034630 Currently the set_alt callback immediately disables the endpoint and queues the v4l2 streamoff event. However, as the streamoff event is processed asynchronously, it is possible that the video_pump thread attempts to queue requests to an already disabled endpoint. This change moves disabling usb endpoint to the end of streamoff event callback. As the endpoint's state can no longer be used, video_pump is now guarded by uvc->state as well. To be consistent with the actual streaming state, uvc->state is now toggled between CONNECTED and STREAMING from the v4l2 event callback only. Link: https://lore.kernel.org/20230615171558.GK741@pendragon.ideasonboard.com/ Link: https://lore.kernel.org/20230531085544.253363-1-dan.scally@ideasonboard.com/ Reviewed-by: Daniel Scally Reviewed-by: Michael Grzeschik Tested-by: Michael Grzeschik Signed-off-by: Avichal Rakesh --- v1 -> v2 : Rebased to ToT and reworded commit message. v2 -> v3 : Fix email threading goof-up v3 -> v4 : Address review comments & re-rebase to ToT v4 -> v5 : Add Reviewed-by & Tested-by v5 -> v6 : No change v6 -> v7 : No change v7 -> v8 : No change. Getting back in review queue v8 -> v9 : Fix typo. No functional change. v9 -> v10: Rebase to ToT (usb-next) drivers/usb/gadget/function/f_uvc.c | 11 +++++------ drivers/usb/gadget/function/f_uvc.h | 2 +- drivers/usb/gadget/function/uvc.h | 2 +- drivers/usb/gadget/function/uvc_v4l2.c | 20 +++++++++++++++++--- drivers/usb/gadget/function/uvc_video.c | 3 ++- 5 files changed, 26 insertions(+), 12 deletions(-) -- 2.42.0.820.g83a721a137-goog diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index 786379f1b7b7..77999ed53d33 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -263,10 +263,13 @@ uvc_function_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) return 0; } -void uvc_function_setup_continue(struct uvc_device *uvc) +void uvc_function_setup_continue(struct uvc_device *uvc, int disable_ep) { struct usb_composite_dev *cdev = uvc->func.config->cdev; + if (disable_ep && uvc->video.ep) + usb_ep_disable(uvc->video.ep); + usb_composite_setup_continue(cdev); } @@ -337,15 +340,11 @@ uvc_function_set_alt(struct usb_function *f, unsigned interface, unsigned alt) if (uvc->state != UVC_STATE_STREAMING) return 0; - if (uvc->video.ep) - usb_ep_disable(uvc->video.ep); - memset(&v4l2_event, 0, sizeof(v4l2_event)); v4l2_event.type = UVC_EVENT_STREAMOFF; v4l2_event_queue(&uvc->vdev, &v4l2_event); - uvc->state = UVC_STATE_CONNECTED; - return 0; + return USB_GADGET_DELAYED_STATUS; case 1: if (uvc->state != UVC_STATE_CONNECTED) diff --git a/drivers/usb/gadget/function/f_uvc.h b/drivers/usb/gadget/function/f_uvc.h index 1db972d4beeb..083aef0c65c6 100644 --- a/drivers/usb/gadget/function/f_uvc.h +++ b/drivers/usb/gadget/function/f_uvc.h @@ -11,7 +11,7 @@ struct uvc_device; -void uvc_function_setup_continue(struct uvc_device *uvc); +void uvc_function_setup_continue(struct uvc_device *uvc, int disable_ep); void uvc_function_connect(struct uvc_device *uvc); diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h index 6751de8b63ad..989bc6b4e93d 100644 --- a/drivers/usb/gadget/function/uvc.h +++ b/drivers/usb/gadget/function/uvc.h @@ -177,7 +177,7 @@ struct uvc_file_handle { * Functions */ -extern void uvc_function_setup_continue(struct uvc_device *uvc); +extern void uvc_function_setup_continue(struct uvc_device *uvc, int disable_ep); extern void uvc_function_connect(struct uvc_device *uvc); extern void uvc_function_disconnect(struct uvc_device *uvc); diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c index 3f0a9795c0d4..7cb8d027ff0c 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -451,7 +451,7 @@ uvc_v4l2_streamon(struct file *file, void *fh, enum v4l2_buf_type type) * Complete the alternate setting selection setup phase now that * userspace is ready to provide video frames. */ - uvc_function_setup_continue(uvc); + uvc_function_setup_continue(uvc, 0); uvc->state = UVC_STATE_STREAMING; return 0; @@ -463,11 +463,18 @@ uvc_v4l2_streamoff(struct file *file, void *fh, enum v4l2_buf_type type) struct video_device *vdev = video_devdata(file); struct uvc_device *uvc = video_get_drvdata(vdev); struct uvc_video *video = &uvc->video; + int ret = 0; if (type != video->queue.queue.type) return -EINVAL; - return uvcg_video_enable(video, 0); + uvc->state = UVC_STATE_CONNECTED; + ret = uvcg_video_enable(video, 0); + if (ret < 0) + return ret; + + uvc_function_setup_continue(uvc, 1); + return 0; } static int @@ -500,6 +507,14 @@ uvc_v4l2_subscribe_event(struct v4l2_fh *fh, static void uvc_v4l2_disable(struct uvc_device *uvc) { uvc_function_disconnect(uvc); + /* + * Drop uvc->state to CONNECTED if it was streaming before. + * This ensures that the usb_requests are no longer queued + * to the controller. + */ + if (uvc->state == UVC_STATE_STREAMING) + uvc->state = UVC_STATE_CONNECTED; + uvcg_video_enable(&uvc->video, 0); uvcg_free_buffers(&uvc->video.queue); uvc->func_connected = false; @@ -647,4 +662,3 @@ const struct v4l2_file_operations uvc_v4l2_fops = { .get_unmapped_area = uvcg_v4l2_get_unmapped_area, #endif }; - diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c index 91af3b1ef0d4..c334802ac0a4 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c @@ -384,13 +384,14 @@ static void uvcg_video_pump(struct work_struct *work) struct uvc_video_queue *queue = &video->queue; /* video->max_payload_size is only set when using bulk transfer */ bool is_bulk = video->max_payload_size; + struct uvc_device *uvc = video->uvc; struct usb_request *req = NULL; struct uvc_buffer *buf; unsigned long flags; bool buf_done; int ret; - while (video->ep->enabled) { + while (uvc->state == UVC_STATE_STREAMING && video->ep->enabled) { /* * Retrieve the first available USB request, protected by the * request lock.