From: "Vincent Stehlé" <vincent.stehle@arm.com>
To: u-boot@lists.denx.de
Subject: [PATCH 1/1] sandbox: fix sandbox_reset()
Date: Wed, 12 May 2021 19:53:13 +0200 [thread overview]
Message-ID: <YJwWCUevP64Q44H1@debian> (raw)
In-Reply-To: <20210512163851.135479-1-xypron.glpk@gmx.de>
On Wed, May 12, 2021 at 06:38:51PM +0200, Heinrich Schuchardt wrote:
> state_uninit() and dm_uninit() are mutually exclusive:
>
> state_uninit() prints via drivers. So it cannot be executed after
> dm_uninit().
>
> dm_uninit() requires memory. So it cannot be executed after state_uninit()
> which releases all memory.
>
> Just skip dm_uninit() when resetting the sandbox. We will wake up in a new
> process and allocate new memory. So this cleanup is not required. We don't
> do it in sandbox_exit() either.
>
> This avoids a segmentation error when efi_reset_system_boottime() is
> invoked by a UEFI application.
Hi Heinrich,
Thanks for fixing this!
Before, I was hitting the following segfault with the sandbox under qemu arm64
when running the UEFI SCT:
Boot services test: ExitBootServices_Conf
Iterations: 1/1
System will cold reset after 2 second and test will be resumed after reboot.resetting ...
Writing sandbox state
qemu: uncaught target signal 11 (Segmentation fault) - core dumped
With your patch I do not hit this segfault anymore.
FWIW, feel free to add (or not):
Tested-by: Vincent Stehl? <vincent.stehle@arm.com>
Best regards,
Vincent.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
> arch/sandbox/cpu/start.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
> index e87365e800..4ffd97ccbc 100644
> --- a/arch/sandbox/cpu/start.c
> +++ b/arch/sandbox/cpu/start.c
> @@ -425,9 +425,6 @@ void sandbox_reset(void)
> if (state_uninit())
> os_exit(2);
>
> - if (dm_uninit())
> - os_exit(2);
> -
> /* Restart U-Boot */
> os_relaunch(os_argv);
> }
> --
> 2.30.2
>
next prev parent reply other threads:[~2021-05-12 17:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 16:38 [PATCH 1/1] sandbox: fix sandbox_reset() Heinrich Schuchardt
2021-05-12 17:53 ` Vincent Stehlé [this message]
2021-05-15 15:20 ` Simon Glass
2021-07-04 20:15 ` Simon Glass
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=YJwWCUevP64Q44H1@debian \
--to=vincent.stehle@arm.com \
--cc=u-boot@lists.denx.de \
/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.