mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Tom Lendacky <thomas.lendacky@amd.com>
To: x86@kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
	linux-kernel@vger.kernel.org, Ingo Molnar <mingo@redhat.com>,
	Borislav Petkov <bp@alien8.de>, "H. Peter Anvin" <hpa@zytor.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Tomeu Vizoso <tomeu@tomeuvizoso.net>
Subject: Re: [PATCH] x86/boot: Fix boot failure when SMP MP-table is based at 0
Date: Mon, 6 Nov 2017 14:25:35 -0600	[thread overview]
Message-ID: <827db6ca-89d7-0863-35ab-31059dea6bf1@amd.com> (raw)
In-Reply-To: <20171106201753.23059.86674.stgit@tlendack-t1.amdoffice.net>

On 11/6/2017 2:17 PM, Tom Lendacky wrote:
> When crosvm is used to boot a kernel as a VM, the SMP MP-table is found
> at physical address 0x0. This causes mpf_base to be set to 0 and a
> subsequent "if (!mpf_base)" check in default_get_smp_config() results in
> the MP-table not being parsed.  Further into the boot this results in an
> oops when attempting a read_apic_id().
> 
> Add a boolean variable that is set to true when the MP-table is found.
> Use this variable for testing if the MP-table was found so that even a
> value of 0 for mpf_base will result in continued parsing of the MP-table.
> 
> Reported-by: Tomeu Vizoso <tomeu@tomeuvizoso.net>
> Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>

I forgot to add a Fixes tag. If the patch is acceptable as is, let me know
if you would prefer another version with the Fixes tag or if you can add
it when merged:

Fixes: 5997efb96756 ("x86/boot: Use memremap() to map the MPF and MPC data")

Thanks,
Tom

> ---
>   arch/x86/kernel/mpparse.c |    6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
> index 5cbb317..c3d3094 100644
> --- a/arch/x86/kernel/mpparse.c
> +++ b/arch/x86/kernel/mpparse.c
> @@ -430,6 +430,7 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)
>   }
>   
>   static unsigned long mpf_base;
> +static bool mpf_found;
>   
>   static unsigned long __init get_mpc_size(unsigned long physptr)
>   {
> @@ -503,7 +504,7 @@ void __init default_get_smp_config(unsigned int early)
>   	if (!smp_found_config)
>   		return;
>   
> -	if (!mpf_base)
> +	if (!mpf_found)
>   		return;
>   
>   	if (acpi_lapic && early)
> @@ -592,6 +593,7 @@ static int __init smp_scan_config(unsigned long base, unsigned long length)
>   			smp_found_config = 1;
>   #endif
>   			mpf_base = base;
> +			mpf_found = true;
>   
>   			pr_info("found SMP MP-table at [mem %#010lx-%#010lx] mapped at [%p]\n",
>   				base, base + sizeof(*mpf) - 1, mpf);
> @@ -857,7 +859,7 @@ static int __init update_mp_table(void)
>   	if (!enable_update_mptable)
>   		return 0;
>   
> -	if (!mpf_base)
> +	if (!mpf_found)
>   		return 0;
>   
>   	mpf = early_memremap(mpf_base, sizeof(*mpf));
> 

  reply	other threads:[~2017-11-06 20:25 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-06 20:17 Tom Lendacky
2017-11-06 20:25 ` Tom Lendacky [this message]
2017-11-06 21:41 ` H. Peter Anvin
2017-11-06 22:01   ` Tom Lendacky
2017-11-06 23:00     ` Tom Lendacky
2017-11-16 11:40       ` Borislav Petkov
2017-11-08  8:37     ` Tomeu Vizoso
2017-11-16  9:16       ` Tomeu Vizoso
2017-11-16  9:20         ` Tomeu Vizoso
2017-11-17 13:03     ` Thomas Gleixner
2017-11-17 15:25 ` [tip:x86/urgent] " tip-bot for Tom Lendacky

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=827db6ca-89d7-0863-35ab-31059dea6bf1@amd.com \
    --to=thomas.lendacky@amd.com \
    --cc=bp@alien8.de \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=tomeu@tomeuvizoso.net \
    --cc=x86@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®