From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3523D79F0; Mon, 8 Apr 2024 13:40:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583611; cv=none; b=cmaU4+G/A1DIRk6eOPjX4tATqaJWHow1pch6iE50w7pnKfP7ronXlXljVTd5tjni6vxY4J6KvD8nfQZ2QR2CexZ3oHxoFzuNKOIZxiYSTV1TCouWgwl9+ug/AlleS7hM2AolmFu3cQO5wHBaJsO6bhg9qnxciNUMeARdNz9sXoU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583611; c=relaxed/simple; bh=U4nRN8wHqxg+i1jiwPbaAfe8j/ptRZyBFFxLZBApTw4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WVvW23rDjIFklQuaLmaRodLnakvJFfN5WRDKunNAdJmD74TsRv16Mrr+nvzp03z6RV+89vigXn/f2BgSKcnN3eSQGnOyzYQNg7F0qQDoXq1ESE3aXucpiiUE1vXqrU7tdjtNB1ijhT69+tOjKxsv8N05kLZfffTq4LKiRLy7RHY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kP9iqJ6V; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kP9iqJ6V" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0B4AC433C7; Mon, 8 Apr 2024 13:40:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712583611; bh=U4nRN8wHqxg+i1jiwPbaAfe8j/ptRZyBFFxLZBApTw4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kP9iqJ6VZrccNt/DN7WO83DIALSuARj6OyPgOiVT3/bmJ8P8PxRiwW4r2N0gvm8VT Y0yHlnhNCdOQu7A1v0Ok119s0HSt4YgjuIZhAJpPdVK/V/qpD7vcxfzLdlKm3TqbRz m3uHDf7H9kpByOUb6lyO8TOHWA3Xs/JF73YXO9aY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Herve Codina , Saravana Kannan , Luca Ceresoli , Nuno Sa , Rob Herring Subject: [PATCH 6.6 215/252] of: dynamic: Synchronize of_changeset_destroy() with the devlink removals Date: Mon, 8 Apr 2024 14:58:34 +0200 Message-ID: <20240408125313.334738784@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125306.643546457@linuxfoundation.org> References: <20240408125306.643546457@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Herve Codina commit 8917e7385346bd6584890ed362985c219fe6ae84 upstream. 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: Saravana Kannan Tested-by: Luca Ceresoli Reviewed-by: Nuno Sa Link: https://lore.kernel.org/r/20240325152140.198219-3-herve.codina@bootlin.com Signed-off-by: Rob Herring Signed-off-by: Greg Kroah-Hartman --- drivers/of/dynamic.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -9,6 +9,7 @@ #define pr_fmt(fmt) "OF: " fmt +#include #include #include #include @@ -667,6 +668,17 @@ void of_changeset_destroy(struct of_chan { struct of_changeset_entry *ce, *cen; + /* + * When a device is deleted, the device links to/from it are also queued + * for deletion. Until these device links are freed, the devices + * themselves aren't freed. If the device being deleted is due to an + * overlay change, this device might be holding a reference to a device + * node that will be freed. So, wait until all already pending device + * links are deleted before freeing a device node. This ensures we don't + * free any device node that has a non-zero reference count. + */ + device_link_wait_removal(); + list_for_each_entry_safe_reverse(ce, cen, &ocs->entries, node) __of_changeset_entry_destroy(ce); }