Received: by 2002:ab2:788f:0:b0:1ee:8f2e:70ae with SMTP id b15csp484257lqi; Thu, 7 Mar 2024 03:11:50 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXS/9UyfeegGOybitRYIQl8hXcKrEqxItcIg2fKD4ohM6WUbyt+y82CQK13Onl81lSDp820EpQ0WgUbqgMZ9Eq8/nkIYG1CRtJ+LSGPog== X-Google-Smtp-Source: AGHT+IH6sAXoGeZlxajXVh4/kAxOfVr1G4uFXpUIgO4NkOthzHTLeN+1l2UVNNazvok29TuWytc+ X-Received: by 2002:a17:902:d551:b0:1d9:d341:b150 with SMTP id z17-20020a170902d55100b001d9d341b150mr9517430plf.40.1709809909800; Thu, 07 Mar 2024 03:11:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709809909; cv=pass; d=google.com; s=arc-20160816; b=Y7bzLsiLHIzyvY+p/lnNmMrIrQvlhdfNvzjDpeaF6Xntt8YC9w4xIGfR5WNOQjMThU zLAlzKMLXK7wSgPeliAqDAd0OM+eRZCRW17X75hRCRHCPWv86PaqAT6MmsuDFUPxhJHZ XTjWXRQaZ3+ZtqO6cWfHwUcl6JJZPIh9gNmRJPWgfYw0hl3cqZ6KCbrfvYGQW6248/aL y/y37v2jPnzs7+hW7emTP2KdlLcWDJEF+3mvTmLvG/fEeDnmqt7GxUQUoESGzEmRL4C0 3VS63AL2gCNzf0iXb/Q6YUjJpFwNFIYNj6XbhFBjOnHf5jWmnFpU40asr+HAr8HWnYTr fqDA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=tU47TyT4ht6W8dfbwRiEMrDRHy9bv5aClb8wq33Hq18=; fh=JfsClYTjt8qDhUqyVlL6sma6bIUBcmxkDWND1AnjMEI=; b=EFjHuyOtTX+c0K8KpioDoS8XbEhbSj7znFYF450QOCYGGEh83Z7RT3kGbfZcbNTD7s zsBL1aI95DHB4RATo7n/GGq/+nUlk2gAsCoOuKqbEpioPR4Mjj8o/CDehaYphIlV8Avz nwaxa2BmxHWKjnd3hmsX6ZhGG+4Q0efIY+v+vRAi20gfDprbGAfYbbiaNtjOMXKfN6XV a6YAlNLAUx+hL/O++LFiy9HKhRJw0mmIAUUDwOYU1ZnHD52JOMRdzc/3WONK68u9Gj5v Zfnax+KSUKzNs+GjEKFNWsoWHdcM9uSre0z+J/UY8n476S2Zb9ruyx36Q2L70CUfSYxw qhJQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=A6lqKiF4; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-95385-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-95385-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id k17-20020a170902761100b001dccc0ca2b0si13077690pll.169.2024.03.07.03.11.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 03:11:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-95385-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=A6lqKiF4; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-95385-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-95385-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id D887CB21620 for ; Thu, 7 Mar 2024 11:11:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DD0A5129A61; Thu, 7 Mar 2024 11:10:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="A6lqKiF4" Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) (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 526F28529C; Thu, 7 Mar 2024 11:10:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709809849; cv=none; b=mR/yClxlqJ3NuVHUa1yt1ieCOM8rpSWyQgq1lDeuPhGnEro6H6kyUqBUHUW4xI76F9YyDOz8kZTV+MtjX0EaOspO4t/GhFp+p5nfYsyWj6jmvjuHHwrx0LvUYi2f0AcdoIm+Z3lOMjzs9wIycPl8blkpypTebt9zTcrlUja5MRI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709809849; c=relaxed/simple; bh=QKb8Y0+5Befr7x73+f5zDW4KRxUSMOCTpyxsnkuG8xo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WZtQR9URb+KPW4XQIjZ0m4Z2gCbZrP+4/8Yff1E6OfUeXkzn7dbmOtZqPNFpLT7EzDrCntSZGxOncOi2iQYTHoxAglL2P4QdJVRDdG+/dpROL8182ZA7T9E8Rb/YYC8/lZb2h73a/eUQunKE2mYXRwlE5zl8dOnyg8tFXIUOuGA= 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=A6lqKiF4; arc=none smtp.client-ip=217.70.183.195 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 Received: by mail.gandi.net (Postfix) with ESMTPA id 9435660005; Thu, 7 Mar 2024 11:10:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1709809845; 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=tU47TyT4ht6W8dfbwRiEMrDRHy9bv5aClb8wq33Hq18=; b=A6lqKiF4rsb5rt/aV11LWbgagNJs8j74XtcmCBM+bbJXZhxM/Lsk+VLuTtAYZ2d6djFnLp vLgmVxkeF7+PsmUib0bFtCQiGI0/pMGTaplziu/m4/VbAA79RMUZDWleqnyaKlx5IOOpfp SVwNM0/EneCFoQQ1ZJEaIqY/dE5MHoWh95glbmxuW81KShYG6MZm3Rx1IjW7vTE5wAze2T piVxAg6h8VJK+pqTGEyobV12rRkX5wmI1aizbs+bd3xZvA90auw00hy082rKCiPgXXXTWN Z7jdHclyN94NpLigOa8OF4H5zs/AG2xQsv5yg8FlWgOkc5dL666pPafHK3UFkw== 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 v5 1/2] driver core: Introduce device_link_wait_removal() Date: Thu, 7 Mar 2024 12:10:00 +0100 Message-ID: <20240307111036.225007-2-herve.codina@bootlin.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240307111036.225007-1-herve.codina@bootlin.com> References: <20240307111036.225007-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: 8bit X-GND-Sasl: herve.codina@bootlin.com 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. Cc: stable@vger.kernel.org Signed-off-by: Herve Codina Tested-by: Luca Ceresoli Reviewed-by: Nuno Sa --- 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..48b28c59c592 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; /** * __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); } +/** + * 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. + */ + flush_workqueue(device_link_wq); +} +EXPORT_SYMBOL_GPL(device_link_wait_removal); + static struct class devlink_class = { .name = "devlink", .dev_groups = devlink_groups, @@ -4099,9 +4114,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; + device_link_wq = alloc_workqueue("device_link_wq", 0, 0); + if (!device_link_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 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); /* Create alias, so I can be autoloaded. */ #define MODULE_ALIAS_CHARDEV(major,minor) \ -- 2.43.0