From patchwork Thu Jul 25 16:20:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 18583 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f70.google.com (mail-qe0-f70.google.com [209.85.128.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6EDC025E88 for ; Thu, 25 Jul 2013 16:21:07 +0000 (UTC) Received: by mail-qe0-f70.google.com with SMTP id 2sf818272qea.5 for ; Thu, 25 Jul 2013 09:21:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=cEKW9sSMIJhf5zr5+y1cbD/5LppogR0w/a0po76esZs=; b=kvmXPVER0WtvhXX9V2UpWbktIklNO1AIveYsKqR11N5hq7RE7vzB2AmgPadoYeO4+9 eJcyuZvs0j4z43aVWrwAQyb5lrPrcac5mck0JodMloRb9YJ/xMCJ/dynV6fD42AYtasH kVFKkZA6gEEwbZCZr0XYXW5Flbik3QiBIscJtUhhZucHydusItuEdetii9WTl7j31eoc sAxtvPwUNcuLtXvqnmwTS4u+kbSofcb6Z/74tNsbY0F3/PgxQ+HgoNSnPpAZFeks9fEc GxN+6kGWwn36LbftYG2erpatH5JGpTqkXp1Pe2Lb2/kObvWEaQjSqUJGRzjpUwYuCIrn M38Q== X-Received: by 10.236.133.19 with SMTP id p19mr24069484yhi.54.1374769267167; Thu, 25 Jul 2013 09:21:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.34.130 with SMTP id z2ls687090qei.98.gmail; Thu, 25 Jul 2013 09:21:07 -0700 (PDT) X-Received: by 10.52.164.146 with SMTP id yq18mr1330535vdb.73.1374769267060; Thu, 25 Jul 2013 09:21:07 -0700 (PDT) Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by mx.google.com with ESMTPS id q1si12599899vex.5.2013.07.25.09.21.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Jul 2013 09:21:07 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.46 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.46; Received: by mail-vb0-f46.google.com with SMTP id w8so565099vbf.19 for ; Thu, 25 Jul 2013 09:21:07 -0700 (PDT) X-Received: by 10.52.27.172 with SMTP id u12mr15087727vdg.64.1374769266945; Thu, 25 Jul 2013 09:21:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp85396veb; Thu, 25 Jul 2013 09:21:06 -0700 (PDT) X-Received: by 10.194.123.199 with SMTP id mc7mr31185538wjb.35.1374769265998; Thu, 25 Jul 2013 09:21:05 -0700 (PDT) Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48]) by mx.google.com with ESMTPS id g11si1888928wiw.70.2013.07.25.09.21.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Jul 2013 09:21:05 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.48 is neither permitted nor denied by best guess record for domain of steve.capper@linaro.org) client-ip=74.125.82.48; Received: by mail-wg0-f48.google.com with SMTP id f12so1245080wgh.27 for ; Thu, 25 Jul 2013 09:21:05 -0700 (PDT) X-Received: by 10.180.85.6 with SMTP id d6mr2635236wiz.47.1374769265518; Thu, 25 Jul 2013 09:21:05 -0700 (PDT) Received: from localhost.localdomain (marmot.wormnet.eu. [188.246.204.87]) by mx.google.com with ESMTPSA id b20sm4801140wiw.4.2013.07.25.09.21.04 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 25 Jul 2013 09:21:05 -0700 (PDT) From: Steve Capper To: linux-arm-kernel@lists.infradead.org Cc: christoffer.dall@linaro.org, catalin.marinas@arm.com, will.deacon@arm.com, patches@linaro.org, rob.herring@calxeda.com, stefano.stabellini@eu.citrix.com, hoffman@marvell.com, mark.brown@linaro.org, notasas@gmail.com, Steve Capper Subject: [RFC 2/2] ARM: mm: Transparent huge page support for non-LPAE systems. Date: Thu, 25 Jul 2013 17:20:49 +0100 Message-Id: <1374769249-15908-3-git-send-email-steve.capper@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1374769249-15908-1-git-send-email-steve.capper@linaro.org> References: <1374769249-15908-1-git-send-email-steve.capper@linaro.org> X-Gm-Message-State: ALoCoQmSmN76qBM4S69GtyKqRlFwTzgIz/qVo8JmUWkQruwIpGcZro2tURCZBbZu/J08o6ZW5Qlz X-Original-Sender: steve.capper@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.46 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 | 47 +++++++++++++++++++++++++++++++++++ arch/arm/include/asm/pgtable-3level.h | 1 + arch/arm/include/asm/pgtable.h | 2 -- 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fe6eeae..6b53969 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1755,7 +1755,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 29ace75..a48eddc 100644 --- a/arch/arm/include/asm/pgtable-2level.h +++ b/arch/arm/include/asm/pgtable-2level.h @@ -217,6 +217,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr) #define PMD_DSECT_PROT_NONE (_AT(pmdval_t, 1) << 5) #define PMD_DSECT_DIRTY (_AT(pmdval_t, 1) << 6) #define PMD_DSECT_AF (_AT(pmdval_t, 1) << 7) +#define PMD_DSECT_SPLITTING (_AT(pmdval_t, 1) << 8) #define PMD_BIT_FUNC(fn,op) \ static inline pmd_t pmd_##fn(pmd_t pmd) { pmd_val(pmd) op; return pmd; } @@ -304,6 +305,52 @@ static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, pmdret; \ }) +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#define pmd_trans_splitting(pmd) (pmd_val(pmd) & PMD_DSECT_SPLITTING) +#define pmd_trans_huge(pmd) (pmd_large(pmd)) +#else +static inline int pmd_trans_huge(pmd_t pmd); +#endif + +PMD_BIT_FUNC(mksplitting, |= PMD_DSECT_SPLITTING); +#define pmd_mkhuge(pmd) (__pmd((pmd_val(pmd) & ~PMD_TYPE_MASK) | PMD_TYPE_SECT)) + +static inline unsigned long pmd_pfn(pmd_t pmd) +{ + /* + * for a section, we need to mask off more of the pmd + * before looking up the pfn. + * + * pmd_pfn only gets sections from the thp code. + */ + if (pmd_trans_huge(pmd)) + return __phys_to_pfn(pmd_val(pmd) & HPAGE_MASK); + else + return __phys_to_pfn(pmd_val(pmd) & PHYS_MASK); +} + +#define pfn_pmd(pfn,prot) pmd_modify(__pmd(__pfn_to_phys(pfn)),prot); +#define mk_pmd(page,prot) pfn_pmd(page_to_pfn(page),prot); + +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 67a0e06..9c38f29 100644 --- a/arch/arm/include/asm/pgtable-3level.h +++ b/arch/arm/include/asm/pgtable-3level.h @@ -234,6 +234,7 @@ PMD_BIT_FUNC(mkyoung, |= PMD_SECT_AF); /* represent a notpresent pmd by zero, this is used by pmdp_invalidate */ #define pmd_mknotpresent(pmd) (__pmd(0)) +#define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd) & PHYS_MASK)) static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot) { diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index cf77a59..66a1417 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)