diff options
| author | Michael Ellerman <[email protected]> | 2017-11-13 23:17:28 +1100 |
|---|---|---|
| committer | Michael Ellerman <[email protected]> | 2017-11-13 23:34:06 +1100 |
| commit | 7ece370996b694ae263025e056ad785afc1be5ab (patch) | |
| tree | b17550158c0e7bc6010630a5fbbd25e595d1a03f | |
| parent | f23ab3efb1b30cc5c5ef5ae4ef294ed467f30675 (diff) | |
powerpc/64s/hash: Fix 512T hint detection to use >= 128T
Currently userspace is able to request mmap() search between 128T-512T
by specifying a hint address that is greater than 128T. But that means
a hint of 128T exactly will return an address below 128T, which is
confusing and wrong.
So fix the logic to check the hint is greater than *or equal* to 128T.
Fixes: f4ea6dcb08ea ("powerpc/mm: Enable mappings above 128TB")
Cc: [email protected] # v4.12+
Suggested-by: Aneesh Kumar K.V <[email protected]>
Suggested-by: Nicholas Piggin <[email protected]>
[mpe: Split out of Nick's bigger patch]
Signed-off-by: Michael Ellerman <[email protected]>
| -rw-r--r-- | arch/powerpc/mm/slice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c index 45f6740dd407..48a5312103a1 100644 --- a/arch/powerpc/mm/slice.c +++ b/arch/powerpc/mm/slice.c @@ -419,7 +419,7 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len, /* * Check if we need to expland slice area. */ - if (unlikely(addr > mm->context.addr_limit && + if (unlikely(addr >= mm->context.addr_limit && mm->context.addr_limit != TASK_SIZE)) { mm->context.addr_limit = TASK_SIZE; on_each_cpu(slice_flush_segments, mm, 1); @@ -427,7 +427,7 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len, /* * This mmap request can allocate upt to 512TB */ - if (addr > DEFAULT_MAP_WINDOW) + if (addr >= DEFAULT_MAP_WINDOW) high_limit = mm->context.addr_limit; else high_limit = DEFAULT_MAP_WINDOW; |