OSDN Git Service

powerpc/64s/hash: Allow MAP_FIXED allocations to cross 128TB boundary
authorNicholas Piggin <npiggin@gmail.com>
Thu, 9 Nov 2017 17:27:38 +0000 (04:27 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Nov 2017 08:40:57 +0000 (08:40 +0000)
commit 35602f82d0c765f991420e319c8d3a596c921eb8 upstream.

While mapping hints with a length that cross 128TB are disallowed,
MAP_FIXED allocations that cross 128TB are allowed. These are failing
on hash (on radix they succeed). Add an additional case for fixed
mappings to expand the addr_limit when crossing 128TB.

Fixes: f4ea6dcb08ea ("powerpc/mm: Enable mappings above 128TB")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/mm/slice.c

index 3889201..a4f9369 100644 (file)
@@ -418,7 +418,7 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
        unsigned long high_limit;
 
        high_limit = DEFAULT_MAP_WINDOW;
-       if (addr >= high_limit)
+       if (addr >= high_limit || (fixed && (addr + len > high_limit)))
                high_limit = TASK_SIZE;
 
        if (len > high_limit)