Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76c567fb authored by Chris Metcalf's avatar Chris Metcalf
Browse files

arch/tile: support 4KB page size as well as 64KB 



The Tilera architecture traditionally supports 64KB page sizes
to improve TLB utilization and improve performance when the
hardware is being used primarily to run a single application.

For more generic server scenarios, it can be beneficial to run
with 4KB page sizes, so this commit allows that to be specified
(by modifying the arch/tile/include/hv/pagesize.h header).

As part of this change, we also re-worked the PTE management
slightly so that PTE writes all go through a __set_pte() function
where we can do some additional validation.  The set_pte_order()
function was eliminated since the "order" argument wasn't being used.

One bug uncovered was in the PCI DMA code, which wasn't properly
flushing the specified range.  This was benign with 64KB pages,
but with 4KB pages we were getting some larger flushes wrong.

The per-cpu memory reservation code also needed updating to
conform with the newer percpu stuff; before it always chose 64KB,
and that was always correct, but with 4KB granularity we now have
to pay closer attention and reserve the amount of memory that will
be requested when the percpu code starts allocating.

Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
parent 09c17eab

arch/tile/Kconfig

+0 −6
Original line number Original line Diff line number Diff line
@@ -202,12 +202,6 @@ config NODES_SHIFT 
	  By default, 2, i.e. 2^2 == 4 DDR2 controllers.

	  By default, 2, i.e. 2^2 == 4 DDR2 controllers.

	  In a system with more controllers, this value should be raised.

	  In a system with more controllers, this value should be raised.





# Need 16MB areas to enable hugetlb

# See build-time check in arch/tile/mm/init.c.

config FORCE_MAX_ZONEORDER

	int

	default 9



choice

choice

	depends on !TILEGX

	depends on !TILEGX

	prompt "Memory split" if EXPERT

	prompt "Memory split" if EXPERT

arch/tile/include/asm/hugetlb.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb, 
static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

				   pte_t *ptep, pte_t pte)

				   pte_t *ptep, pte_t pte)

{

{

	set_pte_order(ptep, pte, HUGETLB_PAGE_ORDER);

	set_pte(ptep, pte);

}

}





static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,

static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,

arch/tile/include/asm/page.h

+11 −23
Original line number Original line Diff line number Diff line
@@ -16,10 +16,11 @@ 
#define _ASM_TILE_PAGE_H

#define _ASM_TILE_PAGE_H





#include <linux/const.h>

#include <linux/const.h>

#include <hv/pagesize.h>





/* PAGE_SHIFT and HPAGE_SHIFT determine the page sizes. */

/* PAGE_SHIFT and HPAGE_SHIFT determine the page sizes. */

#define PAGE_SHIFT	16

#define PAGE_SHIFT	HV_LOG2_PAGE_SIZE_SMALL

#define HPAGE_SHIFT	24

#define HPAGE_SHIFT	HV_LOG2_PAGE_SIZE_LARGE





#define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)

#define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)

#define HPAGE_SIZE	(_AC(1, UL) << HPAGE_SHIFT)

#define HPAGE_SIZE	(_AC(1, UL) << HPAGE_SHIFT)
@@ -29,25 +30,18 @@ 




#ifdef __KERNEL__

#ifdef __KERNEL__





#include <hv/hypervisor.h>

#include <arch/chip.h>



/*

/*

 * The {,H}PAGE_SHIFT values must match the HV_LOG2_PAGE_SIZE_xxx

 * If the Kconfig doesn't specify, set a maximum zone order that

 * definitions in <hv/hypervisor.h>.  We validate this at build time

 * is enough so that we can create huge pages from small pages given

 * here, and again at runtime during early boot.  We provide a

 * the respective sizes of the two page types.  See <linux/mmzone.h>.

 * separate definition since userspace doesn't have <hv/hypervisor.h>.

 *

 * Be careful to distinguish PAGE_SHIFT from HV_PTE_INDEX_PFN, since

 * they are the same on i386 but not TILE.

 */

 */

#if HV_LOG2_PAGE_SIZE_SMALL != PAGE_SHIFT

#ifndef CONFIG_FORCE_MAX_ZONEORDER

# error Small page size mismatch in Linux

#define CONFIG_FORCE_MAX_ZONEORDER (HPAGE_SHIFT - PAGE_SHIFT + 1)

#endif

#if HV_LOG2_PAGE_SIZE_LARGE != HPAGE_SHIFT

# error Huge page size mismatch in Linux

#endif

#endif





#include <hv/hypervisor.h>

#include <arch/chip.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__





#include <linux/types.h>

#include <linux/types.h>
@@ -81,12 +75,6 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr, 
 * Hypervisor page tables are made of the same basic structure.

 * Hypervisor page tables are made of the same basic structure.

 */

 */





typedef __u64 pteval_t;

typedef __u64 pmdval_t;

typedef __u64 pudval_t;

