From: Baoquan He <bhe@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, pasha.tatashin@oracle.com,
mhocko@suse.com, rppt@linux.vnet.ibm.com,
richard.weiyang@gmail.com, linux-mm@kvack.org,
Baoquan He <bhe@redhat.com>
Subject: [PATCH 3/3] mm/sparse: Rename function related to section memmap allocation/free
Date: Wed, 20 Mar 2019 15:35:40 +0800 [thread overview]
Message-ID: <20190320073540.12866-3-bhe@redhat.com> (raw)
In-Reply-To: <20190320073540.12866-1-bhe@redhat.com>
These functions are used allocate/free section memmap, have nothing
to do with kmalloc/free during the handling. Rename them to remove
the confusion.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
mm/sparse.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/mm/sparse.c b/mm/sparse.c
index 054b99f74181..374206212d01 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -579,13 +579,13 @@ void offline_mem_sections(unsigned long start_pfn, unsigned long end_pfn)
#endif
#ifdef CONFIG_SPARSEMEM_VMEMMAP
-static inline struct page *kmalloc_section_memmap(unsigned long pnum, int nid,
+static inline struct page *alloc_section_memmap(unsigned long pnum, int nid,
struct vmem_altmap *altmap)
{
/* This will make the necessary allocations eventually. */
return sparse_mem_map_populate(pnum, nid, altmap);
}
-static void __kfree_section_memmap(struct page *memmap,
+static void __free_section_memmap(struct page *memmap,
struct vmem_altmap *altmap)
{
unsigned long start = (unsigned long)memmap;
@@ -603,7 +603,7 @@ static void free_map_bootmem(struct page *memmap)
}
#endif /* CONFIG_MEMORY_HOTREMOVE */
#else
-static struct page *__kmalloc_section_memmap(void)
+static struct page *__alloc_section_memmap(void)
{
struct page *page, *ret;
unsigned long memmap_size = sizeof(struct page) * PAGES_PER_SECTION;
@@ -624,13 +624,13 @@ static struct page *__kmalloc_section_memmap(void)
return ret;
}
-static inline struct page *kmalloc_section_memmap(unsigned long pnum, int nid,
+static inline struct page *alloc_section_memmap(unsigned long pnum, int nid,
struct vmem_altmap *altmap)
{
- return __kmalloc_section_memmap();
+ return __alloc_section_memmap();
}
-static void __kfree_section_memmap(struct page *memmap,
+static void __free_section_memmap(struct page *memmap,
struct vmem_altmap *altmap)
{
if (is_vmalloc_addr(memmap))
@@ -701,7 +701,7 @@ int __meminit sparse_add_one_section(int nid, unsigned long start_pfn,
usemap = __kmalloc_section_usemap();
if (!usemap)
return -ENOMEM;
- memmap = kmalloc_section_memmap(section_nr, nid, altmap);
+ memmap = alloc_section_memmap(section_nr, nid, altmap);
if (!memmap) {
kfree(usemap);
return -ENOMEM;
@@ -726,7 +726,7 @@ int __meminit sparse_add_one_section(int nid, unsigned long start_pfn,
out:
if (ret < 0) {
kfree(usemap);
- __kfree_section_memmap(memmap, altmap);
+ __free_section_memmap(memmap, altmap);
}
return ret;
}
@@ -777,7 +777,7 @@ static void free_section_usemap(struct page *memmap, unsigned long *usemap,
if (PageSlab(usemap_page) || PageCompound(usemap_page)) {
kfree(usemap);
if (memmap)
- __kfree_section_memmap(memmap, altmap);
+ __free_section_memmap(memmap, altmap);
return;
}
--
2.17.2
next prev parent reply other threads:[~2019-03-20 7:36 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-20 7:35 [PATCH 1/3] mm/sparse: Clean up the obsolete code comment Baoquan He
2019-03-20 7:35 ` [PATCH 2/3] mm/sparse: Optimize sparse_add_one_section() Baoquan He
2019-03-20 7:56 ` Mike Rapoport
2019-03-20 8:03 ` Baoquan He
2019-03-20 10:13 ` Baoquan He
2019-03-20 11:22 ` Matthew Wilcox
2019-03-20 11:27 ` Mike Rapoport
2019-03-20 7:35 ` Baoquan He [this message]
2019-03-20 7:50 ` [PATCH 1/3] mm/sparse: Clean up the obsolete code comment Mike Rapoport
2019-03-20 8:00 ` Baoquan He
2019-03-20 11:19 ` Matthew Wilcox
2019-03-20 11:53 ` Baoquan He
2019-03-20 12:20 ` Oscar Salvador
2019-03-20 12:22 ` Matthew Wilcox
2019-03-20 12:36 ` Mike Rapoport
2019-03-20 12:58 ` Matthew Wilcox
2019-03-21 6:40 ` Baoquan He
2019-03-21 9:21 ` Baoquan He
2019-03-21 10:24 ` William Kucharski
2019-03-21 10:35 ` Michal Hocko
2019-03-21 11:19 ` William Kucharski
2019-03-21 14:19 ` Baoquan He
2019-03-20 12:37 ` Oscar Salvador
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190320073540.12866-3-bhe@redhat.com \
--to=bhe@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=pasha.tatashin@oracle.com \
--cc=richard.weiyang@gmail.com \
--cc=rppt@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox