From: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
To: linux-mm@kvack.org, akpm@linux-foundation.org,
mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org,
npiggin@gmail.com, christophe.leroy@csgroup.eu
Cc: Vishal Verma <vishal.l.verma@intel.com>,
David Hildenbrand <david@redhat.com>,
Michal Hocko <mhocko@suse.com>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
Oscar Salvador <osalvador@suse.de>
Subject: [PATCH v7 7/7] mm/memory_hotplug: Enable runtime update of memmap_on_memory parameter
Date: Tue, 1 Aug 2023 10:11:16 +0530 [thread overview]
Message-ID: <20230801044116.10674-8-aneesh.kumar@linux.ibm.com> (raw)
In-Reply-To: <20230801044116.10674-1-aneesh.kumar@linux.ibm.com>
Allow updating memmap_on_memory mode after the kernel boot. Memory
hotplug done after the mode update will use the new mmemap_on_memory
value.
Acked-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
---
mm/memory_hotplug.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 1ce8ad04a980..d282664f558e 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -89,7 +89,10 @@ static int set_memmap_mode(const char *val, const struct kernel_param *kp)
else
mode = MEMMAP_ON_MEMORY_DISABLE;
}
+ /* Avoid changing memmap mode during hotplug. */
+ get_online_mems();
*((int *)kp->arg) = mode;
+ put_online_mems();
if (mode == MEMMAP_ON_MEMORY_FORCE) {
unsigned long memmap_pages = memory_block_memmap_on_memory_pages();
@@ -110,7 +113,7 @@ static const struct kernel_param_ops memmap_mode_ops = {
.set = set_memmap_mode,
.get = get_memmap_mode,
};
-module_param_cb(memmap_on_memory, &memmap_mode_ops, &memmap_mode, 0444);
+module_param_cb(memmap_on_memory, &memmap_mode_ops, &memmap_mode, 0644);
MODULE_PARM_DESC(memmap_on_memory, "Enable memmap on memory for memory hotplug\n"
"With value \"force\" it could result in memory wastage due "
"to memmap size limitations (Y/N/force)");
@@ -2172,22 +2175,20 @@ static int __ref try_remove_memory(u64 start, u64 size)
* We only support removing memory added with MHP_MEMMAP_ON_MEMORY in
* the same granularity it was added - a single memory block.
*/
- if (mhp_memmap_on_memory()) {
- ret = walk_memory_blocks(start, size, &mem, test_has_altmap_cb);
- if (ret) {
- if (size != memory_block_size_bytes()) {
- pr_warn("Refuse to remove %#llx - %#llx,"
- "wrong granularity\n",
- start, start + size);
- return -EINVAL;
- }
- altmap = mem->altmap;
- /*
- * Mark altmap NULL so that we can add a debug
- * check on memblock free.
- */
- mem->altmap = NULL;
+ ret = walk_memory_blocks(start, size, &mem, test_has_altmap_cb);
+ if (ret) {
+ if (size != memory_block_size_bytes()) {
+ pr_warn("Refuse to remove %#llx - %#llx,"
+ "wrong granularity\n",
+ start, start + size);
+ return -EINVAL;
}
+ altmap = mem->altmap;
+ /*
+ * Mark altmap NULL so that we can add a debug
+ * check on memblock free.
+ */
+ mem->altmap = NULL;
}
/* remove memmap entry */
--
2.41.0
next prev parent reply other threads:[~2023-08-01 4:47 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-01 4:41 [PATCH v7 0/7] Add support for memmap on memory feature on ppc64 Aneesh Kumar K.V
2023-08-01 4:41 ` [PATCH v7 1/7] mm/memory_hotplug: Simplify ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE kconfig Aneesh Kumar K.V
2023-08-01 4:41 ` [PATCH v7 2/7] mm/memory_hotplug: Allow memmap on memory hotplug request to fallback Aneesh Kumar K.V
2023-08-01 4:41 ` [PATCH v7 3/7] mm/memory_hotplug: Allow architecture to override memmap on memory support check Aneesh Kumar K.V
2023-08-01 4:41 ` [PATCH v7 4/7] mm/memory_hotplug: Support memmap_on_memory when memmap is not aligned to pageblocks Aneesh Kumar K.V
2023-08-01 9:04 ` Michal Hocko
2023-08-01 4:41 ` [PATCH v7 5/7] powerpc/book3s64/memhotplug: Enable memmap on memory for radix Aneesh Kumar K.V
2023-08-01 4:41 ` [PATCH v7 6/7] mm/memory_hotplug: Embed vmem_altmap details in memory block Aneesh Kumar K.V
2023-08-01 23:10 ` Verma, Vishal L
2023-08-02 4:47 ` Aneesh Kumar K V
2023-08-01 4:41 ` Aneesh Kumar K.V [this message]
2023-08-01 8:58 ` [PATCH v7 7/7] mm/memory_hotplug: Enable runtime update of memmap_on_memory parameter Michal Hocko
2023-08-01 9:28 ` Aneesh Kumar K V
2023-08-01 10:50 ` Michal Hocko
2023-08-02 4:45 ` Aneesh Kumar K V
2023-08-02 15:50 ` Michal Hocko
2023-08-02 15:54 ` David Hildenbrand
2023-08-02 15:57 ` Aneesh Kumar K V
2023-08-02 16:02 ` Verma, Vishal L
2023-08-02 16:59 ` Michal Hocko
2023-08-03 8:52 ` Michal Hocko
2023-08-03 9:24 ` David Hildenbrand
2023-08-03 11:30 ` Michal Hocko
2023-08-05 14:24 ` Aneesh Kumar K V
2023-08-07 12:27 ` Michal Hocko
2023-08-07 12:41 ` David Hildenbrand
2023-08-07 18:35 ` David Hildenbrand
2023-08-08 6:09 ` Aneesh Kumar K V
2023-08-08 6:29 ` Aneesh Kumar K V
2023-08-08 7:46 ` David Hildenbrand
2023-08-07 12:54 ` David Hildenbrand
2023-08-01 9:07 ` [PATCH v7 0/7] Add support for memmap on memory feature on ppc64 Michal Hocko
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=20230801044116.10674-8-aneesh.kumar@linux.ibm.com \
--to=aneesh.kumar@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=christophe.leroy@csgroup.eu \
--cc=david@redhat.com \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mhocko@suse.com \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=osalvador@suse.de \
--cc=vishal.l.verma@intel.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;
as well as URLs for NNTP newsgroup(s).