From: Palmer Dabbelt <palmer@dabbelt.com>
To: Atish Patra <Atish.Patra@wdc.com>
Cc: aou@eecs.berkeley.edu, vincent.chen@sifive.com,
Anup Patel <Anup.Patel@wdc.com>,
linux-kernel@vger.kernel.org, sudeep.holla@arm.com,
Atish Patra <Atish.Patra@wdc.com>,
zong.li@sifive.com, Paul Walmsley <paul.walmsley@sifive.com>,
greentime.hu@sifive.com, linux-riscv@lists.infradead.org
Subject: Re: [PATCH 4/4] riscv: Parse all memory blocks to remove unusable memory
Date: Fri, 24 Jul 2020 22:12:42 -0700 (PDT) [thread overview]
Message-ID: <mhng-ab4785af-26a2-4494-81f7-b0c206711515@palmerdabbelt-glaptop1> (raw)
In-Reply-To: <20200715233009.27183-5-atish.patra@wdc.com>
On Wed, 15 Jul 2020 16:30:09 PDT (-0700), Atish Patra wrote:
> Currently, maximum physical memory allowed is equal to -PAGE_OFFSET.
> That's why we remove any memory blocks spanning beyond that size. However,
> it is done only for memblock containing linux kernel which will not work
> if there are multiple memblocks.
>
> Process all memory blocks to figure out how much memory needs to be removed
> and remove at the end instead of updating the memblock list in place.
>
> Signed-off-by: Atish Patra <atish.patra@wdc.com>
> ---
> arch/riscv/mm/init.c | 31 +++++++++++++++++--------------
> 1 file changed, 17 insertions(+), 14 deletions(-)
>
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index f818a47a72d1..79e9d55bdf1a 100644
> --- a/arch/riscv/mm/init.c
> +++ b/arch/riscv/mm/init.c
> @@ -147,26 +147,29 @@ void __init setup_bootmem(void)
> {
> struct memblock_region *reg;
> phys_addr_t mem_size = 0;
> + phys_addr_t total_mem = 0;
> + phys_addr_t mem_start, end = 0;
> phys_addr_t vmlinux_end = __pa_symbol(&_end);
> phys_addr_t vmlinux_start = __pa_symbol(&_start);
>
> /* Find the memory region containing the kernel */
> for_each_memblock(memory, reg) {
> - phys_addr_t end = reg->base + reg->size;
> -
> - if (reg->base <= vmlinux_start && vmlinux_end <= end) {
> - mem_size = min(reg->size, (phys_addr_t)-PAGE_OFFSET);
> -
> - /*
> - * Remove memblock from the end of usable area to the
> - * end of region
> - */
> - if (reg->base + mem_size < end)
> - memblock_remove(reg->base + mem_size,
> - end - reg->base - mem_size);
> - }
> + end = reg->base + reg->size;
> + if (!total_mem)
> + mem_start = reg->base;
> + if (reg->base <= vmlinux_start && vmlinux_end <= end)
> + BUG_ON(reg->size == 0);
> + total_mem = total_mem + reg->size;
> }
> - BUG_ON(mem_size == 0);
> +
> + /*
> + * Remove memblock from the end of usable area to the
> + * end of region
> + */
> + mem_size = min(total_mem, (phys_addr_t)-PAGE_OFFSET);
> + if (mem_start + mem_size < end)
> + memblock_remove(mem_start + mem_size,
> + end - mem_start - mem_size);
>
> /* Reserve from the start of the kernel to the end of the kernel */
> memblock_reserve(vmlinux_start, vmlinux_end - vmlinux_start);
Thanks, this one is also on fixes.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
prev parent reply other threads:[~2020-07-25 5:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 23:30 [PATCH 0/4] Few mm & exception handling fixes Atish Patra
2020-07-15 23:30 ` [PATCH 1/4] RISC-V: Setup exception vector early Atish Patra
2020-07-25 5:12 ` Palmer Dabbelt
2020-07-25 5:26 ` Atish Patra
2020-07-15 23:30 ` [PATCH 2/4] RISC-V: Set maximum number of mapped pages correctly Atish Patra
2020-07-25 5:12 ` Palmer Dabbelt
2020-07-15 23:30 ` [PATCH 3/4] RISC-V: Do not rely on initrd_start/end computed during early dt parsing Atish Patra
2020-07-25 5:12 ` Palmer Dabbelt
2020-07-25 5:44 ` Atish Patra
2020-07-15 23:30 ` [PATCH 4/4] riscv: Parse all memory blocks to remove unusable memory Atish Patra
2020-07-25 5:12 ` Palmer Dabbelt [this message]
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=mhng-ab4785af-26a2-4494-81f7-b0c206711515@palmerdabbelt-glaptop1 \
--to=palmer@dabbelt.com \
--cc=Anup.Patel@wdc.com \
--cc=Atish.Patra@wdc.com \
--cc=aou@eecs.berkeley.edu \
--cc=greentime.hu@sifive.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=paul.walmsley@sifive.com \
--cc=sudeep.holla@arm.com \
--cc=vincent.chen@sifive.com \
--cc=zong.li@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).