* Re: [PATCH v17 1/9] mm: memory_hotplug: factor out bootmem core functions to bootmem_info.c [not found] <<20210225132130.26451-2-songmuchun@bytedance.com> @ 2021-02-26 18:06 ` Bodeddula, Balasubramaniam 2021-03-01 3:01 ` [External] " Muchun Song 0 siblings, 1 reply; 5+ messages in thread From: Bodeddula, Balasubramaniam @ 2021-02-26 18:06 UTC (permalink / raw) To: songmuchun Cc: akpm, almasrymina, anshuman.khandual, bp, corbet, dave.hansen, david, duanxiongchun, hpa, joao.m.martins, jroedel, linmiaohe, linux-doc, linux-fsdevel, linux-kernel, linux-mm, luto, mchehab+huawei, mhocko, mike.kravetz, mingo, naoya.horiguchi, oneukum, osalvador, paulmck, pawan.kumar.gupta, peterz, rdunlap, rientjes, song.bao.hua, tglx, viro, willy, x86 [-- Attachment #1: Type: text/plain, Size: 981 bytes --] Tested-by: bodeddub@amazon.com We are interested in this patch and have tested an earlier version of this patch on 5.11-rc4 kernel version. I did a functional validation of the changes and saw that the total memory listed by free command increasing and more memory was made available when memory was allocated in hugepages. 1G hugepages gave higher improvements compared to 2M, as expected. Is there a formal way to publish the results? I can do the same as required (I am new to Linux Kernel patching process). I have a few follow-up questions on this patch: 1. What is the overall status of this patch? What is the ballpark timeline we are looking for this patch to be accepted. 2. Why is this patch not working when memory is allocated as hugepages by THP (transparent hugepages). THP uses AnonHugePages, doesn’t this patch generalize for all ‘type’ of hugepages? Please let me know if there are any additional tasks that I can help. Happy to help. Thanks. [-- Attachment #2: Type: text/html, Size: 4041 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [External] Re: [PATCH v17 1/9] mm: memory_hotplug: factor out bootmem core functions to bootmem_info.c 2021-02-26 18:06 ` [PATCH v17 1/9] mm: memory_hotplug: factor out bootmem core functions to bootmem_info.c Bodeddula, Balasubramaniam @ 2021-03-01 3:01 ` Muchun Song 0 siblings, 0 replies; 5+ messages in thread From: Muchun Song @ 2021-03-01 3:01 UTC (permalink / raw) To: Bodeddula, Balasubramaniam Cc: akpm, almasrymina, anshuman.khandual, bp, corbet, dave.hansen, david, duanxiongchun, hpa, joao.m.martins, jroedel, linmiaohe, linux-doc, linux-fsdevel, linux-kernel, linux-mm, luto, mchehab+huawei, mhocko, mike.kravetz, mingo, naoya.horiguchi, oneukum, osalvador, paulmck, pawan.kumar.gupta, peterz, rdunlap, rientjes, song.bao.hua, tglx, viro, willy, x86 On Sat, Feb 27, 2021 at 2:06 AM Bodeddula, Balasubramaniam <bodeddub@amazon.com> wrote: > > Tested-by: bodeddub@amazon.com Very thanks for your test. > > > > We are interested in this patch and have tested an earlier version of this patch on 5.11-rc4 kernel version. I did a functional validation of the changes and saw that the total memory listed by free command increasing and more memory was made available when memory was allocated in hugepages. 1G hugepages gave higher improvements compared to 2M, as expected. Is there a formal way to publish the results? I can do the same as required (I am new to Linux Kernel patching process). I don’t know if there is a formal way. But maybe you can share the test result directly through this thread. If someone knows this, please let me know. Thanks. > > > > I have a few follow-up questions on this patch: > > 1. What is the overall status of this patch? What is the ballpark timeline we are looking for this patch to be accepted. There is only one patch of this patchset that has no reviewed-by tag. I think it might be 5.13 in the best case But I don't have the right to decide. > > 2. Why is this patch not working when memory is allocated as hugepages by THP (transparent hugepages). THP uses AnonHugePages, doesn’t this patch generalize for all ‘type’ of hugepages? Now it only supports HugeTLB pages. THP is a little different and complex compared to HugeTLB. I need to investigate THP in depth to determine the possible problems. > > > > Please let me know if there are any additional tasks that I can help. Happy to help. > > > > Thanks. ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v17 0/9] Free some vmemmap pages of HugeTLB page
@ 2021-02-25 13:21 Muchun Song
2021-02-25 13:21 ` [PATCH v17 1/9] mm: memory_hotplug: factor out bootmem core functions to bootmem_info.c Muchun Song
0 siblings, 1 reply; 5+ messages in thread
From: Muchun Song @ 2021-02-25 13:21 UTC (permalink / raw)
To: corbet, mike.kravetz, tglx, mingo, bp, x86, hpa, dave.hansen,
luto, peterz, viro, akpm, paulmck, mchehab+huawei,
pawan.kumar.gupta, rdunlap, oneukum, anshuman.khandual, jroedel,
almasrymina, rientjes, willy, osalvador, mhocko, song.bao.hua,
david, naoya.horiguchi, joao.m.martins
Cc: duanxiongchun, linux-doc, linux-kernel, linux-mm, linux-fsdevel,
Muchun Song
Hi all,
This patch series will free some vmemmap pages(struct page structures)
associated with each hugetlbpage when preallocated to save memory.
In order to reduce the difficulty of the first version of code review.
From this version, we disable PMD/huge page mapping of vmemmap if this
feature was enabled. This accutualy eliminate a bunch of the complex code
doing page table manipulation. When this patch series is solid, we cam add
the code of vmemmap page table manipulation in the future.
The struct page structures (page structs) are used to describe a physical
page frame. By default, there is a one-to-one mapping from a page frame to
it's corresponding page struct.
The HugeTLB pages consist of multiple base page size pages and is supported
by many architectures. See hugetlbpage.rst in the Documentation directory
for more details. On the x86 architecture, HugeTLB pages of size 2MB and 1GB
are currently supported. Since the base page size on x86 is 4KB, a 2MB
HugeTLB page consists of 512 base pages and a 1GB HugeTLB page consists of
4096 base pages. For each base page, there is a corresponding page struct.
Within the HugeTLB subsystem, only the first 4 page structs are used to
contain unique information about a HugeTLB page. HUGETLB_CGROUP_MIN_ORDER
provides this upper limit. The only 'useful' information in the remaining
page structs is the compound_head field, and this field is the same for all
tail pages.
By removing redundant page structs for HugeTLB pages, memory can returned to
the buddy allocator for other uses.
When the system boot up, every 2M HugeTLB has 512 struct page structs which
size is 8 pages(sizeof(struct page) * 512 / PAGE_SIZE).
HugeTLB struct pages(8 pages) page frame(8 pages)
+-----------+ ---virt_to_page---> +-----------+ mapping to +-----------+
| | | 0 | -------------> | 0 |
| | +-----------+ +-----------+
| | | 1 | -------------> | 1 |
| | +-----------+ +-----------+
| | | 2 | -------------> | 2 |
| | +-----------+ +-----------+
| | | 3 | -------------> | 3 |
| | +-----------+ +-----------+
| | | 4 | -------------> | 4 |
| 2MB | +-----------+ +-----------+
| | | 5 | -------------> | 5 |
| | +-----------+ +-----------+
| | | 6 | -------------> | 6 |
| | +-----------+ +-----------+
| | | 7 | -------------> | 7 |
| | +-----------+ +-----------+
| |
| |
| |
+-----------+
The value of page->compound_head is the same for all tail pages. The first
page of page structs (page 0) associated with the HugeTLB page contains the 4
page structs necessary to describe the HugeTLB. The only use of the remaining
pages of page structs (page 1 to page 7) is to point to page->compound_head.
Therefore, we can remap pages 2 to 7 to page 1. Only 2 pages of page structs
will be used for each HugeTLB page. This will allow us to free the remaining
6 pages to the buddy allocator.
Here is how things look after remapping.
HugeTLB struct pages(8 pages) page frame(8 pages)
+-----------+ ---virt_to_page---> +-----------+ mapping to +-----------+
| | | 0 | -------------> | 0 |
| | +-----------+ +-----------+
| | | 1 | -------------> | 1 |
| | +-----------+ +-----------+
| | | 2 | ----------------^ ^ ^ ^ ^ ^
| | +-----------+ | | | | |
| | | 3 | ------------------+ | | | |
| | +-----------+ | | | |
| | | 4 | --------------------+ | | |
| 2MB | +-----------+ | | |
| | | 5 | ----------------------+ | |
| | +-----------+ | |
| | | 6 | ------------------------+ |
| | +-----------+ |
| | | 7 | --------------------------+
| | +-----------+
| |
| |
| |
+-----------+
When a HugeTLB is freed to the buddy system, we should allocate 6 pages for
vmemmap pages and restore the previous mapping relationship.
Apart from 2MB HugeTLB page, we also have 1GB HugeTLB page. It is similar
to the 2MB HugeTLB page. We also can use this approach to free the vmemmap
pages.
In this case, for the 1GB HugeTLB page, we can save 4094 pages. This is a
very substantial gain. On our server, run some SPDK/QEMU applications which
will use 1024GB hugetlbpage. With this feature enabled, we can save ~16GB
(1G hugepage)/~12GB (2MB hugepage) memory.
Because there are vmemmap page tables reconstruction on the freeing/allocating
path, it increases some overhead. Here are some overhead analysis.
1) Allocating 10240 2MB hugetlb pages.
a) With this patch series applied:
# time echo 10240 > /proc/sys/vm/nr_hugepages
real 0m0.166s
user 0m0.000s
sys 0m0.166s
# bpftrace -e 'kprobe:alloc_fresh_huge_page { @start[tid] = nsecs; }
kretprobe:alloc_fresh_huge_page /@start[tid]/ { @latency = hist(nsecs -
@start[tid]); delete(@start[tid]); }'
Attaching 2 probes...
@latency:
[8K, 16K) 5476 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@|
[16K, 32K) 4760 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
[32K, 64K) 4 | |
b) Without this patch series:
# time echo 10240 > /proc/sys/vm/nr_hugepages
real 0m0.067s
user 0m0.000s
sys 0m0.067s
# bpftrace -e 'kprobe:alloc_fresh_huge_page { @start[tid] = nsecs; }
kretprobe:alloc_fresh_huge_page /@start[tid]/ { @latency = hist(nsecs -
@start[tid]); delete(@start[tid]); }'
Attaching 2 probes...
@latency:
[4K, 8K) 10147 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@|
[8K, 16K) 93 | |
Summarize: this feature is about ~2x slower than before.
2) Freeing 10240 2MB hugetlb pages.
a) With this patch series applied:
# time echo 0 > /proc/sys/vm/nr_hugepages
real 0m0.213s
user 0m0.000s
sys 0m0.213s
# bpftrace -e 'kprobe:free_pool_huge_page { @start[tid] = nsecs; }
kretprobe:free_pool_huge_page /@start[tid]/ { @latency = hist(nsecs -
@start[tid]); delete(@start[tid]); }'
Attaching 2 probes...
@latency:
[8K, 16K) 6 | |
[16K, 32K) 10227 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@|
[32K, 64K) 7 | |
b) Without this patch series:
# time echo 0 > /proc/sys/vm/nr_hugepages
real 0m0.081s
user 0m0.000s
sys 0m0.081s
# bpftrace -e 'kprobe:free_pool_huge_page { @start[tid] = nsecs; }
kretprobe:free_pool_huge_page /@start[tid]/ { @latency = hist(nsecs -
@start[tid]); delete(@start[tid]); }'
Attaching 2 probes...
@latency:
[4K, 8K) 6805 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@|
[8K, 16K) 3427 |@@@@@@@@@@@@@@@@@@@@@@@@@@ |
[16K, 32K) 8 | |
Summarize: The overhead of __free_hugepage is about ~2-3x slower than before.
Although the overhead has increased, the overhead is not significant. Like Mike
said, "However, remember that the majority of use cases create hugetlb pages at
or shortly after boot time and add them to the pool. So, additional overhead is
at pool creation time. There is no change to 'normal run time' operations of
getting a page from or returning a page to the pool (think page fault/unmap)".
Despite the overhead and in addition to the memory gains from this series. The
following data is obtained by Joao Martins. Very thanks to his effort.
There's an additional benefit which is page (un)pinners will see an improvement
and Joao presumes because there are fewer memmap pages and thus the tail/head
pages are staying in cache more often.
Out of the box Joao saw (when comparing linux-next against linux-next + this series)
with gup_test and pinning a 16G hugetlb file (with 1G pages):
get_user_pages(): ~32k -> ~9k
unpin_user_pages(): ~75k -> ~70k
Usually any tight loop fetching compound_head(), or reading tail pages data (e.g.
compound_head) benefit a lot. There's some unpinning inefficiencies Joao was
fixing[0], but with that in added it shows even more:
unpin_user_pages(): ~27k -> ~3.8k
[0] https://lore.kernel.org/linux-mm/20210204202500.26474-1-joao.m.martins@oracle.com/
Todo:
- Free all of the tail vmemmap pages
Now for the 2MB HugrTLB page, we only free 6 vmemmap pages. we really can
free 7 vmemmap pages. In this case, we can see 8 of the 512 struct page
structures has beed set PG_head flag. If we can adjust compound_head()
slightly and make compound_head() return the real head struct page when
the parameter is the tail struct page but with PG_head flag set.
In order to make the code evolution route clearer. This feature can can be
a separate patch after this patchset is solid.
- Support for other architectures (e.g. aarch64).
- Enable PMD/huge page mapping of vmemmap even if this feature was enabled.
Changelog in v16 -> v17:
- Fix issues suggested by Mike and Oscar.
- Update commit log suggested by Michal.
Thanks to Mike, David H and Michal's suggestions and review.
Changelog in v15 -> v16:
- Use GFP_KERNEL to allocate vmemmap pages.
Thanks to Mike, David H and Michal's suggestions.
Changelog in v14 -> v15:
- Fix some issues suggested by Oscar. Thanks to Oscar.
- Add numbers which Joao Martins tested to cover letter. Thanks to his effort.
Changelog in v13 -> v14:
- Refuse to free the HugeTLB page when the system is under memory pressure.
- Use GFP_ATOMIC to allocate vmemmap pages instead of GFP_KERNEL.
- Rebase to linux-next 20210202.
- Fix and add some comments for vmemmap_remap_free().
Thanks to Oscar, Mike, David H and David R's suggestions and review.
Changelog in v12 -> v13:
- Remove VM_WARN_ON_PAGE macro.
- Add more comments in vmemmap_pte_range() and vmemmap_remap_free().
Thanks to Oscar and Mike's suggestions and review.
Changelog in v11 -> v12:
- Move VM_WARN_ON_PAGE to a separate patch.
- Call __free_hugepage() with hugetlb_lock (See patch #5.) to serialize
with dissolve_free_huge_page(). It is to prepare for patch #9.
- Introduce PageHugeInflight. See patch #9.
Changelog in v10 -> v11:
- Fix compiler error when !CONFIG_HUGETLB_PAGE_FREE_VMEMMAP.
- Rework some comments and commit changes.
- Rework vmemmap_remap_free() to 3 parameters.
Thanks to Oscar and Mike's suggestions and review.
Changelog in v9 -> v10:
- Fix a bug in patch #11. Thanks to Oscar for pointing that out.
- Rework some commit log or comments. Thanks Mike and Oscar for the suggestions.
- Drop VMEMMAP_TAIL_PAGE_REUSE in the patch #3.
Thank you very much Mike and Oscar for reviewing the code.
Changelog in v8 -> v9:
- Rework some code. Very thanks to Oscar.
- Put all the non-hugetlb vmemmap functions under sparsemem-vmemmap.c.
Changelog in v7 -> v8:
- Adjust the order of patches.
Very thanks to David and Oscar. Your suggestions are very valuable.
Changelog in v6 -> v7:
- Rebase to linux-next 20201130
- Do not use basepage mapping for vmemmap when this feature is disabled.
- Rework some patchs.
[PATCH v6 08/16] mm/hugetlb: Free the vmemmap pages associated with each hugetlb page
[PATCH v6 10/16] mm/hugetlb: Allocate the vmemmap pages associated with each hugetlb page
Thanks to Oscar and Barry.
Changelog in v5 -> v6:
- Disable PMD/huge page mapping of vmemmap if this feature was enabled.
- Simplify the first version code.
Changelog in v4 -> v5:
- Rework somme comments and code in the [PATCH v4 04/21] and [PATCH v4 05/21].
Thanks to Mike and Oscar's suggestions.
Changelog in v3 -> v4:
- Move all the vmemmap functions to hugetlb_vmemmap.c.
- Make the CONFIG_HUGETLB_PAGE_FREE_VMEMMAP default to y, if we want to
disable this feature, we should disable it by a boot/kernel command line.
- Remove vmemmap_pgtable_{init, deposit, withdraw}() helper functions.
- Initialize page table lock for vmemmap through core_initcall mechanism.
Thanks for Mike and Oscar's suggestions.
Changelog in v2 -> v3:
- Rename some helps function name. Thanks Mike.
- Rework some code. Thanks Mike and Oscar.
- Remap the tail vmemmap page with PAGE_KERNEL_RO instead of PAGE_KERNEL.
Thanks Matthew.
- Add some overhead analysis in the cover letter.
- Use vmemap pmd table lock instead of a hugetlb specific global lock.
Changelog in v1 -> v2:
- Fix do not call dissolve_compound_page in alloc_huge_page_vmemmap().
- Fix some typo and code style problems.
- Remove unused handle_vmemmap_fault().
- Merge some commits to one commit suggested by Mike.
Muchun Song (9):
mm: memory_hotplug: factor out bootmem core functions to
bootmem_info.c
mm: hugetlb: introduce a new config HUGETLB_PAGE_FREE_VMEMMAP
mm: hugetlb: free the vmemmap pages associated with each HugeTLB page
mm: hugetlb: alloc the vmemmap pages associated with each HugeTLB page
mm: hugetlb: set the PageHWPoison to the raw error page
mm: hugetlb: add a kernel parameter hugetlb_free_vmemmap
mm: hugetlb: introduce nr_free_vmemmap_pages in the struct hstate
mm: hugetlb: gather discrete indexes of tail page
mm: hugetlb: optimize the code with the help of the compiler
Documentation/admin-guide/kernel-parameters.txt | 14 ++
Documentation/admin-guide/mm/hugetlbpage.rst | 11 +
arch/x86/mm/init_64.c | 13 +-
fs/Kconfig | 6 +
include/linux/bootmem_info.h | 65 ++++++
include/linux/hugetlb.h | 47 +++-
include/linux/hugetlb_cgroup.h | 19 +-
include/linux/memory_hotplug.h | 27 ---
include/linux/mm.h | 5 +
mm/Makefile | 2 +
mm/bootmem_info.c | 124 ++++++++++
mm/hugetlb.c | 176 +++++++++++---
mm/hugetlb_vmemmap.c | 293 ++++++++++++++++++++++++
mm/hugetlb_vmemmap.h | 51 +++++
mm/memory_hotplug.c | 116 ----------
mm/sparse-vmemmap.c | 280 ++++++++++++++++++++++
mm/sparse.c | 1 +
17 files changed, 1062 insertions(+), 188 deletions(-)
create mode 100644 include/linux/bootmem_info.h
create mode 100644 mm/bootmem_info.c
create mode 100644 mm/hugetlb_vmemmap.c
create mode 100644 mm/hugetlb_vmemmap.h
--
2.11.0
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v17 1/9] mm: memory_hotplug: factor out bootmem core functions to bootmem_info.c 2021-02-25 13:21 [PATCH v17 0/9] Free some vmemmap pages of HugeTLB page Muchun Song @ 2021-02-25 13:21 ` Muchun Song 2021-03-03 2:45 ` Singh, Balbir 0 siblings, 1 reply; 5+ messages in thread From: Muchun Song @ 2021-02-25 13:21 UTC (permalink / raw) To: corbet, mike.kravetz, tglx, mingo, bp, x86, hpa, dave.hansen, luto, peterz, viro, akpm, paulmck, mchehab+huawei, pawan.kumar.gupta, rdunlap, oneukum, anshuman.khandual, jroedel, almasrymina, rientjes, willy, osalvador, mhocko, song.bao.hua, david, naoya.horiguchi, joao.m.martins Cc: duanxiongchun, linux-doc, linux-kernel, linux-mm, linux-fsdevel, Muchun Song, Miaohe Lin Move bootmem info registration common API to individual bootmem_info.c. And we will use {get,put}_page_bootmem() to initialize the page for the vmemmap pages or free the vmemmap pages to buddy in the later patch. So move them out of CONFIG_MEMORY_HOTPLUG_SPARSE. This is just code movement without any functional change. Signed-off-by: Muchun Song <songmuchun@bytedance.com> Acked-by: Mike Kravetz <mike.kravetz@oracle.com> Reviewed-by: Oscar Salvador <osalvador@suse.de> Reviewed-by: David Hildenbrand <david@redhat.com> Reviewed-by: Miaohe Lin <linmiaohe@huawei.com> --- arch/x86/mm/init_64.c | 3 +- include/linux/bootmem_info.h | 40 +++++++++++++ include/linux/memory_hotplug.h | 27 --------- mm/Makefile | 1 + mm/bootmem_info.c | 124 +++++++++++++++++++++++++++++++++++++++++ mm/memory_hotplug.c | 116 -------------------------------------- mm/sparse.c | 1 + 7 files changed, 168 insertions(+), 144 deletions(-) create mode 100644 include/linux/bootmem_info.h create mode 100644 mm/bootmem_info.c diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index b5a3fa4033d3..0a45f062826e 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -33,6 +33,7 @@ #include <linux/nmi.h> #include <linux/gfp.h> #include <linux/kcore.h> +#include <linux/bootmem_info.h> #include <asm/processor.h> #include <asm/bios_ebda.h> @@ -1571,7 +1572,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, return err; } -#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HAVE_BOOTMEM_INFO_NODE) +#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE void register_page_bootmem_memmap(unsigned long section_nr, struct page *start_page, unsigned long nr_pages) { diff --git a/include/linux/bootmem_info.h b/include/linux/bootmem_info.h new file mode 100644 index 000000000000..4ed6dee1adc9 --- /dev/null +++ b/include/linux/bootmem_info.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LINUX_BOOTMEM_INFO_H +#define __LINUX_BOOTMEM_INFO_H + +#include <linux/mmzone.h> + +/* + * Types for free bootmem stored in page->lru.next. These have to be in + * some random range in unsigned long space for debugging purposes. + */ +enum { + MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE = 12, + SECTION_INFO = MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE, + MIX_SECTION_INFO, + NODE_INFO, + MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE = NODE_INFO, +}; + +#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE +void __init register_page_bootmem_info_node(struct pglist_data *pgdat); + +void get_page_bootmem(unsigned long info, struct page *page, + unsigned long type); +void put_page_bootmem(struct page *page); +#else +static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) +{ +} + +static inline void put_page_bootmem(struct page *page) +{ +} + +static inline void get_page_bootmem(unsigned long info, struct page *page, + unsigned long type) +{ +} +#endif + +#endif /* __LINUX_BOOTMEM_INFO_H */ diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 7288aa5ef73b..96659a8b9d02 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -18,18 +18,6 @@ struct vmem_altmap; #ifdef CONFIG_MEMORY_HOTPLUG struct page *pfn_to_online_page(unsigned long pfn); -/* - * Types for free bootmem stored in page->lru.next. These have to be in - * some random range in unsigned long space for debugging purposes. - */ -enum { - MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE = 12, - SECTION_INFO = MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE, - MIX_SECTION_INFO, - NODE_INFO, - MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE = NODE_INFO, -}; - /* Types for control the zone type of onlined and offlined memory */ enum { /* Offline the memory. */ @@ -210,17 +198,6 @@ static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat) #endif /* CONFIG_NUMA */ #endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ -#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE -extern void __init register_page_bootmem_info_node(struct pglist_data *pgdat); -#else -static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) -{ -} -#endif -extern void put_page_bootmem(struct page *page); -extern void get_page_bootmem(unsigned long ingo, struct page *page, - unsigned long type); - void get_online_mems(void); void put_online_mems(void); @@ -248,10 +225,6 @@ static inline void zone_span_writelock(struct zone *zone) {} static inline void zone_span_writeunlock(struct zone *zone) {} static inline void zone_seqlock_init(struct zone *zone) {} -static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) -{ -} - static inline int try_online_node(int nid) { return 0; diff --git a/mm/Makefile b/mm/Makefile index 72227b24a616..daabf86d7da8 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -83,6 +83,7 @@ obj-$(CONFIG_SLUB) += slub.o obj-$(CONFIG_KASAN) += kasan/ obj-$(CONFIG_KFENCE) += kfence/ obj-$(CONFIG_FAILSLAB) += failslab.o +obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) += bootmem_info.o obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o obj-$(CONFIG_MEMTEST) += memtest.o obj-$(CONFIG_MIGRATION) += migrate.o diff --git a/mm/bootmem_info.c b/mm/bootmem_info.c new file mode 100644 index 000000000000..fcab5a3f8cc0 --- /dev/null +++ b/mm/bootmem_info.c @@ -0,0 +1,124 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * linux/mm/bootmem_info.c + * + * Copyright (C) + */ +#include <linux/mm.h> +#include <linux/compiler.h> +#include <linux/memblock.h> +#include <linux/bootmem_info.h> +#include <linux/memory_hotplug.h> + +void get_page_bootmem(unsigned long info, struct page *page, unsigned long type) +{ + page->freelist = (void *)type; + SetPagePrivate(page); + set_page_private(page, info); + page_ref_inc(page); +} + +void put_page_bootmem(struct page *page) +{ + unsigned long type; + + type = (unsigned long) page->freelist; + BUG_ON(type < MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE || + type > MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE); + + if (page_ref_dec_return(page) == 1) { + page->freelist = NULL; + ClearPagePrivate(page); + set_page_private(page, 0); + INIT_LIST_HEAD(&page->lru); + free_reserved_page(page); + } +} + +#ifndef CONFIG_SPARSEMEM_VMEMMAP +static void register_page_bootmem_info_section(unsigned long start_pfn) +{ + unsigned long mapsize, section_nr, i; + struct mem_section *ms; + struct page *page, *memmap; + struct mem_section_usage *usage; + + section_nr = pfn_to_section_nr(start_pfn); + ms = __nr_to_section(section_nr); + + /* Get section's memmap address */ + memmap = sparse_decode_mem_map(ms->section_mem_map, section_nr); + + /* + * Get page for the memmap's phys address + * XXX: need more consideration for sparse_vmemmap... + */ + page = virt_to_page(memmap); + mapsize = sizeof(struct page) * PAGES_PER_SECTION; + mapsize = PAGE_ALIGN(mapsize) >> PAGE_SHIFT; + + /* remember memmap's page */ + for (i = 0; i < mapsize; i++, page++) + get_page_bootmem(section_nr, page, SECTION_INFO); + + usage = ms->usage; + page = virt_to_page(usage); + + mapsize = PAGE_ALIGN(mem_section_usage_size()) >> PAGE_SHIFT; + + for (i = 0; i < mapsize; i++, page++) + get_page_bootmem(section_nr, page, MIX_SECTION_INFO); + +} +#else /* CONFIG_SPARSEMEM_VMEMMAP */ +static void register_page_bootmem_info_section(unsigned long start_pfn) +{ + unsigned long mapsize, section_nr, i; + struct mem_section *ms; + struct page *page, *memmap; + struct mem_section_usage *usage; + + section_nr = pfn_to_section_nr(start_pfn); + ms = __nr_to_section(section_nr); + + memmap = sparse_decode_mem_map(ms->section_mem_map, section_nr); + + register_page_bootmem_memmap(section_nr, memmap, PAGES_PER_SECTION); + + usage = ms->usage; + page = virt_to_page(usage); + + mapsize = PAGE_ALIGN(mem_section_usage_size()) >> PAGE_SHIFT; + + for (i = 0; i < mapsize; i++, page++) + get_page_bootmem(section_nr, page, MIX_SECTION_INFO); +} +#endif /* !CONFIG_SPARSEMEM_VMEMMAP */ + +void __init register_page_bootmem_info_node(struct pglist_data *pgdat) +{ + unsigned long i, pfn, end_pfn, nr_pages; + int node = pgdat->node_id; + struct page *page; + + nr_pages = PAGE_ALIGN(sizeof(struct pglist_data)) >> PAGE_SHIFT; + page = virt_to_page(pgdat); + + for (i = 0; i < nr_pages; i++, page++) + get_page_bootmem(node, page, NODE_INFO); + + pfn = pgdat->node_start_pfn; + end_pfn = pgdat_end_pfn(pgdat); + + /* register section info */ + for (; pfn < end_pfn; pfn += PAGES_PER_SECTION) { + /* + * Some platforms can assign the same pfn to multiple nodes - on + * node0 as well as nodeN. To avoid registering a pfn against + * multiple nodes we check that this pfn does not already + * reside in some other nodes. + */ + if (pfn_valid(pfn) && (early_pfn_to_nid(pfn) == node)) + register_page_bootmem_info_section(pfn); + } +} diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 5ba51a8bdaeb..a2a72b617040 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -144,122 +144,6 @@ static void release_memory_resource(struct resource *res) } #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE -void get_page_bootmem(unsigned long info, struct page *page, - unsigned long type) -{ - page->freelist = (void *)type; - SetPagePrivate(page); - set_page_private(page, info); - page_ref_inc(page); -} - -void put_page_bootmem(struct page *page) -{ - unsigned long type; - - type = (unsigned long) page->freelist; - BUG_ON(type < MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE || - type > MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE); - - if (page_ref_dec_return(page) == 1) { - page->freelist = NULL; - ClearPagePrivate(page); - set_page_private(page, 0); - INIT_LIST_HEAD(&page->lru); - free_reserved_page(page); - } -} - -#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE -#ifndef CONFIG_SPARSEMEM_VMEMMAP -static void register_page_bootmem_info_section(unsigned long start_pfn) -{ - unsigned long mapsize, section_nr, i; - struct mem_section *ms; - struct page *page, *memmap; - struct mem_section_usage *usage; - - section_nr = pfn_to_section_nr(start_pfn); - ms = __nr_to_section(section_nr); - - /* Get section's memmap address */ - memmap = sparse_decode_mem_map(ms->section_mem_map, section_nr); - - /* - * Get page for the memmap's phys address - * XXX: need more consideration for sparse_vmemmap... - */ - page = virt_to_page(memmap); - mapsize = sizeof(struct page) * PAGES_PER_SECTION; - mapsize = PAGE_ALIGN(mapsize) >> PAGE_SHIFT; - - /* remember memmap's page */ - for (i = 0; i < mapsize; i++, page++) - get_page_bootmem(section_nr, page, SECTION_INFO); - - usage = ms->usage; - page = virt_to_page(usage); - - mapsize = PAGE_ALIGN(mem_section_usage_size()) >> PAGE_SHIFT; - - for (i = 0; i < mapsize; i++, page++) - get_page_bootmem(section_nr, page, MIX_SECTION_INFO); - -} -#else /* CONFIG_SPARSEMEM_VMEMMAP */ -static void register_page_bootmem_info_section(unsigned long start_pfn) -{ - unsigned long mapsize, section_nr, i; - struct mem_section *ms; - struct page *page, *memmap; - struct mem_section_usage *usage; - - section_nr = pfn_to_section_nr(start_pfn); - ms = __nr_to_section(section_nr); - - memmap = sparse_decode_mem_map(ms->section_mem_map, section_nr); - - register_page_bootmem_memmap(section_nr, memmap, PAGES_PER_SECTION); - - usage = ms->usage; - page = virt_to_page(usage); - - mapsize = PAGE_ALIGN(mem_section_usage_size()) >> PAGE_SHIFT; - - for (i = 0; i < mapsize; i++, page++) - get_page_bootmem(section_nr, page, MIX_SECTION_INFO); -} -#endif /* !CONFIG_SPARSEMEM_VMEMMAP */ - -void __init register_page_bootmem_info_node(struct pglist_data *pgdat) -{ - unsigned long i, pfn, end_pfn, nr_pages; - int node = pgdat->node_id; - struct page *page; - - nr_pages = PAGE_ALIGN(sizeof(struct pglist_data)) >> PAGE_SHIFT; - page = virt_to_page(pgdat); - - for (i = 0; i < nr_pages; i++, page++) - get_page_bootmem(node, page, NODE_INFO); - - pfn = pgdat->node_start_pfn; - end_pfn = pgdat_end_pfn(pgdat); - - /* register section info */ - for (; pfn < end_pfn; pfn += PAGES_PER_SECTION) { - /* - * Some platforms can assign the same pfn to multiple nodes - on - * node0 as well as nodeN. To avoid registering a pfn against - * multiple nodes we check that this pfn does not already - * reside in some other nodes. - */ - if (pfn_valid(pfn) && (early_pfn_to_nid(pfn) == node)) - register_page_bootmem_info_section(pfn); - } -} -#endif /* CONFIG_HAVE_BOOTMEM_INFO_NODE */ - static int check_pfn_span(unsigned long pfn, unsigned long nr_pages, const char *reason) { diff --git a/mm/sparse.c b/mm/sparse.c index 7bd23f9d6cef..87676bf3af40 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -13,6 +13,7 @@ #include <linux/vmalloc.h> #include <linux/swap.h> #include <linux/swapops.h> +#include <linux/bootmem_info.h> #include "internal.h" #include <asm/dma.h> -- 2.11.0 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v17 1/9] mm: memory_hotplug: factor out bootmem core functions to bootmem_info.c 2021-02-25 13:21 ` [PATCH v17 1/9] mm: memory_hotplug: factor out bootmem core functions to bootmem_info.c Muchun Song @ 2021-03-03 2:45 ` Singh, Balbir 2021-03-04 4:26 ` Balbir Singh 0 siblings, 1 reply; 5+ messages in thread From: Singh, Balbir @ 2021-03-03 2:45 UTC (permalink / raw) To: Muchun Song, corbet, mike.kravetz, tglx, mingo, bp, x86, hpa, dave.hansen, luto, peterz, viro, akpm, paulmck, mchehab+huawei, pawan.kumar.gupta, rdunlap, oneukum, anshuman.khandual, jroedel, almasrymina, rientjes, willy, osalvador, mhocko, song.bao.hua, david, naoya.horiguchi, joao.m.martins Cc: duanxiongchun, linux-doc, linux-kernel, linux-mm, linux-fsdevel, Miaohe Lin On 26/2/21 12:21 am, Muchun Song wrote: > Move bootmem info registration common API to individual bootmem_info.c. > And we will use {get,put}_page_bootmem() to initialize the page for the > vmemmap pages or free the vmemmap pages to buddy in the later patch. > So move them out of CONFIG_MEMORY_HOTPLUG_SPARSE. This is just code > movement without any functional change. > > Signed-off-by: Muchun Song <songmuchun@bytedance.com> > Acked-by: Mike Kravetz <mike.kravetz@oracle.com> > Reviewed-by: Oscar Salvador <osalvador@suse.de> > Reviewed-by: David Hildenbrand <david@redhat.com> > Reviewed-by: Miaohe Lin <linmiaohe@huawei.com> ... > diff --git a/mm/bootmem_info.c b/mm/bootmem_info.c > new file mode 100644 > index 000000000000..fcab5a3f8cc0 > --- /dev/null > +++ b/mm/bootmem_info.c > @@ -0,0 +1,124 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * linux/mm/bootmem_info.c > + * > + * Copyright (C) Looks like incomplete Balbir Singh ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v17 1/9] mm: memory_hotplug: factor out bootmem core functions to bootmem_info.c 2021-03-03 2:45 ` Singh, Balbir @ 2021-03-04 4:26 ` Balbir Singh 0 siblings, 0 replies; 5+ messages in thread From: Balbir Singh @ 2021-03-04 4:26 UTC (permalink / raw) To: Muchun Song, corbet, mike.kravetz, tglx, mingo, bp, x86, hpa, dave.hansen, luto, peterz, viro, akpm, paulmck, mchehab+huawei, pawan.kumar.gupta, rdunlap, oneukum, anshuman.khandual, jroedel, almasrymina, rientjes, willy, osalvador, mhocko, song.bao.hua, david, naoya.horiguchi, joao.m.martins Cc: duanxiongchun, linux-doc, linux-kernel, linux-mm, linux-fsdevel, Miaohe Lin On Wed, Mar 03, 2021 at 01:45:00PM +1100, Singh, Balbir wrote: > On 26/2/21 12:21 am, Muchun Song wrote: > > Move bootmem info registration common API to individual bootmem_info.c. > > And we will use {get,put}_page_bootmem() to initialize the page for the > > vmemmap pages or free the vmemmap pages to buddy in the later patch. > > So move them out of CONFIG_MEMORY_HOTPLUG_SPARSE. This is just code > > movement without any functional change. > > > > Signed-off-by: Muchun Song <songmuchun@bytedance.com> > > Acked-by: Mike Kravetz <mike.kravetz@oracle.com> > > Reviewed-by: Oscar Salvador <osalvador@suse.de> > > Reviewed-by: David Hildenbrand <david@redhat.com> > > Reviewed-by: Miaohe Lin <linmiaohe@huawei.com> > ... > > > diff --git a/mm/bootmem_info.c b/mm/bootmem_info.c > > new file mode 100644 > > index 000000000000..fcab5a3f8cc0 > > --- /dev/null > > +++ b/mm/bootmem_info.c > > @@ -0,0 +1,124 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * linux/mm/bootmem_info.c > > + * > > + * Copyright (C) > > Looks like incomplete > Not that my comment was, I should have said The copyright looks very incomplete Balbir Singh. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-04 4:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <<20210225132130.26451-2-songmuchun@bytedance.com>
2021-02-26 18:06 ` [PATCH v17 1/9] mm: memory_hotplug: factor out bootmem core functions to bootmem_info.c Bodeddula, Balasubramaniam
2021-03-01 3:01 ` [External] " Muchun Song
2021-02-25 13:21 [PATCH v17 0/9] Free some vmemmap pages of HugeTLB page Muchun Song
2021-02-25 13:21 ` [PATCH v17 1/9] mm: memory_hotplug: factor out bootmem core functions to bootmem_info.c Muchun Song
2021-03-03 2:45 ` Singh, Balbir
2021-03-04 4:26 ` Balbir Singh
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox