Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp1406816rwd; Thu, 8 Jun 2023 18:06:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5A69sDP4jUO/exoHd4yaNjweXfW0GKTppemF//m5EG6J5f+YzhvTavdOlYrWgr1EAWmSAF X-Received: by 2002:a05:6a20:748e:b0:119:69ac:8a8e with SMTP id p14-20020a056a20748e00b0011969ac8a8emr385162pzd.19.1686272780876; Thu, 08 Jun 2023 18:06:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686272780; cv=none; d=google.com; s=arc-20160816; b=PaxxKl/QQEvqgs8K0uyP8oVUm02LruSlFOGyRY7Sux7gGReCikDkgrHBltHYkjOhpY T081XOeZNyOIr8u/Zdj/RB4o4RRUc8vj32v0Mvx6nogyvJ5/gjaXcwcBH6XaKp5vyZTn ixbpY7f89CSydRiPiZlb+jJbxnhbMdlriCI7qnAfZUSGGHi5h1gIWHruofM0JkZ0j9Vl YRWf/AUX2MQZ+/tODUwikT8mZjgAXPVFV3KN8cGfFu7zQ5ht8R8h2+pvK+EWBUbsVt1W HK2vQdJJw2/rWRKea0lp8DIlSn1rmIw99CVkqbzZx3OGxAIu14KAO+DU02kfpSnkUYFo 5JuA== 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:mime-version:date :dkim-signature; bh=Ko+yK0G5YPcfLrCdYKWKvJQM3mjVNr0PQnkqrJ1wnbo=; b=MPy9V9WWqScQSg5m9lnsOvwlR9A1YSjOTOTFQCAXsXgMJX/+nSu6BiIlnTyG10LXbO vb3mJeDkn8g7B5ng3N+awA3xhnhyf1c124Dt067tPsN7s+M/lEi0BosWnBjv+Fhf2hu0 2mDm1PdxTvIOmx0vEaEGnhu5MvHx0+arXkGszMiEjZvGwBH6JjqLzHGWcQ+FgO0kxx4r wzDIGU1JrQDoe3ANk+GqDh/eG4fqqwOPp0IqaSKhU5++r8j4cNhc47bb9jE41Zb/6ds1 hxrVPv1AjxjTYb/43dTAbCFUHHPhl3PH5ETi0S8QV3K9jRon2NQ3Y6j2SEBZUyKM0/oY 2lsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=5WReRZo4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a19-20020a637053000000b0053481a225desi1754510pgn.340.2023.06.08.18.06.07; Thu, 08 Jun 2023 18:06:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=5WReRZo4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235704AbjFIBCg (ORCPT + 99 others); Thu, 8 Jun 2023 21:02:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230049AbjFIBCe (ORCPT ); Thu, 8 Jun 2023 21:02:34 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8882D30DA for ; Thu, 8 Jun 2023 18:02:30 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5689bcc5f56so16153207b3.2 for ; Thu, 08 Jun 2023 18:02:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686272550; x=1688864550; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=Ko+yK0G5YPcfLrCdYKWKvJQM3mjVNr0PQnkqrJ1wnbo=; b=5WReRZo4IyzFkMULlIrJ9ZxOwQNTLiI8QH6WR8pORRLZ3+QfjAG0J7srogyXJQuuv1 +bQF+h+kC49jf/ipib783FfRTGH1Vs0Q0hv3RPgcvYzI02Z4HdcI3HLic0dXLQoivBiK Uep+OmUvda1Kdmf3Vvxfx2/ZWq42465JS4742wAqk8sDp/d4VUaeH6mYgR2xooRY2+5j 529UaL1qKGr48g6TJ3Suyupjlw7q5WdLvgPUxrP/JjSBrqod6VnftbqtzhNfhF8kcSSR ZFnoSHWz+5EnZH2vEjqFCYcLU6lL0vA4Uq0hxamFcaUPitS8rFNBDbQApsLZQU2VUVFx PW2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686272550; x=1688864550; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Ko+yK0G5YPcfLrCdYKWKvJQM3mjVNr0PQnkqrJ1wnbo=; b=TLex/LrFCSY/oQqnMhvjMqwlvZhHhPeB00hUn5zz+NQYS/6MgSjAW1skS5T28oouE4 6wra33/LKs6KmSi4jObbZIKmIPI48nOyAkESwBcMl4Eg/vTUo/0h8UIFCzAE65dWToHF ziEwqH05Uj8T1TwBgDo2m2/fbi9f8tzhDokqPdoR7aQUOccIet9tnILhdtJsRG+dxWrt rnXSifu+cOpAH1uB9ofKtJOESqaV4U+Bd65ISNLZfPdl0gnUfxA7pXeAFsfeUaSamE3x y/qAo90jDK/EKNjhFhaXTkKzgoO2LIP2QshZx8k/1M3kIvtmDqzEqKqEFfpgbiqeBOrT rrUw== X-Gm-Message-State: AC+VfDz2jjLqUhwfD4AJYvyp8qgpXnPpD23KUGsJfty0iA6HDeYZYYcu T+D5bR6ossBxH64v4If1zToNyKJZyNk= X-Received: from badhri.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:6442]) (user=badhri job=sendgmr) by 2002:a81:ad62:0:b0:565:d16b:d799 with SMTP id l34-20020a81ad62000000b00565d16bd799mr733681ywk.1.1686272549802; Thu, 08 Jun 2023 18:02:29 -0700 (PDT) Date: Fri, 9 Jun 2023 01:02:26 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Message-ID: <20230609010227.978661-1-badhri@google.com> Subject: [PATCH v8 1/2] usb: gadget: udc: core: Offload usb_udc_vbus_handler processing From: Badhri Jagan Sridharan To: gregkh@linuxfoundation.org, stern@rowland.harvard.edu, colin.i.king@gmail.com, xuetao09@huawei.com, quic_eserrao@quicinc.com, water.zhangjiantao@huawei.com, peter.chen@freescale.com, balbi@ti.com, francesco@dolcini.it, alistair@alistair23.me, stephan@gerhold.net, bagasdotme@gmail.com, luca@z3ntu.xyz Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Badhri Jagan Sridharan Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL 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 usb_udc_vbus_handler() can be invoked from interrupt context by irq handlers of the gadget drivers, however, usb_udc_connect_control() has to run in non-atomic context due to the following: a. Some of the gadget driver implementations expect the ->pullup callback to be invoked in non-atomic context. b. usb_gadget_disconnect() acquires udc_lock which is a mutex. Hence offload invocation of usb_udc_connect_control() to workqueue. UDC should not be pulled up unless gadget driver is bound. The new flag "allow_connect" is now set by gadget_bind_driver() and cleared by gadget_unbind_driver(). This prevents work item to pull up the gadget even if queued when the gadget driver is already unbound. Cc: stable@vger.kernel.org Fixes: 1016fc0c096c ("USB: gadget: Fix obscure lockdep violation for udc_mutex") Signed-off-by: Badhri Jagan Sridharan Reviewed-by: Alan Stern --- Changes since v1: - Address Alan Stern's comment on usb_udc_vbus_handler invocation from atomic context: * vbus_events_lock is now a spinlock and allocations in * usb_udc_vbus_handler are atomic now. Changes since v2: - Addressing Alan Stern's comments: ** connect_lock is now held by callers of * usb_gadget_pullup_update_locked() and gadget_(un)bind_driver() does * notdirectly hold the lock. ** Both usb_gadget_(dis)connect() and usb_udc_vbus_handler() would * set/clear udc->vbus and invoke usb_gadget_pullup_update_locked. ** Add "unbinding" to prevent new connections after the gadget is being * unbound. Changes since v3: ** Made a minor cleanup which I missed to do in v3 in * usb_udc_vbus_handler(). Changes since v4: - Addressing Alan Stern's comments: ** usb_udc_vbus_handler() now offloads invocation of usb_udc_connect_control() * from workqueue. ** Dropped vbus_events list as this was redundant. Updating to the * latest value is suffice Changes since v5: - Addressing Alan Stern's comments: ** Squashed allow_connect logic to this patch. ** Fixed comment length to wrap at 76 ** Cancelling vbus_work in del_gadget() Changes since v6: - Added reviewed by tag Changes since v7: - None --- drivers/usb/gadget/udc/core.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index 52e6d2e84e35..d2e4f78c53e3 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -37,6 +37,9 @@ static const struct bus_type gadget_bus_type; * @vbus: for udcs who care about vbus status, this value is real vbus status; * for udcs who do not care about vbus status, this value is always true * @started: the UDC's started state. True if the UDC had started. + * @allow_connect: Indicates whether UDC is allowed to be pulled up. + * Set/cleared by gadget_(un)bind_driver() after gadget driver is bound or + * unbound. * * This represents the internal data structure which is used by the UDC-class * to hold information about udc driver and gadget together. @@ -48,6 +51,8 @@ struct usb_udc { struct list_head list; bool vbus; bool started; + bool allow_connect; + struct work_struct vbus_work; }; static struct class *udc_class; @@ -706,7 +711,7 @@ int usb_gadget_connect(struct usb_gadget *gadget) goto out; } - if (gadget->deactivated) { + if (gadget->deactivated || !gadget->udc->allow_connect) { /* * If gadget is deactivated we only save new state. * Gadget will be connected automatically after activation. @@ -1086,6 +1091,13 @@ static void usb_udc_connect_control(struct usb_udc *udc) usb_gadget_disconnect(udc->gadget); } +static void vbus_event_work(struct work_struct *work) +{ + struct usb_udc *udc = container_of(work, struct usb_udc, vbus_work); + + usb_udc_connect_control(udc); +} + /** * usb_udc_vbus_handler - updates the udc core vbus status, and try to * connect or disconnect gadget @@ -1094,6 +1106,14 @@ static void usb_udc_connect_control(struct usb_udc *udc) * * The udc driver calls it when it wants to connect or disconnect gadget * according to vbus status. + * + * This function can be invoked from interrupt context by irq handlers of + * the gadget drivers, however, usb_udc_connect_control() has to run in + * non-atomic context due to the following: + * a. Some of the gadget driver implementations expect the ->pullup + * callback to be invoked in non-atomic context. + * b. usb_gadget_disconnect() acquires udc_lock which is a mutex. + * Hence offload invocation of usb_udc_connect_control() to workqueue. */ void usb_udc_vbus_handler(struct usb_gadget *gadget, bool status) { @@ -1101,7 +1121,7 @@ void usb_udc_vbus_handler(struct usb_gadget *gadget, bool status) if (udc) { udc->vbus = status; - usb_udc_connect_control(udc); + schedule_work(&udc->vbus_work); } } EXPORT_SYMBOL_GPL(usb_udc_vbus_handler); @@ -1328,6 +1348,7 @@ int usb_add_gadget(struct usb_gadget *gadget) mutex_lock(&udc_lock); list_add_tail(&udc->list, &udc_list); mutex_unlock(&udc_lock); + INIT_WORK(&udc->vbus_work, vbus_event_work); ret = device_add(&udc->dev); if (ret) @@ -1459,6 +1480,7 @@ void usb_del_gadget(struct usb_gadget *gadget) flush_work(&gadget->work); device_del(&gadget->dev); ida_free(&gadget_id_numbers, gadget->id_number); + cancel_work_sync(&udc->vbus_work); device_unregister(&udc->dev); } EXPORT_SYMBOL_GPL(usb_del_gadget); @@ -1527,6 +1549,7 @@ static int gadget_bind_driver(struct device *dev) if (ret) goto err_start; usb_gadget_enable_async_callbacks(udc); + udc->allow_connect = true; usb_udc_connect_control(udc); kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE); @@ -1558,6 +1581,8 @@ static void gadget_unbind_driver(struct device *dev) kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE); + udc->allow_connect = false; + cancel_work_sync(&udc->vbus_work); usb_gadget_disconnect(gadget); usb_gadget_disable_async_callbacks(udc); if (gadget->irq) base-commit: d37537a1f7cf09e304fe7993cb5e732534a0fb22 -- 2.41.0.162.gfafddb0af9-goog