Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932325AbcCIMM0 (ORCPT ); Wed, 9 Mar 2016 07:12:26 -0500 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:51423 "EHLO e23smtp05.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753566AbcCIML4 (ORCPT ); Wed, 9 Mar 2016 07:11:56 -0500 X-IBM-Helo: d23dlp02.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 4/9] powerpc/mm: Split huge_pte_alloc function for BOOK3S 64K Date: Wed, 9 Mar 2016 17:40:45 +0530 Message-Id: <1457525450-4262-4-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-0017-0000-0000-0000030476B2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3517 Lines: 124 From: root Currently the 'huge_pte_alloc' function has two versions, one for the BOOK3S and the other one for the BOOK3E platforms. This change splits the BOOK3S version into two parts, one for the 4K page size based implementation and the other one for the 64K page sized implementation. This change is one of the prerequisites towards enabling GENERAL_HUGETLB implementation for BOOK3S 64K based huge pages. Signed-off-by: Anshuman Khandual --- arch/powerpc/mm/hugetlbpage.c | 67 +++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 744e24b..a49c6ae 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -59,6 +59,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) return __find_linux_pte_or_hugepte(mm->pgd, addr, NULL, NULL); } +#if !defined(CONFIG_PPC_64K_PAGES) || !defined(CONFIG_PPC_BOOK3S_64) static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp, unsigned long address, unsigned pdshift, unsigned pshift) { @@ -117,6 +118,7 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp, spin_unlock(&mm->page_table_lock); return 0; } +#endif /* !defined(CONFIG_PPC_64K_PAGES) || !defined(CONFIG_PPC_BOOK3S_64) */ /* * These macros define how to determine which level of the page table holds @@ -131,6 +133,7 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp, #endif #ifdef CONFIG_PPC_BOOK3S_64 +#ifdef CONFIG_PPC_4K_PAGES /* * At this point we do the placement change only for BOOK3S 64. This would * possibly work on other subarchs. @@ -146,32 +149,23 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz addr &= ~(sz-1); pg = pgd_offset(mm, addr); - - if (pshift == PGDIR_SHIFT) - /* 16GB huge page */ - return (pte_t *) pg; - else if (pshift > PUD_SHIFT) - /* - * We need to use hugepd table - */ + if (pshift > PUD_SHIFT) { hpdp = (hugepd_t *)pg; - else { - pdshift = PUD_SHIFT; - pu = pud_alloc(mm, pg, addr); - if (pshift == PUD_SHIFT) - return (pte_t *)pu; - else if (pshift > PMD_SHIFT) - hpdp = (hugepd_t *)pu; - else { - pdshift = PMD_SHIFT; - pm = pmd_alloc(mm, pu, addr); - if (pshift == PMD_SHIFT) - /* 16MB hugepage */ - return (pte_t *)pm; - else - hpdp = (hugepd_t *)pm; - } + goto hugepd_search; + } + + pdshift = PUD_SHIFT; + pu = pud_alloc(mm, pg, addr); + if (pshift > PMD_SHIFT) { + hpdp = (hugepd_t *)pu; + goto hugepd_search; } + + pdshift = PMD_SHIFT; + pm = pmd_alloc(mm, pu, addr); + hpdp = (hugepd_t *)pm; + +hugepd_search: if (!hpdp) return NULL; @@ -184,6 +178,31 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz } #else +pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) +{ + pgd_t *pg; + pud_t *pu; + pmd_t *pm; + unsigned pshift = __ffs(sz); + + addr &= ~(sz-1); + pg = pgd_offset(mm, addr); + + if (pshift == PGDIR_SHIFT) /* 16GB Huge Page */ + return (pte_t *)pg; + + pu = pud_alloc(mm, pg, addr); /* NA, skipped */ + if (pshift == PUD_SHIFT) + return (pte_t *)pu; + + pm = pmd_alloc(mm, pu, addr); /* 16MB Huge Page */ + if (pshift == PMD_SHIFT) + return (pte_t *)pm; + + return NULL; +} +#endif +#else pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) { -- 2.1.0