From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754391AbdGUJo3 (ORCPT ); Fri, 21 Jul 2017 05:44:29 -0400 Received: from terminus.zytor.com ([65.50.211.136]:48511 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753831AbdGUJo0 (ORCPT ); Fri, 21 Jul 2017 05:44:26 -0400 Date: Fri, 21 Jul 2017 02:39:20 -0700 From: "tip-bot for Kirill A. Shutemov" Message-ID: Cc: linux-kernel@vger.kernel.org, kirill.shutemov@linux.intel.com, dave.hansen@intel.com, hpa@zytor.com, mingo@kernel.org, jgross@suse.com, torvalds@linux-foundation.org, tglx@linutronix.de, akpm@linux-foundation.org, luto@amacapital.net, peterz@infradead.org Reply-To: linux-kernel@vger.kernel.org, kirill.shutemov@linux.intel.com, dave.hansen@intel.com, mingo@kernel.org, jgross@suse.com, hpa@zytor.com, akpm@linux-foundation.org, luto@amacapital.net, peterz@infradead.org, torvalds@linux-foundation.org, tglx@linutronix.de In-Reply-To: <20170716225954.74185-4-kirill.shutemov@linux.intel.com> References: <20170716225954.74185-4-kirill.shutemov@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/xen: Redefine XEN_ELFNOTE_INIT_P2M using PUD_SIZE * PTRS_PER_PUD Git-Commit-ID: daaa42f04178ac7b02e4d43cdfc7fac48430152e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: daaa42f04178ac7b02e4d43cdfc7fac48430152e Gitweb: http://git.kernel.org/tip/daaa42f04178ac7b02e4d43cdfc7fac48430152e Author: Kirill A. Shutemov AuthorDate: Mon, 17 Jul 2017 01:59:49 +0300 Committer: Ingo Molnar CommitDate: Fri, 21 Jul 2017 10:05:18 +0200 x86/xen: Redefine XEN_ELFNOTE_INIT_P2M using PUD_SIZE * PTRS_PER_PUD XEN_ELFNOTE_INIT_P2M has to be 512GB for both 4- and 5-level paging. (PUD_SIZE * PTRS_PER_PUD) would do this. Unfortunately, we cannot use P4D_SIZE, which would fit here. With current headers structure it cannot be used in assembly, if p4d level is folded. Signed-off-by: Kirill A. Shutemov Reviewed-by: Juergen Gross Cc: Andrew Morton Cc: Andy Lutomirski Cc: Dave Hansen Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-arch@vger.kernel.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20170716225954.74185-4-kirill.shutemov@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/xen/xen-head.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 72a8e6a..a7525e9 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -58,7 +58,7 @@ ENTRY(hypercall_page) #else ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, _ASM_PTR __START_KERNEL_map) /* Map the p2m table to a 512GB-aligned user address. */ - ELFNOTE(Xen, XEN_ELFNOTE_INIT_P2M, .quad PGDIR_SIZE) + ELFNOTE(Xen, XEN_ELFNOTE_INIT_P2M, .quad (PUD_SIZE * PTRS_PER_PUD)) #endif #ifdef CONFIG_XEN_PV ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, _ASM_PTR startup_xen)