typedef __u64 pgdval_t;

typedef __u64 pgprotval_t;



typedef HV_PTE pte_t;

typedef HV_PTE pte_t;

typedef HV_PTE pgd_t;

typedef HV_PTE pgd_t;

typedef HV_PTE pgprot_t;

typedef HV_PTE pgprot_t;

arch/tile/include/asm/pgalloc.h

+5 −2
Original line number Original line Diff line number Diff line
@@ -41,9 +41,9 @@ 
static inline void set_pmd(pmd_t *pmdp, pmd_t pmd)

static inline void set_pmd(pmd_t *pmdp, pmd_t pmd)

{

{

#ifdef CONFIG_64BIT

#ifdef CONFIG_64BIT

	set_pte_order(pmdp, pmd, L2_USER_PGTABLE_ORDER);

	set_pte(pmdp, pmd);

#else

#else

	set_pte_order(&pmdp->pud.pgd, pmd.pud.pgd, L2_USER_PGTABLE_ORDER);

	set_pte(&pmdp->pud.pgd, pmd.pud.pgd);

#endif

#endif

}

}
@@ -100,6 +100,9 @@ pte_t *get_prealloc_pte(unsigned long pfn); 
/* During init, we can shatter kernel huge pages if needed. */

/* During init, we can shatter kernel huge pages if needed. */

void shatter_pmd(pmd_t *pmd);

void shatter_pmd(pmd_t *pmd);





/* After init, a more complex technique is required. */

void shatter_huge_page(unsigned long addr);



#ifdef __tilegx__

#ifdef __tilegx__

/* We share a single page allocator for both L1 and L2 page tables. */

/* We share a single page allocator for both L1 and L2 page tables. */

#if HV_L1_SIZE != HV_L2_SIZE

#if HV_L1_SIZE != HV_L2_SIZE

arch/tile/include/asm/pgtable.h

+12 −19
Original line number Original line Diff line number Diff line
@@ -233,15 +233,23 @@ static inline void __pte_clear(pte_t *ptep) 
#define pgd_ERROR(e) \

#define pgd_ERROR(e) \

	pr_err("%s:%d: bad pgd 0x%016llx.\n", __FILE__, __LINE__, pgd_val(e))

	pr_err("%s:%d: bad pgd 0x%016llx.\n", __FILE__, __LINE__, pgd_val(e))





/* Return PA and protection info for a given kernel VA. */

int va_to_cpa_and_pte(void *va, phys_addr_t *cpa, pte_t *pte);



/*

 * __set_pte() ensures we write the 64-bit PTE with 32-bit words in

 * the right order on 32-bit platforms and also allows us to write

 * hooks to check valid PTEs, etc., if we want.

 */

void __set_pte(pte_t *ptep, pte_t pte);



/*

/*

 * set_pte_order() sets the given PTE and also sanity-checks the

 * set_pte() sets the given PTE and also sanity-checks the

 * requested PTE against the page homecaching.  Unspecified parts

 * requested PTE against the page homecaching.  Unspecified parts

 * of the PTE are filled in when it is written to memory, i.e. all

 * of the PTE are filled in when it is written to memory, i.e. all

 * caching attributes if "!forcecache", or the home cpu if "anyhome".

 * caching attributes if "!forcecache", or the home cpu if "anyhome".

 */

 */

extern void set_pte_order(pte_t *ptep, pte_t pte, int order);

extern void set_pte(pte_t *ptep, pte_t pte);



#define set_pte(ptep, pteval) set_pte_order(ptep, pteval, 0)

#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)

#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)

#define set_pte_atomic(pteptr, pteval) set_pte(pteptr, pteval)

#define set_pte_atomic(pteptr, pteval) set_pte(pteptr, pteval)
@@ -292,21 +300,6 @@ extern void check_mm_caching(struct mm_struct *prev, struct mm_struct *next); 
#define __pte_to_swp_entry(pte)	((swp_entry_t) { (pte).val >> 32 })

#define __pte_to_swp_entry(pte)	((swp_entry_t) { (pte).val >> 32 })

#define __swp_entry_to_pte(swp)	((pte_t) { (((long long) ((swp).val)) << 32) })

#define __swp_entry_to_pte(swp)	((pte_t) { (((long long) ((swp).val)) << 32) })





/*

 * clone_pgd_range(pgd_t *dst, pgd_t *src, int count);

 *

 *  dst - pointer to pgd range anwhere on a pgd page

 *  src - ""

 *  count - the number of pgds to copy.

 *

 * dst and src can be on the same page, but the range must not overlap,

 * and must not cross a page boundary.

 */

static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)

{

       memcpy(dst, src, count * sizeof(pgd_t));

}



/*

/*

 * Conversion functions: convert a page and protection to a page entry,

 * Conversion functions: convert a page and protection to a page entry,

 * and a page entry and page directory to the page they refer to.

 * and a page entry and page directory to the page they refer to.