From patchwork Wed Apr 16 11:46:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 4000291 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 629EF9F387 for ; Wed, 16 Apr 2014 11:49:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C4832027D for ; Wed, 16 Apr 2014 11:49:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9568620272 for ; Wed, 16 Apr 2014 11:49:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WaOJR-0005Pc-7U; Wed, 16 Apr 2014 11:47:33 +0000 Received: from mail-wi0-f181.google.com ([209.85.212.181]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WaOJ9-0005H5-6k for linux-arm-kernel@lists.infradead.org; Wed, 16 Apr 2014 11:47:16 +0000 Received: by mail-wi0-f181.google.com with SMTP id hm4so1217922wib.8 for ; Wed, 16 Apr 2014 04:46:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=l0iN2RPoS4uWa4Byjf3HFsHtLG75e7nV/rVyQ+LnuxA=; b=e7NonLBz63zfoG75ItUSFkS75EHYMAYzqYFDEVPAr+onfxXIkkXtAGFAkUuN78BWOy IIjBR7aQJ3DHeFFuNGyREvHJ6Z1ChqOoIMYEzB/scZVPGUzPjEsR/ru3Yb1tNCNVju/m RxwnhTAdpie8a7uwuC+7B2vBO21aeXSjxgf+TFCed+DiRUVlyKK+leDVHmI7ID5PvQMe iEtKWx0UrGPLY7wfj2avcjdXRAwh6YEFTnpDelF97CZsCn69xXr3HHvtRtz38yWRDDr6 5RUIsNjZTKxUt4kWQ751A5YplMFBvymuiibQVVeDNIkXDJbYK2dxMm0Bq5ejfXjNJl5s MafQ== X-Gm-Message-State: ALoCoQnC4A4PWvl0GMIvhj2NQg96RK38k0XGMCy4d/UHHp61XD4DEEdiP48XdRYhGFdnSzVzIvSE X-Received: by 10.181.9.65 with SMTP id dq1mr7109327wid.51.1397648818089; Wed, 16 Apr 2014 04:46:58 -0700 (PDT) Received: from marmot.wormnet.eu (marmot.wormnet.eu. [188.246.204.87]) by mx.google.com with ESMTPSA id mw4sm24116996wib.12.2014.04.16.04.46.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Apr 2014 04:46:57 -0700 (PDT) From: Steve Capper To: linux@arm.linux.org.uk, akpm@linux-foundation.org Subject: [PATCH V2 5/5] arm: mm: Add Transparent HugePage support for non-LPAE Date: Wed, 16 Apr 2014 12:46:43 +0100 Message-Id: <1397648803-15961-6-git-send-email-steve.capper@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1397648803-15961-1-git-send-email-steve.capper@linaro.org> References: <1397648803-15961-1-git-send-email-steve.capper@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140416_044715_562543_F1149190 X-CRM114-Status: GOOD ( 16.23 ) X-Spam-Score: -0.7 (/) Cc: Steve Capper , catalin.marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, gerald.schaefer@de.ibm.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Much of the required code for THP has been implemented in the earlier non-LPAE HugeTLB patch. One more domain bit is used (to store whether or not the THP is splitting). Some THP helper functions are defined; and we have to re-define pmd_page such that it distinguishes between page tables and sections. Signed-off-by: Steve Capper --- arch/arm/Kconfig | 2 +- arch/arm/include/asm/pgtable-2level.h | 32 ++++++++++++++++++++++++++++++++ arch/arm/include/asm/pgtable-3level.h | 1 + arch/arm/include/asm/pgtable.h | 2 -- arch/arm/include/asm/tlb.h | 3 +++ 5 files changed, 37 insertions(+), 3 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5e80fad..f5d4354 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1836,7 +1836,7 @@ config SYS_SUPPORTS_HUGETLBFS config HAVE_ARCH_TRANSPARENT_HUGEPAGE def_bool y - depends on ARM_LPAE + depends on SYS_SUPPORTS_HUGETLBFS config ARCH_WANT_GENERAL_HUGETLB def_bool y diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h index 323e19f..bc1a7b8 100644 --- a/arch/arm/include/asm/pgtable-2level.h +++ b/arch/arm/include/asm/pgtable-2level.h @@ -212,6 +212,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr) */ #define PMD_DSECT_DIRTY (_AT(pmdval_t, 1) << 5) #define PMD_DSECT_AF (_AT(pmdval_t, 1) << 6) +#define PMD_DSECT_SPLITTING (_AT(pmdval_t, 1) << 7) #define PMD_BIT_FUNC(fn,op) \ static inline pmd_t pmd_##fn(pmd_t pmd) { pmd_val(pmd) op; return pmd; } @@ -232,6 +233,16 @@ extern pgprot_t get_huge_pgprot(pgprot_t newprot); #define pfn_pmd(pfn,prot) __pmd(__pfn_to_phys(pfn) | pgprot_val(prot)); #define mk_pmd(page,prot) pfn_pmd(page_to_pfn(page),get_huge_pgprot(prot)); +#define pmd_mkhuge(pmd) (pmd) + +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#define pmd_trans_splitting(pmd) (pmd_val(pmd) & PMD_DSECT_SPLITTING) +#define pmd_trans_huge(pmd) (pmd_thp_or_huge(pmd)) +#else +static inline int pmd_trans_huge(pmd_t pmd); +#endif + +#define pmd_mknotpresent(pmd) (__pmd(0)) PMD_BIT_FUNC(mkdirty, |= PMD_DSECT_DIRTY); PMD_BIT_FUNC(mkwrite, |= PMD_SECT_AP_WRITE); @@ -239,6 +250,8 @@ PMD_BIT_FUNC(wrprotect, &= ~PMD_SECT_AP_WRITE); PMD_BIT_FUNC(mknexec, |= PMD_SECT_XN); PMD_BIT_FUNC(rmprotnone, |= PMD_TYPE_SECT); PMD_BIT_FUNC(mkyoung, |= PMD_DSECT_AF); +PMD_BIT_FUNC(mkold, &= ~PMD_DSECT_AF); +PMD_BIT_FUNC(mksplitting, |= PMD_DSECT_SPLITTING); #define pmd_young(pmd) (pmd_val(pmd) & PMD_DSECT_AF) #define pmd_write(pmd) (pmd_val(pmd) & PMD_SECT_AP_WRITE) @@ -279,6 +292,25 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot) return pmd; } +static inline int has_transparent_hugepage(void) +{ + return 1; +} + +static inline struct page *pmd_page(pmd_t pmd) +{ + /* + * for a section, we need to mask off more of the pmd + * before looking up the page as it is a section descriptor. + * + * pmd_page only gets sections from the thp code. + */ + if (pmd_trans_huge(pmd)) + return (phys_to_page(pmd_val(pmd) & HPAGE_MASK)); + + return phys_to_page(pmd_val(pmd) & PHYS_MASK); +} + #endif /* __ASSEMBLY__ */ #endif /* _ASM_PGTABLE_2LEVEL_H */ diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h index a4b71c1..82c61d6 100644 --- a/arch/arm/include/asm/pgtable-3level.h +++ b/arch/arm/include/asm/pgtable-3level.h @@ -214,6 +214,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr) #define pmd_hugewillfault(pmd) (!pmd_young(pmd) || !pmd_write(pmd)) #define pmd_thp_or_huge(pmd) (pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT)) +#define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd) & PHYS_MASK)) #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define pmd_trans_huge(pmd) (pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT)) diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 576511f2..95f1909 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -189,8 +189,6 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd) return __va(pmd_val(pmd) & PHYS_MASK & (s32)PAGE_MASK); } -#define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd) & PHYS_MASK)) - #ifndef CONFIG_HIGHPTE #define __pte_map(pmd) pmd_page_vaddr(*(pmd)) #define __pte_unmap(pte) do { } while (0) diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h index b2498e6..77037d9 100644 --- a/arch/arm/include/asm/tlb.h +++ b/arch/arm/include/asm/tlb.h @@ -218,6 +218,9 @@ static inline void tlb_remove_pmd_tlb_entry(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr) { tlb_add_flush(tlb, addr); +#ifndef CONFIG_ARM_LPAE + tlb_add_flush(tlb, addr + SZ_1M); +#endif } #define pte_free_tlb(tlb, ptep, addr) __pte_free_tlb(tlb, ptep, addr)