From patchwork Thu Oct 26 14:23:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 158561 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp715349vqb; Thu, 26 Oct 2023 07:24:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEkiDk0aqeSDJU17MHSbwiiiPMIBhCbMCkNE/d+G2WwcziHzvB6yxN3Z9sN6Xcakk8ZDg8Z X-Received: by 2002:a05:6808:1895:b0:3ac:b73a:757f with SMTP id bi21-20020a056808189500b003acb73a757fmr18556038oib.39.1698330293558; Thu, 26 Oct 2023 07:24:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698330293; cv=none; d=google.com; s=arc-20160816; b=WLdtR0M25K6/X1Av6vNaqlbN1qpFR6eNVlSAuyxzx+VtZEfm3yxGYScmaxxlSK8V0U 8x6jQOHzCvDb3HkwOYeh9Eh5Vk+/sTfZVoB+nq7r9TnBcPXFDXwIZsYZHXbelgEvaMRn xxFCTTzZ/71J42IM/nyxbiwnJHVck73aYEgCbtXgVUjpr9HlnlsKhxGSXDztEXtC2i/v qxnIuinDGPIWlfIhWvcpXARIg7IPj3QHDIUAmkKY2R0NxBiramL9d89I5k8VX9Shj8cN +/ksPK2jvfWQIUTi5yuSPdBEBtlgdwn7t+Te3mxKsGnrndd+xMNTSTJWaxrEFCRtIQ6U qL4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=w9sbKYXZtIyf/ohQE3Edg07I3no4RCuR4cZPauSieZc=; fh=q6dJyfmJ5aFZN8bWGYgWdkT0uTkQR5Dhijz5GpOkTmI=; b=ieOHnhG2xTdFxozqgtMjH3pwnf5Bk72sngLTmoGe5n90hZTNr8HU3M/+heElHBGnaV qaJKqJ2jCI0pRO/Ggh8OEU1xgAJtZyX94ogxKZ8rl1Wd/SaM4CdAJxHyEoxTrDfXWJcM eCafZJa833zlbUwbNT1xOy1EJlhhENyKK1gxihnf9PTTrQJSo+dhthGfmuNF56KEZ/2H OGy94lcR2bU+MJYkQp4ig0nIxCTfvYpPX/pPVPo1OlllAKkrOpjGv0XvjT5WC80O52yN eDyE7XLVoXFHXTiBK+u8OlCoL4gGTtvvjYNjO1uFq3kK+l2Z/nydCW8pZyD/xGwdYPNT 9kgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=pzsjr0LI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id x130-20020a254a88000000b00da07b0da758si5100637yba.6.2023.10.26.07.24.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 07:24:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=pzsjr0LI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 086DB80D6529; Thu, 26 Oct 2023 07:24:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345225AbjJZOYQ (ORCPT + 26 others); Thu, 26 Oct 2023 10:24:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234902AbjJZOYO (ORCPT ); Thu, 26 Oct 2023 10:24:14 -0400 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B6009C for ; Thu, 26 Oct 2023 07:24:09 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1698330247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=w9sbKYXZtIyf/ohQE3Edg07I3no4RCuR4cZPauSieZc=; b=pzsjr0LIp7pb/XtXqknldRSmwBGEupiwm0vXOysw+nZ5AkXmX4Mn1tMREjMwSEl1PyRTR0 RrMsQuW1oZ48xwGaxHMFSSgLkkxejvAhXprLAJpRUHicqO6wsJEoffVlR2iFc5eZDF6NBS lUlaaOHetFd8DugXkRNuZ/UPPwd0ufs= From: andrey.konovalov@linux.dev To: Greg Kroah-Hartman , Alan Stern Cc: Andrey Konovalov , Felipe Balbi , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] usb: raw-gadget: properly handle interrupted requests Date: Thu, 26 Oct 2023 16:23:59 +0200 Message-Id: <0db45b1d7cc466e3d4d1ab353f61d63c977fbbc5.1698329862.git.andreyknvl@gmail.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Thu, 26 Oct 2023 07:24:44 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780828385608254235 X-GMAIL-MSGID: 1780828385608254235 From: Andrey Konovalov Currently, if a USB request that was queued by Raw Gadget is interrupted (via a signal), wait_for_completion_interruptible returns -ERESTARTSYS. Raw Gadget then attempts to propagate this value to userspace as a return value from its ioctls. However, when -ERESTARTSYS is returned by a syscall handler, the kernel internally restarts the syscall. This doesn't allow userspace applications to interrupt requests queued by Raw Gadget (which is required when the emulated device is asked to switch altsettings). It also violates the implied interface of Raw Gadget that a single ioctl must only queue a single USB request. Instead, make Raw Gadget do what GadgetFS does: check whether the request was interrupted (dequeued with status == -ECONNRESET) and report -EINTR to userspace. Fixes: f2c2e717642c ("usb: gadget: add raw-gadget interface") Signed-off-by: Andrey Konovalov --- drivers/usb/gadget/legacy/raw_gadget.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/usb/gadget/legacy/raw_gadget.c b/drivers/usb/gadget/legacy/raw_gadget.c index b9ecc55a2ce2..ce9e87f84911 100644 --- a/drivers/usb/gadget/legacy/raw_gadget.c +++ b/drivers/usb/gadget/legacy/raw_gadget.c @@ -674,12 +674,12 @@ static int raw_process_ep0_io(struct raw_dev *dev, struct usb_raw_ep_io *io, if (WARN_ON(in && dev->ep0_out_pending)) { ret = -ENODEV; dev->state = STATE_DEV_FAILED; - goto out_done; + goto out_unlock; } if (WARN_ON(!in && dev->ep0_in_pending)) { ret = -ENODEV; dev->state = STATE_DEV_FAILED; - goto out_done; + goto out_unlock; } dev->req->buf = data; @@ -694,7 +694,7 @@ static int raw_process_ep0_io(struct raw_dev *dev, struct usb_raw_ep_io *io, "fail, usb_ep_queue returned %d\n", ret); spin_lock_irqsave(&dev->lock, flags); dev->state = STATE_DEV_FAILED; - goto out_done; + goto out_queue_failed; } ret = wait_for_completion_interruptible(&dev->ep0_done); @@ -703,13 +703,16 @@ static int raw_process_ep0_io(struct raw_dev *dev, struct usb_raw_ep_io *io, usb_ep_dequeue(dev->gadget->ep0, dev->req); wait_for_completion(&dev->ep0_done); spin_lock_irqsave(&dev->lock, flags); - goto out_done; + if (dev->ep0_status == -ECONNRESET) + dev->ep0_status = -EINTR; + goto out_interrupted; } spin_lock_irqsave(&dev->lock, flags); - ret = dev->ep0_status; -out_done: +out_interrupted: + ret = dev->ep0_status; +out_queue_failed: dev->ep0_urb_queued = false; out_unlock: spin_unlock_irqrestore(&dev->lock, flags); @@ -1078,7 +1081,7 @@ static int raw_process_ep_io(struct raw_dev *dev, struct usb_raw_ep_io *io, "fail, usb_ep_queue returned %d\n", ret); spin_lock_irqsave(&dev->lock, flags); dev->state = STATE_DEV_FAILED; - goto out_done; + goto out_queue_failed; } ret = wait_for_completion_interruptible(&done); @@ -1087,13 +1090,16 @@ static int raw_process_ep_io(struct raw_dev *dev, struct usb_raw_ep_io *io, usb_ep_dequeue(ep->ep, ep->req); wait_for_completion(&done); spin_lock_irqsave(&dev->lock, flags); - goto out_done; + if (ep->status == -ECONNRESET) + ep->status = -EINTR; + goto out_interrupted; } spin_lock_irqsave(&dev->lock, flags); - ret = ep->status; -out_done: +out_interrupted: + ret = ep->status; +out_queue_failed: ep->urb_queued = false; out_unlock: spin_unlock_irqrestore(&dev->lock, flags); From patchwork Thu Oct 26 14:24:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 158562 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp716444vqb; Thu, 26 Oct 2023 07:26:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEnWve8iCr2hYqP4whC8S/k+J2DdH9KNU2Kl4c7lz96Jf3Vtqcw4qEgv2fMlgi+N6GVckGn X-Received: by 2002:a05:6808:ab7:b0:3ad:f5b7:d691 with SMTP id r23-20020a0568080ab700b003adf5b7d691mr19659564oij.18.1698330394986; Thu, 26 Oct 2023 07:26:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698330394; cv=none; d=google.com; s=arc-20160816; b=Kbz7OkobuSCzOCHF7c6Ng0sZW9kAnqheCj0G7hcSQHV0Xg/wpHBR746yzX53i8NK6U elXvDinJIw+FZwpLOglG7u3zy9xAByjZ6iXueTtXmKEtXhyOZFoQyVHkBIX2Bqr9382q T24ZgZF182BcMnYkZnGiiblQ0FXMBIjus9Be9MLj/nLmEf8ofnvvyFp6J1l1fnKRbjTA Rsg6Iq6vRYCvnVMH00MXLUmH6SyxDCLcWLe85ksIJDcbEqN5HH3YUyqpRGBhSRUPrsPH FEpleETBPPZYDknPz7IYxv+ybaee2GFUISeaIUorSF8p6bntXm/aTBjCu9vzYQ2gphPZ As8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=i2fWBBG9mLsogb4ThmIrsmZJLekVVeeZs1stUDz5bLY=; fh=q6dJyfmJ5aFZN8bWGYgWdkT0uTkQR5Dhijz5GpOkTmI=; b=ZfX+B3bpHIBlW1HGNTgP/zoHMrqCFx0f7FraI41qrAHKJh1cWuSgUO5HlhlsYcT8uQ WNVKYZPbKwnxHOPqEuHRBju1knnBpjHRAYv6fDhPphG1/H6sRt9DFVZfK5FdFOGUG7Ri Lr9krM6CmrVQrCnbB7UQIx7o3krsgL4vJStSY/mVPu7tEvw64RsEUZeNPXEczyingKGq P1OPFeqXpVnq8g4zds6Uf2TMxaBU1VQ7Ftfrk/8SilSTNqKEfr6pbbVo2f4uaogZOEOg SnW3wq0y45MH68zKyQA7/k+bWl2uM3M7ckIR5KgfHEhStpKqYdCgh/N9TQR0Yh7RS3So dvCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=XBvI+jgF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id m74-20020a25264d000000b00d7757c8c584si16005976ybm.574.2023.10.26.07.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 07:26:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=XBvI+jgF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 2FF0E808286F; Thu, 26 Oct 2023 07:25:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345207AbjJZOYO (ORCPT + 26 others); Thu, 26 Oct 2023 10:24:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231180AbjJZOYN (ORCPT ); Thu, 26 Oct 2023 10:24:13 -0400 Received: from out-175.mta1.migadu.com (out-175.mta1.migadu.com [95.215.58.175]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DE9C1B2 for ; Thu, 26 Oct 2023 07:24:10 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1698330247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i2fWBBG9mLsogb4ThmIrsmZJLekVVeeZs1stUDz5bLY=; b=XBvI+jgFgfBTEd3SPlLvylwAVqtL0K0PzVa2uIgN3YzHxGBA567eUeA+uGIeE8BOOgyigz EEbDUIErsoIamX7fErA4whB0G/ptZmzumkL5O2Zkht57Ue4sMRFqaoyeA1ElapIU6H4wDM Ro3JhkWurPuVf/RtAJtc7ru+TEaPdDA= From: andrey.konovalov@linux.dev To: Greg Kroah-Hartman , Alan Stern Cc: Andrey Konovalov , Felipe Balbi , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] usb: raw-gadget: don't disable device if usb_ep_queue fails Date: Thu, 26 Oct 2023 16:24:00 +0200 Message-Id: <3c5df3dddb67623b4aeb11c5546370363e65d8e2.1698329862.git.andreyknvl@gmail.com> In-Reply-To: <0db45b1d7cc466e3d4d1ab353f61d63c977fbbc5.1698329862.git.andreyknvl@gmail.com> References: <0db45b1d7cc466e3d4d1ab353f61d63c977fbbc5.1698329862.git.andreyknvl@gmail.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Thu, 26 Oct 2023 07:25:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780828491935025855 X-GMAIL-MSGID: 1780828491935025855 From: Andrey Konovalov During device operation, the host might decide to reset a device emulated via Raw Gadget. In this case, if the device emulation code has endpoint requests queued, usb_ep_queue will fail with -ESHUTDOWN. Currently, this disables the Raw Gadget device and makes the emulation code unable to proceed. Do not disable the Raw Gadget device if usb_ep_queue fails. Signed-off-by: Andrey Konovalov --- drivers/usb/gadget/legacy/raw_gadget.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/usb/gadget/legacy/raw_gadget.c b/drivers/usb/gadget/legacy/raw_gadget.c index ce9e87f84911..daac1f078516 100644 --- a/drivers/usb/gadget/legacy/raw_gadget.c +++ b/drivers/usb/gadget/legacy/raw_gadget.c @@ -693,7 +693,6 @@ static int raw_process_ep0_io(struct raw_dev *dev, struct usb_raw_ep_io *io, dev_err(&dev->gadget->dev, "fail, usb_ep_queue returned %d\n", ret); spin_lock_irqsave(&dev->lock, flags); - dev->state = STATE_DEV_FAILED; goto out_queue_failed; } @@ -1080,7 +1079,6 @@ static int raw_process_ep_io(struct raw_dev *dev, struct usb_raw_ep_io *io, dev_err(&dev->gadget->dev, "fail, usb_ep_queue returned %d\n", ret); spin_lock_irqsave(&dev->lock, flags); - dev->state = STATE_DEV_FAILED; goto out_queue_failed; } From patchwork Thu Oct 26 14:24:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 158560 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp715130vqb; Thu, 26 Oct 2023 07:24:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTWpozLZuowA9ehoAOos/JHSPwFstf1RipoikRT9LlYNkb2nOuGyn0BIHpUp5pvOIg8b4X X-Received: by 2002:a25:bcca:0:b0:d9a:e1bb:5468 with SMTP id l10-20020a25bcca000000b00d9ae1bb5468mr16652797ybm.46.1698330271360; Thu, 26 Oct 2023 07:24:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698330271; cv=none; d=google.com; s=arc-20160816; b=obuo1xJD0CnxJOsIuxPbskTjzeUqe1Nect0a9UTgLtKuSHv6RV9ud5f/aXREOEHtbG dGR7BQLMzss7AcxoUQDIruw3AOt6vvaohI2Oz32MRTzoTW1zNMz3O+VEDEn2x5xCSegn dYuDOxmQicmI8bXjcYuT2R/bz35Ik8a3qdP3ISgYer4mnCsxzZH7QKE9lhE+xlkB2seT yP5b//4D/ZgZpbbCE/d+N9KOYdKvmD5A5YoxGGkyixFfOpJu+E6uHh8zg4boa+LqMW92 30W/rcGmeB65A7RWW6l1sknO1VCrEcLYr+ALMFWC78+GdiMmap8AJg39/4lcBMoRFZ56 pspQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=V3WoE26nAgEdBcPVcwYl75mEnNpoIurBRTnIv4fRtFU=; fh=q6dJyfmJ5aFZN8bWGYgWdkT0uTkQR5Dhijz5GpOkTmI=; b=0kjQ5WUJML6Ukzu7psDXiccHR9pSmcVfyNJZFUTQ5QX8TYFVF61MGHcouV/1IKy1d2 LL6+Hi+OSdtHHCrMXNQlI6/7uv+H9ZK4kE9pOI75wIwu3Y+W14/n027hyO0iSIdEKfHZ MEElhEP3bVkDbTgHYzCPc9hAB/BgTZ53gq3P6WrbjpTL/WStm4pwgFcuefogib2sSi4E LK0n9ODeRIxSakpRtGP09L27vXJRMRIH1d8q+f7FE2ewVJFS12HZ1eoACg1+5dLsUx9I LN6/HIhmFE5vqUE6/DeSVDGW77e0Z/g+oMD9EUud6teO0ITmEZI2zU4yjBIb3tA2r6V1 wX8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=m3gmsQYZ; 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=linux.dev Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id u68-20020a25ab4a000000b00d9a6b331944si15320945ybi.304.2023.10.26.07.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 07:24:31 -0700 (PDT) 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=@linux.dev header.s=key1 header.b=m3gmsQYZ; 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=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 056F3819A6A9; Thu, 26 Oct 2023 07:24:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345232AbjJZOYS (ORCPT + 26 others); Thu, 26 Oct 2023 10:24:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235044AbjJZOYO (ORCPT ); Thu, 26 Oct 2023 10:24:14 -0400 Received: from out-189.mta1.migadu.com (out-189.mta1.migadu.com [95.215.58.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAD8C1AE for ; Thu, 26 Oct 2023 07:24:10 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1698330248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V3WoE26nAgEdBcPVcwYl75mEnNpoIurBRTnIv4fRtFU=; b=m3gmsQYZFpE/NvKwO3uvnBHptamqVHuDQBj+qeCmN04QH0rR9MGJgSjR0+mM16CRz7Y15v YszuEHHTNjFLfnAUkF2t0uBJcx6V7xIIedpZz2LfWTCPDClrYXe5nz2U0eWrjIca1mFZqu rshzxKtceA7ssbd+f0BIGC8xNDpdq50= From: andrey.konovalov@linux.dev To: Greg Kroah-Hartman , Alan Stern Cc: Andrey Konovalov , Felipe Balbi , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] usb: raw-gadget: report suspend, resume, reset, and disconnect events Date: Thu, 26 Oct 2023 16:24:01 +0200 Message-Id: In-Reply-To: <0db45b1d7cc466e3d4d1ab353f61d63c977fbbc5.1698329862.git.andreyknvl@gmail.com> References: <0db45b1d7cc466e3d4d1ab353f61d63c977fbbc5.1698329862.git.andreyknvl@gmail.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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]); Thu, 26 Oct 2023 07:24:30 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780828362935658106 X-GMAIL-MSGID: 1780828362935658106 From: Andrey Konovalov Update USB_RAW_IOCTL_EVENT_FETCH to also report suspend, resume, reset, and disconnect events. This allows the code that emulates a USB device via Raw Gadget to handle these events. For example, the device can restart enumeration when it gets reset. Also do not print a WARNING when the event queue overflows. With these new events being queued, the queue might overflow if the device emulation code stops fetching events. Instead, print an error message. Also print debug messages when a non-control event is received. Signed-off-by: Andrey Konovalov --- drivers/usb/gadget/legacy/raw_gadget.c | 53 ++++++++++++++++++++++---- include/uapi/linux/usb/raw_gadget.h | 14 ++++++- 2 files changed, 57 insertions(+), 10 deletions(-) diff --git a/drivers/usb/gadget/legacy/raw_gadget.c b/drivers/usb/gadget/legacy/raw_gadget.c index daac1f078516..ee712e6570b4 100644 --- a/drivers/usb/gadget/legacy/raw_gadget.c +++ b/drivers/usb/gadget/legacy/raw_gadget.c @@ -65,8 +65,9 @@ static int raw_event_queue_add(struct raw_event_queue *queue, struct usb_raw_event *event; spin_lock_irqsave(&queue->lock, flags); - if (WARN_ON(queue->size >= RAW_EVENT_QUEUE_SIZE)) { + if (queue->size >= RAW_EVENT_QUEUE_SIZE) { spin_unlock_irqrestore(&queue->lock, flags); + dev_err(&gadget->dev, "event queue overflown\n"); return -ENOMEM; } event = kmalloc(sizeof(*event) + length, GFP_ATOMIC); @@ -311,9 +312,10 @@ static int gadget_bind(struct usb_gadget *gadget, dev->eps_num = i; spin_unlock_irqrestore(&dev->lock, flags); + dev_dbg(&gadget->dev, "gadget connected\n"); ret = raw_queue_event(dev, USB_RAW_EVENT_CONNECT, 0, NULL); if (ret < 0) { - dev_err(&gadget->dev, "failed to queue event\n"); + dev_err(&gadget->dev, "failed to queue connect event\n"); set_gadget_data(gadget, NULL); return ret; } @@ -358,7 +360,7 @@ static int gadget_setup(struct usb_gadget *gadget, ret = raw_queue_event(dev, USB_RAW_EVENT_CONTROL, sizeof(*ctrl), ctrl); if (ret < 0) - dev_err(&gadget->dev, "failed to queue event\n"); + dev_err(&gadget->dev, "failed to queue control event\n"); goto out; out_unlock: @@ -377,11 +379,46 @@ static int gadget_setup(struct usb_gadget *gadget, return ret; } -/* These are currently unused but present in case UDC driver requires them. */ -static void gadget_disconnect(struct usb_gadget *gadget) { } -static void gadget_suspend(struct usb_gadget *gadget) { } -static void gadget_resume(struct usb_gadget *gadget) { } -static void gadget_reset(struct usb_gadget *gadget) { } +static void gadget_disconnect(struct usb_gadget *gadget) +{ + struct raw_dev *dev = get_gadget_data(gadget); + int ret; + + dev_dbg(&gadget->dev, "gadget disconnected\n"); + ret = raw_queue_event(dev, USB_RAW_EVENT_DISCONNECT, 0, NULL); + if (ret < 0) + dev_err(&gadget->dev, "failed to queue disconnect event\n"); +} +static void gadget_suspend(struct usb_gadget *gadget) +{ + struct raw_dev *dev = get_gadget_data(gadget); + int ret; + + dev_dbg(&gadget->dev, "gadget suspended\n"); + ret = raw_queue_event(dev, USB_RAW_EVENT_SUSPEND, 0, NULL); + if (ret < 0) + dev_err(&gadget->dev, "failed to queue suspend event\n"); +} +static void gadget_resume(struct usb_gadget *gadget) +{ + struct raw_dev *dev = get_gadget_data(gadget); + int ret; + + dev_dbg(&gadget->dev, "gadget resumed\n"); + ret = raw_queue_event(dev, USB_RAW_EVENT_RESUME, 0, NULL); + if (ret < 0) + dev_err(&gadget->dev, "failed to queue resume event\n"); +} +static void gadget_reset(struct usb_gadget *gadget) +{ + struct raw_dev *dev = get_gadget_data(gadget); + int ret; + + dev_dbg(&gadget->dev, "gadget reset\n"); + ret = raw_queue_event(dev, USB_RAW_EVENT_RESET, 0, NULL); + if (ret < 0) + dev_err(&gadget->dev, "failed to queue reset event\n"); +} /*----------------------------------------------------------------------*/ diff --git a/include/uapi/linux/usb/raw_gadget.h b/include/uapi/linux/usb/raw_gadget.h index c7d2199134d7..f0224a8dc858 100644 --- a/include/uapi/linux/usb/raw_gadget.h +++ b/include/uapi/linux/usb/raw_gadget.h @@ -44,6 +44,16 @@ enum usb_raw_event_type { /* This event is queued when a new control request arrived to ep0. */ USB_RAW_EVENT_CONTROL = 2, + /* + * These events are queued when the gadget driver is suspended, + * resumed, reset, or disconnected. Note that some UDCs (e.g. dwc2) + * report a disconnect event instead of a reset. + */ + USB_RAW_EVENT_SUSPEND = 3, + USB_RAW_EVENT_RESUME = 4, + USB_RAW_EVENT_RESET = 5, + USB_RAW_EVENT_DISCONNECT = 6, + /* The list might grow in the future. */ }; @@ -54,8 +64,8 @@ enum usb_raw_event_type { * actual length of the fetched event data. * @data: A buffer to store the fetched event data. * - * Currently the fetched data buffer is empty for USB_RAW_EVENT_CONNECT, - * and contains struct usb_ctrlrequest for USB_RAW_EVENT_CONTROL. + * The fetched event data buffer contains struct usb_ctrlrequest for + * USB_RAW_EVENT_CONTROL and is empty for other events. */ struct usb_raw_event { __u32 type;