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);