From: Adam Ford <aford173@gmail.com>
To: Mike Rapoport <rppt@linux.ibm.com>
Cc: Fabio Estevam <festevam@gmail.com>, Rich Felker <dalias@libc.org>,
linux-ia64@vger.kernel.org, Petr Mladek <pmladek@suse.com>,
linux-sh@vger.kernel.org,
Catalin Marinas <catalin.marinas@arm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Max Filippov <jcmvbkbc@gmail.com>, Guo Ren <guoren@kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>,
sparclinux@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
linux-s390@vger.kernel.org, linux-c6x-dev@linux-c6x.org,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Richard Weinberger <richard@nod.at>,
x86@kernel.org, Russell King <linux@armlinux.org.uk>,
kasan-dev <kasan-dev@googlegroups.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Mark Salter <msalter@redhat.com>,
Dennis Zhou <dennis@kernel.org>,
Matt Turner <mattst88@gmail.com>,
linux-snps-arc@lists.infradead.org,
uclinux-h8-devel@lists.sourceforge.jp,
devicetree <devicetree@vger.kernel.org>,
linux-xtensa@linux-xtensa.org, linux-um@lists.infradead.org,
The etnaviv authors <etnaviv@lists.freedesktop.org>,
linux-m68k@lists.linux-m68k.org,
Rob Herring <robh+dt@kernel.org>,
Greentime Hu <green.hu@gmail.com>,
xen-devel@lists.xenproject.org,
Stafford Horne <shorne@gmail.com>, Guan Xuetao <gxt@pku.edu.cn>,
arm-soc <linux-arm-kernel@lists.infradead.org>,
Michal Simek <monstr@monstr.eu>, Tony Luck <tony.luck@intel.com>,
Linux Memory Management List <linux-mm@kvack.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
USB list <linux-usb@vger.kernel.org>,
linux-mips@vger.kernel.org, Paul Burton <paul.burton@mips.com>,
Vineet Gupta <vgupta@synopsys.com>,
linux-alpha@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org,
"David S. Miller" <davem@davemloft.net>,
openrisc@lists.librecores.org, Chris Healy <cphealy@gmail.com>
Subject: Re: [PATCH v2 00/21] Refine memblock API
Date: Wed, 2 Oct 2019 06:14:11 -0500 [thread overview]
Message-ID: <CAHCN7xL1MkJh44N3W_1+08DHmX__SqnfH6dqUzYzr2Wpg0kQyQ@mail.gmail.com> (raw)
In-Reply-To: <20191002073605.GA30433@linux.ibm.com>
On Wed, Oct 2, 2019 at 2:36 AM Mike Rapoport <rppt@linux.ibm.com> wrote:
>
> Hi Adam,
>
> On Tue, Oct 01, 2019 at 07:14:13PM -0500, Adam Ford wrote:
> > On Sun, Sep 29, 2019 at 8:33 AM Adam Ford <aford173@gmail.com> wrote:
> > >
> > > I am attaching two logs. I now the mailing lists will be unhappy, but
> > > don't want to try and spam a bunch of log through the mailing liast.
> > > The two logs show the differences between the working and non-working
> > > imx6q 3D accelerator when trying to run a simple glmark2-es2-drm demo.
> > >
> > > The only change between them is the 2 line code change you suggested.
> > >
> > > In both cases, I have cma=128M set in my bootargs. Historically this
> > > has been sufficient, but cma=256M has not made a difference.
> > >
> >
> > Mike any suggestions on how to move forward?
> > I was hoping to get the fixes tested and pushed before 5.4 is released
> > if at all possible
>
> I have a fix (below) that kinda restores the original behaviour, but I
> still would like to double check to make sure it's not a band aid and I
> haven't missed the actual root cause.
>
> Can you please send me your device tree definition and the output of
>
> cat /sys/kernel/debug/memblock/memory
>
> and
>
> cat /sys/kernel/debug/memblock/reserved
>
> Thanks!
>
Before the patch:
# cat /sys/kernel/debug/memblock/memory
0: 0x10000000..0x8fffffff
# cat /sys/kernel/debug/memblock/reserved
0: 0x10004000..0x10007fff
1: 0x10100000..0x11ab141f
2: 0x1fff1000..0x1fffcfff
3: 0x2ee40000..0x2ef53fff
4: 0x2ef56940..0x2ef56c43
5: 0x2ef56c48..0x2fffefff
6: 0x2ffff0c0..0x2ffff4d8
7: 0x2ffff500..0x2ffff55f
8: 0x2ffff580..0x2ffff703
9: 0x2ffff740..0x2ffff918
10: 0x2ffff940..0x2ffff9cf
11: 0x2ffffa00..0x2ffffa0f
12: 0x2ffffa40..0x2ffffa43
13: 0x2ffffa80..0x2ffffad5
14: 0x2ffffb00..0x2ffffb55
15: 0x2ffffb80..0x2ffffbd5
16: 0x2ffffc00..0x2ffffc4e
17: 0x2ffffc50..0x2ffffc6a
18: 0x2ffffc6c..0x2ffffce6
19: 0x2ffffce8..0x2ffffd02
20: 0x2ffffd04..0x2ffffd1e
21: 0x2ffffd20..0x2ffffd3a
22: 0x2ffffd3c..0x2ffffd56
23: 0x2ffffd58..0x2ffffe30
24: 0x2ffffe34..0x2ffffe4c
25: 0x2ffffe50..0x2ffffe68
26: 0x2ffffe6c..0x2ffffe84
27: 0x2ffffe88..0x2ffffea0
28: 0x2ffffea4..0x2ffffebc
29: 0x2ffffec0..0x2ffffedf
30: 0x2ffffee4..0x2ffffefc
31: 0x2fffff00..0x2fffff13
32: 0x2fffff28..0x2fffff4b
33: 0x2fffff50..0x2fffff84
34: 0x2fffff88..0x3fffffff
After the patch:
# cat /sys/kernel/debug/memblock/memory
0: 0x10000000..0x8fffffff
# cat /sys/kernel/debug/memblock/reserved
0: 0x10004000..0x10007fff
1: 0x10100000..0x11ab141f
2: 0x1fff1000..0x1fffcfff
3: 0x3eec0000..0x3efd3fff
4: 0x3efd6940..0x3efd6c43
5: 0x3efd6c48..0x3fffbfff
6: 0x3fffc0c0..0x3fffc4d8
7: 0x3fffc500..0x3fffc55f
8: 0x3fffc580..0x3fffc703
9: 0x3fffc740..0x3fffc918
10: 0x3fffc940..0x3fffc9cf
11: 0x3fffca00..0x3fffca0f
12: 0x3fffca40..0x3fffca43
13: 0x3fffca80..0x3fffca83
14: 0x3fffcac0..0x3fffcb15
15: 0x3fffcb40..0x3fffcb95
16: 0x3fffcbc0..0x3fffcc15
17: 0x3fffcc28..0x3fffcc72
18: 0x3fffcc74..0x3fffcc8e
19: 0x3fffcc90..0x3fffcd0a
20: 0x3fffcd0c..0x3fffcd26
21: 0x3fffcd28..0x3fffcd42
22: 0x3fffcd44..0x3fffcd5e
23: 0x3fffcd60..0x3fffcd7a
24: 0x3fffcd7c..0x3fffce54
25: 0x3fffce58..0x3fffce70
26: 0x3fffce74..0x3fffce8c
27: 0x3fffce90..0x3fffcea8
28: 0x3fffceac..0x3fffcec4
29: 0x3fffcec8..0x3fffcee0
30: 0x3fffcee4..0x3fffcefc
31: 0x3fffcf00..0x3fffcf1f
32: 0x3fffcf28..0x3fffcf53
33: 0x3fffcf68..0x3fffcf8b
34: 0x3fffcf90..0x3fffcfac
35: 0x3fffcfb0..0x3fffffff
36: 0x80000000..0x8fffffff
> From 06529f861772b7dea2912fc2245debe4690139b8 Mon Sep 17 00:00:00 2001
> From: Mike Rapoport <rppt@linux.ibm.com>
> Date: Wed, 2 Oct 2019 10:14:17 +0300
> Subject: [PATCH] mm: memblock: do not enforce current limit for memblock_phys*
> family
>
> 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.
>
This fixed the issue. Thank you
Tested-by: Adam Ford <aford173@gmail.com> #imx6q-logicpd
> Fixes: 92d12f9544b7 ("memblock: refactor internal allocation functions")
> Reported-by: Adam Ford <aford173@gmail.com>
> 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
>
>
> > > adam
> > >
> > > On Sat, Sep 28, 2019 at 2:33 AM Mike Rapoport <rppt@linux.ibm.com> wrote:
> > > >
> > > > On Thu, Sep 26, 2019 at 02:35:53PM -0500, Adam Ford wrote:
> > > > > On Thu, Sep 26, 2019 at 11:04 AM Mike Rapoport <rppt@linux.ibm.com> wrote:
> > > > > >
> > > > > > Hi,
> > > > > >
> > > > > > On Thu, Sep 26, 2019 at 08:09:52AM -0500, Adam Ford wrote:
> > > > > > > On Wed, Sep 25, 2019 at 10:17 AM Fabio Estevam <festevam@gmail.com> wrote:
> > > > > > > >
> > > > > > > > On Wed, Sep 25, 2019 at 9:17 AM Adam Ford <aford173@gmail.com> wrote:
> > > > > > > >
> > > > > > > > > I tried cma=256M and noticed the cma dump at the beginning didn't
> > > > > > > > > change. Do we need to setup a reserved-memory node like
> > > > > > > > > imx6ul-ccimx6ulsom.dtsi did?
> > > > > > > >
> > > > > > > > I don't think so.
> > > > > > > >
> > > > > > > > Were you able to identify what was the exact commit that caused such regression?
> > > > > > >
> > > > > > > I was able to narrow it down the 92d12f9544b7 ("memblock: refactor
> > > > > > > internal allocation functions") that caused the regression with
> > > > > > > Etnaviv.
> > > > > >
> > > > > >
> > > > > > Can you please test with this change:
> > > > > >
> > > > >
> > > > > That appears to have fixed my issue. I am not sure what the impact
> > > > > is, but is this a safe option?
> > > >
> > > > It's not really a fix, I just wanted to see how exactly 92d12f9544b7 ("memblock:
> > > > refactor internal allocation functions") broke your setup.
> > > >
> > > > Can you share the dts you are using and the full kernel log?
> > > >
> > > > > adam
> > > > >
> > > > > > diff --git a/mm/memblock.c b/mm/memblock.c
> > > > > > index 7d4f61a..1f5a0eb 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);
> > > > > >
> > > > > > > I also noticed that if I create a reserved memory node as was done one
> > > > > > > imx6ul-ccimx6ulsom.dtsi the 3D seems to work again, but without it, I
> > > > > > > was getting errors regardless of the 'cma=256M' or not.
> > > > > > > I don't have a problem using the reserved memory, but I guess I am not
> > > > > > > sure what the amount should be. I know for the video decoding 1080p,
> > > > > > > I have historically used cma=128M, but with the 3D also needing some
> > > > > > > memory allocation, is that enough or should I use 256M?
> > > > > > >
> > > > > > > adam
> > > > > >
> > > > > > --
> > > > > > Sincerely yours,
> > > > > > Mike.
> > > > > >
> > > >
> > > > --
> > > > Sincerely yours,
> > > > Mike.
> > > >
>
> --
> Sincerely yours,
> Mike.
>
next prev parent reply other threads:[~2019-10-02 11:14 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-21 8:03 [PATCH v2 00/21] Refine memblock API Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 01/21] openrisc: prefer memblock APIs returning virtual address Mike Rapoport
2019-01-27 3:07 ` Stafford Horne
2019-01-21 8:03 ` [PATCH v2 02/21] powerpc: use memblock functions " Mike Rapoport
2019-01-29 9:52 ` Michael Ellerman
2019-01-21 8:03 ` [PATCH v2 03/21] memblock: replace memblock_alloc_base(ANYWHERE) with memblock_phys_alloc Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 04/21] memblock: drop memblock_alloc_base_nid() Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 05/21] memblock: emphasize that memblock_alloc_range() returns a physical address Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 06/21] memblock: memblock_phys_alloc_try_nid(): don't panic Mike Rapoport
2019-01-25 17:45 ` Catalin Marinas
2019-01-25 19:32 ` Mike Rapoport
2019-01-29 9:56 ` Michael Ellerman
2019-01-29 9:58 ` Michael Ellerman
2019-01-21 8:03 ` [PATCH v2 07/21] memblock: memblock_phys_alloc(): " Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 08/21] memblock: drop __memblock_alloc_base() Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 09/21] memblock: drop memblock_alloc_base() Mike Rapoport
2019-01-29 10:29 ` Michael Ellerman
2019-01-21 8:03 ` [PATCH v2 10/21] memblock: refactor internal allocation functions Mike Rapoport
2019-02-03 9:39 ` Michael Ellerman
2019-02-03 10:04 ` Mike Rapoport
2019-02-03 11:39 ` Mike Rapoport
2019-02-04 8:45 ` Michael Ellerman
2019-02-04 23:08 ` Stephen Rothwell
2019-01-21 8:03 ` [PATCH v2 11/21] memblock: make memblock_find_in_range_node() and choose_memblock_flags() static Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 12/21] arch: use memblock_alloc() instead of memblock_alloc_from(size, align, 0) Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 13/21] arch: don't memset(0) memory returned by memblock_alloc() Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 14/21] ia64: add checks for the return value of memblock_alloc*() Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 15/21] sparc: " Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 16/21] mm/percpu: " Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 17/21] init/main: " Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 18/21] swiotlb: " Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 19/21] treewide: " Mike Rapoport
2019-01-21 8:39 ` Geert Uytterhoeven
2019-01-21 8:39 ` Geert Uytterhoeven
2019-01-21 17:18 ` Rob Herring
2019-01-31 6:07 ` Christophe Leroy
2019-01-31 6:41 ` Mike Rapoport
2019-01-31 6:44 ` Christophe Leroy
2019-01-31 7:07 ` Christophe Leroy
2019-01-31 7:14 ` Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 20/21] memblock: memblock_alloc_try_nid: don't panic Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 21/21] memblock: drop memblock_alloc_*_nopanic() variants Mike Rapoport
2019-01-30 13:38 ` Petr Mladek
2019-09-24 17:52 ` [PATCH v2 00/21] Refine memblock API Adam Ford
2019-09-25 6:42 ` Mike Rapoport
2019-09-25 12:12 ` Fabio Estevam
2019-09-25 12:17 ` Adam Ford
2019-09-25 15:17 ` Fabio Estevam
2019-09-26 13:09 ` Adam Ford
2019-09-26 16:04 ` Mike Rapoport
2019-09-26 19:35 ` Adam Ford
2019-09-28 7:33 ` Mike Rapoport
2019-09-29 13:33 ` Adam Ford
2019-10-02 0:14 ` Adam Ford
2019-10-02 7:36 ` Mike Rapoport
2019-10-02 11:14 ` Adam Ford [this message]
2019-10-03 5:34 ` Mike Rapoport
2019-10-03 8:49 ` Russell King - ARM Linux admin
2019-10-03 11:30 ` Mike Rapoport
2019-10-03 13:17 ` Lucas Stach
2019-10-04 9:27 ` Russell King - ARM Linux admin
2019-10-04 13:21 ` Lucas Stach
2019-10-04 13:58 ` Adam Ford
2019-10-04 17:10 ` Mike Rapoport
2019-10-04 17:29 ` Mike Rapoport
2019-10-03 14:46 ` Chris Healy
2019-10-04 9:12 ` Russell King - ARM Linux admin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAHCN7xL1MkJh44N3W_1+08DHmX__SqnfH6dqUzYzr2Wpg0kQyQ@mail.gmail.com \
--to=aford173@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=cphealy@gmail.com \
--cc=dalias@libc.org \
--cc=davem@davemloft.net \
--cc=dennis@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=etnaviv@lists.freedesktop.org \
--cc=festevam@gmail.com \
--cc=geert@linux-m68k.org \
--cc=green.hu@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=guoren@kernel.org \
--cc=gxt@pku.edu.cn \
--cc=hch@lst.de \
--cc=heiko.carstens@de.ibm.com \
--cc=jcmvbkbc@gmail.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux-um@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mattst88@gmail.com \
--cc=monstr@monstr.eu \
--cc=mpe@ellerman.id.au \
--cc=msalter@redhat.com \
--cc=openrisc@lists.librecores.org \
--cc=paul.burton@mips.com \
--cc=pmladek@suse.com \
--cc=richard@nod.at \
--cc=robh+dt@kernel.org \
--cc=rppt@linux.ibm.com \
--cc=shorne@gmail.com \
--cc=sparclinux@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=uclinux-h8-devel@lists.sourceforge.jp \
--cc=vgupta@synopsys.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).