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.
Signed-off-by: "Huang, Ying" <[email protected]>
Cc: Aneesh Kumar K.V <[email protected]>
Cc: Alistair Popple <[email protected]>
Cc: Bharata B Rao <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: Davidlohr Bueso <[email protected]>
Cc: Hesham Almatary <[email protected]>
Cc: Jagdish Gediya <[email protected]>
Cc: Johannes Weiner <[email protected]>
Cc: Jonathan Cameron <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Tim Chen <[email protected]>
Cc: Wei Xu <[email protected]>
Cc: Yang Shi <[email protected]>
---
Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers | 4 ++--
mm/memory-tiers.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers b/Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers
index 45985e411f13..721a05b90109 100644
--- 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 <[email protected]>
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 f116b7b6333e..fa8c9d07f9ce 100644
--- 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
};
--
2.35.1
Acked-by: Wei Xu <[email protected]>
On Wed, Oct 19, 2022 at 6:51 PM Huang Ying <[email protected]> wrote:
>
> 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.
>
> Signed-off-by: "Huang, Ying" <[email protected]>
> Cc: Aneesh Kumar K.V <[email protected]>
> Cc: Alistair Popple <[email protected]>
> Cc: Bharata B Rao <[email protected]>
> Cc: Dan Williams <[email protected]>
> Cc: Dave Hansen <[email protected]>
> Cc: Davidlohr Bueso <[email protected]>
> Cc: Hesham Almatary <[email protected]>
> Cc: Jagdish Gediya <[email protected]>
> Cc: Johannes Weiner <[email protected]>
> Cc: Jonathan Cameron <[email protected]>
> Cc: Michal Hocko <[email protected]>
> Cc: Tim Chen <[email protected]>
> Cc: Wei Xu <[email protected]>
> Cc: Yang Shi <[email protected]>
> ---
> Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers | 4 ++--
> mm/memory-tiers.c | 8 ++++----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers b/Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers
> index 45985e411f13..721a05b90109 100644
> --- 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 <[email protected]>
> 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 f116b7b6333e..fa8c9d07f9ce 100644
> --- 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
> };
>
> --
> 2.35.1
>
Huang Ying <[email protected]> writes:
> 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.
>
Reviewed-by: Aneesh Kumar K.V <[email protected]>
> Signed-off-by: "Huang, Ying" <[email protected]>
> Cc: Aneesh Kumar K.V <[email protected]>
> Cc: Alistair Popple <[email protected]>
> Cc: Bharata B Rao <[email protected]>
> Cc: Dan Williams <[email protected]>
> Cc: Dave Hansen <[email protected]>
> Cc: Davidlohr Bueso <[email protected]>
> Cc: Hesham Almatary <[email protected]>
> Cc: Jagdish Gediya <[email protected]>
> Cc: Johannes Weiner <[email protected]>
> Cc: Jonathan Cameron <[email protected]>
> Cc: Michal Hocko <[email protected]>
> Cc: Tim Chen <[email protected]>
> Cc: Wei Xu <[email protected]>
> Cc: Yang Shi <[email protected]>
> ---
> Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers | 4 ++--
> mm/memory-tiers.c | 8 ++++----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers b/Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers
> index 45985e411f13..721a05b90109 100644
> --- 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 <[email protected]>
> 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 f116b7b6333e..fa8c9d07f9ce 100644
> --- 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
> };
>
> --
> 2.35.1
On Wed, Oct 19, 2022 at 6:51 PM Huang Ying <[email protected]> wrote:
>
> 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.
>
> Signed-off-by: "Huang, Ying" <[email protected]>
> Cc: Aneesh Kumar K.V <[email protected]>
> Cc: Alistair Popple <[email protected]>
> Cc: Bharata B Rao <[email protected]>
> Cc: Dan Williams <[email protected]>
> Cc: Dave Hansen <[email protected]>
> Cc: Davidlohr Bueso <[email protected]>
> Cc: Hesham Almatary <[email protected]>
> Cc: Jagdish Gediya <[email protected]>
> Cc: Johannes Weiner <[email protected]>
> Cc: Jonathan Cameron <[email protected]>
> Cc: Michal Hocko <[email protected]>
> Cc: Tim Chen <[email protected]>
> Cc: Wei Xu <[email protected]>
> Cc: Yang Shi <[email protected]>
> ---
> Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers | 4 ++--
> mm/memory-tiers.c | 8 ++++----
> 2 files changed, 6 insertions(+), 6 deletions(-)
Reviewed-by: Yang Shi <[email protected]>
>
> diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers b/Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers
> index 45985e411f13..721a05b90109 100644
> --- 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 <[email protected]>
> 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 f116b7b6333e..fa8c9d07f9ce 100644
> --- 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
> };
>
> --
> 2.35.1
>
On Thu, 20 Oct 2022 09:51:22 +0800 Huang Ying <[email protected]> wrote:
> 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.
I'll add
Fixes: 9832fb87834e2b ("mm/demotion: expose memory tier details via sysfs")
to this to reduce the risk that someone will backport 9832fb87834e2b
but will miss this alteration.
On Thu, 20 Oct 2022, Huang Ying wrote:
>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.
>
>Signed-off-by: "Huang, Ying" <[email protected]>
>Cc: Aneesh Kumar K.V <[email protected]>
>Cc: Alistair Popple <[email protected]>
>Cc: Bharata B Rao <[email protected]>
>Cc: Dan Williams <[email protected]>
>Cc: Dave Hansen <[email protected]>
>Cc: Davidlohr Bueso <[email protected]>
>Cc: Hesham Almatary <[email protected]>
>Cc: Jagdish Gediya <[email protected]>
>Cc: Johannes Weiner <[email protected]>
>Cc: Jonathan Cameron <[email protected]>
>Cc: Michal Hocko <[email protected]>
>Cc: Tim Chen <[email protected]>
>Cc: Wei Xu <[email protected]>
>Cc: Yang Shi <[email protected]>
Reviewed-by: Davidlohr Bueso <[email protected]>