From: Luis Chamberlain <mcgrof@kernel.org>
To: Alexandre Ghiti <alex@ghiti.fr>
Cc: Albert Ou <aou@eecs.berkeley.edu>,
Kees Cook <keescook@chromium.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Palmer Dabbelt <palmer@sifive.com>,
Will Deacon <will.deacon@arm.com>,
Russell King <linux@armlinux.org.uk>,
Ralf Baechle <ralf@linux-mips.org>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Paul Burton <paul.burton@mips.com>,
linux-riscv@lists.infradead.org,
Alexander Viro <viro@zeniv.linux.org.uk>,
James Hogan <jhogan@kernel.org>,
linux-fsdevel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
linux-mips@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH REBASE v4 12/14] mips: Replace arch specific way to determine 32bit task with generic version
Date: Wed, 24 Jul 2019 17:16:48 +0000 [thread overview]
Message-ID: <20190724171648.GW19023@42.do-not-panic.com> (raw)
In-Reply-To: <20190724055850.6232-13-alex@ghiti.fr>
On Wed, Jul 24, 2019 at 01:58:48AM -0400, Alexandre Ghiti wrote:
> Mips uses TASK_IS_32BIT_ADDR to determine if a task is 32bit, but
> this define is mips specific and other arches do not have it: instead,
> use !IS_ENABLED(CONFIG_64BIT) || is_compat_task() condition.
>
> Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
> Reviewed-by: Kees Cook <keescook@chromium.org>
> ---
> arch/mips/mm/mmap.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
> index faa5aa615389..d4eafbb82789 100644
> --- a/arch/mips/mm/mmap.c
> +++ b/arch/mips/mm/mmap.c
> @@ -17,6 +17,7 @@
> #include <linux/sched/signal.h>
> #include <linux/sched/mm.h>
> #include <linux/sizes.h>
> +#include <linux/compat.h>
>
> unsigned long shm_align_mask = PAGE_SIZE - 1; /* Sane caches */
> EXPORT_SYMBOL(shm_align_mask);
> @@ -191,7 +192,7 @@ static inline unsigned long brk_rnd(void)
>
> rnd = rnd << PAGE_SHIFT;
> /* 32MB for 32bit, 1GB for 64bit */
> - if (TASK_IS_32BIT_ADDR)
> + if (!IS_ENABLED(CONFIG_64BIT) || is_compat_task())
> rnd = rnd & SZ_32M;
> else
> rnd = rnd & SZ_1G;
> --
Since there are at least two users why not just create an inline for
this which describes what we are looking for and remove the comments?
Luis
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-07-24 17:18 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-24 5:58 [PATCH REBASE v4 00/14] Provide generic top-down mmap layout functions Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 01/14] mm, fs: Move randomize_stack_top from fs to mm Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 02/14] arm64: Make use of is_compat_task instead of hardcoding this test Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 03/14] arm64: Consider stack randomization for mmap base only when necessary Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 04/14] arm64, mm: Move generic mmap layout functions to mm Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 05/14] arm64, mm: Make randomization selected by generic topdown mmap layout Alexandre Ghiti
2019-07-24 17:11 ` Luis Chamberlain
2019-07-25 5:48 ` Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 06/14] arm: Properly account for stack randomization and stack guard gap Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 07/14] arm: Use STACK_TOP when computing mmap base address Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 08/14] arm: Use generic mmap top-down layout and brk randomization Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 09/14] mips: Properly account for stack randomization and stack guard gap Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 10/14] mips: Use STACK_TOP when computing mmap base address Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 11/14] mips: Adjust brk randomization offset to fit generic version Alexandre Ghiti
2019-07-25 6:22 ` Alexandre Ghiti
2019-07-25 20:00 ` Kees Cook
2019-07-26 0:55 ` Andrew Morton
2019-07-24 5:58 ` [PATCH REBASE v4 12/14] mips: Replace arch specific way to determine 32bit task with " Alexandre Ghiti
2019-07-24 17:16 ` Luis Chamberlain [this message]
2019-07-25 6:09 ` Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 13/14] mips: Use generic mmap top-down layout and brk randomization Alexandre Ghiti
2019-07-24 5:58 ` [PATCH REBASE v4 14/14] riscv: Make mmap allocation top-down by default Alexandre Ghiti
2019-07-26 0:20 ` Paul Walmsley
2019-07-26 11:48 ` Alexandre Ghiti
2019-07-26 20:15 ` Paul Walmsley
2019-07-24 17:17 ` [PATCH REBASE v4 00/14] Provide generic top-down mmap layout functions Luis Chamberlain
2019-07-25 6:10 ` Alexandre Ghiti
2019-07-24 20:18 ` [EXTERNAL][PATCH " Paul Burton
2019-07-25 6:21 ` Alexandre Ghiti
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=20190724171648.GW19023@42.do-not-panic.com \
--to=mcgrof@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=alex@ghiti.fr \
--cc=aou@eecs.berkeley.edu \
--cc=catalin.marinas@arm.com \
--cc=hch@lst.de \
--cc=jhogan@kernel.org \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=palmer@sifive.com \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.org \
--cc=viro@zeniv.linux.org.uk \
--cc=will.deacon@arm.com \
/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).