Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1030967ybp; Thu, 17 Oct 2019 07:06:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqwnXmO9pB75NSZU46g1sUJLkOTNvL5l2PHlJe+fS9vVUXMF4RBv5rLgJPnE0tnbqbp4+eiP X-Received: by 2002:a17:906:2961:: with SMTP id x1mr3628824ejd.91.1571321205416; Thu, 17 Oct 2019 07:06:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571321205; cv=none; d=google.com; s=arc-20160816; b=odVqzksrqCSQRsZUA0Z+PUBewuROHj4uqQoE08eQAsNj6JM86d35JOHHIePC1JetmM OcrK8/1nW4YsjL6ZI63BmMsz8MP4Ub6o9lwfhJZJTdUp+5lz9GsQt6CKPOLfmdoMw9KH EZF7f9AtyrPa6sc7eHh4KEfLLqDQVm1kHlErhp10+LaFvr9qUDFMJoOwREg+hiqQsRao cq5z3Ehqg2j3ZHNuQAKh8VrrVnjsFLvEwRyUDdpET7hgm2n534muu5dmwmSeU0W2MfaM IiIBbzGth40dzhY50vqumkc+juuPxm4ZevvGhOCJAN/LvlfVPf1Jzmftz0lBlqm0n9Mb 69Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=bfOGDWzikmOJBzCAtkiIxcv6c5ZcmR8y/XNQVA8Amkg=; b=ZqJ9raAbTWYIoV0YdwgxGMDp72/etBRlzriGi2IiFX6WmxMMujk1uIEARjrpBBiMmr OUxc97ei9vHsbzvyLjLp2NadCVFiBTzeMlFtSx92j/EmRSkBiGwCdBrD8T8+4O4cpkH3 cWYk0OQYget1BVYzKitjDPH3p3DBuH0qJeSLXzh/FNQneCQr2hxHbKP71xR1rNkKXzlo A4fRYEgMraGIgu38uDljqlEcU6wZXTZ/ZWsYtYQOo/X+5Y295iSk2+Kd8i97+hibaTt9 VnYMkWb/SXO/J1NVZIfJYk1uQmktXPyowTNCX6NtwbA1XFeVYCK9w7x2bE25HfQ5Bvo0 FcBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=uugI1aeL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p40si1734833eda.334.2019.10.17.07.06.20; Thu, 17 Oct 2019 07:06:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=uugI1aeL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390158AbfJPVej (ORCPT + 99 others); Wed, 16 Oct 2019 17:34:39 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:40988 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389344AbfJPVej (ORCPT ); Wed, 16 Oct 2019 17:34:39 -0400 Received: by mail-ed1-f66.google.com with SMTP id f20so22470045edv.8 for ; Wed, 16 Oct 2019 14:34:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=bfOGDWzikmOJBzCAtkiIxcv6c5ZcmR8y/XNQVA8Amkg=; b=uugI1aeLVNLvw9BnJDgl7fGVUgsjPSAHAD05XlZDH53TNa5o1WLJLMwF9QnMGqfsqN Z1sU+jB2LvS90d2Ttm3twrk9nTXfFIjwIhQyY6raJz6L+gTVFU+msbiJZKbe5p8TNkop cxD/oghyLeUDCnywTQqxnnvAzh1DF6BbKdwKmEKf+WNMIpliuRYXtdm7CZ3RH0akodxY DMQowAHXKiyEhVHljLApsZ4r7F584fCkLA89gDE9lF4sa/R0PNjRre5hKu45/KqXhWLf KJorWKTd7htX4tyX+XZpPtXZP94LMw1iwl0UxGnv0GrQcdJ9pwFr/crSIu8LqOT5JhUh oGMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=bfOGDWzikmOJBzCAtkiIxcv6c5ZcmR8y/XNQVA8Amkg=; b=DECiaTbIrArA7dICAiqX5kHYE9CQQVtzHjx8oOgcNJru9MuF4YcCVEgolF2RA1xZyc 9YL0TIoalZQQN7d3lKOHVU1S6+6CBqPpgJYaGLFfn9YYSAmfh9GnY6Fg7tm8e8df0RCo OhBSr+JpQKVmznazKUBYhtD40Z+OULpEeHB2IgNWejlGAz5MfYJOhvGra3flord/Nb09 d3huJs3yfDYKJMr4OPkV+wS7W3x6hFRifVfgTD+PBSkhFQWQHRlRR0Htq+s2aessWX2G YDOe2a2y8xM/OVO+jD4MQHt27MKYa9mk6MeNqccfF2cufuL6BWHs3RAgIF8oc6nQTrPy hdbQ== X-Gm-Message-State: APjAAAX/fpWCI2zJf3B2Mw5JUbv7dAnf54fEyDpFuTiN7thS6GdvQpif kpd18MpADB5QZslV230Uw3E1Cjh0uNtG4OcT3jlo1Q== X-Received: by 2002:a17:906:2961:: with SMTP id x1mr423990ejd.91.1571261676139; Wed, 16 Oct 2019 14:34:36 -0700 (PDT) MIME-Version: 1.0 References: <20191015061349.141448-1-wvw@google.com> In-Reply-To: From: Wei Wang Date: Wed, 16 Oct 2019 14:34:25 -0700 Message-ID: Subject: Re: [PATCH] thermal: create softlink by name for thermal_zone and cooling_device To: Amit Kucheria Cc: Wei Wang , Zhang Rui , Eduardo Valentin , Daniel Lezcano , Linux PM list , LKML Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 16, 2019 at 10:16 AM Amit Kucheria wrote: > > On Wed, Oct 16, 2019 at 10:20 PM Amit Kucheria > wrote: > > > > On Tue, Oct 15, 2019 at 11:43 AM Wei Wang wrote: > > > > > > The paths thermal_zone%d and cooling_device%d are not intuitive and the > > > numbers are subject to change due to device tree change. This usually > > > leads to tree traversal in userspace code. > > > The patch creates `tz-by-name' and `cdev-by-name' for thermal zone and > > > cooling_device respectively. > > > > I like this. > > > > > Signed-off-by: Wei Wang > > > --- > > > drivers/thermal/thermal_core.c | 23 +++++++++++++++++++++-- > > > 1 file changed, 21 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > > > index d4481cc8958f..0ff8fb1d7b0a 100644 > > > --- a/drivers/thermal/thermal_core.c > > > +++ b/drivers/thermal/thermal_core.c > > > @@ -22,6 +22,7 @@ > > > #include > > > #include > > > #include > > > +#include > > > > > > #define CREATE_TRACE_POINTS > > > #include > > > @@ -46,6 +47,8 @@ static DEFINE_MUTEX(poweroff_lock); > > > > > > static atomic_t in_suspend; > > > static bool power_off_triggered; > > > +static struct kobject *cdev_link_kobj; > > > +static struct kobject *tz_link_kobj; > > > > > > static struct thermal_governor *def_governor; > > > > > > @@ -954,7 +957,7 @@ __thermal_cooling_device_register(struct device_node *np, > > > struct thermal_zone_device *pos = NULL; > > > int result; > > > > > > - if (type && strlen(type) >= THERMAL_NAME_LENGTH) > > > + if (!type || !type[0] || strlen(type) >= THERMAL_NAME_LENGTH) > > > return ERR_PTR(-EINVAL); > > > > This should be a separate fix, if needed. Agree, but the link now requires that "" as invalid _type_. > > > > > if (!ops || !ops->get_max_state || !ops->get_cur_state || > > > @@ -989,9 +992,15 @@ __thermal_cooling_device_register(struct device_node *np, > > > return ERR_PTR(result); > > > } > > > > > > - /* Add 'this' new cdev to the global cdev list */ > > > + /* Add 'this' new cdev to the global cdev list and create link*/ > > > mutex_lock(&thermal_list_lock); > > > list_add(&cdev->node, &thermal_cdev_list); > > > + if (!cdev_link_kobj) > > > + cdev_link_kobj = kobject_create_and_add("cdev-by-name", > > > + cdev->device.kobj.parent); > > > + if (!cdev_link_kobj || sysfs_create_link(cdev_link_kobj, > > > + &cdev->device.kobj, cdev->type)) > > > + dev_err(&cdev->device, "Failed to create cdev-by-name link\n"); > > > > Any reason not to use the following form instead? It seems easier to read. > > > > if (!cdev_link_kobj) { > > cdev_link_kobj = kobject_create_and_add("cdev-by-name", > > cdev->device.kobj.parent); > > ret = sysfs_create_link(cdev_link_kobj, > > &cdev->device.kobj, cdev->type)) > > if (ret) > > dev_err(&cdev->device, "Failed to create > > cdev-by-name link\n"); > > } > > I can now see why you had to do that - none of the other links would > get created after the first one. > > Perhaps create the directories in the __init functions and only create > the links here? > AFAICT, this is no such API except the private get_device_parent() under driver/base/. Also the lazy initialization makes sense in such case when there is no thermal device attached. Looks like the class dir is also lazy-initialized when first device registered https://elixir.bootlin.com/linux/v5.3.5/source/drivers/base/core.c#L1790. > > > > mutex_unlock(&thermal_list_lock); > > > > > > /* Update binding information for 'this' new cdev */ > > > @@ -1157,6 +1166,8 @@ void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev) > > > } > > > } > > > } > > > + if (cdev_link_kobj) > > > + sysfs_remove_link(cdev_link_kobj, cdev->type); > > > > > > mutex_unlock(&thermal_list_lock); > > > > > > @@ -1340,6 +1351,12 @@ thermal_zone_device_register(const char *type, int trips, int mask, > > > > > > mutex_lock(&thermal_list_lock); > > > list_add_tail(&tz->node, &thermal_tz_list); > > > + if (!tz_link_kobj) > > > + tz_link_kobj = kobject_create_and_add("tz-by-name", > > > + tz->device.kobj.parent); > > > + if (!tz_link_kobj || sysfs_create_link(tz_link_kobj, > > > + &tz->device.kobj, tz->type)) > > > + dev_err(&tz->device, "Failed to create tz-by-name link\n"); > > > > Same as above. > > > > > mutex_unlock(&thermal_list_lock); > > > > > > /* Bind cooling devices for this zone */ > > > @@ -1411,6 +1428,8 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) > > > } > > > } > > > } > > > + if (tz_link_kobj) > > > + sysfs_remove_link(tz_link_kobj, tz->type); > > > > > > mutex_unlock(&thermal_list_lock); > > > > > > -- > > > 2.23.0.700.g56cf767bdb-goog > > >