From: Alistair Francis <Alistair.Francis@wdc.com>
To: "paul.walmsley@sifive.com" <paul.walmsley@sifive.com>,
"palmer@sifive.com" <palmer@sifive.com>,
Anup Patel <Anup.Patel@wdc.com>
Cc: "anup@brainfault.org" <anup@brainfault.org>,
"linux-riscv@lists.infradead.org"
<linux-riscv@lists.infradead.org>,
Atish Patra <Atish.Patra@wdc.com>,
"hch@infradead.org" <hch@infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] RISC-V: Fix FIXMAP area corruption on RV32 systems
Date: Fri, 16 Aug 2019 17:57:29 +0000 [thread overview]
Message-ID: <4c4831bc93995c54c8df0de14da23b85975f62f8.camel@wdc.com> (raw)
In-Reply-To: <20190816114915.4648-1-anup.patel@wdc.com>
On Fri, 2019-08-16 at 11:49 +0000, Anup Patel wrote:
> Currently, the order of various virtual memory areas in increasing
> order of virtual addresses is as follows:
> 1. User space area
> 2. FIXMAP area
> 3. VMALLOC area
> 4. Kernel area
>
> The user space area starts at 0x0 and it's maximum size is
> represented
> by TASK_SIZE.
>
> On RV32 systems, TASK_SIZE is defined as VMALLOC_START which causes
> the
> user space area to overlap the FIXMAP area. This allows user space
> apps
> to potentially corrupt the FIXMAP area and kernel OF APIs will crash
> whenever they access corrupted FDT in the FIXMAP area.
>
> On RV64 systems, TASK_SIZE is set to fixed 256GB and no other areas
> happen to overlap so we don't see any FIXMAP area corruptions.
>
> This patch fixes FIXMAP area corruption on RV32 systems by setting
> TASK_SIZE to FIXADDR_START. We also move FIXADDR_TOP, FIXADDR_SIZE,
> and FIXADDR_START defines to asm/pgtable.h so that we can avoid
> cyclic
> header includes.
>
> Signed-off-by: Anup Patel <anup.patel@wdc.com>
This fixes the RV32 issue.
Tested-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> arch/riscv/include/asm/fixmap.h | 4 ----
> arch/riscv/include/asm/pgtable.h | 12 ++++++++++--
> 2 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/arch/riscv/include/asm/fixmap.h
> b/arch/riscv/include/asm/fixmap.h
> index 9c66033c3a54..161f28d04a07 100644
> --- a/arch/riscv/include/asm/fixmap.h
> +++ b/arch/riscv/include/asm/fixmap.h
> @@ -30,10 +30,6 @@ enum fixed_addresses {
> __end_of_fixed_addresses
> };
>
> -#define FIXADDR_SIZE (__end_of_fixed_addresses * PAGE_SIZE)
> -#define FIXADDR_TOP (VMALLOC_START)
> -#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
> -
> #define FIXMAP_PAGE_IO PAGE_KERNEL
>
> #define __early_set_fixmap __set_fixmap
> diff --git a/arch/riscv/include/asm/pgtable.h
> b/arch/riscv/include/asm/pgtable.h
> index a364aba23d55..9dd08a006a28 100644
> --- a/arch/riscv/include/asm/pgtable.h
> +++ b/arch/riscv/include/asm/pgtable.h
> @@ -420,14 +420,22 @@ static inline void pgtable_cache_init(void)
> #define VMALLOC_END (PAGE_OFFSET - 1)
> #define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE)
>
> +#define FIXADDR_TOP (VMALLOC_START)
> +#ifdef CONFIG_64BIT
> +#define FIXADDR_SIZE PMD_SIZE
> +#else
> +#define FIXADDR_SIZE PGDIR_SIZE
> +#endif
> +#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
> +
> /*
> - * Task size is 0x4000000000 for RV64 or 0xb800000 for RV32.
> + * Task size is 0x4000000000 for RV64 or 0x9fc00000 for RV32.
> * Note that PGDIR_SIZE must evenly divide TASK_SIZE.
> */
> #ifdef CONFIG_64BIT
> #define TASK_SIZE (PGDIR_SIZE * PTRS_PER_PGD / 2)
> #else
> -#define TASK_SIZE VMALLOC_START
> +#define TASK_SIZE FIXADDR_START
> #endif
>
> #include <asm-generic/pgtable.h>
next prev parent reply other threads:[~2019-08-16 17:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-16 11:49 [PATCH] RISC-V: Fix FIXMAP area corruption on RV32 systems Anup Patel
2019-08-16 17:57 ` Alistair Francis [this message]
2019-08-18 18:19 ` Christoph Hellwig
2019-08-19 4:49 ` Anup Patel
2019-08-26 21:17 ` Palmer Dabbelt
2019-08-26 21:30 ` Alistair Francis
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=4c4831bc93995c54c8df0de14da23b85975f62f8.camel@wdc.com \
--to=alistair.francis@wdc.com \
--cc=Anup.Patel@wdc.com \
--cc=Atish.Patra@wdc.com \
--cc=anup@brainfault.org \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@sifive.com \
--cc=paul.walmsley@sifive.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).