From patchwork Wed May 30 16:31:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Liu X-Patchwork-Id: 10439379 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9FB37601E9 for ; Wed, 30 May 2018 16:37:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 898E428F56 for ; Wed, 30 May 2018 16:37:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7CA54291D9; Wed, 30 May 2018 16:37:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAA3528F56 for ; Wed, 30 May 2018 16:37:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753657AbeE3QhK (ORCPT ); Wed, 30 May 2018 12:37:10 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35712 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753573AbeE3QhJ (ORCPT ); Wed, 30 May 2018 12:37:09 -0400 Received: by mail-pg0-f68.google.com with SMTP id 15-v6so8065540pge.2 for ; Wed, 30 May 2018 09:37:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ioo4BanqiyUacjWR2zB+LgvPj7T0RXS69NlWGVWWkGg=; b=SFXSVLIPOoV7Qctf0bhHpalmwJush/33jxC7R6/9mUjfhLsf6N6/jFOsXH/322V3qi ivlnGEOc82+cA34DuJ154eLedkLhMXxUpJ2/wzJN3CUIFNr4AdJvJLH5bCuB5kU2bhDK gO1UH4GcT603xypktq0lTTaVIuclPFRQ3QLQlZWvDBoq6LpbyeiH1HboobXSHY6k7tQt BcBOTK/YdstKC5FDPoChDjiYQCIan1UJVQ781VlG0pyS6hMiNGNeNXR4F1ywjzmWV1r1 sftlHCTCUqonN1uMVwN+917YYisR4eeB4otLVkj+ZpR314jPvGgP1Vvx2Az2DanfqpQP KShQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ioo4BanqiyUacjWR2zB+LgvPj7T0RXS69NlWGVWWkGg=; b=fkIQ7sYwWEk/AUxfYLB6KLdf3eUyG9icqPvq/cDc3n9rYTdgX8fABJf5MbOFhyysmq eYFURmBTt6HOkUpUnMwJSt6DP0wfFwkuicsR3oUb7tiJcliA6mbpAZ5YhP87b1kguvus PBMu70Io5L9VGb2A4QKNzuzNAjIbifqVtY215xaXSuXPo7CjflR5OPjofmZFHm99KA0u 5IZeWHBuZO+7oWhbsIP3L3HQXsbAUFxYmAus+QP6sZ3oJIMCmMylCVvWWmaemtsQv0+r M0MYTSUqQdgTWjn3zu0BPlYDt9l5wuQfXkOKGlx9/bMDiAUmuKzI/nrbI+GUrXPkIHjG TV7Q== X-Gm-Message-State: ALKqPwf6H94dZo80p/RanLDRABG34CHjaicCsajfFs6WPEaSVTJyTtgm tPVRRyCUq1pvEfeoS3ZoOYH+yQ== X-Google-Smtp-Source: ADUXVKJhSNcHqxGze3Gl3UQ/kPKSAiF7msdM5nvbWblWJAwMXQEAdJYmqccol+7VenZ3jidSjN5pmw== X-Received: by 2002:a62:ca4a:: with SMTP id n71-v6mr3469047pfg.14.1527698228260; Wed, 30 May 2018 09:37:08 -0700 (PDT) Received: from liumartin.ntc.corp.google.com ([2401:fa00:fc:202:ac57:d0e0:7094:5]) by smtp.gmail.com with ESMTPSA id k63-v6sm94511994pfk.90.2018.05.30.09.37.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 09:37:07 -0700 (PDT) From: Martin Liu To: gregkh@linuxfoundation.org, heikki.krogerus@linux.intel.com, johan@kernel.org, stern@rowland.harvard.edu, andy.shevchenko@gmail.com Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, jenhaochen@google.com, Martin Liu Subject: [PATCH v4] driver core: hold dev's parent lock when needed Date: Thu, 31 May 2018 00:31:36 +0800 Message-Id: <20180530163135.50081-1-liumartin@google.com> X-Mailer: git-send-email 2.17.0.921.gf22659ad46-goog In-Reply-To: References: Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP SoC have internal I/O buses that can't be proved for devices. The devices on the buses can be accessed directly without additinal configuration required. This type of bus is represented as "simple-bus". In some platforms, we name "soc" with "simple-bus" attribute and many devices are hooked under it described in DT (device tree). In commit bf74ad5bc417 ("Hold the device's parent's lock during probe and remove") to solve USB subsystem lock sequence since USB device's characteristic. Thus "soc" needs to be locked whenever a device and driver's probing happen under "soc" bus. During this period, an async driver tries to probe a device which is under the "soc" bus would be blocked until previous driver finish the probing and release "soc" lock. And the next probing under the "soc" bus need to wait for async finish. Because of that, driver's async probe for init time improvement will be shadowed. Since many devices don't have USB devices' characteristic, they actually don't need parent's lock. Thus, we introduce a lock flag in bus_type struct and driver core would lock the parent lock base on the flag. For USB, we set this flag in usb_bus_type to keep original lock behavior in driver core. Async probe could have more benefit after this patch. Signed-off-by: Martin Liu Acked-by: Alan Stern Reviewed-by: Andy Shevchenko --- Changes in v4: -fix comment and wording. -follow the suggestion. [v3]: https://lkml.org/lkml/2018/5/29/876 [v2]: https://lkml.org/lkml/2018/5/29/108 [v1]: https://lkml.org/lkml/2018/5/22/545 drivers/base/bus.c | 16 ++++++++-------- drivers/base/dd.c | 8 ++++---- drivers/usb/core/driver.c | 1 + include/linux/device.h | 3 +++ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/base/bus.c b/drivers/base/bus.c index ef6183306b40..8bfd27ec73d6 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -184,10 +184,10 @@ static ssize_t unbind_store(struct device_driver *drv, const char *buf, dev = bus_find_device_by_name(bus, NULL, buf); if (dev && dev->driver == drv) { - if (dev->parent) /* Needed for USB */ + if (dev->parent && dev->bus->need_parent_lock) device_lock(dev->parent); device_release_driver(dev); - if (dev->parent) + if (dev->parent && dev->bus->need_parent_lock) device_unlock(dev->parent); err = count; } @@ -211,12 +211,12 @@ static ssize_t bind_store(struct device_driver *drv, const char *buf, dev = bus_find_device_by_name(bus, NULL, buf); if (dev && dev->driver == NULL && driver_match_device(drv, dev)) { - if (dev->parent) /* Needed for USB */ + if (dev->parent && bus->need_parent_lock) device_lock(dev->parent); device_lock(dev); err = driver_probe_device(drv, dev); device_unlock(dev); - if (dev->parent) + if (dev->parent && bus->need_parent_lock) device_unlock(dev->parent); if (err > 0) { @@ -735,10 +735,10 @@ static int __must_check bus_rescan_devices_helper(struct device *dev, int ret = 0; if (!dev->driver) { - if (dev->parent) /* Needed for USB */ + if (dev->parent && dev->bus->need_parent_lock) device_lock(dev->parent); ret = device_attach(dev); - if (dev->parent) + if (dev->parent && dev->bus->need_parent_lock) device_unlock(dev->parent); } return ret < 0 ? ret : 0; @@ -770,10 +770,10 @@ EXPORT_SYMBOL_GPL(bus_rescan_devices); int device_reprobe(struct device *dev) { if (dev->driver) { - if (dev->parent) /* Needed for USB */ + if (dev->parent && dev->bus->need_parent_lock) device_lock(dev->parent); device_release_driver(dev); - if (dev->parent) + if (dev->parent && dev->bus->need_parent_lock) device_unlock(dev->parent); } return bus_rescan_devices_helper(dev, NULL); diff --git a/drivers/base/dd.c b/drivers/base/dd.c index c9f54089429b..7c09f73b96f3 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -817,13 +817,13 @@ static int __driver_attach(struct device *dev, void *data) return ret; } /* ret > 0 means positive match */ - if (dev->parent) /* Needed for USB */ + if (dev->parent && dev->bus->need_parent_lock) device_lock(dev->parent); device_lock(dev); if (!dev->driver) driver_probe_device(drv, dev); device_unlock(dev); - if (dev->parent) + if (dev->parent && dev->bus->need_parent_lock) device_unlock(dev->parent); return 0; @@ -919,7 +919,7 @@ void device_release_driver_internal(struct device *dev, struct device_driver *drv, struct device *parent) { - if (parent) + if (parent && dev->bus->need_parent_lock) device_lock(parent); device_lock(dev); @@ -927,7 +927,7 @@ void device_release_driver_internal(struct device *dev, __device_release_driver(dev, parent); device_unlock(dev); - if (parent) + if (parent && dev->bus->need_parent_lock) device_unlock(parent); } diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 9792cedfc351..e76e95f62f76 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -1922,4 +1922,5 @@ struct bus_type usb_bus_type = { .name = "usb", .match = usb_device_match, .uevent = usb_uevent, + .need_parent_lock = true, }; diff --git a/include/linux/device.h b/include/linux/device.h index 477956990f5e..beca424395dd 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -98,6 +98,8 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *); * @lock_key: Lock class key for use by the lock validator * @force_dma: Assume devices on this bus should be set up by dma_configure() * even if DMA capability is not explicitly described by firmware. + * @need_parent_lock: When probing or removing a device on this bus, the + * device core should lock the device's parent. * * A bus is a channel between the processor and one or more devices. For the * purposes of the device model, all devices are connected via a bus, even if @@ -138,6 +140,7 @@ struct bus_type { struct lock_class_key lock_key; bool force_dma; + bool need_parent_lock; }; extern int __must_check bus_register(struct bus_type *bus);