From nobody Sat Feb 7 10:07:44 2026 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 4C7677AE60; Thu, 29 Feb 2024 10:52:16 +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=1709203940; cv=none; b=cYx8usXG/LeT/tghb64/WcAVgqyqLkGlkbq8ETstCWxUt2EukhsZCqJXuyW2wuR1XlcXrbQAWDCcOJnpxXjXewbZLBgFphOE7TPtQLOcVueRk3aZDejdsuLZutigbZ8lPOZrNV4wo+cfamSrXoqh457ufPNYKwugdR/NhA+ljFY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709203940; c=relaxed/simple; bh=SSEgSmIjvoB6heog7+gtc8Uy+8npFtBEk7ueeKXKYuw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K8h0/sokOXWaHHbak05lMsd7P/NBorJ6Gkoefvl37pqpUba7Vl8i3boLIkhkvOCsMv+bMkIMhLCdy8vGYhXU0VRM5qcB9+dEHTEpUWnyueN3DdfvSmYBhRsXBrU3BwmgOs2xi3XzmsHo1ZA9vVCDW3SMZhiSQx7zcjhvNJeqFyI= 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=dulW2t5m; 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="dulW2t5m" Received: by mail.gandi.net (Postfix) with ESMTPA id 869EDC0005; Thu, 29 Feb 2024 10:52:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1709203935; 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=1xdIudFYP++8Jopq2IvnU8pitcTKUx9uYl+U7XwqORA=; b=dulW2t5mFd03HHceprIxDApC7CVVcwL4V8q7pTLjivkclLri59bjTCSR61wVmfAHEQmwAf jQsMT2Uu/f3RUN0jktqdnHx8Vv1cwxe5uupiVA7DbGIX6cRTagHDDrREil+IpRPM0Flyay qlkRefvEDG00hpeoRkOrV9I+mzD4aj4W+yKQxNhmKyThQbmv1yj+1l7yvhWiM6kYCAR3Yq hBYdR/jTyaeDvlxA2lOZ8lxn+RXtczGdCNzzNDlIf+U/tqGMYSNXtrz7mqXdupZvHS7w0r LGK0NPEhkf5bAYT4yKT822qyX0iix3iUwxkKggI2jlnYfqiW/kQm+z2icq+p/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 , Luca Ceresoli , Nuno Sa , Thomas Petazzoni , Herve Codina , stable@vger.kernel.org Subject: [PATCH v3 1/2] driver core: Introduce device_link_wait_removal() Date: Thu, 29 Feb 2024 11:52:02 +0100 Message-ID: <20240229105204.720717-2-herve.codina@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240229105204.720717-1-herve.codina@bootlin.com> References: <20240229105204.720717-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" 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. Fixes: 80dd33cf72d1 ("drivers: base: Fix device link removal") Cc: stable@vger.kernel.org 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 d5f4e4aac09b..80d9430856a8 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 *device_link_wq; =20 /** * __fwnode_link_add - Create a link between two fwnode_handles. @@ -532,12 +533,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(device_link_wq, &link->rm_work); } =20 +/** + * device_link_wait_removal - Wait for ongoing devlink removal jobs to ter= minate + */ +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(device_link_wq); +} +EXPORT_SYMBOL_GPL(device_link_wait_removal); + static struct class devlink_class =3D { .name =3D "devlink", .dev_groups =3D devlink_groups, @@ -4099,9 +4114,14 @@ int __init devices_init(void) sysfs_dev_char_kobj =3D kobject_create_and_add("char", dev_kobj); if (!sysfs_dev_char_kobj) goto char_kobj_err; + device_link_wq =3D alloc_workqueue("device_link_wq", 0, 0); + if (!device_link_wq) + goto wq_err; =20 return 0; =20 + 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 1795121dee9a..d7d8305a72e8 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -1249,6 +1249,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); =20 /* Create alias, so I can be autoloaded. */ #define MODULE_ALIAS_CHARDEV(major,minor) \ --=20 2.43.0 From nobody Sat Feb 7 10:07:44 2026 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 279007AE73; Thu, 29 Feb 2024 10:52:18 +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=1709203941; cv=none; b=fE9ZQ0pl9P8ev6Kp0SH7dDBDKtSRsKie96Ew6OcfJxCqDWWCwD0cAWk3Tie0wPh5cp8rTXBnyLjtFo9naMhYiBWb62ObOpILepk8g+DM8SMv4cZOp33gfqZLZGN2UAA4lmmIMs5ika0tbPMbrqjJ++8BTvwffZRp/qnJ5i/079U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709203941; c=relaxed/simple; bh=zfGeDfyRmaFp1JOEzDfUGcjVtP7tQN/s50BcDdDqvD0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D2RK6mIXr2WcN++WtosjSXQ4yIzRBIlaQpAGDILuuDQWk7IZmt759c9/364ZwtMpsCpMsa74xe4xSdEVYsXNJQruFhnFeOxurSOHkvv1R0ENuzs54SasiDwywTuklyTxrTXNHcJ0MhFcT8BjNqyPk6P4H9H39Dkpa4nXJDEZSng= 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=A3ZE4+ob; 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="A3ZE4+ob" Received: by mail.gandi.net (Postfix) with ESMTPA id 821C9C0003; Thu, 29 Feb 2024 10:52:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1709203937; 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=yCXysWU34VdlLu8PHd2qD3CH0eUBVQ9+sisrVNEEJMU=; b=A3ZE4+obaUKBUYrzYYpw7/+4tzUBwLP3K+U4Z+PkVz+LyIlBL0SEinir8alS1UsUr7QYu2 1+okgDWJFW+K4k8eZYmxcbmfl4vihNEvnKl402+rm1RWHb+4TNnm7K/RaoGmrAWj6BGSHB bY2bT4f+1yJj9EP1cD2ujhBJRG64iu8yzudkCRBeuNpF6+IpDoG/KBrqERFPRfmY/65nSF hgyuLNA5+HSCUBqQk4B2AW8m+g7TyJv2Z0uZxR9IlKhCYdtaSErIBVIh4fxWgdX5G/DciB hbkIcOoZF8FXonqU7Z+fYaSGqu2AZqI7YA0bwgXBnHF41MZ2jzVK1WaXb4BfeQ== 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 , Luca Ceresoli , Nuno Sa , Thomas Petazzoni , Herve Codina , stable@vger.kernel.org Subject: [PATCH v3 2/2] of: overlay: Synchronize of_overlay_remove() with the devlink removals Date: Thu, 29 Feb 2024 11:52:03 +0100 Message-ID: <20240229105204.720717-3-herve.codina@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240229105204.720717-1-herve.codina@bootlin.com> References: <20240229105204.720717-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_overlay_remove() with the devlink removals. Fixes: 80dd33cf72d1 ("drivers: base: Fix device link removal") Cc: stable@vger.kernel.org Signed-off-by: Herve Codina --- drivers/of/overlay.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 2ae7e9d24a64..7a010a62b9d8 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -8,6 +8,7 @@ =20 #define pr_fmt(fmt) "OF: overlay: " fmt =20 +#include #include #include #include @@ -853,6 +854,14 @@ static void free_overlay_changeset(struct overlay_chan= geset *ovcs) { int i; =20 + /* + * Wait for any ongoing device link removals before removing some of + * nodes. Drop the global lock while waiting + */ + mutex_unlock(&of_mutex); + device_link_wait_removal(); + mutex_lock(&of_mutex); + if (ovcs->cset.entries.next) of_changeset_destroy(&ovcs->cset); =20 @@ -862,7 +871,6 @@ static void free_overlay_changeset(struct overlay_chang= eset *ovcs) ovcs->id =3D 0; } =20 - for (i =3D 0; i < ovcs->count; i++) { of_node_put(ovcs->fragments[i].target); of_node_put(ovcs->fragments[i].overlay); --=20 2.43.0