public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Baoquan He <bhe@redhat.com>
To: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com,
	kirill.shutemov@linux.intel.com
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
	kexec@lists.infradead.org, Baoquan He <bhe@redhat.com>
Subject: [PATCH 2/3] x86/kexec/64: Error out if try to jump to old 4-level kernel from 5-level kernel
Date: Wed, 29 Aug 2018 22:16:23 +0800	[thread overview]
Message-ID: <20180829141624.13985-3-bhe@redhat.com> (raw)
In-Reply-To: <20180829141624.13985-1-bhe@redhat.com>

In relocate_kernel() CR4.LA57 flag is set before kexec jumping if
the kernel has 5-level paging enabled. Then in boot/compressed/head_64.S,
it will check if the booting kernel is in 4-level or 5-level paging
mode, and handle accordingly. However, the old kernel which doesn't
contain the 5-level codes doesn't know how to cope with it, then #GP
triggered.

Instead of triggering #GP during kexec kernel boot, error out during
kexec loading if find out we are trying to jump to old 4-level kernel
from 5-level kernel.

Signed-off-by: Baoquan He <bhe@redhat.com>
---
 arch/x86/kernel/kexec-bzimage64.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
index 7326078eaa7a..f5fe94ee209a 100644
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@ -316,6 +316,11 @@ static int bzImage64_probe(const char *buf, unsigned long len)
 		return ret;
 	}
 
+	if (!(header->xloadflags & XLF_5LEVEL) && pgtable_l5_enabled()) {
+		pr_err("Can not jump to old 4-level kernel from 5-level kernel.\n");
+		return ret;
+	}
+
 	/* I've got a bzImage */
 	pr_debug("It's a relocatable bzImage64\n");
 	ret = 0;
-- 
2.13.6


  parent reply	other threads:[~2018-08-29 14:16 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-29 14:16 [PATCH 0/3] Add restrictions for kexec/kdump jumping between 5-level and 4-level kernel Baoquan He
2018-08-29 14:16 ` [PATCH 1/3] x86/boot: Add bit fields into xloadflags for 5-level kernel checking Baoquan He
2018-09-04  2:41   ` H. Peter Anvin
2018-09-04  3:44     ` Baoquan He
2018-09-04  4:13       ` H. Peter Anvin
2018-09-04  5:20         ` Baoquan He
2018-09-04  5:46           ` H. Peter Anvin
2018-09-04  6:06             ` Baoquan He
2018-09-04  6:36               ` H. Peter Anvin
2018-09-04  7:16                 ` Baoquan He
2018-09-04  8:42             ` Kirill A. Shutemov
2018-09-05  4:06               ` H. Peter Anvin
2018-09-05  8:02                 ` Thomas Gleixner
2018-09-26  7:54                   ` Baoquan He
2018-08-29 14:16 ` Baoquan He [this message]
2018-08-29 14:16 ` [PATCH 3/3] x86/kdump/64: Change the upper limit of crashkernel reservation Baoquan He
2018-08-30 13:50   ` Kirill A. Shutemov
2018-08-30 14:13     ` Baoquan He
2018-08-30 13:58 ` [PATCH 0/3] Add restrictions for kexec/kdump jumping between 5-level and 4-level kernel Kirill A. Shutemov
2018-08-30 14:12   ` Baoquan He
2018-08-30 14:27     ` Kirill A. Shutemov
2018-08-30 14:57       ` Baoquan He
2018-08-30 15:01         ` Baoquan He
2018-09-02 20:45         ` Kirill A. Shutemov

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=20180829141624.13985-3-bhe@redhat.com \
    --to=bhe@redhat.com \
    --cc=hpa@zytor.com \
    --cc=kexec@lists.infradead.org \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --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