From patchwork Thu Nov 30 17:41:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herve Codina X-Patchwork-Id: 172032 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp563776vqy; Thu, 30 Nov 2023 09:41:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IFH8hTU545ls2vsLvptXe09+qBJzX702LpXAn8cScLS9aNYCS1RI2meqorN297djgoEJhkl X-Received: by 2002:a17:902:ee82:b0:1c6:2ae1:dc28 with SMTP id a2-20020a170902ee8200b001c62ae1dc28mr23350304pld.36.1701366116656; Thu, 30 Nov 2023 09:41:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701366116; cv=none; d=google.com; s=arc-20160816; b=IasiGsVISMA+LDsWcBy8abYWVVCFdQJ/emIH21Rb3Q0XZRnmg6w0mzWQ89+hZIqUaA 2OJjlTC7v83z4pRiEIxMIKXjY04fbqeQQ3eYQpSQXejeVluIPsY0OFQhLr33szYok7IX +GFHKcCcLlubvKhSVqHk1wRNrl5UFOUEle7NLHurckWN9gaY8ls5D14+DEAcw3EjRao8 vHQjdjKPrzvZF9fsjoU0FvIx4x4beL4Jb5V45AN4cfNgvNASrRr8D/3Y8+R8bsRLvjaL L+5Z24Na0cvM9g4d9y/LtScf+6b321yAbzmsSc6Y1E15q3PRQCPCWHI4aAwx4jHv4l8a lSWA== 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=bZYcrZj6HAsVu5Q51awnJk6PzzvhbxN5gePC1mvCY2w=; fh=hxCb8OzaXBuSbXNrdSfbxd9E+OOUaTeXTLLu8usFTUA=; b=b/P0VwxLe1xjZbXJ/GEntFJYB4l92G5XD8lkS81OQdNQILmmNkzO13kwEq0ZPLc2EU VEG6WVcI03mHlIgSAkLyCIhpHa25zDg7XLD4X8v5c6Do8HD75ygLyy0Or3jLSC/NJDDc 60XoBRbR43hfK6Py9Kbj+txaIcALefaFF5aqievB2qqp4EfVD1bQNNGJffjhGq5ajlQn Lbn9hy5JITEsNuTPuWzeoEfjB8q05nQjPXKuil4XQ0ierLTUA+jSDUAz/iUL7xobL3UG BLUVt/BMaHS0O2xiK4W1PppLfmBwvXtgGdogTYgjilq5/0SN7qepndVw/6hnB5e1meb7 pVfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=GjgAzYp+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id t17-20020a170902e85100b001cf8e9e8813si1672744plg.315.2023.11.30.09.41.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 09:41:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=GjgAzYp+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id C26748020929; Thu, 30 Nov 2023 09:41:52 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346583AbjK3Rl3 (ORCPT + 99 others); Thu, 30 Nov 2023 12:41:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230460AbjK3Rl0 (ORCPT ); Thu, 30 Nov 2023 12:41:26 -0500 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 505A410D9; Thu, 30 Nov 2023 09:41:32 -0800 (PST) Received: by mail.gandi.net (Postfix) with ESMTPA id 5795A1BF205; Thu, 30 Nov 2023 17:41:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1701366091; 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=bZYcrZj6HAsVu5Q51awnJk6PzzvhbxN5gePC1mvCY2w=; b=GjgAzYp+S5WY4+3ceyC2RNJMwmWxIw618L4lY8z8QTqOz9pD+uZ9aBpDPoBrsdcvOU0m5J w//JloZuZgvptd8q9Rr6X91vCPGpNBAVxv0X2u2xu8ZWQVJFYQwCkn3S1m7qdInJ0RDfyI jnyLEaj+D6v1EWYM1t7n8AObgK368bdS/ErOiT0v7bGoS0SIo9+FT10iMb1CBBPjPCVmnh 7BNHoQK8ZHR7u1Y5v6QJIpJ68zX2CdEkBnuiF7o/heEgFwEoVvNKzLnu1FAK0bWdhuvcaq htqaaHjA7C7aPSabvrm0+GJWUl4t3uJxGXvs0S7AQBHHHA5YEVhR2Rr+pKqH+g== From: Herve Codina To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Rob Herring , Frank Rowand Cc: Lizhi Hou , Max Zhen , Sonal Santan , Stefano Stabellini , Jonathan Cameron , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Allan Nielsen , Horatiu Vultur , Steen Hegelund , Thomas Petazzoni , Herve Codina Subject: [PATCH 1/2] driver core: Introduce device_link_wait_removal() Date: Thu, 30 Nov 2023 18:41:08 +0100 Message-ID: <20231130174126.688486-2-herve.codina@bootlin.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231130174126.688486-1-herve.codina@bootlin.com> References: <20231130174126.688486-1-herve.codina@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: herve.codina@bootlin.com X-Spam-Status: No, score=-0.9 required=5.0 tests=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 howler.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 (howler.vger.email [0.0.0.0]); Thu, 30 Nov 2023 09:41:52 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784011677349555855 X-GMAIL-MSGID: 1784011677349555855 The commit 80dd33cf72d1 ("drivers: base: Fix device link removal") introduces a workqueue to release the consumer and supplier devices used in the devlink. In the job queued, devices are release and in turn, when all the references to these devices are dropped, the release function of the device itself is called. Nothing is present to provide some synchronisation with this workqueue in order to ensure that all ongoing releasing operations are done and so, some other operations can be started safely. For instance, in the following sequence: 1) of_platform_depopulate() 2) of_overlay_remove() During the step 1, devices are released and related devlinks are removed (jobs pushed in the workqueue). During the step 2, OF nodes are destroyed but, without any synchronisation with devlink removal jobs, of_overlay_remove() can raise warnings related to missing of_node_put(): ERROR: memory leak, expected refcount 1 instead of 2 Indeed, the missing of_node_put() call is going to be done, too late, from the workqueue job execution. Introduce device_link_wait_removal() to offer a way to synchronize operations waiting for the end of devlink removals (i.e. end of workqueue jobs). Also, as a flushing operation is done on the workqueue, the workqueue used is moved from a system-wide workqueue to a local one. Signed-off-by: Herve Codina --- drivers/base/core.c | 26 +++++++++++++++++++++++--- include/linux/device.h | 1 + 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index ac026187ac6a..2e102a77758c 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -44,6 +44,7 @@ static bool fw_devlink_is_permissive(void); static void __fw_devlink_link_to_consumers(struct device *dev); static bool fw_devlink_drv_reg_done; static bool fw_devlink_best_effort; +static struct workqueue_struct *fw_devlink_wq; /** * __fwnode_link_add - Create a link between two fwnode_handles. @@ -530,12 +531,26 @@ static void devlink_dev_release(struct device *dev) /* * It may take a while to complete this work because of the SRCU * synchronization in device_link_release_fn() and if the consumer or - * supplier devices get deleted when it runs, so put it into the "long" - * workqueue. + * supplier devices get deleted when it runs, so put it into the + * dedicated workqueue. */ - queue_work(system_long_wq, &link->rm_work); + queue_work(fw_devlink_wq, &link->rm_work); } +/** + * device_link_wait_removal - Wait for ongoing devlink removal jobs to terminate + */ +void device_link_wait_removal(void) +{ + /* + * devlink removal jobs are queued in the dedicated work queue. + * To be sure that all removal jobs are terminated, ensure that any + * scheduled work has run to completion. + */ + drain_workqueue(fw_devlink_wq); +} +EXPORT_SYMBOL_GPL(device_link_wait_removal); + static struct class devlink_class = { .name = "devlink", .dev_groups = devlink_groups, @@ -4085,9 +4100,14 @@ int __init devices_init(void) sysfs_dev_char_kobj = kobject_create_and_add("char", dev_kobj); if (!sysfs_dev_char_kobj) goto char_kobj_err; + fw_devlink_wq = alloc_workqueue("fw_devlink_wq", 0, 0); + if (!fw_devlink_wq) + goto wq_err; return 0; + wq_err: + kobject_put(sysfs_dev_char_kobj); char_kobj_err: kobject_put(sysfs_dev_block_kobj); block_kobj_err: diff --git a/include/linux/device.h b/include/linux/device.h index 2b093e62907a..c26f4b3df2bd 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -1250,6 +1250,7 @@ void device_link_del(struct device_link *link); void device_link_remove(void *consumer, struct device *supplier); void device_links_supplier_sync_state_pause(void); void device_links_supplier_sync_state_resume(void); +void device_link_wait_removal(void); /* Create alias, so I can be autoloaded. */ #define MODULE_ALIAS_CHARDEV(major,minor) \ From patchwork Thu Nov 30 17:41:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herve Codina X-Patchwork-Id: 172031 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp563731vqy; Thu, 30 Nov 2023 09:41:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IGt+MZ0+6RxzTIik7W/pSFzzWs+JAboPBRKW6POEmAMNL7h3qjA4G8pOsZa3cxRMLTJDO0X X-Received: by 2002:a05:6a20:549b:b0:187:758e:9781 with SMTP id i27-20020a056a20549b00b00187758e9781mr34762377pzk.17.1701366112292; Thu, 30 Nov 2023 09:41:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701366112; cv=none; d=google.com; s=arc-20160816; b=y4juQxIKyrspMGFd57nqD1997u1qPY96YFZavVJI2MKY7q2D0P+uwY48pY42PKTofw fgZ/vr5RLHZoCv3slaz0nTRhlbMz6yQg74T2Lu0JKytLQJJiAz3tvsYodqw7hm2QzcYq Z2gGAhZaHcr1NJ+RfdPya3S9Q/KYhGp5xFG/iPTfSRRMMIYgRi1QEh7CEsg5nLD/q3mm K11NRI3fzIgChHAjo1vNniqRVF/S0Np3nrcHyNMqiKJNqE22dKBCi6AsLGPZDD4M4QkP /1/p3M+0ok1GB339gEC8pQvklwGRtyO0zLhN3XOXBDs3Q3/pIPdq5EBpFGC4B8d0ECC0 FLNA== 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=YCtXOEjZA4vVhqRvZxyqSJ/sJ1S1+pskPHyTx+aj7Bo=; fh=hxCb8OzaXBuSbXNrdSfbxd9E+OOUaTeXTLLu8usFTUA=; b=RIO5VMpvcfSwzi0YYiwxraYAkWKnLSsZMVXcw2/hzAz2T9Eo3CMcU9LlQwsI2hnxwK 2hP9TDGkMG8N01b1HxXjx6OWQotr7F4LKF1ntXj/+F4ggWeUnvKnDLoU0cjUIHIYHvku +GGiQ+YAGRJx2v01KSbDJh5G+fa2cxDkA+ApSQ7yvMrq7iQYj2GhcHn9oVgeBdKF2wff hbaj8Hf90KrEvSyquir0wypQamNjCCEO2Gqgp1i7c5J+GB41GqqrC1HJJ6CQx8jeeVXk jagatHDANKdgAJutgliRMeSGSfJrhXes+uxXIFlX5sQl7c+2scWk5EFxGhG0ozQMXaBI aJHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=LPx1+fRX; 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=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id dh3-20020a056a020b8300b005b999968b85si1825830pgb.666.2023.11.30.09.41.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 09:41:52 -0800 (PST) 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=@bootlin.com header.s=gm1 header.b=LPx1+fRX; 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=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 351EC82CB858; Thu, 30 Nov 2023 09:41:48 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346604AbjK3Rlc (ORCPT + 99 others); Thu, 30 Nov 2023 12:41:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346496AbjK3Rl1 (ORCPT ); Thu, 30 Nov 2023 12:41:27 -0500 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::228]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 363A810DE; Thu, 30 Nov 2023 09:41:33 -0800 (PST) Received: by mail.gandi.net (Postfix) with ESMTPA id 32A621BF206; Thu, 30 Nov 2023 17:41:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1701366091; 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=YCtXOEjZA4vVhqRvZxyqSJ/sJ1S1+pskPHyTx+aj7Bo=; b=LPx1+fRXYo9UizKn96Mo1PH2HBts4hfEy67nbnAsjK2WsGwfe2AqQ1twJi1tJiOE5RZ4C5 gaSWtIScGmcLpC8O+IbgeysUdhiqvbpILR9O1//gEskk4TKHXqDP1FCYd4nJdPuRyRyAgd NSVPU2xlfSCr3WLH1Xe0uUpzvCsH6XGMUxrtfyFn/UgZniaRrDzf1gGBOCJ0OMVPehGvhO pNJAlvN8ZOLQTzremWQjjtGbH7eTtKiUNV7heBDwknRhEZfXR1k7aVESlwktB7HsdUyVFk S449nqA/ggrQQOzKd5s5rvetaK5RNG58hVkjC0PxrrJdkTx03lxYC7XAzgweNw== From: Herve Codina To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Rob Herring , Frank Rowand Cc: Lizhi Hou , Max Zhen , Sonal Santan , Stefano Stabellini , Jonathan Cameron , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Allan Nielsen , Horatiu Vultur , Steen Hegelund , Thomas Petazzoni , Herve Codina Subject: [PATCH 2/2] of: overlay: Synchronize of_overlay_remove() with the devlink removals Date: Thu, 30 Nov 2023 18:41:09 +0100 Message-ID: <20231130174126.688486-3-herve.codina@bootlin.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231130174126.688486-1-herve.codina@bootlin.com> References: <20231130174126.688486-1-herve.codina@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: herve.codina@bootlin.com X-Spam-Status: No, score=-0.9 required=5.0 tests=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 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, 30 Nov 2023 09:41:48 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784011672933693390 X-GMAIL-MSGID: 1784011672933693390 In the following sequence: 1) of_platform_depopulate() 2) of_overlay_remove() During the step 1, devices are destroyed and devlinks are removed. During the step 2, OF nodes are destroyed but __of_changeset_entry_destroy() can raise warnings related to missing of_node_put(): ERROR: memory leak, expected refcount 1 instead of 2 ... Indeed, during the devlink removals performed at step 1, the removal itself releasing the device (and the attached of_node) is done by a job queued in a workqueue and so, it is done asynchronously with respect to function calls. When the warning is present, of_node_put() will be called but wrongly too late from the workqueue job. In order to be sure that any ongoing devlink removals are done before the of_node destruction, synchronize the of_overlay_remove() with the devlink removals. Signed-off-by: Herve Codina --- drivers/of/overlay.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index a9a292d6d59b..5c5f808b163e 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -1202,6 +1202,12 @@ int of_overlay_remove(int *ovcs_id) goto out; } + /* + * Wait for any ongoing device link removals before removing some of + * nodes + */ + device_link_wait_removal(); + mutex_lock(&of_mutex); ovcs = idr_find(&ovcs_idr, *ovcs_id);