Received-SPF: pass (google.com: domain of linux-kernel+bounces-9437-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Precedence: bulk
MIME-Version: 1.0
References: <20231221154702.2267684-1-guoren@kernel.org> <20231221154702.2267684-3-guoren@kernel.org>
 <ZYUD4C1aXWt2oFJo@LeoBras> <CAJF2gTSiaNWkXS6rc+3OSZfnFqG2d7btzjrd-L1mBgAVu3ym3A@mail.gmail.com>
 <ZYUT22KmGJ1tJSWx@LeoBras> <CAJF2gTRptBZyYbnY-mjn-AuQwVnekQtGY8nAOV7KVWLCY1WBcw@mail.gmail.com>
 <ZYUeU0URQvgw42jt@LeoBras>
In-Reply-To: <ZYUeU0URQvgw42jt@LeoBras>
From: Guo Ren <guoren@kernel.org>
Date: Fri, 22 Dec 2023 15:20:15 +0800
Message-ID: <CAJF2gTQ33JmhUZtr6nkAY5mXRxOEA88pXy1CHcU0jNMzcQZz_g@mail.gmail.com>
Subject: Re: [PATCH V2 2/4] riscv: mm: Fixup compat arch_get_mmap_end
To: Leonardo Bras <leobras@redhat.com>
Cc: linux-kernel@vger.kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, 
	alexghiti@rivosinc.com, charlie@rivosinc.com, xiao.w.wang@intel.com, 
	david@redhat.com, panqinglin2020@iscas.ac.cn, rick.p.edgecombe@intel.com, 
	willy@infradead.org, bjorn@rivosinc.com, conor.dooley@microchip.com, 
	cleger@rivosinc.com, linux-riscv@lists.infradead.org, 
	Guo Ren <guoren@linux.alibaba.com>, stable@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, Dec 22, 2023 at 1:28=E2=80=AFPM Leonardo Bras <leobras@redhat.com> =
wrote:
>
> On Fri, Dec 22, 2023 at 12:50:44PM +0800, Guo Ren wrote:
> > On Fri, Dec 22, 2023 at 12:43=E2=80=AFPM Leonardo Bras <leobras@redhat.=
com> wrote:
> > >
> > > On Fri, Dec 22, 2023 at 12:26:19PM +0800, Guo Ren wrote:
> > > > On Fri, Dec 22, 2023 at 11:35=E2=80=AFAM Leonardo Bras <leobras@red=
hat.com> wrote:
> > > > >
> > > > > On Thu, Dec 21, 2023 at 10:46:59AM -0500, guoren@kernel.org wrote=
:
> > > > > > From: Guo Ren <guoren@linux.alibaba.com>
> > > > > >
> > > > > > When the task is in COMPAT mode, the arch_get_mmap_end should b=
e 2GB,
> > > > > > not TASK_SIZE_64. The TASK_SIZE has contained is_compat_mode()
> > > > > > detection, so change the definition of STACK_TOP_MAX to TASK_SI=
ZE
> > > > > > directly.
> > > > >
> > > > > ok
> > > > >
> > > > > >
> > > > > > Cc: stable@vger.kernel.org
> > > > > > Fixes: add2cc6b6515 ("RISC-V: mm: Restrict address space for sv=
39,sv48,sv57")
> > > > > > Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
> > > > > > Signed-off-by: Guo Ren <guoren@kernel.org>
> > > > > > ---
> > > > > >  arch/riscv/include/asm/processor.h | 6 ++----
> > > > > >  1 file changed, 2 insertions(+), 4 deletions(-)
> > > > > >
> > > > > > diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/in=
clude/asm/processor.h
> > > > > > index f19f861cda54..1f538fc4448d 100644
> > > > > > --- a/arch/riscv/include/asm/processor.h
> > > > > > +++ b/arch/riscv/include/asm/processor.h
> > > > > > @@ -16,15 +16,13 @@
> > > > > >
> > > > > >  #ifdef CONFIG_64BIT
> > > > > >  #define DEFAULT_MAP_WINDOW   (UL(1) << (MMAP_VA_BITS - 1))
> > > > > > -#define STACK_TOP_MAX                TASK_SIZE_64
> > > > > > +#define STACK_TOP_MAX                TASK_SIZE
> > > > >
> > > > > It means STACK_TOP_MAX will be in 64BIT:
> > > > > - TASK_SIZE_32 if compat_mode=3Dy
> > > > > - TASK_SIZE_64 if compat_mode=3Dn
> > > > >
> > > > > Makes sense for me.
> > > > >
> > > > > >
> > > > > >  #define arch_get_mmap_end(addr, len, flags)                  \
> > > > > >  ({                                                           \
> > > > > >       unsigned long mmap_end;                                 \
> > > > > >       typeof(addr) _addr =3D (addr);                           =
 \
> > > > > > -     if ((_addr) =3D=3D 0 || (IS_ENABLED(CONFIG_COMPAT) && is_=
compat_task())) \
> > > > > > -             mmap_end =3D STACK_TOP_MAX;                      =
 \
> > > > > > -     else if ((_addr) >=3D VA_USER_SV57)                      =
 \
> > > > > > +     if ((_addr) =3D=3D 0 || (_addr) >=3D VA_USER_SV57)       =
     \
> > > > > >               mmap_end =3D STACK_TOP_MAX;                      =
 \
> > > > > >       else if ((((_addr) >=3D VA_USER_SV48)) && (VA_BITS >=3D V=
A_BITS_SV48)) \
> > > > > >               mmap_end =3D VA_USER_SV48;                       =
 \
> > > > >
> > > > >
> > > > > I don't think I got this change, or how it's connected to the com=
mit msg.
> > > > The above is just code simplification; if STACK_TOP_MAX is TASK_SIZ=
E, then
> > > >
> > > >      if ((_addr) =3D=3D 0 || (IS_ENABLED(CONFIG_COMPAT) && is_compa=
t_task())) \
> > > >              mmap_end =3D STACK_TOP_MAX;                       \
> > > >     else if ((_addr) >=3D VA_USER_SV57)                       \
> > > >
> > > > is equal to:
> > > >
> > > >      if ((_addr) =3D=3D 0 || (_addr) >=3D VA_USER_SV57)            =
\
> > >
> > > I am failing to understand exactly how are they equal.
> > > I mean, what in your STACK_TOP_MAX change made them equal?
> > #define STACK_TOP_MAX TASK_SIZE
> > #define TASK_SIZE       (is_compat_task() ? TASK_SIZE_32 : TASK_SIZE_64=
)
> >
>
> yes, I am aware. Let's do a simple test with the new code and
> addr =3D 2^27 (random 32-bit addr) and compat mode.
>
> if ((_addr) =3D=3D 0 || (_addr) >=3D VA_USER_SV57)
>         // Evaluates to false: 2^27 !=3D 0, and is < 2^57
> else if ((((_addr) >=3D VA_USER_SV48)) && (VA_BITS >=3D VA_BITS_SV48))
>         // Evaluates to false: 2^27 < 2^48
> else
>         mmap_end =3D VA_USER_SV39;
>
> mmap_end =3D VA_USER_SV39, even in compat_mode.
>
> We need the extra is_compat_task() if we want to return 2^32.
Yes, my stupid, I fell into the wrong logic. Sorry for the noisy part,
which should be removed.

>
> Thanks!
> Leo
>
>
> > >
> > > See below, the behavior changed:
> > > >
> > > > >
> > > > > Before:
> > > > > - addr =3D=3D 0, or addr > 2^57, or compat: mmap_end =3D STACK_TO=
P_MAX
> > > > > - 2^48 < addr < 2^57: mmap_end =3D 2^48
> > > > > - 0 < addr < 2^48 : mmap_end =3D 2^39
> > > > >
> > > > > Now:
> > > > > - addr =3D=3D 0, or addr > 2^57: mmap_end =3D STACK_TOP_MAX
> > > > > - 2^48 < addr < 2^57: mmap_end =3D 2^48
> > > > > - 0 < addr < 2^48 : mmap_end =3D 2^39
> > > > >
> > > > > IIUC compat mode addr will be < 2^32, so will always have mmap_en=
d =3D 2^39
> > > > > if addr !=3D 0. Is that desireable?
> > > > > (if not, above change is unneeded)
> > > > >
> > >
> > > ^
> > >
> > > With your change on STACK_TOP_MAX only (not changing arch_get_mmap_en=
d),
> > > you would have:
> > >
> > > - compat_mode & (0 < addr < 2^32)       -> mmap_end =3D 2^32
> > compat_mode      -> mmap_end =3D 2^32
> >
>
> This is correct!
> Yeah, since you changed STACK_TOP_MAX to be 2^32 in compat mode,
> any addr value < 2^32 with compat value will return 2^32.
> (without the change in arch_get_mmap_end(), that is.)
>
> > > - non-compat, addr =3D=3D 0, or addr > 2^57 -> mmap_end =3D TASK_SIZE=
_64
> > > - non-compat, (2^48 < addr < 2^57)      -> mmap_end =3D 2^48
> > > - non-compat, (0 < addr < 2^48)         -> mmap_end =3D 2^39
> > >
> > > Which seems more likely, based on Charlie comments.
> > >
> > > Thanks,
> > > Leo
> > >
> > > > > Also, unrelated to the change:
> > > > > - 2^48 < addr < 2^57: mmap_end =3D 2^48
> > > > > Is the above correct?
> > > > > It looks like it should be 2^57 instead, and a new if clause for
> > > > > 2^32 < addr < 2^48 should have mmap_end =3D 2^48.
> > > > >
> > > > > Do I get it wrong?
> > > > Maybe I should move this into the optimization part.
> > > >
> > > > >
> > > > > (I will send an RFC 'fixing' the code the way I am whinking it sh=
ould look
> > > > > like)
> > > > >
> > > > > Thanks,
> > > > > Leo
> > > > >
> > > > >
> > > > >
> > > > >
> > > > >
> > > > > > --
> > > > > > 2.40.1
> > > > > >
> > > > >
> > > >
> > > >
> > > > --
> > > > Best Regards
> > > >  Guo Ren
> > > >
> > >
> >
> >
> > --
> > Best Regards
> >  Guo Ren
> >
>


--=20
Best Regards
 Guo Ren