All allocated memory tiers will be listed as /sys/devices/virtual/memtier/memtierN/ Each memtier directory contains symbolic link for the memory types that are part of the memory tier. A directory hierarchy looks like :/sys/devices/virtual/memtier# tree memtier512/ memtier512/ ├── memtype1 -> ../memtype1 ├── memtype2 -> ../memtype2 ├── subsystem -> ../../../../bus/memtier └── uevent The nodes which are part of a specific memory type can be listed via /sys/devices/system/memtier/memtypeN/nodes. The adistance value of a specific memory type can be listed via /sys/devices/system/memtier/memtypeN/adistance. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxx> --- mm/memory-tiers.c | 62 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c index 9eef3bd8d134..4005c3124ff0 100644 --- a/mm/memory-tiers.c +++ b/mm/memory-tiers.c @@ -20,6 +20,7 @@ struct memory_tier { * adistance_start .. adistance_start + MEMTIER_CHUNK_SIZE */ int adistance_start; + struct device dev; /* All the nodes that are part of all the lower memory tiers. */ nodemask_t lower_tier_mask; }; @@ -36,6 +37,7 @@ static struct memory_dev_type *default_dram_type; #define MAX_MEMORY_TYPE_ID 20 static DEFINE_IDR(memory_type_idr); #define to_memory_type(device) container_of(device, struct memory_dev_type, dev) +#define to_memory_tier(device) container_of(device, struct memory_tier, dev) static struct bus_type memory_tier_subsys = { .name = "memtier", .dev_name = "memtier", @@ -103,8 +105,25 @@ static int top_tier_adistance; static struct demotion_nodes *node_demotion __read_mostly; #endif /* CONFIG_MIGRATION */ +static void memory_tier_device_release(struct device *dev) +{ + struct memory_tier *tier = to_memory_tier(dev); + /* + * synchronize_rcu in clear_node_memory_tier makes sure + * we don't have rcu access to this memory tier. + */ + kfree(tier); +} + +static void destroy_memory_tier(struct memory_tier *memtier) +{ + list_del(&memtier->list); + device_unregister(&memtier->dev); +} + static struct memory_tier *find_create_memory_tier(struct memory_dev_type *memtype) { + int ret; bool found_slot = false; struct memory_tier *memtier, *new_memtier; int adistance = memtype->adistance; @@ -128,15 +147,14 @@ static struct memory_tier *find_create_memory_tier(struct memory_dev_type *memty list_for_each_entry(memtier, &memory_tiers, list) { if (adistance == memtier->adistance_start) { - list_add(&memtype->tier_sibiling, &memtier->memory_types); - return memtier; + goto link_memtype; } else if (adistance < memtier->adistance_start) { found_slot = true; break; } } - new_memtier = kmalloc(sizeof(struct memory_tier), GFP_KERNEL); + new_memtier = kzalloc(sizeof(struct memory_tier), GFP_KERNEL); if (!new_memtier) return ERR_PTR(-ENOMEM); @@ -147,8 +165,30 @@ static struct memory_tier *find_create_memory_tier(struct memory_dev_type *memty list_add_tail(&new_memtier->list, &memtier->list); else list_add_tail(&new_memtier->list, &memory_tiers); - list_add(&memtype->tier_sibiling, &new_memtier->memory_types); - return new_memtier; + + new_memtier->dev.id = adistance; + new_memtier->dev.bus = &memory_tier_subsys; + new_memtier->dev.release = memory_tier_device_release; + + ret = device_register(&new_memtier->dev); + if (ret) { + list_del(&memtier->list); + put_device(&memtier->dev); + return ERR_PTR(ret); + } + memtier = new_memtier; + +link_memtype: + list_add(&memtype->tier_sibiling, &memtier->memory_types); + /* + * ignore error below because the driver creating the device can get + * unloaded and hence the below sysfs create link can fail. We continue + * with the in memory representation. + */ + ret = sysfs_create_link(&memtier->dev.kobj, + &memtype->dev.kobj, kobject_name(&memtype->dev.kobj)); + + return memtier; } static struct memory_tier *__node_get_memory_tier(int node) @@ -424,16 +464,6 @@ static struct memory_tier *set_node_memory_tier(int node) return memtier; } -static void destroy_memory_tier(struct memory_tier *memtier) -{ - list_del(&memtier->list); - /* - * synchronize_rcu in clear_node_memory_tier makes sure - * we don't have rcu access to this memory tier. - */ - kfree(memtier); -} - static bool clear_node_memory_tier(int node) { bool cleared = false; @@ -462,6 +492,8 @@ static bool clear_node_memory_tier(int node) node_clear(node, memtype->nodes); if (nodes_empty(memtype->nodes)) { list_del_init(&memtype->tier_sibiling); + sysfs_delete_link(&memtier->dev.kobj, + &memtype->dev.kobj, kobject_name(&memtype->dev.kobj)); if (list_empty(&memtier->memory_types)) destroy_memory_tier(memtier); } -- 2.37.2