Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp1440962imw; Tue, 5 Jul 2022 09:29:35 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tdVD1edFb5AEL4kZJPiopCzeHSKSh6FfWYdmaeoJJOlEKljTJDDrcqEI8gLvCRYaB8sEij X-Received: by 2002:a17:902:f383:b0:16b:e3db:1868 with SMTP id f3-20020a170902f38300b0016be3db1868mr11566119ple.113.1657038574999; Tue, 05 Jul 2022 09:29:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657038574; cv=none; d=google.com; s=arc-20160816; b=ar4TsnK9onld/gQPsHn9fjTwDRguAp7y8vJF31ftwv96z+IVqm0qW9cbeCkJBPJpg5 +wJque0KGUZN5MQPS41UV0gkqTTaKVciX46Yg2/S2Zs2qR84b/+ZdrC2hhq1EUSojr07 nSccmr46U4DehhafBbSEunR7zdXDMtOX6QNu6vOfPFToavs2PMlo+mnjcX03dMB0DBzr cTid8/pgogwzn9zkdqVt2/pYXFQNaSyXbW6mrViCv0xkNxp0neVP/pFkTFlRk8KUQahR g47h0ZRCGm+xC2L+/Ojq2B5M5OWWE4u/PMiw8iDHNw2HPqMe/fYbbTFLhYW4jeEfn36a 5+iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=ZU7W/SaUNwlLynUXHU1559g+E1sKkpeDnZgFm447AJ4=; b=YoZK4Gww9ydNRbnLsUvxdNPvwwCVP4dGhY9pIVfpI3EfQ1Mu4p5lfA63yqXXxTmogt m4u7LbTi7KrKoo5lq5N6bDxzFR9XVqhEI8dzOVVMs1RNMi1XhEiC09VBjnzFpT0XcsmB CfXJro5OtBdUvrTThf3IhuKdyC8CoGGbPlgfcpWN8WtWZY4WKf4rk5zKrI+J8jxqqZNl v1M/4sQi2HRBI3q7gDpNjfTcHvqzAyl56iRMVz/zZr621uUOe8xhEMNYHnT9Qc/bkvre OiLT5B2iI9tUU1d/lNWt/CgbE0WoF1yOluFyATvfdG2gAu3vNGKR6wjRLdTqe+ZFZtRk uzvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=RUpc5Hba; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a29-20020a630b5d000000b0041270f8a629si2916092pgl.759.2022.07.05.09.29.20; Tue, 05 Jul 2022 09:29:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=RUpc5Hba; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232676AbiGEP7X (ORCPT + 99 others); Tue, 5 Jul 2022 11:59:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229718AbiGEP7V (ORCPT ); Tue, 5 Jul 2022 11:59:21 -0400 Received: from mail-vk1-xa29.google.com (mail-vk1-xa29.google.com [IPv6:2607:f8b0:4864:20::a29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CD2410FEF for ; Tue, 5 Jul 2022 08:59:19 -0700 (PDT) Received: by mail-vk1-xa29.google.com with SMTP id j63so510412vkj.8 for ; Tue, 05 Jul 2022 08:59:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ZU7W/SaUNwlLynUXHU1559g+E1sKkpeDnZgFm447AJ4=; b=RUpc5HbairS1muuAandh0K1YIz3OU+CY1bzs4MzSb9d/yXOHKExzfTTMvhjxdRoGrH brzzY7co1C3auBZAiVCPtPod3rgW0LVIwohOoXpsFpPcsR2TYsHiXUFJD3jKlnlZx7vf eSowmcatcNNChGbFwNzBc3isGsXUvaR+zL838= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZU7W/SaUNwlLynUXHU1559g+E1sKkpeDnZgFm447AJ4=; b=4vNFzq3E7k1WVvE99PzlvTZKHJDDFSPWbK1mYY7+wV5raqiTuCoTsLjKWLH+KF39jr q6jpTuJM6d/+p5qVr+2gNMNVHv2W1TrN0+IBePR8QSvJp0EKOVx8aTDcNk5HelIOxxtn T12JSbyXlw4FFjt0GDpt9Ut2hWcbelwr03WsROjK0h97P1Pnxm8plYPKg0uX9YvqpnWt ymNFlAYIfJeZ1JdqTzmetTCpH9vsHXfB//2vAlw1r8hlExXMd5uGZLLc/2u/Y+qyYI7u qvOkPlMPLXH5gOjsiI/+iUdeH3tCJys4AgA0V2R522N83P4IqHL9hXU0DhwT4dSA35gY p5eQ== X-Gm-Message-State: AJIora/nIxmVLKeTmsA+Cj0qZdkwp9FpGJWMI+bCe4HHr+d8Emgdwssv rVOn50G9h7jGW1+lEyq4rdt760Sx8A8YztI7ClWwcw== X-Received: by 2002:a1f:1f84:0:b0:370:44fb:5e90 with SMTP id f126-20020a1f1f84000000b0037044fb5e90mr20575906vkf.6.1657036758529; Tue, 05 Jul 2022 08:59:18 -0700 (PDT) MIME-Version: 1.0 References: <20220705094946.827697-1-hsinyi@chromium.org> In-Reply-To: From: Hsin-Yi Wang Date: Tue, 5 Jul 2022 23:58:52 +0800 Message-ID: Subject: Re: [PATCH] PM: domains: Ensure genpd_debugfs_dir exists before remove To: Greg Kroah-Hartman Cc: "Rafael J . Wysocki" , Kevin Hilman , Ulf Hansson , Len Brown , Pavel Machek , Thierry Strudel , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, AngeloGioacchino Del Regno , Pin-yen Lin Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 5, 2022 at 7:51 PM Greg Kroah-Hartman wrote: > > On Tue, Jul 05, 2022 at 07:06:41PM +0800, Hsin-Yi Wang wrote: > > On Tue, Jul 5, 2022 at 6:38 PM Greg Kroah-Hartman > > wrote: > > > > > > On Tue, Jul 05, 2022 at 05:49:47PM +0800, Hsin-Yi Wang wrote: > > > > genpd_debug_remove() may be indirectly called from others while > > > > genpd_debugfs_dir is not yet set. Make sure genpd_debugfs_dir exists > > > > before remove the sub components, otherwise components under > > > > /sys/kernel/debug may be accidentally removed. > > > > > > > > Fixes: 718072ceb211 ("PM: domains: create debugfs nodes when adding power domains") > > > > Signed-off-by: Hsin-Yi Wang > > > > --- > > > > An example: > > > > scpsys_probe() in drivers/soc/mediatek/mtk-pm-domains.c indirectly calls > > > > genpd_debug_remove() on probe fail, causing /sys/kernel/debug/usb to be > > > > removed. > > > > --- > > > > drivers/base/power/domain.c | 3 +++ > > > > 1 file changed, 3 insertions(+) > > > > > > > > diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c > > > > index 3e86772d5fac5..5a2e0232862e0 100644 > > > > --- a/drivers/base/power/domain.c > > > > +++ b/drivers/base/power/domain.c > > > > @@ -222,6 +222,9 @@ static void genpd_debug_remove(struct generic_pm_domain *genpd) > > > > { > > > > struct dentry *d; > > > > > > > > + if (!genpd_debugfs_dir) > > > > + return; > > > > + > > > > d = debugfs_lookup(genpd->name, genpd_debugfs_dir); > > > > debugfs_remove(d); > > > > > > Why not just change this to be: > > > debugfs_remove(debugfs_lookup(genpd->name, debugfs_lookup("pm_genpd", NULL))); > > If pm_genpd hasn't been created yet, debugfs_lookup("pm_genpd", NULL) > > will return null. > > And how is this codepath being called if pm_genpd is not created yet? > Surely you are not relying on the presence of a debugfs file to > determine that? > Caller didn't directly call genpd_debug_remove(). The flow is as follows: Normally, scpsys will create pm domain by: scpsys_probe() --> scpsys_add_one_domain() --> pm_genpd_init() --> genpd_debug_add() If something fails, it will do the cleanup: scpsys_probe() --> scpsys_domain_cleanup() --> scpsys_remove_one_domain() --> pm_genpd_remove() --> genpd_remove() --> genpd_debug_remove() genpd_debug_add() checks if genpd_debugfs_dir is init by a late_initcall genpd_debug_init(). If it's NULL, it will return directly without creating anything. Later when genpd_debug_init() is called, it will call genpd_debug_add() again. pm_genpd_remove() still needs to be called on the cleanup path to free other stuff, but if genpd_debug_init() hasn't happened, genpd_debug_remove() should be a no-op, or genpd_remove() shouldn't call it. (We can move the check there, but adding in genpd_debug_remove() is more similar to what genpd_debug_add() currently is.) > > If genpd->name also exists under root debugfs, it will still be > > deleted unintentionally, since NULL represents root debugfs. > > Eg. one of the genpd->name is "usb", which is supposed to be added as > > /sys/kernel/debug/pm_genpd/usb later. But pm_genpd is not yet created, > > /sys/kernel/debug/usb will be removed. > > Ah, that's a bad name to pick :) > > But still, don't paper over this problem, please solve the root issue of > never relying on the creation of a debugfs file to determine functional > logic. > Currently we can't remove genpd_debug_add() called in pm_genpd_init() and genpd_debug_remove() called in genpd_remove(). If some power domain is created after genpd_debug_init(), their genpd subdomain won't be registered in debugfs. genpd_debug_remove() also has similar issues, eg. failed domain not removed after genpd_debug_init() is called. > thanks, > > greg k-h