From: Catalin Marinas <catalin.marinas@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 04/20] ARM: LPAE: Do not assume Linux PTEs are always at PTRS_PER_PTE offset Date: Fri, 12 Nov 2010 18:00:24 +0000 [thread overview] Message-ID: <1289584840-18097-5-git-send-email-catalin.marinas@arm.com> (raw) In-Reply-To: <1289584840-18097-1-git-send-email-catalin.marinas@arm.com> Placing the Linux PTEs at a 2KB offset inside a page is a workaround for the 2-level page table format where not enough spare bits are available. With LPAE this is no longer required. This patch changes such assumption by using a different macro, LINUX_PTE_OFFSET, which is defined to PTRS_PER_PTE for the 2-level page tables. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> --- arch/arm/include/asm/pgalloc.h | 6 +++--- arch/arm/include/asm/pgtable-2level.h | 1 + arch/arm/include/asm/pgtable.h | 6 +++--- arch/arm/mm/fault.c | 2 +- arch/arm/mm/mmu.c | 3 ++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h index b12cc98..c2a1f64 100644 --- a/arch/arm/include/asm/pgalloc.h +++ b/arch/arm/include/asm/pgalloc.h @@ -62,7 +62,7 @@ pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr) pte = (pte_t *)__get_free_page(PGALLOC_GFP); if (pte) { clean_dcache_area(pte, sizeof(pte_t) * PTRS_PER_PTE); - pte += PTRS_PER_PTE; + pte += LINUX_PTE_OFFSET; } return pte; @@ -95,7 +95,7 @@ pte_alloc_one(struct mm_struct *mm, unsigned long addr) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) { if (pte) { - pte -= PTRS_PER_PTE; + pte -= LINUX_PTE_OFFSET; free_page((unsigned long)pte); } } @@ -128,7 +128,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep) * The pmd must be loaded with the physical * address of the PTE table */ - pte_ptr -= PTRS_PER_PTE * sizeof(void *); + pte_ptr -= LINUX_PTE_OFFSET * sizeof(void *); __pmd_populate(pmdp, __pa(pte_ptr) | _PAGE_KERNEL_TABLE); } diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h index d60bda9..36bdef7 100644 --- a/arch/arm/include/asm/pgtable-2level.h +++ b/arch/arm/include/asm/pgtable-2level.h @@ -71,6 +71,7 @@ #define PTRS_PER_PTE 512 #define PTRS_PER_PMD 1 #define PTRS_PER_PGD 2048 +#define LINUX_PTE_OFFSET PTRS_PER_PTE /* * PMD_SHIFT determines the size of the area a second-level page table can map diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 17e7ba6..ea08ab7 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -135,8 +135,8 @@ extern struct page *empty_zero_page; #define __pte_map(dir) pmd_page_vaddr(*(dir)) #define __pte_unmap(pte) do { } while (0) #else -#define __pte_map(dir) ((pte_t *)kmap_atomic(pmd_page(*(dir))) + PTRS_PER_PTE) -#define __pte_unmap(pte) kunmap_atomic((pte - PTRS_PER_PTE)) +#define __pte_map(dir) ((pte_t *)kmap_atomic(pmd_page(*(dir))) + LINUX_PTE_OFFSET) +#define __pte_unmap(pte) kunmap_atomic((pte - LINUX_PTE_OFFSET)) #endif #define set_pte_ext(ptep,pte,ext) cpu_set_pte_ext(ptep,pte,ext) @@ -232,7 +232,7 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd) unsigned long ptr; ptr = pmd_val(pmd) & ~(PTRS_PER_PTE * sizeof(void *) - 1); - ptr += PTRS_PER_PTE * sizeof(void *); + ptr += LINUX_PTE_OFFSET * sizeof(void *); return __va(ptr); } diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 1e21e12..5da7b0c 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -108,7 +108,7 @@ void show_pte(struct mm_struct *mm, unsigned long addr) pte = pte_offset_map(pmd, addr); printk(", *pte=%08lx", pte_val(*pte)); - printk(", *ppte=%08lx", pte_val(pte[-PTRS_PER_PTE])); + printk(", *ppte=%08lx", pte_val(pte[-LINUX_PTE_OFFSET])); pte_unmap(pte); } while(0); diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 5e3adca..7324fbc 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -535,7 +535,8 @@ static void __init *early_alloc(unsigned long sz) static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr, unsigned long prot) { if (pmd_none(*pmd)) { - pte_t *pte = early_alloc(2 * PTRS_PER_PTE * sizeof(pte_t)); + pte_t *pte = early_alloc((LINUX_PTE_OFFSET + + PTRS_PER_PTE) * sizeof(pte_t)); __pmd_populate(pmd, __pa(pte) | prot); } BUG_ON(pmd_bad(*pmd));
WARNING: multiple messages have this Message-ID (diff)
From: catalin.marinas@arm.com (Catalin Marinas) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 04/20] ARM: LPAE: Do not assume Linux PTEs are always at PTRS_PER_PTE offset Date: Fri, 12 Nov 2010 18:00:24 +0000 [thread overview] Message-ID: <1289584840-18097-5-git-send-email-catalin.marinas@arm.com> (raw) In-Reply-To: <1289584840-18097-1-git-send-email-catalin.marinas@arm.com> Placing the Linux PTEs at a 2KB offset inside a page is a workaround for the 2-level page table format where not enough spare bits are available. With LPAE this is no longer required. This patch changes such assumption by using a different macro, LINUX_PTE_OFFSET, which is defined to PTRS_PER_PTE for the 2-level page tables. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> --- arch/arm/include/asm/pgalloc.h | 6 +++--- arch/arm/include/asm/pgtable-2level.h | 1 + arch/arm/include/asm/pgtable.h | 6 +++--- arch/arm/mm/fault.c | 2 +- arch/arm/mm/mmu.c | 3 ++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h index b12cc98..c2a1f64 100644 --- a/arch/arm/include/asm/pgalloc.h +++ b/arch/arm/include/asm/pgalloc.h @@ -62,7 +62,7 @@ pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr) pte = (pte_t *)__get_free_page(PGALLOC_GFP); if (pte) { clean_dcache_area(pte, sizeof(pte_t) * PTRS_PER_PTE); - pte += PTRS_PER_PTE; + pte += LINUX_PTE_OFFSET; } return pte; @@ -95,7 +95,7 @@ pte_alloc_one(struct mm_struct *mm, unsigned long addr) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) { if (pte) { - pte -= PTRS_PER_PTE; + pte -= LINUX_PTE_OFFSET; free_page((unsigned long)pte); } } @@ -128,7 +128,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep) * The pmd must be loaded with the physical * address of the PTE table */ - pte_ptr -= PTRS_PER_PTE * sizeof(void *); + pte_ptr -= LINUX_PTE_OFFSET * sizeof(void *); __pmd_populate(pmdp, __pa(pte_ptr) | _PAGE_KERNEL_TABLE); } diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h index d60bda9..36bdef7 100644 --- a/arch/arm/include/asm/pgtable-2level.h +++ b/arch/arm/include/asm/pgtable-2level.h @@ -71,6 +71,7 @@ #define PTRS_PER_PTE 512 #define PTRS_PER_PMD 1 #define PTRS_PER_PGD 2048 +#define LINUX_PTE_OFFSET PTRS_PER_PTE /* * PMD_SHIFT determines the size of the area a second-level page table can map diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 17e7ba6..ea08ab7 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -135,8 +135,8 @@ extern struct page *empty_zero_page; #define __pte_map(dir) pmd_page_vaddr(*(dir)) #define __pte_unmap(pte) do { } while (0) #else -#define __pte_map(dir) ((pte_t *)kmap_atomic(pmd_page(*(dir))) + PTRS_PER_PTE) -#define __pte_unmap(pte) kunmap_atomic((pte - PTRS_PER_PTE)) +#define __pte_map(dir) ((pte_t *)kmap_atomic(pmd_page(*(dir))) + LINUX_PTE_OFFSET) +#define __pte_unmap(pte) kunmap_atomic((pte - LINUX_PTE_OFFSET)) #endif #define set_pte_ext(ptep,pte,ext) cpu_set_pte_ext(ptep,pte,ext) @@ -232,7 +232,7 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd) unsigned long ptr; ptr = pmd_val(pmd) & ~(PTRS_PER_PTE * sizeof(void *) - 1); - ptr += PTRS_PER_PTE * sizeof(void *); + ptr += LINUX_PTE_OFFSET * sizeof(void *); return __va(ptr); } diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 1e21e12..5da7b0c 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -108,7 +108,7 @@ void show_pte(struct mm_struct *mm, unsigned long addr) pte = pte_offset_map(pmd, addr); printk(", *pte=%08lx", pte_val(*pte)); - printk(", *ppte=%08lx", pte_val(pte[-PTRS_PER_PTE])); + printk(", *ppte=%08lx", pte_val(pte[-LINUX_PTE_OFFSET])); pte_unmap(pte); } while(0); diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 5e3adca..7324fbc 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -535,7 +535,8 @@ static void __init *early_alloc(unsigned long sz) static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr, unsigned long prot) { if (pmd_none(*pmd)) { - pte_t *pte = early_alloc(2 * PTRS_PER_PTE * sizeof(pte_t)); + pte_t *pte = early_alloc((LINUX_PTE_OFFSET + + PTRS_PER_PTE) * sizeof(pte_t)); __pmd_populate(pmd, __pa(pte) | prot); } BUG_ON(pmd_bad(*pmd));
next prev parent reply other threads:[~2010-11-12 18:01 UTC|newest] Thread overview: 154+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-11-12 18:00 [PATCH v2 00/20] ARM: Add support for the Large Physical Address Extensions Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 01/20] ARM: LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_* Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-22 12:43 ` Russell King - ARM Linux 2010-11-22 12:43 ` Russell King - ARM Linux 2010-11-22 13:00 ` Catalin Marinas 2010-11-22 13:00 ` Catalin Marinas 2010-11-22 13:28 ` Russell King - ARM Linux 2010-11-22 13:28 ` Russell King - ARM Linux 2010-11-12 18:00 ` [PATCH v2 02/20] ARM: LPAE: Factor out 2-level page table definitions into separate files Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-15 23:31 ` Russell King - ARM Linux 2010-11-15 23:31 ` Russell King - ARM Linux 2010-11-16 9:14 ` Catalin Marinas 2010-11-16 9:14 ` Catalin Marinas 2010-11-16 9:59 ` Russell King - ARM Linux 2010-11-16 9:59 ` Russell King - ARM Linux 2010-11-16 10:02 ` Catalin Marinas 2010-11-16 10:02 ` Catalin Marinas 2010-11-16 10:04 ` Russell King - ARM Linux 2010-11-16 10:04 ` Russell King - ARM Linux 2010-11-16 10:11 ` Catalin Marinas 2010-11-16 10:11 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 03/20] ARM: LPAE: use u32 instead of unsigned long for 32-bit ptes Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-14 13:19 ` Russell King - ARM Linux 2010-11-14 13:19 ` Russell King - ARM Linux 2010-11-14 14:09 ` Catalin Marinas 2010-11-14 14:09 ` Catalin Marinas 2010-11-14 14:13 ` Catalin Marinas 2010-11-14 14:13 ` Catalin Marinas 2010-11-14 15:14 ` Russell King - ARM Linux 2010-11-14 15:14 ` Russell King - ARM Linux 2010-11-15 9:39 ` Catalin Marinas 2010-11-15 9:39 ` Catalin Marinas 2010-11-15 9:47 ` Arnd Bergmann 2010-11-15 9:47 ` Arnd Bergmann 2010-11-15 9:51 ` Catalin Marinas 2010-11-15 9:51 ` Catalin Marinas 2010-11-15 22:11 ` Nicolas Pitre 2010-11-15 22:11 ` Nicolas Pitre 2010-11-15 23:35 ` Russell King - ARM Linux 2010-11-15 23:35 ` Russell King - ARM Linux 2010-11-16 9:19 ` Catalin Marinas 2010-11-16 9:19 ` Catalin Marinas 2010-11-15 22:07 ` Nicolas Pitre 2010-11-15 22:07 ` Nicolas Pitre 2010-11-15 17:36 ` Russell King - ARM Linux 2010-11-15 17:36 ` Russell King - ARM Linux 2010-11-15 17:39 ` Catalin Marinas 2010-11-15 17:39 ` Catalin Marinas 2010-11-16 19:34 ` Catalin Marinas 2010-11-16 19:34 ` Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas [this message] 2010-11-12 18:00 ` [PATCH v2 04/20] ARM: LPAE: Do not assume Linux PTEs are always at PTRS_PER_PTE offset Catalin Marinas 2010-11-15 17:42 ` Russell King - ARM Linux 2010-11-15 17:42 ` Russell King - ARM Linux 2010-11-15 21:46 ` Catalin Marinas 2010-11-15 21:46 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 05/20] ARM: LPAE: Introduce L_PTE_NOEXEC and L_PTE_NOWRITE Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-15 18:30 ` Russell King - ARM Linux 2010-11-15 18:30 ` Russell King - ARM Linux 2010-11-16 10:07 ` Catalin Marinas 2010-11-16 10:07 ` Catalin Marinas 2010-11-16 15:18 ` Catalin Marinas 2010-11-16 15:18 ` Catalin Marinas 2010-11-16 15:32 ` Catalin Marinas 2010-11-16 15:32 ` Catalin Marinas 2010-11-16 18:19 ` Russell King - ARM Linux 2010-11-16 18:19 ` Russell King - ARM Linux 2010-11-17 17:02 ` Catalin Marinas 2010-11-17 17:02 ` Catalin Marinas 2010-11-17 17:16 ` Russell King - ARM Linux 2010-11-17 17:16 ` Russell King - ARM Linux 2010-11-17 17:22 ` Catalin Marinas 2010-11-17 17:22 ` Catalin Marinas 2010-11-17 17:24 ` Russell King - ARM Linux 2010-11-17 17:24 ` Russell King - ARM Linux 2010-11-17 17:30 ` Catalin Marinas 2010-11-17 17:30 ` Catalin Marinas 2010-11-17 17:32 ` Russell King - ARM Linux 2010-11-17 17:32 ` Russell King - ARM Linux 2010-11-17 17:34 ` Catalin Marinas 2010-11-17 17:34 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 06/20] ARM: LPAE: Introduce the 3-level page table format definitions Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-15 18:34 ` Russell King - ARM Linux 2010-11-15 18:34 ` Russell King - ARM Linux 2010-11-16 9:57 ` Catalin Marinas 2010-11-16 9:57 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 07/20] ARM: LPAE: Page table maintenance for the 3-level format Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-22 12:58 ` Russell King - ARM Linux 2010-11-22 12:58 ` Russell King - ARM Linux 2010-11-12 18:00 ` [PATCH v2 08/20] ARM: LPAE: MMU setup for the 3-level page table format Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-14 10:13 ` Catalin Marinas 2010-11-14 10:13 ` Catalin Marinas 2010-11-22 13:10 ` Russell King - ARM Linux 2010-11-22 13:10 ` Russell King - ARM Linux 2010-11-23 11:38 ` Catalin Marinas 2010-11-23 11:38 ` Catalin Marinas 2010-11-23 17:33 ` Russell King - ARM Linux 2010-11-23 17:33 ` Russell King - ARM Linux 2010-11-23 17:35 ` Catalin Marinas 2010-11-23 17:35 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 09/20] ARM: LPAE: Change setup_mm_for_reboot() to work with LPAE Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-22 13:11 ` Russell King - ARM Linux 2010-11-22 13:11 ` Russell King - ARM Linux 2010-11-12 18:00 ` [PATCH v2 10/20] ARM: LPAE: Remove the FIRST_USER_PGD_NR and USER_PTRS_PER_PGD definitions Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-22 13:11 ` Russell King - ARM Linux 2010-11-22 13:11 ` Russell King - ARM Linux 2010-11-12 18:00 ` [PATCH v2 11/20] ARM: LPAE: Add fault handling support Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-22 13:15 ` Russell King - ARM Linux 2010-11-22 13:15 ` Russell King - ARM Linux 2010-11-22 13:19 ` Catalin Marinas 2010-11-22 13:19 ` Catalin Marinas 2010-11-22 13:32 ` Russell King - ARM Linux 2010-11-22 13:32 ` Russell King - ARM Linux 2010-11-22 13:38 ` Catalin Marinas 2010-11-22 13:38 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 12/20] ARM: LPAE: Add context switching support Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 13/20] ARM: LPAE: Add SMP support for the 3-level page table format Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-22 13:37 ` Russell King - ARM Linux 2010-11-22 13:37 ` Russell King - ARM Linux 2010-11-12 18:00 ` [PATCH v2 14/20] ARM: LPAE: use phys_addr_t instead of unsigned long for physical addresses Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 15/20] ARM: LPAE: Use generic dma_addr_t type definition Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 16/20] ARM: LPAE: mark memory banks with start > ULONG_MAX as highmem Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 17/20] ARM: LPAE: use phys_addr_t for physical start address in early_mem Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 18/20] ARM: LPAE: add support for ATAG_MEM64 Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 19/20] ARM: LPAE: define printk format for physical addresses and page table entries Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-22 13:43 ` Russell King - ARM Linux 2010-11-22 13:43 ` Russell King - ARM Linux 2010-11-22 13:49 ` Catalin Marinas 2010-11-22 13:49 ` Catalin Marinas 2010-11-12 18:00 ` [PATCH v2 20/20] ARM: LPAE: Add the Kconfig entries Catalin Marinas 2010-11-12 18:00 ` Catalin Marinas 2010-11-13 12:38 ` Sergei Shtylyov 2010-11-13 12:38 ` Sergei Shtylyov 2010-11-14 10:11 ` Catalin Marinas 2010-11-14 10:11 ` Catalin Marinas
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=1289584840-18097-5-git-send-email-catalin.marinas@arm.com \ --to=catalin.marinas@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.