Skip to content

Commit

Permalink
powerpc: Chunk calls to flush_dcache_range in arch_*_memory
Browse files Browse the repository at this point in the history
When presented with large amounts of memory being hotplugged
(in my test case, ~890GB), the call to flush_dcache_range takes
a while (~50 seconds), triggering RCU stalls.

This patch breaks up the call into 1GB chunks, calling
cond_resched() inbetween to allow the scheduler to run.

Fixes: fb5924f ("powerpc/mm: Flush cache on memory hot(un)plug")
Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191104023305.9581-6-alastair@au1.ibm.com
  • Loading branch information
Alastair D'Silva authored and Michael Ellerman committed Nov 7, 2019
1 parent 23eb7f5 commit 0762659
Showing 1 changed file with 25 additions and 2 deletions.
27 changes: 25 additions & 2 deletions arch/powerpc/mm/mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,27 @@ int __weak remove_section_mapping(unsigned long start, unsigned long end)
return -ENODEV;
}

#define FLUSH_CHUNK_SIZE SZ_1G
/**
* flush_dcache_range_chunked(): Write any modified data cache blocks out to
* memory and invalidate them, in chunks of up to FLUSH_CHUNK_SIZE
* Does not invalidate the corresponding instruction cache blocks.
*
* @start: the start address
* @stop: the stop address (exclusive)
* @chunk: the max size of the chunks
*/
static void flush_dcache_range_chunked(unsigned long start, unsigned long stop,
unsigned long chunk)
{
unsigned long i;

for (i = start; i < stop; i += chunk) {
flush_dcache_range(i, min(stop, start + chunk));
cond_resched();
}
}

int __ref arch_add_memory(int nid, u64 start, u64 size,
struct mhp_restrictions *restrictions)
{
Expand All @@ -120,7 +141,8 @@ int __ref arch_add_memory(int nid, u64 start, u64 size,
start, start + size, rc);
return -EFAULT;
}
flush_dcache_range(start, start + size);

flush_dcache_range_chunked(start, start + size, FLUSH_CHUNK_SIZE);

return __add_pages(nid, start_pfn, nr_pages, restrictions);
}
Expand All @@ -137,7 +159,8 @@ void __ref arch_remove_memory(int nid, u64 start, u64 size,

/* Remove htab bolted mappings for this section of memory */
start = (unsigned long)__va(start);
flush_dcache_range(start, start + size);
flush_dcache_range_chunked(start, start + size, FLUSH_CHUNK_SIZE);

ret = remove_section_mapping(start, start + size);
WARN_ON_ONCE(ret);

Expand Down

0 comments on commit 0762659

Please sign in to comment.