From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759574AbbIVTua (ORCPT ); Tue, 22 Sep 2015 15:50:30 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54765 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752960AbbIVTu1 (ORCPT ); Tue, 22 Sep 2015 15:50:27 -0400 Date: Tue, 22 Sep 2015 12:44:37 -0700 From: tip-bot for Toshi Kani Message-ID: Cc: elliott@hpe.com, hpa@zytor.com, akpm@linux-foundation.org, mingo@kernel.org, toshi.kani@hpe.com, mingo@redhat.com, jgross@suse.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, konrad.wilk@oracle.com, bp@alien8.de Reply-To: linux-kernel@vger.kernel.org, jgross@suse.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, konrad.wilk@oracle.com, hpa@zytor.com, akpm@linux-foundation.org, elliott@hpe.com, toshi.kani@hpe.com, mingo@kernel.org In-Reply-To: <1442514264-12475-8-git-send-email-toshi.kani@hpe.com> References: <1442514264-12475-8-git-send-email-toshi.kani@hpe.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm: Fix slow_virt_to_phys() to handle large PAT bit Git-Commit-ID: 34437e67a6727885bdf6cbfd8441b1ac43a1ee65 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: 34437e67a6727885bdf6cbfd8441b1ac43a1ee65 Gitweb: http://git.kernel.org/tip/34437e67a6727885bdf6cbfd8441b1ac43a1ee65 Author: Toshi Kani AuthorDate: Thu, 17 Sep 2015 12:24:20 -0600 Committer: Thomas Gleixner CommitDate: Tue, 22 Sep 2015 21:27:33 +0200 x86/mm: Fix slow_virt_to_phys() to handle large PAT bit slow_virt_to_phys() calls lookup_address() to obtain *pte and its level. It then calls pte_pfn() to obtain a physical address for any level. However, this physical address is not correct when the large PAT bit is set because pte_pfn() does not mask the large PAT bit properly for PUD/PMD. Fix slow_virt_to_phys() to use pud_pfn() and pmd_pfn() for 1GB and 2MB mapping levels. Signed-off-by: Toshi Kani Cc: Andrew Morton Cc: Juergen Gross Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Borislav Petkov Cc: Konrad Wilk Cc: Robert Elliot Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/1442514264-12475-8-git-send-email-toshi.kani@hpe.com Signed-off-by: Thomas Gleixner --- arch/x86/mm/pageattr.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 2c44c07..1441368 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -414,18 +414,28 @@ pmd_t *lookup_pmd_address(unsigned long address) phys_addr_t slow_virt_to_phys(void *__virt_addr) { unsigned long virt_addr = (unsigned long)__virt_addr; - phys_addr_t phys_addr; - unsigned long offset; + unsigned long phys_addr, offset; enum pg_level level; - unsigned long pmask; pte_t *pte; pte = lookup_address(virt_addr, &level); BUG_ON(!pte); - pmask = page_level_mask(level); - offset = virt_addr & ~pmask; - phys_addr = (phys_addr_t)pte_pfn(*pte) << PAGE_SHIFT; - return (phys_addr | offset); + + switch (level) { + case PG_LEVEL_1G: + phys_addr = pud_pfn(*(pud_t *)pte) << PAGE_SHIFT; + offset = virt_addr & ~PUD_PAGE_MASK; + break; + case PG_LEVEL_2M: + phys_addr = pmd_pfn(*(pmd_t *)pte) << PAGE_SHIFT; + offset = virt_addr & ~PMD_PAGE_MASK; + break; + default: + phys_addr = pte_pfn(*pte) << PAGE_SHIFT; + offset = virt_addr & ~PAGE_MASK; + } + + return (phys_addr_t)(phys_addr | offset); } EXPORT_SYMBOL_GPL(slow_virt_to_phys);