From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75777C2D0BE for ; Wed, 4 Dec 2019 21:58:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FCCD2073C for ; Wed, 4 Dec 2019 21:58:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sPM/fSNU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728208AbfLDV64 (ORCPT ); Wed, 4 Dec 2019 16:58:56 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:33179 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727989AbfLDV6z (ORCPT ); Wed, 4 Dec 2019 16:58:55 -0500 Received: by mail-ed1-f65.google.com with SMTP id l63so855160ede.0 for ; Wed, 04 Dec 2019 13:58:53 -0800 (PST) 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=834X6enFsR+krNoNr0e4709pAh8Q2+irN0s0KLWbKdY=; b=sPM/fSNUtqQcSP7CWF7NsVFpZb0O/fwkH6QMYfP4/5MBhsR1iYWl7ktf1NtM1E9wus sgx86dcRhjC3zXVM4P4m3LrN9TwYy0JZ5xZA8r1jifNGH2qJXysVovAqaHvVwl9/xxHY nZ1wQNfZghdYIqvM8jJS8ijSTFdYzX9YJMfqQRCIm/rphFi9dgRRt7PNul+4OUH1G8By ElWJ9rMcl4rIYxWVPNcDMzsJkb0kJS6CRYBZaud39U/idiWl1Tnxyg4H5J/bgS7aG2bt 7UbEIt45Yc53CcCqFvTS37y2PEJ5imCCpg8K/92zuB4ZhjoLhyci3W+y/ai/c3ffwjHl 9uOg== 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=834X6enFsR+krNoNr0e4709pAh8Q2+irN0s0KLWbKdY=; b=UfYyRRP3ayKWWkcTxZUG05e+oshpgMD7EiH8MKgYhwLJ2yDzH411hwA08NIFYsKkG1 W8dg/QCvsmdqHKzngrMu9543YWNYZKg81fSbti8yj6IQU6JVud+t0i0v/Pb8WqWHQ/Uy qCwF/ErIQxiS/7W4m9QsMstfYe4NlcgjTdO2AszHi8vtbDa4cctQ7Nynu6b8/o8HcfM8 KhAiXGnGy/1vDS4bHCXRJEDN6GFF7thMKZeFYuQ7dsjUFlxMRrEmNM7fkVjDm0mVwBGi U4Z68A9EagOMzV/lq35OI6mPpLJ6sWDnsSHneze4/+dM1lOpH9Dp3tj8jnWHUdgmoa0V XjMQ== X-Gm-Message-State: APjAAAWbAyAmE7wCiB4EDajM/MllgajMmyhQi2b9qF2aYHtXr2+hezWi TiVeycASPWMK471PyegsdiAZFjV36F8HqyxfLCITww== X-Google-Smtp-Source: APXvYqy/Ks8cCcfmSZFk7CgBt9JjE5OX2CyjdQWADUUGHLoLTj7qI2gKdo0JtHG5d1MJruFqD+aZgNinpBN5Aq0pgbw= X-Received: by 2002:a50:8d52:: with SMTP id t18mr6921117edt.26.1575496732591; Wed, 04 Dec 2019 13:58:52 -0800 (PST) MIME-Version: 1.0 References: <20191015061349.141448-1-wvw@google.com> In-Reply-To: From: Wei Wang Date: Wed, 4 Dec 2019 13:58:41 -0800 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, Dec 4, 2019 at 4:45 AM Amit Kucheria wrote: > > On Mon, Nov 11, 2019 at 11:22 PM Wei Wang wrote: > > > > On Sun, Nov 10, 2019 at 9:26 PM Amit Kucheria > > wrote: > > > > > > On Thu, Oct 17, 2019 at 3:04 AM Wei Wang wrote: > > > > > > > > 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_. > > > > > > I'm not sure I understand. What does this change have to do with > > > adding symlinks below? > > > > > > > cdev->type will be used later in sysfs_create_link and adding "" as > > symlink is kind of bad practise AIUI. > > > > Perhaps I'm being dense here, in which case my apologies. > > But what stops us from splitting the patch into two? > 1. Make type == "" as invalid by using your change above and fixing up > the strlcpy(cdev->type....) further down. > 2. Create the actual symlinks in a separate patch. > > Regards, > Amit > Updated with v2, thanks. > > > > > > > > > > > > > > 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. > > > > > > OK. > > > > > > > > > > > > > > > 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 > > > > > > >