Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2815062lqp; Mon, 25 Mar 2024 09:58:04 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUAwicHtGjmjHVTbt6Mh2gHsBjObAiGB5JDrkAe6x2R0pO2cCH4zEJ/RdZEPnaU1y3hQ/KNIc9y9t3SnTaM0OcxMtuD5zbWJXcDo3yZug== X-Google-Smtp-Source: AGHT+IHQ8wWL7+ycslm0L0vFwL40eReUVwKIgCazZfPyt8zusTx1TCiK7hJFx3ha0+qX9wN4kZmi X-Received: by 2002:ad4:5aec:0:b0:696:946e:183b with SMTP id c12-20020ad45aec000000b00696946e183bmr1560052qvh.24.1711385883938; Mon, 25 Mar 2024 09:58:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711385883; cv=pass; d=google.com; s=arc-20160816; b=aFusqbKh/Pf1sRH8Iqb8wUgL1+W7VajVkJaZ01gbVzU4xttzfaF2HhXHWnpDYjmKhh 2PTpHUTqmgr20YyK2HSYNhCtcmj2CnIBi2SAMiqPqYhGG+FjgHs/veMviRlidzo3o0FM W5f4A+sRp+fRGq3ClsOnFulRtW6PJUlIkt01UEEnzYP5vCAAm4QEHHhcCWXDzeuNcH3o qOl16nlldjOMYhNLYd2nDcRObGAebi5Mnx9Dh9AzX3k1Rvyjk3OWCz4VlF+VD5W/VkAx U7pIj2WKzr8MOUfiDi4oHg8Bv+ulPfVB+x0pwbg7gvSPck8zT2vCzAA+OxVALxKVcDJk q++g== 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=UpWR4WCDuNDYnnhlODtqNwmnfIhRuBZf4UaQrvurOwU=; fh=JfsClYTjt8qDhUqyVlL6sma6bIUBcmxkDWND1AnjMEI=; b=LQ0Q3KKew0LzKntsJqP7W08KCDwY0yYH9zi1U4ManrzUTWeO3KrHb6M0Ip64fJPRvv 6JXqDjjAfxQpgY2JNzbngCJLBTmqw18bIolWtRlOSFnyijPUH8l6bF5V/qIi92SJG5HX 2e+gYQkmPNSkF8rK13iZc/BEQ57qwgwND0GsLaKc3+GBemd2HFMcp+oKXhHj+t/YDOWj 6b5RH+AguQdAyZZ1SZgrvSIl6FtHvJ6mX5d96dBqRyVw1rax88QX7qUfB5ilRDz8acll U4uWdcY73rJZ6tyOzYuR6HeAgDJfPnU+cu5G/ureYvFS28+Hc6Nfcn4MoIm5rgL2xbP2 aDAQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=W6nC0Pe6; 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-117355-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-117355-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id hf9-20020a0562140e8900b006967acdae5dsi5193483qvb.261.2024.03.25.09.58.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 09:58:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-117355-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=W6nC0Pe6; 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-117355-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-117355-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 06F3D1C39C90 for ; Mon, 25 Mar 2024 16:57:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1595B13DDD9; Mon, 25 Mar 2024 15:22:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="W6nC0Pe6" Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) (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 78A75DF49; Mon, 25 Mar 2024 15:21:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711380121; cv=none; b=DftLYD6jKmH+H0PL5pYWJyPh2RZKRsqUGU2F7v0MLHA/+slIAVcxT2qziOC1S03YxgbnFAAdgd9o3WLxuYrpGD+FlP7uomF/lOb6kDxc8Y5CklR1ekrenUn4mDZlbJn3JVUMZ9Qg2c8RyuyREmaSxOQaMAwFJd6GsmlVilXD9d0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711380121; c=relaxed/simple; bh=WKicl9RpGDu1gJ6HqIzRdJp8b9byCb1GpL96zLyvR+I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PAtAJeKBXPWbOsZjsakCb1dsCeIOQwYW01XBoUsxWKbTegEPX603VjSwJ04vrvXaGRHXNOgjLn/fhaQ+iE4nxg+HPqDGcS7nDBHYdazKJLa7pQ16RCnkUsanZSOmNumkIF3vbCZ/HzPrT2QUaHHNNuelMxZXDuVbhbYY2FZNSGM= 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=W6nC0Pe6; arc=none smtp.client-ip=217.70.183.199 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 CBE0AFF80F; Mon, 25 Mar 2024 15:21:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1711380116; 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=UpWR4WCDuNDYnnhlODtqNwmnfIhRuBZf4UaQrvurOwU=; b=W6nC0Pe6py8mNJRQ5DN90Xo92lsaTVdsFAtCuxacVR5zoQEXtgQ5CKY9b1PvN2UIVjn50/ asyf2aSpS/JBeQTgfqQNFux2wwum1gxmjP2hpC43U5PoxTvor5QxMpw0nPuWwRLw4hz1VG /v8SRnlpoL/DGg8vaVJ31nsxkgvcO+q1K5S8vAxK21FIenNqhfH7ab6nPItUuvhP4gsf59 xL6IFtmEbmeSAro6/reBkPlTdu6f9lIgH5Xj2m28Gr49FOIYbPN/Wj95qyw8GgXaHhG6Ip 8jIHq9KfcnMaDsHGqrQh/ZeKr7qyXkF6/vk/2fGvZJsf3TsVi0trVrjicAvxwA== 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 v6 1/2] driver core: Introduce device_link_wait_removal() Date: Mon, 25 Mar 2024 16:21:25 +0100 Message-ID: <20240325152140.198219-2-herve.codina@bootlin.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240325152140.198219-1-herve.codina@bootlin.com> References: <20240325152140.198219-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 Reviewed-by: Saravana Kannan --- 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 7e3af0ad770a..f2242aadffb0 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. @@ -533,12 +534,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, @@ -4165,9 +4180,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.44.0