Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932511AbcCIMMe (ORCPT ); Wed, 9 Mar 2016 07:12:34 -0500 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:35981 "EHLO e23smtp02.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932367AbcCIMMG (ORCPT ); Wed, 9 Mar 2016 07:12:06 -0500 X-IBM-Helo: d23dlp01.au.ibm.com X-IBM-MailFrom: khandual@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org From: Anshuman Khandual To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: hughd@google.com, kirill@shutemov.name, n-horiguchi@ah.jp.nec.com, akpm@linux-foundation.org, mgorman@techsingularity.net, aneesh.kumar@linux.vnet.ibm.com, mpe@ellerman.id.au Subject: [RFC 7/9] powerpc/hugetlb: Change follow_huge_* routines for BOOK3S 64K Date: Wed, 9 Mar 2016 17:40:48 +0530 Message-Id: <1457525450-4262-7-git-send-email-khandual@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1457525450-4262-1-git-send-email-khandual@linux.vnet.ibm.com> References: <1457525450-4262-1-git-send-email-khandual@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16030912-0005-0000-0000-00000386B658 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1744 Lines: 53 With this change, BOOK3S 64K platforms will not use 'follow_huge_addr' function any more and always return ERR_PTR(-ENIVAL), hence skipping the BUG_ON(flags & FOLL_GET) test in 'follow_page_mask' function. These platforms will then fall back on generic follow_huge_* functions for everything else. While being here, also added 'follow_huge_pgd' function which was missing earlier. Signed-off-by: Anshuman Khandual --- arch/powerpc/mm/hugetlbpage.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index f6e4712..89b748a 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -631,6 +631,10 @@ follow_huge_addr(struct mm_struct *mm, unsigned long address, int write) unsigned long mask, flags; struct page *page = ERR_PTR(-EINVAL); +#if defined(CONFIG_PPC_64K_PAGES) && defined(CONFIG_PPC_BOOK3S_64) + return ERR_PTR(-EINVAL); +#endif + local_irq_save(flags); ptep = find_linux_pte_or_hugepte(mm->pgd, address, &is_thp, &shift); if (!ptep) @@ -658,6 +662,7 @@ no_page: return page; } +#if !defined(CONFIG_PPC_64K_PAGES) || !defined(CONFIG_PPC_BOOK3S_64) struct page * follow_huge_pmd(struct mm_struct *mm, unsigned long address, pmd_t *pmd, int write) @@ -674,6 +679,15 @@ follow_huge_pud(struct mm_struct *mm, unsigned long address, return NULL; } +struct page * +follow_huge_pgd(struct mm_struct *mm, unsigned long address, + pgd_t *pgd, int write) +{ + BUG(); + return NULL; +} +#endif /* !defined(CONFIG_PPC_64K_PAGE) || !defined(CONFIG_BOOK3S_64) */ + static unsigned long hugepte_addr_end(unsigned long addr, unsigned long end, unsigned long sz) { -- 2.1.0