memory tier, sysfs: rename attribute "nodes" to "nodelist"

In sysfs, we use attribute name "cpumap" or "cpus" for cpu mask and
"cpulist" or "cpus_list" for cpu list.  For example, in my system,

 $ cat /sys/devices/system/node/node0/cpumap
 f,ffffffff
 $ cat /sys/devices/system/cpu/cpu2/topology/core_cpus
 0,00100004
 $ cat cat /sys/devices/system/node/node0/cpulist
 0-35
 $ cat /sys/devices/system/cpu/cpu2/topology/core_cpus_list
 2,20

It looks reasonable to use "nodemap" for node mask and "nodelist" for
node list.  So, rename the attribute to follow the naming convention.

Link: https://lkml.kernel.org/r/20221020015122.290097-1-ying.huang@intel.com
Fixes: 9832fb87834e2b ("mm/demotion: expose memory tier details via sysfs")
Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Acked-by: Wei Xu <weixugc@google.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Reviewed-by: Yang Shi <shy828301@gmail.com>
Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Bharata B Rao <bharata@amd.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Hesham Almatary <hesham.almatary@huawei.com>
Cc: Jagdish Gediya <jvgediya.oss@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Tim Chen <tim.c.chen@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers b/Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers
index 45985e411f13d69cef048eda2d8665960636c158..721a05b9010971f717a20043852632b0a9e9d4ad 100644 (file)
--- a/Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers
+++ b/Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers
@@ -10,7 +10,7 @@ Description:  A collection of all the memory tiers allocated.
 
 
 What:          /sys/devices/virtual/memory_tiering/memory_tierN/
-               /sys/devices/virtual/memory_tiering/memory_tierN/nodes
+               /sys/devices/virtual/memory_tiering/memory_tierN/nodelist
 Date:          August 2022
 Contact:       Linux memory management mailing list <linux-mm@kvack.org>
 Description:   Directory with details of a specific memory tier
@@ -21,5 +21,5 @@ Description:  Directory with details of a specific memory tier
                A smaller value of N implies a higher (faster) memory tier in the
                hierarchy.
 
-               nodes: NUMA nodes that are part of this memory tier.
+               nodelist: NUMA nodes that are part of this memory tier.
 

diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c
index f116b7b6333e50f1c3f6c2a7717afe30aa2b1629..fa8c9d07f9ce97ec552d5f6c14e9d9ce4cde100e 100644 (file)
--- a/mm/memory-tiers.c
+++ b/mm/memory-tiers.c
@@ -131,8 +131,8 @@ static void memory_tier_device_release(struct device *dev)
        kfree(tier);
 }
 
-static ssize_t nodes_show(struct device *dev,
-                         struct device_attribute *attr, char *buf)
+static ssize_t nodelist_show(struct device *dev,
+                            struct device_attribute *attr, char *buf)
 {
        int ret;
        nodemask_t nmask;
@@ -143,10 +143,10 @@ static ssize_t nodes_show(struct device *dev,
        mutex_unlock(&memory_tier_lock);
        return ret;
 }
-static DEVICE_ATTR_RO(nodes);
+static DEVICE_ATTR_RO(nodelist);
 
 static struct attribute *memtier_dev_attrs[] = {
-       &dev_attr_nodes.attr,
+       &dev_attr_nodelist.attr,
        NULL
 };