From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754322AbdGUJnM (ORCPT ); Fri, 21 Jul 2017 05:43:12 -0400 Received: from terminus.zytor.com ([65.50.211.136]:59731 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754027AbdGUJnK (ORCPT ); Fri, 21 Jul 2017 05:43:10 -0400 Date: Fri, 21 Jul 2017 02:38:36 -0700 From: "tip-bot for Kirill A. Shutemov" Message-ID: Cc: hpa@zytor.com, luto@amacapital.net, linux-kernel@vger.kernel.org, tglx@linutronix.de, kirill.shutemov@linux.intel.com, akpm@linux-foundation.org, peterz@infradead.org, torvalds@linux-foundation.org, mingo@kernel.org, dave.hansen@intel.com Reply-To: tglx@linutronix.de, luto@amacapital.net, hpa@zytor.com, linux-kernel@vger.kernel.org, dave.hansen@intel.com, mingo@kernel.org, kirill.shutemov@linux.intel.com, torvalds@linux-foundation.org, peterz@infradead.org, akpm@linux-foundation.org In-Reply-To: <20170716225954.74185-2-kirill.shutemov@linux.intel.com> References: <20170716225954.74185-2-kirill.shutemov@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm/dump_pagetables: Generalize address normalization Git-Commit-ID: 3a366f791d83c690f3042e37f410f38de04fb4c7 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: 3a366f791d83c690f3042e37f410f38de04fb4c7 Gitweb: http://git.kernel.org/tip/3a366f791d83c690f3042e37f410f38de04fb4c7 Author: Kirill A. Shutemov AuthorDate: Mon, 17 Jul 2017 01:59:47 +0300 Committer: Ingo Molnar CommitDate: Fri, 21 Jul 2017 10:05:17 +0200 x86/mm/dump_pagetables: Generalize address normalization Modify normalize_addr to handle different sizes of virtual address space. It's preparation for enabling 5-level paging. Signed-off-by: Kirill A. Shutemov 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-2-kirill.shutemov@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/mm/dump_pagetables.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 0470826..a824d57 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -188,11 +188,12 @@ static void printk_prot(struct seq_file *m, pgprot_t prot, int level, bool dmsg) */ static unsigned long normalize_addr(unsigned long u) { -#ifdef CONFIG_X86_64 - return (signed long)(u << 16) >> 16; -#else - return u; -#endif + int shift; + if (!IS_ENABLED(CONFIG_X86_64)) + return u; + + shift = 64 - (__VIRTUAL_MASK_SHIFT + 1); + return (signed long)(u << shift) >> shift; } /*