linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: benh@kernel.crashing.org, paulus@samba.org, dwg@au1.ibm.com
Cc: linuxppc-dev@lists.ozlabs.org,
	"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [PATCH -V9 16/20] powerpc/THP: Enable THP on PPC64
Date: Wed, 22 May 2013 22:27:48 +0530	[thread overview]
Message-ID: <1369241872-15700-17-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1369241872-15700-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>

From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>

We enable only if the we support 16MB page size.

Reviewed-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 arch/powerpc/include/asm/pgtable-ppc64.h |  3 +--
 arch/powerpc/mm/pgtable_64.c             | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h
index 69cb52b..d046289 100644
--- a/arch/powerpc/include/asm/pgtable-ppc64.h
+++ b/arch/powerpc/include/asm/pgtable-ppc64.h
@@ -429,8 +429,7 @@ static inline int pmd_trans_splitting(pmd_t pmd)
 	return 0;
 }
 
-/* We will enable it in the last patch */
-#define has_transparent_hugepage() 0
+extern int has_transparent_hugepage(void);
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 
 static inline pte_t pmd_pte(pmd_t pmd)
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index 2ff92aa..1abf9cd 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -818,4 +818,33 @@ pmd_t pmdp_get_and_clear(struct mm_struct *mm,
 	memset(pgtable, 0, PTE_FRAG_SIZE);
 	return old_pmd;
 }
+
+int has_transparent_hugepage(void)
+{
+	if (!mmu_has_feature(MMU_FTR_16M_PAGE))
+		return 0;
+	/*
+	 * We support THP only if PMD_SIZE is 16MB.
+	 */
+	if (mmu_psize_defs[MMU_PAGE_16M].shift != PMD_SHIFT)
+		return 0;
+	/*
+	 * We need to make sure that we support 16MB hugepage in a segement
+	 * with base page size 64K or 4K. We only enable THP with a PAGE_SIZE
+	 * of 64K.
+	 */
+	/*
+	 * If we have 64K HPTE, we will be using that by default
+	 */
+	if (mmu_psize_defs[MMU_PAGE_64K].shift &&
+	    (mmu_psize_defs[MMU_PAGE_64K].penc[MMU_PAGE_16M] == -1))
+		return 0;
+	/*
+	 * Ok we only have 4K HPTE
+	 */
+	if (mmu_psize_defs[MMU_PAGE_4K].penc[MMU_PAGE_16M] == -1)
+		return 0;
+
+	return 1;
+}
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
-- 
1.8.1.2

  parent reply	other threads:[~2013-05-22 16:58 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-22 16:57 [PATCH -V9 00/20] THP support for PPC64 Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 01/20] mm/THP: Use pmd_populate to update the pmd with pgtable_t pointer Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 02/20] mm/THP: Use the right function when updating access flags Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 03/20] mm/THP: Add pmd args to pgtable deposit and withdraw APIs Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 04/20] mm/THP: withdraw the pgtable after pmdp related operations Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 05/20] mm/THP: Don't use HPAGE_SHIFT in transparent hugepage code Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 06/20] mm/THP: deposit the transpare huge pgtable before set_pmd Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 07/20] powerpc/THP: Double the PMD table size for THP Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 08/20] powerpc/THP: Implement transparent hugepages for ppc64 Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 09/20] powerpc: move find_linux_pte_or_hugepte and gup_hugepte to common code Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 10/20] powerpc: Update find_linux_pte_or_hugepte to handle transparent hugepages Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 11/20] powerpc: Replace find_linux_pte with find_linux_pte_or_hugepte Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 12/20] powerpc: Update gup_pmd_range to handle transparent hugepages Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 13/20] powerpc/THP: Add code to handle HPTE faults for hugepages Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 14/20] powerpc: Make linux pagetable walk safe with THP enabled Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 15/20] powerpc: Prevent gcc to re-read the pagetables Aneesh Kumar K.V
2013-05-22 16:57 ` Aneesh Kumar K.V [this message]
2013-05-22 16:57 ` [PATCH -V9 17/20] powerpc: Optimize hugepage invalidate Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 18/20] powerpc: disable assert_pte_locked for collapse_huge_page Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 19/20] powerpc: use smp_rmb when looking at deposisted pgtable to store hash index Aneesh Kumar K.V
2013-05-22 16:57 ` [PATCH -V9 20/20] powerpc: split hugepage when using subpage protection Aneesh Kumar K.V

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1369241872-15700-17-git-send-email-aneesh.kumar@linux.vnet.ibm.com \
    --to=aneesh.kumar@linux.vnet.ibm.com \
    --cc=benh@kernel.crashing.org \
    --cc=dwg@au1.ibm.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).