From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752504AbeB0IV5 (ORCPT ); Tue, 27 Feb 2018 03:21:57 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:37845 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751993AbeB0IVx (ORCPT ); Tue, 27 Feb 2018 03:21:53 -0500 X-Google-Smtp-Source: AH8x226SSdCdDvKWyt7sQ/j3GzogUlx8fYl30S0jM+Wzju1ZUie0gLEa43YmjRpXu3Q6pA7CCvo+6Q== Date: Tue, 27 Feb 2018 11:21:42 +0300 From: "Kirill A. Shutemov" To: kernel test robot Cc: "Kirill A. Shutemov" , LKP , linux-pm@vger.kernel.org, linux-efi@vger.kernel.org, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, Ingo Molnar , wfg@linux.intel.com Subject: Re: 91f606a8fa ("x86/mm: Replace compile-time checks for 5-level .."): BUG: kernel reboot-without-warning in boot stage Message-ID: <20180227082142.7qxtlcx3hkb22abn@node.shutemov.name> References: <5a94243e.XdjEw/cR1zAcoW8q%fengguang.wu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5a94243e.XdjEw/cR1zAcoW8q%fengguang.wu@intel.com> User-Agent: NeoMutt/20171215 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 26, 2018 at 11:14:06PM +0800, kernel test robot wrote: > Greetings, > > 0day kernel testing robot got the below dmesg and the first bad commit is > > https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/mm > > commit 91f606a8fa68264224cbc76888fa8649cdbe9990 > Author: Kirill A. Shutemov > AuthorDate: Wed Feb 14 21:25:41 2018 +0300 > Commit: Ingo Molnar > CommitDate: Fri Feb 16 10:48:49 2018 +0100 > > x86/mm: Replace compile-time checks for 5-level paging with runtime-time checks > > This patch converts the of CONFIG_X86_5LEVEL check to runtime checks for > p4d folding. > > Signed-off-by: Kirill A. Shutemov > Cc: Andy Lutomirski > Cc: Arjan van de Ven > Cc: Borislav Petkov > Cc: Dan Williams > Cc: Dave Hansen > Cc: David Woodhouse > Cc: Josh Poimboeuf > Cc: Linus Torvalds > Cc: Peter Zijlstra > Cc: Thomas Gleixner > Cc: linux-mm@kvack.org > Link: http://lkml.kernel.org/r/20180214182542.69302-9-kirill.shutemov@linux.intel.com > Signed-off-by: Ingo Molnar > > 98219dda2a x86/mm: Fold p4d page table layer at runtime > 91f606a8fa x86/mm: Replace compile-time checks for 5-level paging with runtime-time checks > 1ea4fe8497 Merge branch 'x86/boot' into x86/mm, to unify branches > 94991480c2 Merge branch 'x86/pti' > f1753f6424 Add linux-next specific files for 20180226 Patch below should help. Please check. diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index 81dda8d1d0bd..163e01a0631d 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h @@ -224,9 +224,9 @@ static inline void native_set_p4d(p4d_t *p4dp, p4d_t p4d) return; } - pgd = native_make_pgd(p4d_val(p4d)); + pgd = native_make_pgd(native_p4d_val(p4d)); pgd = pti_set_user_pgd((pgd_t *)p4dp, pgd); - *p4dp = native_make_p4d(pgd_val(pgd)); + *p4dp = native_make_p4d(native_pgd_val(pgd)); } static inline void native_p4d_clear(p4d_t *p4d) -- Kirill A. Shutemov