Skip to content

Commit 42d9358

Browse files
stellarhopperakpm00
authored andcommitted
mm/memory_hotplug: export mhp_supports_memmap_on_memory()
In preparation for adding sysfs ABI to toggle memmap_on_memory semantics for drivers adding memory, export the mhp_supports_memmap_on_memory() helper. This allows drivers to check if memmap_on_memory support is available before trying to request it, and display an appropriate message if it isn't available. As part of this, remove the size argument to this - with recent updates to allow memmap_on_memory for larger ranges, and the internal splitting of altmaps into respective memory blocks, the size argument is meaningless. [akpm@linux-foundation.org: fix build] Link: https://lkml.kernel.org/r/20240124-vv-dax_abi-v7-4-20d16cb8d23d@intel.com Signed-off-by: Vishal Verma <vishal.l.verma@intel.com> Acked-by: David Hildenbrand <david@redhat.com> Suggested-by: David Hildenbrand <david@redhat.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: Li Zhijian <lizhijian@fujitsu.com> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Oscar Salvador <osalvador@suse.de> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Dave Jiang <dave.jiang@intel.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Huang Ying <ying.huang@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 51e7849 commit 42d9358

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

include/linux/memory_hotplug.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ struct mhp_params {
137137

138138
bool mhp_range_allowed(u64 start, u64 size, bool need_mapping);
139139
struct range mhp_get_pluggable_range(bool need_mapping);
140+
bool mhp_supports_memmap_on_memory(void);
140141

141142
/*
142143
* Zone resizing functions
@@ -278,6 +279,11 @@ static inline bool movable_node_is_enabled(void)
278279
return false;
279280
}
280281

282+
static inline bool mhp_supports_memmap_on_memory(void)
283+
{
284+
return false;
285+
}
286+
281287
static inline void pgdat_kswapd_lock(pg_data_t *pgdat) {}
282288
static inline void pgdat_kswapd_unlock(pg_data_t *pgdat) {}
283289
static inline void pgdat_kswapd_lock_init(pg_data_t *pgdat) {}

mm/memory_hotplug.c

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,7 +1337,7 @@ static inline bool arch_supports_memmap_on_memory(unsigned long vmemmap_size)
13371337
}
13381338
#endif
13391339

1340-
static bool mhp_supports_memmap_on_memory(unsigned long size)
1340+
bool mhp_supports_memmap_on_memory(void)
13411341
{
13421342
unsigned long vmemmap_size = memory_block_memmap_size();
13431343
unsigned long memmap_pages = memory_block_memmap_on_memory_pages();
@@ -1346,17 +1346,11 @@ static bool mhp_supports_memmap_on_memory(unsigned long size)
13461346
* Besides having arch support and the feature enabled at runtime, we
13471347
* need a few more assumptions to hold true:
13481348
*
1349-
* a) We span a single memory block: memory onlining/offlinin;g happens
1350-
* in memory block granularity. We don't want the vmemmap of online
1351-
* memory blocks to reside on offline memory blocks. In the future,
1352-
* we might want to support variable-sized memory blocks to make the
1353-
* feature more versatile.
1354-
*
1355-
* b) The vmemmap pages span complete PMDs: We don't want vmemmap code
1349+
* a) The vmemmap pages span complete PMDs: We don't want vmemmap code
13561350
* to populate memory from the altmap for unrelated parts (i.e.,
13571351
* other memory blocks)
13581352
*
1359-
* c) The vmemmap pages (and thereby the pages that will be exposed to
1353+
* b) The vmemmap pages (and thereby the pages that will be exposed to
13601354
* the buddy) have to cover full pageblocks: memory onlining/offlining
13611355
* code requires applicable ranges to be page-aligned, for example, to
13621356
* set the migratetypes properly.
@@ -1368,7 +1362,7 @@ static bool mhp_supports_memmap_on_memory(unsigned long size)
13681362
* altmap as an alternative source of memory, and we do not exactly
13691363
* populate a single PMD.
13701364
*/
1371-
if (!mhp_memmap_on_memory() || size != memory_block_size_bytes())
1365+
if (!mhp_memmap_on_memory())
13721366
return false;
13731367

13741368
/*
@@ -1391,6 +1385,7 @@ static bool mhp_supports_memmap_on_memory(unsigned long size)
13911385

13921386
return arch_supports_memmap_on_memory(vmemmap_size);
13931387
}
1388+
EXPORT_SYMBOL_GPL(mhp_supports_memmap_on_memory);
13941389

13951390
static void __ref remove_memory_blocks_and_altmaps(u64 start, u64 size)
13961391
{
@@ -1526,7 +1521,7 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags)
15261521
* Self hosted memmap array
15271522
*/
15281523
if ((mhp_flags & MHP_MEMMAP_ON_MEMORY) &&
1529-
mhp_supports_memmap_on_memory(memory_block_size_bytes())) {
1524+
mhp_supports_memmap_on_memory()) {
15301525
ret = create_altmaps_and_memory_blocks(nid, group, start, size, mhp_flags);
15311526
if (ret)
15321527
goto error;

0 commit comments

Comments
 (0)