From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759671AbbIVTpq (ORCPT ); Tue, 22 Sep 2015 15:45:46 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54655 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759652AbbIVTpn (ORCPT ); Tue, 22 Sep 2015 15:45:43 -0400 Date: Tue, 22 Sep 2015 12:44:57 -0700 From: tip-bot for Toshi Kani Message-ID: Cc: mingo@redhat.com, elliott@hpe.com, mingo@kernel.org, hpa@zytor.com, konrad.wilk@oracle.com, tglx@linutronix.de, bp@alien8.de, toshi.kani@hpe.com, linux-kernel@vger.kernel.org, jgross@suse.com, akpm@linux-foundation.org Reply-To: bp@alien8.de, linux-kernel@vger.kernel.org, toshi.kani@hpe.com, akpm@linux-foundation.org, jgross@suse.com, hpa@zytor.com, mingo@kernel.org, elliott@hpe.com, mingo@redhat.com, tglx@linutronix.de, konrad.wilk@oracle.com In-Reply-To: <1442514264-12475-9-git-send-email-toshi.kani@hpe.com> References: <1442514264-12475-9-git-send-email-toshi.kani@hpe.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm: Fix gup_huge_p?d() to handle large PAT bit Git-Commit-ID: daf3e35c5888e8bd6a2f5ed15ed392b2df362ecf 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: daf3e35c5888e8bd6a2f5ed15ed392b2df362ecf Gitweb: http://git.kernel.org/tip/daf3e35c5888e8bd6a2f5ed15ed392b2df362ecf Author: Toshi Kani AuthorDate: Thu, 17 Sep 2015 12:24:21 -0600 Committer: Thomas Gleixner CommitDate: Tue, 22 Sep 2015 21:27:33 +0200 x86/mm: Fix gup_huge_p?d() to handle large PAT bit gup_huge_pud() and gup_huge_pmd() cast *pud and *pmd to *pte, and use pte_xxx() interfaces to obtain the flags and PFN. However, the pte_xxx() interface does not handle the large PAT bit properly for PUD/PMD. Fix gup_huge_pud() and gup_huge_pmd() to use pud_xxx() and pmd_xxx() interfaces according to their type. 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-9-git-send-email-toshi.kani@hpe.com Signed-off-by: Thomas Gleixner --- arch/x86/mm/gup.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c index 81bf3d2..ae9a37b 100644 --- a/arch/x86/mm/gup.c +++ b/arch/x86/mm/gup.c @@ -118,21 +118,20 @@ static noinline int gup_huge_pmd(pmd_t pmd, unsigned long addr, unsigned long end, int write, struct page **pages, int *nr) { unsigned long mask; - pte_t pte = *(pte_t *)&pmd; struct page *head, *page; int refs; mask = _PAGE_PRESENT|_PAGE_USER; if (write) mask |= _PAGE_RW; - if ((pte_flags(pte) & mask) != mask) + if ((pmd_flags(pmd) & mask) != mask) return 0; /* hugepages are never "special" */ - VM_BUG_ON(pte_flags(pte) & _PAGE_SPECIAL); - VM_BUG_ON(!pfn_valid(pte_pfn(pte))); + VM_BUG_ON(pmd_flags(pmd) & _PAGE_SPECIAL); + VM_BUG_ON(!pfn_valid(pmd_pfn(pmd))); refs = 0; - head = pte_page(pte); + head = pmd_page(pmd); page = head + ((addr & ~PMD_MASK) >> PAGE_SHIFT); do { VM_BUG_ON_PAGE(compound_head(page) != head, page); @@ -195,21 +194,20 @@ static noinline int gup_huge_pud(pud_t pud, unsigned long addr, unsigned long end, int write, struct page **pages, int *nr) { unsigned long mask; - pte_t pte = *(pte_t *)&pud; struct page *head, *page; int refs; mask = _PAGE_PRESENT|_PAGE_USER; if (write) mask |= _PAGE_RW; - if ((pte_flags(pte) & mask) != mask) + if ((pud_flags(pud) & mask) != mask) return 0; /* hugepages are never "special" */ - VM_BUG_ON(pte_flags(pte) & _PAGE_SPECIAL); - VM_BUG_ON(!pfn_valid(pte_pfn(pte))); + VM_BUG_ON(pud_flags(pud) & _PAGE_SPECIAL); + VM_BUG_ON(!pfn_valid(pud_pfn(pud))); refs = 0; - head = pte_page(pte); + head = pud_page(pud); page = head + ((addr & ~PUD_MASK) >> PAGE_SHIFT); do { VM_BUG_ON_PAGE(compound_head(page) != head, page);