From nobody Fri Dec 19 21:45:34 2025 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 201565F57A; Wed, 6 Mar 2024 08:51:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709715091; cv=none; b=RA7+eZauX3PEhMS7MPqCoWUzvELZWsa3nefnqolOLCZIsMsG7xx3878kuwWpgW0aGdYgNQPgucU2AtXO5w5TJuakJde2ITl4b+/TaHyk8utT10J0M/iOBpJcbnFvJCmOXoyUz7KTFHjPDdjtOFeIQcETGcLMWK0H2Ucttpa2whQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709715091; c=relaxed/simple; bh=wzT7UhMTi5fgGYNzyYXCwdvm1pnKZUabXN24TffNYU0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uTI3P3dGNNw54pZbsysOtqyEZlFlNHTnSRlzE0YjJ+OqE1FWeZMzNYKhLN4+wDIppl2hvrqqPnc+DYow+KYMDcYTHLuea65TEp4IGPBnHmNY+2LfecMS6F/81S5A96qVTOhIGxbfNo+WBQgROc+KJvEI/x4i4hJ0P0MGPqcKQkg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=IKId+XNt; arc=none smtp.client-ip=217.70.183.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="IKId+XNt" Received: by mail.gandi.net (Postfix) with ESMTPA id 5D105C000E; Wed, 6 Mar 2024 08:51:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1709715087; 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=MsaNdjrSmF9njVQ3P2uiU1SWMrwODHyriD/FQt22xJA=; b=IKId+XNtwfMc9maul8rDek2w6giZktzfLy7TYFnWymsvRHGxatxduZdlZyFiAyZ4eyoN1N 89sVlm3zLG88SKO1emmcJCxSzevEs0XyVOVre/s5b4uQWqoKGwl2N3gaaS6HO6UoPLFy/5 Eo/Gw4CAjc6em+XGmRMkpV4I0z0Mty6FHDgbz1t/fEzAxA8JM4JR0He4K1d17zq0plLqr9 IiekxPe4aoxjw6E1sKJGS/SjdqH2+L1LrSLepzOqU2W3kEVMXdnRt5rGlPZNPCKEbpKPTw XnNefiYjlp9N/qL10vMEk825zf+qhhKkxJhGYHdp4nNzkVdYfkJ0PEiRczNlDw== From: Herve Codina To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Rob Herring , Frank Rowand , Saravana Kannan 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 , Luca Ceresoli , Nuno Sa , Thomas Petazzoni , Herve Codina , stable@vger.kernel.org Subject: [PATCH v4 2/2] of: dynamic: Synchronize of_changeset_destroy() with the devlink removals Date: Wed, 6 Mar 2024 09:50:03 +0100 Message-ID: <20240306085007.169771-3-herve.codina@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240306085007.169771-1-herve.codina@bootlin.com> References: <20240306085007.169771-1-herve.codina@bootlin.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: herve.codina@bootlin.com Content-Type: text/plain; charset="utf-8" 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_changeset_destroy() with the devlink removals. Fixes: 80dd33cf72d1 ("drivers: base: Fix device link removal") Cc: stable@vger.kernel.org Signed-off-by: Herve Codina Reviewed-by: Nuno Sa Reviewed-by: Saravana Kannan Tested-by: Luca Ceresoli --- drivers/of/dynamic.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index 3bf27052832f..169e2a9ae22f 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -9,6 +9,7 @@ =20 #define pr_fmt(fmt) "OF: " fmt =20 +#include #include #include #include @@ -667,6 +668,12 @@ void of_changeset_destroy(struct of_changeset *ocs) { struct of_changeset_entry *ce, *cen; =20 + /* + * Wait for any ongoing device link removals before destroying some of + * nodes. + */ + device_link_wait_removal(); + list_for_each_entry_safe_reverse(ce, cen, &ocs->entries, node) __of_changeset_entry_destroy(ce); } --=20 2.43.0