mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Borislav Petkov <bp@alien8.de>
To: Krzysztof Mazur <krzysiek@podlesie.net>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
	Andrew Morton <akpm@linux-foundation.org>,
	Andy Lutomirski <luto@amacapital.net>,
	"H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
	Laszlo Ersek <lersek@redhat.com>,
	Matt Fleming <matt.fleming@intel.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCH] x86/setup: fix low identity map for >= 2GB kernel range
Date: Fri, 6 Nov 2015 14:27:33 +0100	[thread overview]
Message-ID: <20151106132733.GC19522@pd.tnic> (raw)
In-Reply-To: <1446815916-22105-1-git-send-email-krzysiek@podlesie.net>

On Fri, Nov 06, 2015 at 02:18:36PM +0100, Krzysztof Mazur wrote:
> The commit f5f3497cad8c8416a74b9aaceb127908755d020a (x86/setup: Extend
> low identity map to cover whole kernel range) extended the low identity
> mapping. However, if the kernel uses more than 2 GB (VMSPLIT_2G_OPT or
> VMSPLIT_1G memory split), the normal memory mapping is overwritten by
> the low identity mapping causing crash. To avoid overwritting, limit the
> low identity map to cover only memory before kernel range (PAGE_OFFSET).
> 
> Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
> ---
> The bug can be also fixed by copying identity mapping before copying
> kernel address range, but this fix is smaller.
> 
> It might be also helpful to add a warning, if the low identity mapping
> is truncated due to kernel mapping (KERNEL_PGD_BOUNDARY < KERNEL_PGD_PTRS).
> 
>  arch/x86/kernel/setup.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index a3cccbf..37c8ea8 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -1180,7 +1180,7 @@ void __init setup_arch(char **cmdline_p)
>  	 */
>  	clone_pgd_range(initial_page_table,
>  			swapper_pg_dir     + KERNEL_PGD_BOUNDARY,
> -			KERNEL_PGD_PTRS);
> +			min(KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));
>  #endif
>  
>  	tboot_probe();

http://git.kernel.org/tip/1c5dac914794f0170e1582d8ffdee52d30e0e4dd

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.

  reply	other threads:[~2015-11-06 13:27 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-06 13:18 Krzysztof Mazur
2015-11-06 13:27 ` Borislav Petkov [this message]
2015-11-06 14:11   ` Krzysztof Mazur
2015-11-06 15:00     ` Paolo Bonzini
2015-11-07  9:43     ` Matt Fleming
2015-11-07  9:44 ` [tip:x86/urgent] x86/setup: Fix " tip-bot for Krzysztof Mazur

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=20151106132733.GC19522@pd.tnic \
    --to=bp@alien8.de \
    --cc=akpm@linux-foundation.org \
    --cc=hpa@zytor.com \
    --cc=krzysiek@podlesie.net \
    --cc=lersek@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=matt.fleming@intel.com \
    --cc=mingo@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=tglx@linutronix.de \
    --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

Powered by JetHome