shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: mm/memory_hotplug: Relax remove_memory_subsection error checking

Browse Source 
A memory section may contain a mix of memory present at bootup, and
memory added dynamically via add_memory_subsection(). Fix
remove_memory_subsection to not return an error for this situation.

Bug: 190151165
Fixes: 417ac617ea ("ANDROID: mm/memory_hotplug: implement {add/remove}_memory_subsection")
Change-Id: I20314fe136d6e5b56a9275be7e2d130d18bd79a5
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
Signed-off-by: Sudarshan Rajagopalan <quic_sudaraja@quicinc.com>
This commit is contained in:
Patrick Daly
2021-06-04 16:44:39 -07:00
committed by Suren Baghdasaryan
parent 82ab28f25a
commit 5c9cf613be
1 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mm/memory_hotplug.c
View File

@@ -2293,22 +2293,6 @@ int remove_memory(u64 start, u64 size)
}
EXPORT_SYMBOL_GPL(remove_memory);
static bool __check_sections_offline(unsigned long start_pfn,
unsigned long nr_pages)
{
const unsigned long end_pfn = start_pfn + nr_pages;
unsigned long pfn, sec_nr;
for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) {
sec_nr = pfn_to_section_nr(pfn);
if (!valid_section_nr(sec_nr) || online_section_nr(sec_nr))
return false;
}
return true;
}
int remove_memory_subsection(u64 start, u64 size)
{
if (size == memory_block_size_bytes())
@@ -2322,15 +2306,6 @@ int remove_memory_subsection(u64 start, u64 size)
}
mem_hotplug_begin();
/* we cannot remove subsections that are invalid or online */
if(!__check_sections_offline(PHYS_PFN(start), size >> PAGE_SHIFT)) {
pr_err("%s: [%lx, %lx) sections are not offlined\n",
__func__, start, start + size);
mem_hotplug_done();
return -EBUSY;
}
arch_remove_memory(start, size, NULL);
if (IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK))