[PATCH OLK-6.6 0/2] add memmap interface to reserved memory
Add support for memmap kernel parameters for ARM64. The three below modes are supported: memmap=exactmap Enable setting of an exact memory map, as specified by the user. memmap=nn[KMG]@ss[KMG] Force usage of a specific region of memory. memmap=nn[KMG]$ss[KMG] Region of memory to be reserved is from ss to ss+nn, the region must be in the range of existed memory, otherwise will be ignored. Please note that the above functions are for debugging purposes only. ChangeLog: - Some minor changes about description and code, no functional changes Ze Zuo (2): arm64: Add support for memmap kernel parameters arm64: Request resources for reserved memory via memmap .../admin-guide/kernel-parameters.txt | 14 ++- arch/arm64/kernel/setup.c | 32 +++++ arch/arm64/mm/init.c | 112 ++++++++++++++++++ arch/arm64/mm/internal.h | 12 ++ 4 files changed, 167 insertions(+), 3 deletions(-) create mode 100644 arch/arm64/mm/internal.h -- 2.25.1
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8NIMB ------------------------------------------------- Add support for memmap kernel parameters for ARM64. The three below modes are supported: memmap=exactmap Enable setting of an exact memory map, as specified by the user. memmap=nn[KMG]@ss[KMG] Force usage of a specific region of memory. memmap=nn[KMG]$ss[KMG] Region of memory to be reserved is from ss to ss+nn, the region must be in the range of existed memory, otherwise will be ignored. If users set memmap=exactmap before memmap=nn[KMG]@ss[KMG], they will get the exact memory specified by memmap=nn[KMG]@ss[KMG]. For example, on one machine with 4GB memory, "memmap=exactmap memmap=1G@1G" will make kernel use the memory from 1GB to 2GB only. Please note that the above functions are for debugging purposes only. Signed-off-by: Ze Zuo <zuoze1@huawei.com> --- .../admin-guide/kernel-parameters.txt | 14 ++- arch/arm64/mm/init.c | 112 ++++++++++++++++++ arch/arm64/mm/internal.h | 12 ++ 3 files changed, 135 insertions(+), 3 deletions(-) create mode 100644 arch/arm64/mm/internal.h diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index fe2dc03538fe..161297b49471 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3151,8 +3151,11 @@ option. See Documentation/admin-guide/mm/memory-hotplug.rst. - memmap=exactmap [KNL,X86] Enable setting of an exact - E820 memory map, as specified by the user. + memmap=exactmap [KNL,X86,ARM64] Enable setting of an exact + E820 and ARM64 memory map, as specified by the user. + For ARM64, this setting is limited to dt boot mode as + exact mapping must be done after initializing membloc, + just for debugging purposes. Such memmap=exactmap lines can be constructed based on BIOS output or other requirements. See the memmap=nn@ss option description. @@ -3163,7 +3166,8 @@ If @ss[KMG] is omitted, it is equivalent to mem=nn[KMG], which limits max address to nn[KMG]. Multiple different regions can be specified, - comma delimited. + comma delimited, example as follows is not supported to + ARM64. Example: memmap=100M@2G,100M#3G,1G!1024G @@ -3174,6 +3178,10 @@ memmap=nn[KMG]$ss[KMG] [KNL,ACPI] Mark specific memory as reserved. Region of memory to be reserved is from ss to ss+nn. + For ARM64, reserved memory must be in the range of + existed memory and do not overlap in-use memory region, + otherwise request will be ignored, just for debugging + purposes. Example: Exclude memory from 0x18690000-0x1869ffff memmap=64K$0x18690000 or diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 8a0f8604348b..8c8d7653ba84 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -46,6 +46,8 @@ #include <asm/alternative.h> #include <asm/xen/swiotlb-xen.h> +#include "internal.h" + /* * We need to be able to catch inadvertent references to memstart_addr * that occur (potentially in generic code) before arm64_memblock_init() @@ -309,6 +311,114 @@ static int __init early_mem(char *p) } early_param("mem", early_mem); +struct memblock_region mbk_memmap_regions[MAX_RES_REGIONS] __initdata_memblock; +int mbk_memmap_cnt __initdata; + +static void __init setup_mbk_memmap_regions(phys_addr_t base, phys_addr_t size) +{ + if (mbk_memmap_cnt >= MAX_RES_REGIONS) { + pr_err("Too many memmap specified, exceed %d\n", MAX_RES_REGIONS); + return; + } + + mbk_memmap_regions[mbk_memmap_cnt].base = base; + mbk_memmap_regions[mbk_memmap_cnt].size = size; + mbk_memmap_cnt++; +} + +static void __init reserve_memmap_regions(void) +{ + phys_addr_t base, size; + const char *str; + int i; + + for (i = 0; i < mbk_memmap_cnt; i++) { + base = mbk_memmap_regions[i].base; + size = mbk_memmap_regions[i].size; + if (!memblock_is_region_memory(base, size)) { + str = "is not a memory region - ignore"; + goto err; + } + + if (memblock_is_region_reserved(base, size)) { + str = "overlaps in-use memory region - ignore"; + goto err; + } + + if (memblock_reserve(base, size)) { + str = "failed"; + goto err; + } + + pr_info("memmap reserved: 0x%08llx - 0x%08llx (%lld MB)", + base, base + size - 1, size >> 20); + continue; +err: + mbk_memmap_regions[i].size = 0; + pr_warn("memmap reserve: 0x%08llx - 0x%08llx %s\n", + base, base + size - 1, str); + } +} + +static int need_remove_real_memblock __initdata; + +static int __init parse_memmap_one(char *p) +{ + char *oldp; + u64 start_at, mem_size; + + if (!p) + return -EINVAL; + + if (!strncmp(p, "exactmap", 8)) { + need_remove_real_memblock = 1; + return -EINVAL; + } + + oldp = p; + mem_size = memparse(p, &p); + if (p == oldp) + return -EINVAL; + + if (!mem_size) + return -EINVAL; + + if (*p == '@') { + start_at = memparse(p + 1, &p); + /* + * use the exactmap defined by nn[KMG]@ss[KMG], remove + * memblock populated by DT etc. + */ + if (need_remove_real_memblock) { + need_remove_real_memblock = 0; + memblock_remove(0, ULLONG_MAX); + } + memblock_add(start_at, mem_size); + } else if (*p == '$') { + start_at = memparse(p + 1, &p); + setup_mbk_memmap_regions(start_at, mem_size); + } else + pr_info("Unrecognized memmap option, please check the parameter.\n"); + + return *p == '\0' ? 0 : -EINVAL; +} + +static int __init parse_memmap_opt(char *str) +{ + while (str) { + char *k = strchr(str, ','); + + if (k) + *k++ = 0; + + parse_memmap_one(str); + str = k; + } + + return 0; +} +early_param("memmap", parse_memmap_opt); + void __init arm64_memblock_init(void) { s64 linear_region_size = PAGE_END - _PAGE_OFFSET(vabits_actual); @@ -481,6 +591,8 @@ void __init bootmem_init(void) */ reserve_crashkernel(); + reserve_memmap_regions(); + memblock_dump_all(); } diff --git a/arch/arm64/mm/internal.h b/arch/arm64/mm/internal.h new file mode 100644 index 000000000000..e75ad9dd656d --- /dev/null +++ b/arch/arm64/mm/internal.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ARM64_MM_INTERNAL_H +#define __ARM64_MM_INTERNAL_H + +#include <linux/types.h> + +#define MAX_RES_REGIONS 32 +extern struct memblock_region mbk_memmap_regions[MAX_RES_REGIONS]; +extern int mbk_memmap_cnt; + +#endif /* ifndef _ARM64_MM_INTERNAL_H */ -- 2.25.1
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8NIMB ------------------------------------------------- The memory region reserved for memmap is determined by traversing each memory region in mbk_memmap_regions and determining whether its size is 0. In the for_each_mem_region function, memmap memory can be found and resources requested for it. If request_resource() in request_memmap_resource() returns an error code, an error is displayed. Signed-off-by: Ze Zuo <zuoze1@huawei.com> --- arch/arm64/kernel/setup.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 417a8a86b2db..2b605562bcf4 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -54,6 +54,8 @@ #include <asm/xen/hypervisor.h> #include <asm/mmu_context.h> +#include "../mm/internal.h" + static int num_standard_resources; static struct resource *standard_resources; @@ -217,6 +219,35 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys) dump_stack_set_arch_desc("%s (DT)", name); } +static void __init request_memmap_resources(struct resource *res) +{ + struct resource *memmap_res; + phys_addr_t base, size; + int i; + + for (i = 0; i < MAX_RES_REGIONS; i++) { + base = mbk_memmap_regions[i].base; + size = mbk_memmap_regions[i].size; + if (!size) + continue; + + if ((base < res->start) || (base + size - 1 > res->end)) + continue; + memmap_res = memblock_alloc(sizeof(*memmap_res), SMP_CACHE_BYTES); + if (!memmap_res) + panic("%s: Failed to allocate memmap_res\n", __func__); + memmap_res->name = "memmap reserved"; + memmap_res->flags = IORESOURCE_MEM; + memmap_res->start = base; + memmap_res->end = base + size - 1; + if (request_resource(res, memmap_res)) { + pr_warn("memmap reserve: [%llx, %llx] request resource fail\n", + memmap_res->start, memmap_res->end); + memblock_free(memmap_res, sizeof(*memmap_res)); + } + } +} + static void __init request_standard_resources(void) { struct memblock_region *region; @@ -252,6 +283,7 @@ static void __init request_standard_resources(void) } insert_resource(&iomem_resource, res); + request_memmap_resources(res); } } -- 2.25.1
反馈： 您发送到kernel@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://gitee.com/openeuler/kernel/pulls/3722 邮件列表地址：https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6... FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://gitee.com/openeuler/kernel/pulls/3722 Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6...
participants (2)
-
patchwork bot -
Ze Zuo