lkml.org 
[lkml]   [2022]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 2/8] mm/demotion: Move memory demotion related code
    Date
    This move memory demotion related code to mm/memory-tiers.c.
    No functional change in this patch.

    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
    ---
    include/linux/memory-tiers.h | 6 ++++
    include/linux/migrate.h | 2 --
    mm/memory-tiers.c | 62 ++++++++++++++++++++++++++++++++++++
    mm/migrate.c | 60 +---------------------------------
    mm/vmscan.c | 1 +
    5 files changed, 70 insertions(+), 61 deletions(-)

    diff --git a/include/linux/memory-tiers.h b/include/linux/memory-tiers.h
    index f28f9910a4e7..ef380a39db3a 100644
    --- a/include/linux/memory-tiers.h
    +++ b/include/linux/memory-tiers.h
    @@ -2,6 +2,7 @@
    #ifndef _LINUX_MEMORY_TIERS_H
    #define _LINUX_MEMORY_TIERS_H

    +#include <linux/types.h>
    #ifdef CONFIG_NUMA
    /*
    * Each tier cover a performance level chunk size of 128
    @@ -14,5 +15,10 @@
    /* leave one tier below this slow pmem */
    #define MEMTIER_PERF_LEVEL_PMEM (1 << MEMTIER_CHUNK_BITS)

    +extern bool numa_demotion_enabled;
    +
    +#else
    +
    +#define numa_demotion_enabled false
    #endif /* CONFIG_NUMA */
    #endif /* _LINUX_MEMORY_TIERS_H */
    diff --git a/include/linux/migrate.h b/include/linux/migrate.h
    index 069a89e847f3..43e737215f33 100644
    --- a/include/linux/migrate.h
    +++ b/include/linux/migrate.h
    @@ -78,7 +78,6 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping,
    #if defined(CONFIG_MIGRATION) && defined(CONFIG_NUMA)
    extern void set_migration_target_nodes(void);
    extern void migrate_on_reclaim_init(void);
    -extern bool numa_demotion_enabled;
    extern int next_demotion_node(int node);
    #else
    static inline void set_migration_target_nodes(void) {}
    @@ -87,7 +86,6 @@ static inline int next_demotion_node(int node)
    {
    return NUMA_NO_NODE;
    }
    -#define numa_demotion_enabled false
    #endif

    #ifdef CONFIG_COMPACTION
    diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c
    index 61bb84c54091..41a21cc5ae55 100644
    --- a/mm/memory-tiers.c
    +++ b/mm/memory-tiers.c
    @@ -99,3 +99,65 @@ static int __init memory_tier_init(void)
    return 0;
    }
    subsys_initcall(memory_tier_init);
    +
    +bool numa_demotion_enabled = false;
    +
    +#ifdef CONFIG_MIGRATION
    +#ifdef CONFIG_SYSFS
    +static ssize_t numa_demotion_enabled_show(struct kobject *kobj,
    + struct kobj_attribute *attr, char *buf)
    +{
    + return sysfs_emit(buf, "%s\n",
    + numa_demotion_enabled ? "true" : "false");
    +}
    +
    +static ssize_t numa_demotion_enabled_store(struct kobject *kobj,
    + struct kobj_attribute *attr,
    + const char *buf, size_t count)
    +{
    + ssize_t ret;
    +
    + ret = kstrtobool(buf, &numa_demotion_enabled);
    + if (ret)
    + return ret;
    +
    + return count;
    +}
    +
    +static struct kobj_attribute numa_demotion_enabled_attr =
    + __ATTR(demotion_enabled, 0644, numa_demotion_enabled_show,
    + numa_demotion_enabled_store);
    +
    +static struct attribute *numa_attrs[] = {
    + &numa_demotion_enabled_attr.attr,
    + NULL,
    +};
    +
    +static const struct attribute_group numa_attr_group = {
    + .attrs = numa_attrs,
    +};
    +
    +static int __init numa_init_sysfs(void)
    +{
    + int err;
    + struct kobject *numa_kobj;
    +
    + numa_kobj = kobject_create_and_add("numa", mm_kobj);
    + if (!numa_kobj) {
    + pr_err("failed to create numa kobject\n");
    + return -ENOMEM;
    + }
    + err = sysfs_create_group(numa_kobj, &numa_attr_group);
    + if (err) {
    + pr_err("failed to register numa group\n");
    + goto delete_obj;
    + }
    + return 0;
    +
    +delete_obj:
    + kobject_put(numa_kobj);
    + return err;
    +}
    +subsys_initcall(numa_init_sysfs);
    +#endif /* CONFIG_SYSFS */
    +#endif
    diff --git a/mm/migrate.c b/mm/migrate.c
    index 6c1ea61f39d8..fce7d4a9e940 100644
    --- a/mm/migrate.c
    +++ b/mm/migrate.c
    @@ -2509,64 +2509,6 @@ void __init migrate_on_reclaim_init(void)
    set_migration_target_nodes();
    cpus_read_unlock();
    }
    +#endif /* CONFIG_NUMA */

    -bool numa_demotion_enabled = false;
    -
    -#ifdef CONFIG_SYSFS
    -static ssize_t numa_demotion_enabled_show(struct kobject *kobj,
    - struct kobj_attribute *attr, char *buf)
    -{
    - return sysfs_emit(buf, "%s\n",
    - numa_demotion_enabled ? "true" : "false");
    -}
    -
    -static ssize_t numa_demotion_enabled_store(struct kobject *kobj,
    - struct kobj_attribute *attr,
    - const char *buf, size_t count)
    -{
    - ssize_t ret;
    -
    - ret = kstrtobool(buf, &numa_demotion_enabled);
    - if (ret)
    - return ret;
    -
    - return count;
    -}
    -
    -static struct kobj_attribute numa_demotion_enabled_attr =
    - __ATTR(demotion_enabled, 0644, numa_demotion_enabled_show,
    - numa_demotion_enabled_store);
    -
    -static struct attribute *numa_attrs[] = {
    - &numa_demotion_enabled_attr.attr,
    - NULL,
    -};
    -
    -static const struct attribute_group numa_attr_group = {
    - .attrs = numa_attrs,
    -};
    -
    -static int __init numa_init_sysfs(void)
    -{
    - int err;
    - struct kobject *numa_kobj;

    - numa_kobj = kobject_create_and_add("numa", mm_kobj);
    - if (!numa_kobj) {
    - pr_err("failed to create numa kobject\n");
    - return -ENOMEM;
    - }
    - err = sysfs_create_group(numa_kobj, &numa_attr_group);
    - if (err) {
    - pr_err("failed to register numa group\n");
    - goto delete_obj;
    - }
    - return 0;
    -
    -delete_obj:
    - kobject_put(numa_kobj);
    - return err;
    -}
    -subsys_initcall(numa_init_sysfs);
    -#endif /* CONFIG_SYSFS */
    -#endif /* CONFIG_NUMA */
    diff --git a/mm/vmscan.c b/mm/vmscan.c
    index f7d9a683e3a7..3a8f78277f99 100644
    --- a/mm/vmscan.c
    +++ b/mm/vmscan.c
    @@ -50,6 +50,7 @@
    #include <linux/printk.h>
    #include <linux/dax.h>
    #include <linux/psi.h>
    +#include <linux/memory-tiers.h>

    #include <asm/tlbflush.h>
    #include <asm/div64.h>
    --
    2.36.1
    \
     
     \ /
      Last update: 2022-07-20 05:02    [W:3.003 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site