From: Mike Rapoport <rppt@kernel.org>
To: openrisc@lists.librecores.org
Subject: [OpenRISC] [PATCH v2 1/3] openrisc: Reserve memblock for initrd
Date: Sun, 6 Sep 2020 09:15:38 +0300 [thread overview]
Message-ID: <20200906061538.GB1213823@kernel.org> (raw)
In-Reply-To: <20200905131935.972386-2-shorne@gmail.com>
On Sat, Sep 05, 2020 at 10:19:33PM +0900, Stafford Horne wrote:
> Recently OpenRISC added support for external initrd images, but I found
> some instability when using larger buildroot initrd images. It turned
> out that I forgot to reserve the memblock space for the initrd image.
>
> This patch fixes the instability issue by reserving memblock space.
>
> Fixes: ff6c923dbec3 ("openrisc: Add support for external initrd images")
> Signed-off-by: Stafford Horne <shorne@gmail.com>
Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>
> ---
> arch/openrisc/kernel/setup.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
> index b18e775f8be3..13c87f1f872b 100644
> --- a/arch/openrisc/kernel/setup.c
> +++ b/arch/openrisc/kernel/setup.c
> @@ -80,6 +80,16 @@ static void __init setup_memory(void)
> */
> memblock_reserve(__pa(_stext), _end - _stext);
>
> +#ifdef CONFIG_BLK_DEV_INITRD
> + /* Then reserve the initrd, if any */
> + if (initrd_start && (initrd_end > initrd_start)) {
> + unsigned long aligned_start = ALIGN_DOWN(initrd_start, PAGE_SIZE);
> + unsigned long aligned_end = ALIGN(initrd_end, PAGE_SIZE);
> +
> + memblock_reserve(__pa(aligned_start), aligned_end - aligned_start);
> + }
> +#endif /* CONFIG_BLK_DEV_INITRD */
> +
> early_init_fdt_reserve_self();
> early_init_fdt_scan_reserved_mem();
>
> --
> 2.26.2
>
--
Sincerely yours,
Mike.
WARNING: multiple messages have this Message-ID (diff)
From: Mike Rapoport <rppt@kernel.org>
To: Stafford Horne <shorne@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
Jonas Bonn <jonas@southpole.se>,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
Arvind Sankar <nivedita@alum.mit.edu>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
openrisc@lists.librecores.org
Subject: Re: [PATCH v2 1/3] openrisc: Reserve memblock for initrd
Date: Sun, 6 Sep 2020 09:15:38 +0300 [thread overview]
Message-ID: <20200906061538.GB1213823@kernel.org> (raw)
In-Reply-To: <20200905131935.972386-2-shorne@gmail.com>
On Sat, Sep 05, 2020 at 10:19:33PM +0900, Stafford Horne wrote:
> Recently OpenRISC added support for external initrd images, but I found
> some instability when using larger buildroot initrd images. It turned
> out that I forgot to reserve the memblock space for the initrd image.
>
> This patch fixes the instability issue by reserving memblock space.
>
> Fixes: ff6c923dbec3 ("openrisc: Add support for external initrd images")
> Signed-off-by: Stafford Horne <shorne@gmail.com>
Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>
> ---
> arch/openrisc/kernel/setup.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
> index b18e775f8be3..13c87f1f872b 100644
> --- a/arch/openrisc/kernel/setup.c
> +++ b/arch/openrisc/kernel/setup.c
> @@ -80,6 +80,16 @@ static void __init setup_memory(void)
> */
> memblock_reserve(__pa(_stext), _end - _stext);
>
> +#ifdef CONFIG_BLK_DEV_INITRD
> + /* Then reserve the initrd, if any */
> + if (initrd_start && (initrd_end > initrd_start)) {
> + unsigned long aligned_start = ALIGN_DOWN(initrd_start, PAGE_SIZE);
> + unsigned long aligned_end = ALIGN(initrd_end, PAGE_SIZE);
> +
> + memblock_reserve(__pa(aligned_start), aligned_end - aligned_start);
> + }
> +#endif /* CONFIG_BLK_DEV_INITRD */
> +
> early_init_fdt_reserve_self();
> early_init_fdt_scan_reserved_mem();
>
> --
> 2.26.2
>
--
Sincerely yours,
Mike.
next prev parent reply other threads:[~2020-09-06 6:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-05 13:19 [PATCH v2 0/3] OpenRISC fixes for 5.9 Stafford Horne
2020-09-05 13:19 ` [OpenRISC] [PATCH v2 1/3] openrisc: Reserve memblock for initrd Stafford Horne
2020-09-05 13:19 ` Stafford Horne
2020-09-05 13:25 ` [OpenRISC] " Stafford Horne
2020-09-05 13:25 ` Stafford Horne
2020-09-06 6:15 ` Mike Rapoport [this message]
2020-09-06 6:15 ` Mike Rapoport
2020-09-05 13:19 ` [OpenRISC] [PATCH v2 2/3] openrisc: Fix cache API compile issue when not inlining Stafford Horne
2020-09-05 13:19 ` Stafford Horne
2020-09-05 13:19 ` [OpenRISC] [PATCH v2 3/3] openrisc: Fix issue with get_user for 64-bit values Stafford Horne
2020-09-05 13:19 ` Stafford Horne
2020-09-05 13:57 ` [OpenRISC] " Luc Van Oostenryck
2020-09-05 13:57 ` Luc Van Oostenryck
2020-09-05 21:34 ` [OpenRISC] " Stafford Horne
2020-09-05 21:34 ` Stafford Horne
2020-09-06 0:22 ` [OpenRISC] " Luc Van Oostenryck
2020-09-06 0:22 ` Luc Van Oostenryck
2020-09-06 21:00 ` Stafford Horne
2020-09-06 21:00 ` Stafford Horne
2020-09-05 13:24 ` [PATCH v2 0/3] OpenRISC fixes for 5.9 Stafford Horne
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=20200906061538.GB1213823@kernel.org \
--to=rppt@kernel.org \
--cc=openrisc@lists.librecores.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.