LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Andi Kleen <ak@suse.de>
To: tglx@linutronix.de, mingo@elte.hu, linux-kernel@vger.kernel.org
Subject: [PATCH] [8/12] GBPAGES: Implement gbpages support in change_page_attr()
Date: Fri,  1 Feb 2008 10:53:21 +0100 (CET)	[thread overview]
Message-ID: <20080201095321.506401B416F@basil.firstfloor.org> (raw)
In-Reply-To: <200802011053.107168490@suse.de>


Signed-off-by: Andi Kleen <ak@suse.de>

---
 arch/x86/mm/pageattr.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Index: linux/arch/x86/mm/pageattr.c
===================================================================
--- linux.orig/arch/x86/mm/pageattr.c
+++ linux/arch/x86/mm/pageattr.c
@@ -203,6 +203,7 @@ static int split_large_page(pte_t *kpte,
 	pte_t *pbase, *tmp;
 	struct page *base;
 	unsigned int i, level;
+	unsigned long ps;
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
 	gfp_flags = __GFP_HIGH | __GFP_NOFAIL | __GFP_NOWARN;
@@ -225,13 +226,23 @@ static int split_large_page(pte_t *kpte,
 
 	address = __pa(address);
 	addr = address & PMD_PAGE_MASK;
+
+	ps = PAGE_SIZE;
+#ifdef CONFIG_X86_64
+	if (level == PG_LEVEL_1G) {
+		ps = PMD_PAGE_SIZE;
+		pgprot_val(ref_prot) |= _PAGE_PSE;
+		addr &= PUD_PAGE_MASK;
+	}
+#endif
+
 	pbase = (pte_t *)page_address(base);
 #ifdef CONFIG_X86_32
 	paravirt_alloc_pt(&init_mm, page_to_pfn(base));
 #endif
 
 	pgprot_val(ref_prot) &= ~_PAGE_NX;
-	for (i = 0; i < PTRS_PER_PTE; i++, addr += PAGE_SIZE)
+	for (i = 0; i < PTRS_PER_PTE; i++, addr += ps)
 		set_pte(&pbase[i], pfn_pte(addr >> PAGE_SHIFT, ref_prot));
 
 	/*

  parent reply	other threads:[~2008-02-01  9:56 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-01  9:53 [PATCH] [0/12] GBPAGES patchkit for 2.6.25 v3 Andi Kleen
2008-02-01  9:53 ` [PATCH] [1/12] GBPAGES: Add feature macros for the gbpages cpuid bit Andi Kleen
2008-02-01  9:53 ` [PATCH] [2/12] GBPAGES: Rename LARGE_PAGE_SIZE to PMD_PAGE_SIZE Andi Kleen
2008-02-01  9:53 ` [PATCH] [3/12] GBPAGES: Add PUD_PAGE_SIZE Andi Kleen
2008-02-01  9:53 ` [PATCH] [4/12] Add pgtable accessor functions for GB pages Andi Kleen
2008-02-01  9:53 ` [PATCH] [5/12] GBPAGES: Support gbpages in pagetable dump Andi Kleen
2008-02-01  9:53 ` [PATCH] [6/12] GBPAGES: Add gbpages support to lookup_address Andi Kleen
2008-02-01  9:53 ` [PATCH] [7/12] GBPAGES: Add an option to disable direct mapping gbpages and a global variable Andi Kleen
2008-02-05 22:41   ` Randy Dunlap
2008-02-01  9:53 ` Andi Kleen [this message]
2008-02-01  9:53 ` [PATCH] [9/12] GBPAGES: Switch pci-gart over to using cpa instead of clear_kernel_mapping Andi Kleen
2008-02-01  9:53 ` [PATCH] [10/12] GBPAGES: Remove now unused clear_kernel_mapping Andi Kleen
2008-02-01  9:53 ` [PATCH] [11/12] GBPAGES: Do kernel direct mapping at boot using GB pages Andi Kleen
2008-02-01  9:53 ` [PATCH] [12/12] GBPAGES: Switch direct mapping setup over to set_pte Andi Kleen
2008-02-01 17:37   ` Jeremy Fitzhardinge
2008-02-01 17:58     ` Andi Kleen
2008-02-01 19:16       ` Jeremy Fitzhardinge
2008-02-01 12:25 ` [PATCH] [0/12] GBPAGES patchkit for 2.6.25 v3 Thomas Gleixner

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=20080201095321.506401B416F@basil.firstfloor.org \
    --to=ak@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    /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).