* [PATCH] mm: memblock: do not enforce current limit for memblock_phys* family
@ 2019-10-12 21:31 Mike Rapoport
2019-10-14 22:44 ` Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Mike Rapoport @ 2019-10-12 21:31 UTC (permalink / raw)
To: Andrew Morton
Cc: Adam Ford, Catalin Marinas, Christoph Hellwig, Fabio Estevam,
Lucas Stach, etnaviv, linux-arm-kernel, linux-kernel, linux-mm,
Mike Rapoport
From: Mike Rapoport <rppt@linux.ibm.com>
Until commit 92d12f9544b7 ("memblock: refactor internal allocation
functions") the maximal address for memblock allocations was forced to
memblock.current_limit only for the allocation functions returning virtual
address. The changes introduced by that commit moved the limit enforcement
into the allocation core and as a result the allocation functions returning
physical address also started to limit allocations to
memblock.current_limit.
This caused breakage of etnaviv GPU driver:
[ 3.682347] etnaviv etnaviv: bound 130000.gpu (ops gpu_ops)
[ 3.688669] etnaviv etnaviv: bound 134000.gpu (ops gpu_ops)
[ 3.695099] etnaviv etnaviv: bound 2204000.gpu (ops gpu_ops)
[ 3.700800] etnaviv-gpu 130000.gpu: model: GC2000, revision: 5108
[ 3.723013] etnaviv-gpu 130000.gpu: command buffer outside valid
memory window
[ 3.731308] etnaviv-gpu 134000.gpu: model: GC320, revision: 5007
[ 3.752437] etnaviv-gpu 134000.gpu: command buffer outside valid
memory window
[ 3.760583] etnaviv-gpu 2204000.gpu: model: GC355, revision: 1215
[ 3.766766] etnaviv-gpu 2204000.gpu: Ignoring GPU with VG and FE2.0
Restore the behaviour of memblock_phys* family so that these functions will
not enforce memblock.current_limit.
Fixes: 92d12f9544b7 ("memblock: refactor internal allocation functions")
Reported-by: Adam Ford <aford173@gmail.com>
Tested-by: Adam Ford <aford173@gmail.com> #imx6q-logicpd
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
mm/memblock.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index 7d4f61a..c4b16ca 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1356,9 +1356,6 @@ static phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size,
align = SMP_CACHE_BYTES;
}
- if (end > memblock.current_limit)
- end = memblock.current_limit;
-
again:
found = memblock_find_in_range_node(size, align, start, end, nid,
flags);
@@ -1469,6 +1466,9 @@ static void * __init memblock_alloc_internal(
if (WARN_ON_ONCE(slab_is_available()))
return kzalloc_node(size, GFP_NOWAIT, nid);
+ if (max_addr > memblock.current_limit)
+ max_addr = memblock.current_limit;
+
alloc = memblock_alloc_range_nid(size, align, min_addr, max_addr, nid);
/* retry allocation without lower limit */
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mm: memblock: do not enforce current limit for memblock_phys* family
2019-10-12 21:31 [PATCH] mm: memblock: do not enforce current limit for memblock_phys* family Mike Rapoport
@ 2019-10-14 22:44 ` Andrew Morton
2019-10-15 6:42 ` Mike Rapoport
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2019-10-14 22:44 UTC (permalink / raw)
To: Mike Rapoport
Cc: Adam Ford, Catalin Marinas, Christoph Hellwig, Fabio Estevam,
Lucas Stach, etnaviv, linux-arm-kernel, linux-kernel, linux-mm,
Mike Rapoport
On Sun, 13 Oct 2019 00:31:01 +0300 Mike Rapoport <rppt@kernel.org> wrote:
> Until commit 92d12f9544b7 ("memblock: refactor internal allocation
> functions") the maximal address for memblock allocations was forced to
> memblock.current_limit only for the allocation functions returning virtual
> address. The changes introduced by that commit moved the limit enforcement
> into the allocation core and as a result the allocation functions returning
> physical address also started to limit allocations to
> memblock.current_limit.
>
> This caused breakage of etnaviv GPU driver:
>
> ...
>
So I'll add a cc:stable, yes?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mm: memblock: do not enforce current limit for memblock_phys* family
2019-10-14 22:44 ` Andrew Morton
@ 2019-10-15 6:42 ` Mike Rapoport
0 siblings, 0 replies; 3+ messages in thread
From: Mike Rapoport @ 2019-10-15 6:42 UTC (permalink / raw)
To: Andrew Morton
Cc: Adam Ford, Catalin Marinas, Christoph Hellwig, Fabio Estevam,
Lucas Stach, etnaviv, linux-arm-kernel, linux-kernel, linux-mm,
Mike Rapoport
On October 15, 2019 12:44:23 AM GMT+02:00, Andrew Morton <akpm@linux-foundation.org> wrote:
>On Sun, 13 Oct 2019 00:31:01 +0300 Mike Rapoport <rppt@kernel.org>
>wrote:
>
>> Until commit 92d12f9544b7 ("memblock: refactor internal allocation
>> functions") the maximal address for memblock allocations was forced
>to
>> memblock.current_limit only for the allocation functions returning
>virtual
>> address. The changes introduced by that commit moved the limit
>enforcement
>> into the allocation core and as a result the allocation functions
>returning
>> physical address also started to limit allocations to
>> memblock.current_limit.
>>
>> This caused breakage of etnaviv GPU driver:
>>
>> ...
>>
>
>So I'll add a cc:stable, yes?
Yeah, right. Somehow I've missed that...
--
Sincerely yours,
Mike
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-15 6:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-12 21:31 [PATCH] mm: memblock: do not enforce current limit for memblock_phys* family Mike Rapoport
2019-10-14 22:44 ` Andrew Morton
2019-10-15 6:42 ` Mike Rapoport
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).