Rewrite Motorola MMU page-table layout
cover Rewrite Motorola MMU page-table layout
Hi!
In order to faciliate Will's READ_ONCE() patches:
https://lkml.kernel.org/r/[email protected]
we need to fix m68k/motorola to not have a giant pmd_t. These patches do so and are tested using ARAnyM/68040.
It would be very good if someone can either test or tell us what emulator to use for 020/030.
Please consider.
PATCH 1/5 m68k,mm: Restructure motorola mmu page-table layout
The Motorola 68xxx MMUs, 040 (and later) have a fixed 7,7,{5,6} page-table setup, where the last depends on the page-size selected (8k vs 4k resp.), and head.S selects 4K pages. For 030 (and earlier) we explicitly program 7,7,6 and 4K pages in %tc.
However, the current code implements this mightily weird. What it does is group 16 of those (6 bit) pte tables into one 4k page to not waste space. The down-side is that that forces pmd_t to be a 16-tuple pointing to consecutive pte tables.
This breaks the generic code which assumes READ_ONCE(*pmd) will be word sized.
Therefore implement a straight forward 7,7,6 3 level page-table setup, with the addition (for 020/030) of (partial) large-page support. For now this increases the memory footprint for pte-tables 15 fold.
Tested with ARAnyM/68040 emulation.
--- arch/m68k/include/asm/motorola_pgtable.h | 15 +----------- arch/m68k/include/asm/page.h | 6 ++--- arch/m68k/include/asm/pgtable_mm.h | 10 ++++---- arch/m68k/mm/kmap.c | 36 +++++++++++++------------------ arch/m68k/mm/motorola.c | 28 +++++++++++------------- 5 files changed, 39 insertions(+), 56 deletions(-)
arch/m68k/include/asm/motorola_pgtable.h +2 -13
@@ -108,13 +108,7 @@ static inline pte_t pte_modify(pte_t ptestatic inline void pmd_set (pmd_t *pmdp,pte_t *ptep) { -unsigned long ptbl =virt_to_phys (ptep) | _PAGE_TABLE | _PAGE_ACCESSED; -unsigned long *ptr = pmdp->pmd; -short i =16 ; -while (--i >=0 ) { - *ptr++ = ptbl; - ptbl += (sizeof (pte_t)*PTRS_PER_PTE /16 ); - } +pmd_val (*pmdp) =virt_to_phys (ptep) | _PAGE_TABLE | _PAGE_ACCESSED; }static inline void pud_set (pud_t *pudp,pmd_t *pmdp)
@@ -138,12 +132,7 @@ static inline void pud_set(pud_t *pudp,#define pmd_none (pmd) (!pmd_val(pmd))#define pmd_bad (pmd) ((pmd_val(pmd) & _DESCTYPE_MASK) != _PAGE_TABLE)#define pmd_present (pmd) (pmd_val(pmd) & _PAGE_TABLE) -#define pmd_clear (pmdp) ({ \ - unsigned long *__ptr = pmdp->pmd; \ - short __i = 16; \ - while (--__i >= 0) \ - *__ptr++ = 0; \ -}) +#define pmd_clear (pmdp) ({ pmd_val(*pmdp) = 0; })#define pmd_page (pmd) virt_to_page(__va(pmd_val(pmd)))
arch/m68k/include/asm/page.h +3 -3
@@ -22,9 +22,9 @@* These are used to make use of C type-checking.. */ #if !defined(CONFIG_MMU ) ||CONFIG_PGTABLE_LEVELS ==3 -typedef struct {unsigned long pmd[16 ]; }pmd_t ; -#define pmd_val (x) ((&x)->pmd[0]) -#define __pmd (x) ((pmd_t) { { (x) }, }) +typedef struct {unsigned long pmd; }pmd_t ; +#define pmd_val (x) ((&x)->pmd) +#define __pmd (x) ((pmd_t) { (x) } )#endif typedef struct {unsigned long pte; }pte_t ;
arch/m68k/include/asm/pgtable_mm.h +5 -5
@@ -36,7 +36,7 @@/* PMD_SHIFT determines the size of the area a second-level page table can map */ #if CONFIG_PGTABLE_LEVELS ==3 -#define PMD_SHIFT 22 +#define PMD_SHIFT 18#endif #define PMD_SIZE (1UL << PMD_SHIFT)#define PMD_MASK (~(PMD_SIZE-1))
@@ -67,8 +67,8 @@#define PTRS_PER_PMD 1#define PTRS_PER_PGD 1024#else -#define PTRS_PER_PTE 1024 -#define PTRS_PER_PMD 8 +#define PTRS_PER_PTE 64 +#define PTRS_PER_PMD 128#define PTRS_PER_PGD 128#endif #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE)
@@ -76,8 +76,8 @@/* Virtual address region for use by kernel_map() */ #ifdef CONFIG_SUN3 -#define KMAP_START 0x0DC00000 -#define KMAP_END 0x0E000000 +#define KMAP_START 0x0dc00000 +#define KMAP_END 0x0e000000#elif defined(CONFIG_COLDFIRE )#define KMAP_START 0xe0000000#define KMAP_END 0xf0000000
arch/m68k/mm/kmap.c +16 -20
@@ -24,8 +24,6 @@#undef DEBUG -#define PTRTREESIZE (256*1024) -/* * For 040/060 we can use the virtual memory area like other architectures, * but for 020/030 we want to use early termination page descriptors and we
@@ -50,7 +48,7 @@ static inline void free_io_area(void *ad#else -#define IO_SIZE (256*1024) +#define IO_SIZE PMD_SIZEstatic struct vm_struct *iolist;
@@ -81,14 +79,13 @@ static void __free_io_area(void *addr, u#if CONFIG_PGTABLE_LEVELS ==3 if (CPU_IS_020_OR_030 ) { -int pmd_off = (virtaddr/PTRTREESIZE ) &15 ; -int pmd_type = pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK; +int pmd_type =pmd_val (*pmd_dir) & _DESCTYPE_MASK;if (pmd_type == _PAGE_PRESENT) { - pmd_dir->pmd[pmd_off] =0 ; - virtaddr +=PTRTREESIZE ; - size -=PTRTREESIZE ; -continue ; +pmd_clear (pmd_dir); + virtaddr +=PMD_SIZE ; + size -=PMD_SIZE ; + }else if (pmd_type ==0 )continue ; }
@@ -249,7 +246,7 @@ void __iomem *__ioremap(unsigned long phwhile ((long )size >0 ) {#ifdef DEBUG -if (!(virtaddr & (PTRTREESIZE -1 ))) +if (!(virtaddr & (PMD_SIZE -1 )))printk ("\npa=%#lx va=%#lx " , physaddr, virtaddr);#endif pgd_dir =pgd_offset_k (virtaddr);
@@ -263,10 +260,10 @@ void __iomem *__ioremap(unsigned long ph#if CONFIG_PGTABLE_LEVELS ==3 if (CPU_IS_020_OR_030 ) { - pmd_dir->pmd[(virtaddr/PTRTREESIZE ) &15 ] = physaddr; - physaddr +=PTRTREESIZE ; - virtaddr +=PTRTREESIZE ; - size -=PTRTREESIZE ; +pmd_val (*pmd_dir) = physaddr; + physaddr +=PMD_SIZE ; + virtaddr +=PMD_SIZE ; + size -=PMD_SIZE ; } else#endif {
@@ -367,13 +364,12 @@ void kernel_set_cachemode(void *addr, un#if CONFIG_PGTABLE_LEVELS ==3 if (CPU_IS_020_OR_030 ) { -int pmd_off = (virtaddr/PTRTREESIZE ) &15 ; +unsigned long pmd =pmd_val (*pmd_dir); -if ((pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK) == _PAGE_PRESENT) { - pmd_dir->pmd[pmd_off] = (pmd_dir->pmd[pmd_off] & - _CACHEMASK040) | cmode; - virtaddr +=PTRTREESIZE ; - size -=PTRTREESIZE ; +if ((pmd & _DESCTYPE_MASK) == _PAGE_PRESENT) { + *pmd_dir =__pmd ((pmd & _CACHEMASK040) | cmode); + virtaddr +=PMD_SIZE ; + size -=PMD_SIZE ;continue ; } }
arch/m68k/mm/motorola.c +13 -15
@@ -116,8 +116,6 @@ static pmd_t * __init kernel_ptr_table(vstatic void __init map_node (int node) { -#define PTRTREESIZE (256*1024) -#define ROOTTREESIZE (32*1024*1024)unsigned long physaddr, virtaddr, size;pgd_t *pgd_dir;p4d_t *p4d_dir;
@@ -135,21 +133,21 @@ static void __init map_node(int node)while (size >0 ) {#ifdef DEBUG -if (!(virtaddr & (PTRTREESIZE -1 ))) +if (!(virtaddr & (PMD_SIZE -1 )))printk ("\npa=%#lx va=%#lx " , physaddr &PAGE_MASK , virtaddr);#endif pgd_dir =pgd_offset_k (virtaddr);if (virtaddr &&CPU_IS_020_OR_030 ) { -if (!(virtaddr & (ROOTTREESIZE -1 )) && - size >=ROOTTREESIZE ) { +if (!(virtaddr & (PGDIR_SIZE -1 )) && + size >=PGDIR_SIZE ) {#ifdef DEBUG printk ("[very early term]" );#endif pgd_val (*pgd_dir) = physaddr; - size -=ROOTTREESIZE ; - virtaddr +=ROOTTREESIZE ; - physaddr +=ROOTTREESIZE ; + size -=PGDIR_SIZE ; + virtaddr +=PGDIR_SIZE ; + physaddr +=PGDIR_SIZE ;continue ; } }
@@ -169,8 +167,8 @@ static void __init map_node(int node)#ifdef DEBUG printk ("[early term]" );#endif - pmd_dir->pmd[(virtaddr/PTRTREESIZE ) &15 ] = physaddr; - physaddr +=PTRTREESIZE ; +pmd_val (*pmd_dir) = physaddr; + physaddr +=PMD_SIZE ; }else {int i;#ifdef DEBUG
@@ -178,15 +176,15 @@ static void __init map_node(int node)#endif zero_pgtable =kernel_ptr_table (); pte_dir = (pte_t *)zero_pgtable; - pmd_dir->pmd[0 ] =virt_to_phys (pte_dir) | - _PAGE_TABLE | _PAGE_ACCESSED; +pmd_set (pmd_dir, pte_dir); +pte_val (*pte_dir++) =0 ; physaddr +=PAGE_SIZE ; -for (i =1 ; i <64 ; physaddr +=PAGE_SIZE , i++) +for (i =1 ; i <PTRS_PER_PTE ; physaddr +=PAGE_SIZE , i++)pte_val (*pte_dir++) = physaddr; } - size -=PTRTREESIZE ; - virtaddr +=PTRTREESIZE ; + size -=PMD_SIZE ; + virtaddr +=PMD_SIZE ; }else {if (!pmd_present (*pmd_dir)) {#ifdef DEBUG
PATCH 2/5 m68k,mm: Improve kernel_page_table()
In reply to Peter ZijlstraWith the PTE-tables now only being 256 bytes, allocating a full page for them is a giant waste. Start by improving the boot time allocator such that init_mm initialization will at least have optimal memory density.
Much thanks to Will Deacon in help with debugging and ferreting out lost information on these dusty MMUs.
Notes:
- _TABLE_MASK is reduced to account for the shorter (256 byte) alignment of pte-tables, per the manual, table entries should only ever have state in the low 4 bits (Used,WrProt,Desc1,Desc0) so it is still longer than strictly required. (Thanks Will!!!)
- Also use kernel_page_table() for the 020/030 zero_pgtable case and consequently remove the zero_pgtable init hack (will fix up later).
--- arch/m68k/include/asm/motorola_pgtable.h | 13 ++++++ arch/m68k/mm/init.c | 5 -- arch/m68k/mm/motorola.c | 61 +++++++++++++++++-------------- 3 files changed, 46 insertions(+), 33 deletions(-)
arch/m68k/include/asm/motorola_pgtable.h +12 -1
@@ -23,7 +23,18 @@#define _DESCTYPE_MASK 0x003#define _CACHEMASK040 (~0x060) -#define _TABLE_MASK (0xfffffe00) + +/* +* Currently set to the minimum alignment of table pointers (256 bytes). +* The hardware only uses the low 4 bits for state: +* +* 3 - Used +* 2 - Write Protected +* 0,1 - Desciptor Type +* +* and has the rest of the bits reserved. +*/ +#define _TABLE_MASK (0xffffff00)#define _PAGE_TABLE (_PAGE_SHORT)#define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_NOCACHE)
arch/m68k/mm/init.c +0 -5
@@ -42,7 +42,6 @@ EXPORT_SYMBOL(empty_zero_page);#if !defined(CONFIG_SUN3 ) && !defined(CONFIG_COLDFIRE )extern void init_pointer_table (unsigned long ptable); -extern pmd_t *zero_pgtable;#endif #ifdef CONFIG_MMU
@@ -135,10 +134,6 @@ static inline void init_pointer_tables(vif (pud_present (*pud)) init_pointer_table(pgd_page_vaddr(kernel_pg_dir[i])); } - -/* insert also pointer table that we used to unmap the zero page */ -if (zero_pgtable) -init_pointer_table ((unsigned long )zero_pgtable);#endif }
arch/m68k/mm/motorola.c +34 -27
98 lines not on this page · raw message
PATCH 3/5 m68k,mm: Use table allocator for pgtables
In reply to Peter ZijlstraWith the new page-table layout, using full (4k) pages for (256 byte) pte-tables is immensely wastefull. Move the pte-tables over to the same allocator already used for the (512 byte) higher level tables (pgd/pmd).
This reduces the pte-table waste from 15x to 2x.
Due to no longer being bound to 16 consecutive tables, this might actually already be more efficient than the old code for sparse tables.
--- arch/m68k/include/asm/motorola_pgalloc.h | 54 ++++++------------------------- arch/m68k/include/asm/motorola_pgtable.h | 8 ++++ arch/m68k/include/asm/page.h | 2 - 3 files changed, 19 insertions(+), 45 deletions(-)
arch/m68k/include/asm/motorola_pgalloc.h +11 -43
@@ -10,60 +10,28 @@ extern int free_pointer_table(pmd_t *);static inline pte_t *pte_alloc_one_kernel (struct mm_struct *mm) { -pte_t *pte; - - pte = (pte_t *)__get_free_page (GFP_KERNEL |__GFP_ZERO); -if (pte) { -__flush_page_to_ram (pte); -flush_tlb_kernel_page (pte); -nocache_page (pte); - } - -return pte; +return (pte_t *)get_pointer_table (); }static inline void pte_free_kernel (struct mm_struct *mm,pte_t *pte) { -cache_page (pte); -free_page ((unsigned long ) pte); +free_pointer_table ((void *)pte); }static inline pgtable_t pte_alloc_one (struct mm_struct *mm) { -struct page *page; -pte_t *pte; +return (pte_t *)get_pointer_table (); +} - page =alloc_pages (GFP_KERNEL |__GFP_ZERO,0 ); -if (!page) -return NULL ; -if (!pgtable_pte_page_ctor (page)) { -__free_page (page); -return NULL ; - } - - pte =kmap (page); -__flush_page_to_ram (pte); -flush_tlb_kernel_page (pte); -nocache_page (pte); -kunmap (page); -return page; -} - -static inline void pte_free (struct mm_struct *mm,pgtable_t page) -{ -pgtable_pte_page_dtor (page); -cache_page (kmap (page)); -kunmap (page); -__free_page (page); +static inline void pte_free (struct mm_struct *mm,pgtable_t pgtable) +{ +free_pointer_table ((void *)pgtable); } -static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t page, +static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t pgtable,unsigned long address) { -pgtable_pte_page_dtor (page); -cache_page (kmap (page)); -kunmap (page); -__free_page (page); +free_pointer_table ((void *)pgtable); }
@@ -102,9 +70,9 @@ static inline void pmd_populate_kernel(sstatic inline void pmd_populate (struct mm_struct *mm,pmd_t *pmd,pgtable_t page) { -pmd_set (pmd,page_address (page)); +pmd_set (pmd, page); } -#define pmd_pgtable (pmd) pmd_page(pmd) +#define pmd_pgtable (pmd) ((pgtable_t)__pmd_page(pmd))static inline void pud_populate (struct mm_struct *mm,pud_t *pud,pmd_t *pmd) {
arch/m68k/include/asm/motorola_pgtable.h +7 -1
@@ -133,7 +133,13 @@ static inline void pud_set(pud_t *pudp,#define pmd_bad (pmd) ((pmd_val(pmd) & _DESCTYPE_MASK) != _PAGE_TABLE)#define pmd_present (pmd) (pmd_val(pmd) & _PAGE_TABLE)#define pmd_clear (pmdp) ({ pmd_val(*pmdp) = 0; }) -#define pmd_page (pmd) virt_to_page(__va(pmd_val(pmd))) + +/* +* m68k does not have huge pages (020/030 actually could), but generic code +* expects pmd_page() to exists, only to then DCE it all. Provide a dummy to +* make the compiler happy. +*/ +#define pmd_page (pmd) NULL#define pud_none (pud) (!pud_val(pud))
arch/m68k/include/asm/page.h +1 -1
@@ -30,7 +30,7 @@ typedef struct { unsigned long pmd; } pmtypedef struct {unsigned long pte; }pte_t ;typedef struct {unsigned long pgd; }pgd_t ;typedef struct {unsigned long pgprot; }pgprot_t ; -typedef struct page *pgtable_t ; +typedef pte_t *pgtable_t ;#define pte_val (x) ((x).pte)#define pgd_val (x) ((x).pgd)
Re: [PATCH 3/5] m68k,mm: Use table allocator for pgtables
Quoted 25 lines · Peter Zijlstra
With the new page-table layout, using full (4k) pages for (256 byte) pte-tables is immensely wastefull. Move the pte-tables over to the same allocator already used for the (512 byte) higher level tables (pgd/pmd).
This reduces the pte-table waste from 15x to 2x.
Due to no longer being bound to 16 consecutive tables, this might actually already be more efficient than the old code for sparse tables.
Signed-off-by Peter Zijlstra (Intel) <[email protected]>--- arch/m68k/include/asm/motorola_pgalloc.h | 54 ++++++------------------------- arch/m68k/include/asm/motorola_pgtable.h | 8 ++++ arch/m68k/include/asm/page.h | 2 - 3 files changed, 19 insertions(+), 45 deletions(-)arch/m68k/include/asm/motorola_pgalloc.h +0
-1@@ -10,60 +10,28 @@ extern int free_pointer_table(pmd_t *);static inline pte_t *pte_alloc_one_kernel (struct mm_struct *mm) { -pte_t *pte;
arch/m68k/include/asm/motorola_pgalloc.h extern int free_pointer_table(pmd_t *); · line 13
Quoted 10 lines
arch/m68k/include/asm/motorola_pgalloc.h +1
-9- - pte = (pte_t *)__get_free_page (GFP_KERNEL |__GFP_ZERO); -if (pte) { -__flush_page_to_ram (pte); -flush_tlb_kernel_page (pte); -nocache_page (pte); - } - -return pte; +return (pte_t *)get_pointer_table ();
Weirdly, get_pointer_table() seems to elide the __flush_page_to_ram() call, so you're missing that for ptes with this change. I think it's probably needed for the higher levels too (and kernel_page_table() does it for example) so I'd be inclined to add it unconditionally rather than predicate it on the allocation type introduced by your later patch.
arch/m68k/include/asm/page.h typedef struct { unsigned long pmd; } pm · line 33
Quoted 8 lines
arch/m68k/include/asm/page.h +1
-1@@ -30,7 +30,7 @@ typedef struct { unsigned long pmd; } pmtypedef struct {unsigned long pte; }pte_t ;typedef struct {unsigned long pgd; }pgd_t ;typedef struct {unsigned long pgprot; }pgprot_t ; -typedef struct page *pgtable_t ; +typedef pte_t *pgtable_t ;
Urgh, this is a big (cross-arch) mess that we should fix later.
Will
Re: [PATCH 3/5] m68k,mm: Use table allocator for pgtables
Quoted 18 lines · Will Deacon
Quoted 16 lines · Peter Zijlstra
arch/m68k/include/asm/motorola_pgalloc.h +0
-10@@ -10,60 +10,28 @@ extern int free_pointer_table(pmd_t *);static inline pte_t *pte_alloc_one_kernel (struct mm_struct *mm) { -pte_t *pte; - - pte = (pte_t *)__get_free_page (GFP_KERNEL |__GFP_ZERO); -if (pte) { -__flush_page_to_ram (pte); -flush_tlb_kernel_page (pte); -nocache_page (pte); - } - -return pte;
Quoted 8 lines
arch/m68k/include/asm/motorola_pgalloc.h extern int free_pointer_table(pmd_t *); · line 13
Quoted 1 line
arch/m68k/include/asm/motorola_pgalloc.h +1
-0+return (pte_t *)get_pointer_table ();Weirdly,
get_pointer_table()seems to elide the__flush_page_to_ram()call, so you're missing that for ptes with this change. I think it's probably needed for the higher levels too (andkernel_page_table()does it for example) so I'd be inclined to add it unconditionally rather than predicate it on the allocation type introduced by your later patch.
The next patch adds that unconditionally to the table allocator. The only thing conditional on the type is the PG_PageTable and NR_PAGETABLES accounting crud.
Quoted 10 lines
arch/m68k/include/asm/page.h typedef struct { unsigned long pmd; } pm · line 33
Quoted 8 lines
arch/m68k/include/asm/page.h +1
-1@@ -30,7 +30,7 @@ typedef struct { unsigned long pmd; } pmtypedef struct {unsigned long pte; }pte_t ;typedef struct {unsigned long pgd; }pgd_t ;typedef struct {unsigned long pgprot; }pgprot_t ; -typedef struct page *pgtable_t ; +typedef pte_t *pgtable_t ;Urgh, this is a big (cross-arch) mess that we should fix later.
Yes, I ran into this when I did those MMU-gather fixes as well. For this patch I cribbed what s390 already does.
PATCH 4/5 m68k,mm: Extend table allocator for multiple sizes
In reply to Peter ZijlstraIn addition to the PGD/PMD table size (128*4) add a PTE table size (64*4) to the table allocator. This completely removes the pte-table overhead compared to the old code, even for dense tables.
Notes:
- the allocator gained __flush_page_to_ram(), since the old page-based allocator had that.
- the allocator gained a list_empty() check to deal with there not being any pages at all.
- the free mask is extended to cover more than the 8 bits required for the (512 byte) PGD/PMD tables.
- NR_PAGETABLE accounting is restored.
--- arch/m68k/include/asm/motorola_pgalloc.h | 24 +++++----- arch/m68k/mm/init.c | 6 +- arch/m68k/mm/memory.c | 70 ++++++++++++++++++++----------- 3 files changed, 61 insertions(+), 39 deletions(-)
arch/m68k/include/asm/motorola_pgalloc.h +12 -12
@@ -5,61 +5,61 @@#include <asm/tlb.h> #include <asm/tlbflush.h> -extern pmd_t *get_pointer_table (void ); -extern int free_pointer_table (pmd_t *); +extern void *get_pointer_table (int type); +extern int free_pointer_table (void *table,int type);static inline pte_t *pte_alloc_one_kernel (struct mm_struct *mm) { -return (pte_t *)get_pointer_table (); +return get_pointer_table (1 ); }static inline void pte_free_kernel (struct mm_struct *mm,pte_t *pte) { -free_pointer_table ((void *)pte); +free_pointer_table (pte,1 ); }static inline pgtable_t pte_alloc_one (struct mm_struct *mm) { -return (pte_t *)get_pointer_table (); +return get_pointer_table (1 ); }static inline void pte_free (struct mm_struct *mm,pgtable_t pgtable) { -free_pointer_table ((void *)pgtable); +free_pointer_table (pgtable,1 ); }static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t pgtable,unsigned long address) { -free_pointer_table ((void *)pgtable); +free_pointer_table (pgtable,1 ); }static inline pmd_t *pmd_alloc_one (struct mm_struct *mm,unsigned long address) { -return get_pointer_table (); +return get_pointer_table (0 ); }static inline int pmd_free (struct mm_struct *mm,pmd_t *pmd) { -return free_pointer_table (pmd); +return free_pointer_table (pmd,0 ); }static inline int __pmd_free_tlb (struct mmu_gather *tlb,pmd_t *pmd,unsigned long address) { -return free_pointer_table (pmd); +return free_pointer_table (pmd,0 ); }static inline void pgd_free (struct mm_struct *mm,pgd_t *pgd) { -pmd_free (mm, (pmd_t *)pgd); +free_pointer_table (pgd,0 ); }static inline pgd_t *pgd_alloc (struct mm_struct *mm) { -return (pgd_t *)get_pointer_table (); +return get_pointer_table (0 ); }
arch/m68k/mm/init.c +3 -3
@@ -41,7 +41,7 @@ void *empty_zero_page;EXPORT_SYMBOL (empty_zero_page);#if !defined(CONFIG_SUN3 ) && !defined(CONFIG_COLDFIRE ) -extern void init_pointer_table (unsigned long ptable); +extern void init_pointer_table (unsigned long ptable,int type);#endif #ifdef CONFIG_MMU
@@ -127,12 +127,12 @@ static inline void init_pointer_tables(vint i;/* insert pointer tables allocated so far into the tablelist */ -init_pointer_table ((unsigned long )kernel_pg_dir); +init_pointer_table ((unsigned long )kernel_pg_dir,0 );for (i =0 ; i <PTRS_PER_PGD ; i++) {pud_t *pud = (pud_t *)(&kernel_pg_dir[i]);if (pud_present (*pud)) -init_pointer_table (pgd_page_vaddr (kernel_pg_dir[i])); +init_pointer_table (pgd_page_vaddr (kernel_pg_dir[i]),0 ); }#endif }
arch/m68k/mm/memory.c +46 -24
138 lines not on this page · raw message
Re: [PATCH 4/5] m68k,mm: Extend table allocator for multiple sizes
Quoted 27 lines · Peter Zijlstra
In addition to the PGD/PMD table size (128*4) add a PTE table size (64*4) to the table allocator. This completely removes the pte-table overhead compared to the old code, even for dense tables.
Notes:
- the allocator gained
__flush_page_to_ram(), since the old page-based allocator had that.- the allocator gained a
list_empty()check to deal with there not being any pages at all.- the free mask is extended to cover more than the 8 bits required for the (512 byte) PGD/PMD tables.
-
NR_PAGETABLEaccounting is restored.Signed-off-by Peter Zijlstra (Intel) <[email protected]>--- arch/m68k/include/asm/motorola_pgalloc.h | 24 +++++----- arch/m68k/mm/init.c | 6 +- arch/m68k/mm/memory.c | 70 ++++++++++++++++++++----------- 3 files changed, 61 insertions(+), 39 deletions(-)
arch/m68k/include/asm/motorola_pgalloc.h line 8
Quoted 6 lines
arch/m68k/include/asm/motorola_pgalloc.h +1
-2@@ -5,61 +5,61 @@#include <asm/tlb.h> #include <asm/tlbflush.h> -extern pmd_t *get_pointer_table (void ); -extern int free_pointer_table (pmd_t *); +extern void *get_pointer_table (int type);
Could be prettier/obfuscated with an enum type?
Quoted 47 lines
arch/m68k/mm/memory.c +17
-7@@ -27,24 +27,34 @@arch/sparc/mm/srmmu.c ... */ typedef struct list_head ptable_desc ; -static LIST_HEAD (ptable_list); + +static struct list_head ptable_list[2 ] = { +LIST_HEAD_INIT (ptable_list[0 ]), +LIST_HEAD_INIT (ptable_list[1 ]), +};#define PD_PTABLE (page) ((ptable_desc *)&(virt_to_page(page)->lru))#define PD_PAGE (ptable) (list_entry(ptable, struct page, lru)) -#define PD_MARKBITS (dp) (*(unsigned char *)&PD_PAGE(dp)->index) +#define PD_MARKBITS (dp) (*(unsigned int *)&PD_PAGE(dp)->index) + +static const int ptable_shift[2 ] = { +7 +2 ,/* PGD, PMD */ +6 +2 ,/* PTE */ +}; -#define PTABLE_SIZE (PTRS_PER_PMD * sizeof(pmd_t)) +#define ptable_size (type) (1U << ptable_shift[type]) +#define ptable_mask (type) ((1U << (PAGE_SIZE / ptable_size(type))) - 1) -void __init init_pointer_table (unsigned long ptable) +void __init init_pointer_table (unsigned long ptable,int type) {ptable_desc *dp;unsigned long page = ptable &PAGE_MASK ; -unsigned char mask =1 << ((ptable - page)/PTABLE_SIZE ); +unsigned int mask =1U << ((ptable - page)/ptable_size (type)); dp =PD_PTABLE (page);if (!(PD_MARKBITS (dp) & mask)) { -PD_MARKBITS (dp) =0xff ; -list_add (dp, &ptable_list); +PD_MARKBITS (dp) =ptable_mask (type); +list_add (dp, &ptable_list[type]); }PD_MARKBITS (dp) &= ~mask;@@ -57,12 +67,10 @@ void __init init_pointer_table(unsignedreturn ; }
arch/m68k/mm/memory.c void __init init_pointer_table(unsigned · line 73
Quoted 10 lines
arch/m68k/mm/memory.c +3
-5-pmd_t *get_pointer_table (void ) +void *get_pointer_table (int type) { -ptable_desc *dp = ptable_list.next; -unsigned char mask =PD_MARKBITS (dp); -unsigned char tmp; -unsigned int off; +ptable_desc *dp = ptable_list[type].next; +unsigned int mask, tmp, off;
nit, but if you do:
unsigned int mask = list_empty(&ptable_list[type]) ? 0 : PD_MARKBITS(dp);
then you can leave the existing mask logic as-is.
Will
Re: [PATCH 4/5] m68k,mm: Extend table allocator for multiple sizes
Quoted 5 lines · Will Deacon
Quoted 1 line · Peter Zijlstra
+extern void *get_pointer_table(int type);
Could be prettier/obfuscated with an enum type?
Definitely, but then we get to bike-shed on names :-)
enum m68k_table_type {
TABLE_BIG = 0,
TABLE_SMALL,
};Is not exactly _that_ much better, and while TABLE_PTE works, TABLE_PGD_PMD is a bit crap.
Quoted 15 lines
arch/m68k/mm/memory.c void __init init_pointer_table(unsigned · line 73
Quoted 12 lines
arch/m68k/mm/memory.c +3
-5-pmd_t *get_pointer_table (void ) +void *get_pointer_table (int type) { -ptable_desc *dp = ptable_list.next; -unsigned char mask =PD_MARKBITS (dp); -unsigned char tmp; -unsigned int off; +ptable_desc *dp = ptable_list[type].next; +unsigned int mask, tmp, off;nit, but if you do:
Quoted 3 lines
unsigned int mask = list_empty(&ptable_list[type]) ? 0 : PD_MARKBITS(dp);then you can leave the existing mask logic as-is.
Indeed!
Re: [PATCH 4/5] m68k,mm: Extend table allocator for multiple sizes
Quoted 8 lines · Peter Zijlstra
Quoted 5 lines · Will Deacon
Quoted 1 line · Peter Zijlstra
+extern void *get_pointer_table(int type);
Could be prettier/obfuscated with an enum type?
Definitely, but then we get to bike-shed on names :-)
At least we don't need an emulator for *that*!
Quoted 7 lines
enum m68k_table_type { TABLE_BIG = 0, TABLE_SMALL, };Is not exactly _that_ much better, and while
TABLE_PTEworks,TABLE_PGD_PMDis a bit crap.
Some alternatives:
TABLE_PXD / TABLE_PTETABLE_BRANCH / TABLE_LEAFTABLE_DIR / TABLE_PTETABLE_TI_AB / TABLE_TI_C
Will
PATCH 5/5 m68k,mm: Fully initialize the page-table allocator
In reply to Peter ZijlstraAlso iterate the PMD tables to populate the PTE table allocator. This also fully replaces the previous zero_pgtable hack.
--- arch/m68k/mm/init.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
arch/m68k/mm/init.c +19 -4
@@ -124,15 +124,30 @@ void free_initmem(void)static inline void init_pointer_tables (void ) {#if defined(CONFIG_MMU ) && !defined(CONFIG_SUN3 ) && !defined(CONFIG_COLDFIRE ) -int i; +int i, j;/* insert pointer tables allocated so far into the tablelist */ init_pointer_table ((unsigned long )kernel_pg_dir,0 );for (i =0 ; i <PTRS_PER_PGD ; i++) { -pud_t *pud = (pud_t *)(&kernel_pg_dir[i]); +pud_t *pud = (pud_t *)&kernel_pg_dir[i]; +pmd_t *pmd_dir; -if (pud_present (*pud)) -init_pointer_table (pgd_page_vaddr (kernel_pg_dir[i]),0 ); +if (!pud_present (*pud)) +continue ; + + pmd_dir = (pmd_t *)pgd_page_vaddr (kernel_pg_dir[i]); +init_pointer_table ((unsigned long )pmd_dir,0 ); + +for (j =0 ; j <PTRS_PER_PMD ; j++) { +pmd_t *pmd = &pmd_dir[j]; +pte_t *pte_dir; + +if (!pmd_present (*pmd)) +continue ; + + pte_dir = (pte_t *)__pmd_page (*pmd); +init_pointer_table ((unsigned long )pte_dir,1 ); + } }#endif }
Hi Peter!
Quoted 2 lines · Peter Zijlstra
It would be very good if someone can either test or tell us what emulator to use for 020/030.
If possible, please also test on qemu-system, see [1] for a how-to.
I can test the patches on a real machine, Michael Schmitz could maybe include them in one of his next test builds which we are running on one of the Amigas I have.
Adrian
Quoted 1 line
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Quoted 1 line · John Paul Adrian Glaubitz
Quoted 1 line
Now, if only debian would actually ship that :/
AFAICT that emulates a q800 which is another 68040 and should thus not differ from ARAnyM.
I'm fairly confident in the 040 bits, it's the 020/030 things that need coverage.
Quoted 5 lines · Peter Zijlstra
Quoted 1 line · John Paul Adrian Glaubitz
Quoted 1 line
Now, if only debian would actually ship that :/
Debian should receive the QEMU version that supports full m68k emulation soonish.
Quoted 2 lines
AFAICT that emulates a q800 which is another 68040 and should thus not differ from ARAnyM.
Right. You could switch to a different CPU emulation though, Laurent Vivier should be able to say more on that.
Quoted 2 lines
I'm fairly confident in the 040 bits, it's the 020/030 things that need coverage.
I'm currently setting up an Amiga 500 with an ACA-1233n/40 accelerator which has an 68030 CPU clocked at 40 MHz and 128 MB RAM which will be used for developing a driver for a new network card card for the Amiga 500 called X-Surf 500.
I can definitely test the patches on that setup, but I certainly won't have the time to set everything up until after FOSDEM.
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Quoted 9 lines · John Paul Adrian Glaubitz
Quoted 5 lines · Peter Zijlstra
Quoted 1 line · John Paul Adrian Glaubitz
Quoted 1 line
Now, if only debian would actually ship that :/
Debian should receive the QEMU version that supports full m68k emulation soonish.
Excellent!
Quoted 5 lines
Quoted 2 lines
AFAICT that emulates a q800 which is another 68040 and should thus not differ from ARAnyM.
Right. You could switch to a different CPU emulation though, Laurent Vivier should be able to say more on that.
The link you provided only mentioned that Q-88 thing, let me go rummage through the actual qemu-patch to see if it supports more.
Quoted 7 lines
Quoted 2 lines
I'm fairly confident in the 040 bits, it's the 020/030 things that need coverage.
I'm currently setting up an Amiga 500 with an ACA-1233n/40 accelerator which has an 68030 CPU clocked at 40 MHz and 128 MB RAM which will be used for developing a driver for a new network card card for the Amiga 500 called X-Surf 500.
I remember playing 'Another World' on the Amiga-500, I'm thinking this accelerator is a wee bit overkill for that though ;-)
Quoted 2 lines
I can definitely test the patches on that setup, but I certainly won't have the time to set everything up until after FOSDEM.
That would be great, thanks!
Peter,
Quoted 5 lines · Peter Zijlstra
Quoted 1 line · John Paul Adrian Glaubitz
Quoted 1 line
Quoted 7 lines
Now, if only debian would actually ship that :/
AFAICT that emulates a q800 which is another 68040 and should thus not differ from ARAnyM.
I'm fairly confident in the 040 bits, it's the 020/030 things that need coverage.
I'll take a look - unless this eats up way more kernel memory for page tables, it should still boot on my Falcon.
Cheers,
Michael
Quoted 10 lines · Michael Schmitz
Peter,
Quoted 7 lines · Peter Zijlstra
Quoted 1 line · John Paul Adrian Glaubitz
Quoted 1 line
Now, if only debian would actually ship that :/
Quoted 8 lines
Quoted 5 lines
AFAICT that emulates a q800 which is another 68040 and should thus not differ from ARAnyM.
I'm fairly confident in the 040 bits, it's the 020/030 things that need coverage.
I'll take a look - unless this eats up way more kernel memory for page tables, it should still boot on my Falcon.
It should actually be better in most cases I think, since we no longer require all 16 pte-tables to map consecutive (virtual) memory.
Peter,
Am 30.01.2020 um 08:31 schrieb Peter Zijlstra:
Quoted 14 lines · Michael Schmitz
Quoted 13 lines
Peter,
Quoted 10 lines · Peter Zijlstra
Quoted 1 line · John Paul Adrian Glaubitz
Quoted 1 line
Now, if only debian would actually ship that :/
AFAICT that emulates a q800 which is another 68040 and should thus not differ from ARAnyM.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
I'm fairly confident in the 040 bits, it's the 020/030 things that need coverage.
I'll take a look - unless this eats up way more kernel memory for page tables, it should still boot on my Falcon.
It should actually be better in most cases I think, since we no longer require all 16 pte-tables to map consecutive (virtual) memory.
Not much difference:
total used free shared buffers cached
Mem: 10712 10120 592 0 1860 2276
-/+ buffers/cache: 5984 4728
Swap: 2097144 1552 2095592
vs. vanilla 5.5rc5:
total used free shared buffers cached
Mem: 10716 10104 612 0 1588 2544
-/+ buffers/cache: 5972 4744
Swap: 2097144 1296 2095848
By sheer coincidence, the boot with your patch series happened to run a full filesystem check on the root filesystem, so I'd say it got a good workout re: paging and swapping (even though it's just a paltry 4 GB).
Haven't tried any VM stress testing yet (not sure what to do for that; it's been years since I tried that sort of stuff).
Cheers,
Michael
Hi Michael,
Quoted 14 lines · Michael Schmitz
Not much difference:
total used free shared buffers cached
Mem: 10712 10120 592 0 1860 2276
-/+ buffers/cache: 5984 4728
Swap: 2097144 1552 2095592vs. vanilla 5.5rc5:
total used free shared buffers cached
Mem: 10716 10104 612 0 1588 2544
-/+ buffers/cache: 5972 4744
Swap: 2097144 1296 2095848
Quoted 3 lines
By sheer coincidence, the boot with your patch series happened to run a full filesystem check on the root filesystem, so I'd say it got a good workout
re: paging and swapping (even though it's just a paltry 4 GB).
Sweet!, can I translate this into a Tested-by: from you?
Quoted 2 lines
Haven't tried any VM stress testing yet (not sure what to do for that; it's been years since I tried that sort of stuff).
I think, this not being SMP, doing what you just did tickled just about everything there is.
There is one more potential issue with MMU-gather / TLB invalidate on m68k (and a whole bunch of other archs) and I have patches for that (although I now need to redo the m68k one.
Meanwhile the build robot gifted me with a build issue, and Will had some nitpicks, so I'll go respin and repost these patches.
Peter,
Quoted 18 lines · Peter Zijlstra
Hi Michael,
Quoted 14 lines · Michael Schmitz
Not much difference:
total used free shared buffers cached
Mem: 10712 10120 592 0 1860 2276
-/+ buffers/cache: 5984 4728
Swap: 2097144 1552 2095592vs. vanilla 5.5rc5:
total used free shared buffers cached
Mem: 10716 10104 612 0 1588 2544
-/+ buffers/cache: 5972 4744
Swap: 2097144 1296 2095848
Quoted 4 lines
Quoted 3 lines
By sheer coincidence, the boot with your patch series happened to run a full filesystem check on the root filesystem, so I'd say it got a good workout
re: paging and swapping (even though it's just a paltry 4 GB).Sweet!, can I translate this into a Tested-by: from you?
If the test coverage is sufficient, you may certainly do that.
Cheers,
Michael
Quoted 12 lines
Quoted 3 lines
Haven't tried any VM stress testing yet (not sure what to do for that; it's been years since I tried that sort of stuff).
I think, this not being SMP, doing what you just did tickled just about everything there is.
There is one more potential issue with MMU-gather / TLB invalidate on m68k (and a whole bunch of other archs) and I have patches for that (although I now need to redo the m68k one.
Meanwhile the build robot gifted me with a build issue, and Will had some nitpicks, so I'll go respin and repost these patches.
Hi Peter,
Quoted 11 lines · Peter Zijlstra
Hi!
In order to faciliate Will's
READ_ONCE()patches:https://lkml.kernel.org/r/[email protected]we need to fix m68k/motorola to not have a giant
pmd_t. These patches do so and are tested using ARAnyM/68040.It would be very good if someone can either test or tell us what emulator to use for 020/030.
This series breaks compilation for the ColdFire (with MMU) variant of the m68k family:
CC arch/m68k/kernel/sys_m68k.o
In file included from ./arch/m68k/include/asm/pgalloc.h:12,
from ./include/asm-generic/tlb.h:16,
from ./arch/m68k/include/asm/tlb.h:5,
from arch/m68k/kernel/sys_m68k.c:35:
./arch/m68k/include/asm/mcf_pgalloc.h: In function ‘__pte_free_tlb’:
./arch/m68k/include/asm/mcf_pgalloc.h:41:24: error: passing argument 1 of ‘pgtable_pte_page_dtor’ from incompatible pointer type [-Werror=incompatible-pointer-types]
pgtable_pte_page_dtor(page);
^~~~
In file included from arch/m68k/kernel/sys_m68k.c:13:
./include/linux/mm.h:1949:55: note: expected ‘struct page *’ but argument is of type ‘pgtable_t’ {aka ‘struct <anonymous> *’}
static inline void pgtable_pte_page_dtor(struct page *page)
~~~~~~~~~~~~~^~~~
In file included from ./include/linux/mm.h:10,
from arch/m68k/kernel/sys_m68k.c:13:
./include/linux/gfp.h:577:40: error: passing argument 1 of ‘__free_pages’ from incompatible pointer type [-Werror=incompatible-pointer-types]
#define __free_page(page) __free_pages((page), 0)
^~~~~~./arch/m68k/include/asm/mcf_pgalloc.h:42:2: note: in expansion of macro ‘__free_page’
__free_page(page);
^~~~~~~~~~~./include/linux/gfp.h:566:39: note: expected ‘struct page *’ but argument is of type ‘pgtable_t’ {aka ‘struct <anonymous> *’}
extern void __free_pages(struct page *page, unsigned int order);
~~~~~~~~~~~~~^~~~
cc1: some warnings being treated as errors scripts/Makefile.build:265: recipe for target 'arch/m68k/kernel/sys_m68k.o' failed
Easy to reproduce. Build for the m5475evb_defconfig.
Regards
Greg
Hi Greg,
Quoted 13 lines · Greg Ungerer
Quoted 9 lines · Peter Zijlstra
In order to faciliate Will's
READ_ONCE()patches:https://lkml.kernel.org/r/[email protected]we need to fix m68k/motorola to not have a giant
pmd_t. These patches do so and are tested using ARAnyM/68040.It would be very good if someone can either test or tell us what emulator to use for 020/030.
This series breaks compilation for the ColdFire (with MMU) variant of the m68k family:
[...]
Quoted 1 line
Easy to reproduce. Build for the
m5475evb_defconfig.
I've hacked up a fix below, but I don't know how to test whether it actually works (it does fix the build). However, I also notice that building for m5475evb_defconfig with vanilla v5.5 triggers this scary looking warning due to a mismatch between the pgd size and the (8k!) page size:
| In function 'pgd_alloc.isra.111',
| inlined from 'mm_alloc_pgd' at kernel/fork.c:634:12,
| inlined from 'mm_init.isra.112' at kernel/fork.c:1043:6:
| ./arch/m68k/include/asm/string.h:72:25: warning: '__builtin_memcpy' forming offset [4097, 8192] is out of the bounds [0, 4096] of object 'kernel_pg_dir' with type 'pgd_t[1024]' {aka 'struct <anonymous>[1024]'} [-Warray-bounds]
| #define memcpy(d, s, n) __builtin_memcpy(d, s, n)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
| ./arch/m68k/include/asm/mcf_pgalloc.h:93:2: note: in expansion of macro 'memcpy'
| memcpy(new_pgd, swapper_pg_dir, PAGE_SIZE);
| ^~~~~~I think the correct fix is to add this:
arch/m68k/include/asm/mcf_pgalloc.h +1 -1
@@ -90,7 +90,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) new_pgd = (pgd_t *)__get_free_page (GFP_DMA | __GFP_NOWARN);if (!new_pgd)return NULL ; -memcpy (new_pgd, swapper_pg_dir,PAGE_SIZE ); +memcpy (new_pgd, swapper_pg_dir,PTRS_PER_PGD *sizeof (pgd_t));memset (new_pgd,0 ,PAGE_OFFSET >>PGDIR_SHIFT );return new_pgd; }
but maybe it should be done as a separate patch give that it's not caused by the rework we've been doing.
Will
--->8
arch/m68k/include/asm/mcf_pgalloc.h +16 -16
@@ -28,21 +28,22 @@ extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)return (pmd_t *) pgd; } -#define pmd_populate (mm, pmd, page) (pmd_val(*pmd) = \ - (unsigned long)(page_address(page))) +#define pmd_populate (mm, pmd, pte) (pmd_val(*pmd) = (unsigned long)(pte)) -#define pmd_populate_kernel (mm, pmd, pte) (pmd_val(*pmd) = (unsigned long)(pte)) +#define pmd_populate_kernel pmd_populate -#define pmd_pgtable (pmd) pmd_page(pmd) +#define pmd_pgtable (pmd) pfn_to_virt(pmd_val(pmd) >> PAGE_SHIFT) -static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t page, +static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t pgtable,unsigned long address) { +struct page *page =virt_to_page (pgtable); +pgtable_pte_page_dtor (page);__free_page (page); } -static inline struct page *pte_alloc_one (struct mm_struct *mm) +static inline pgtable_t pte_alloc_one (struct mm_struct *mm) {struct page *page =alloc_pages (GFP_DMA ,0 );pte_t *pte;
@@ -54,20 +55,19 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm)return NULL ; } - pte =kmap (page); -if (pte) { -clear_page (pte); -__flush_page_to_ram (pte); -flush_tlb_kernel_page (pte); -nocache_page (pte); - } -kunmap (page); + pte =page_address (page); +clear_page (pte); +__flush_page_to_ram (pte); +flush_tlb_kernel_page (pte); +nocache_page (pte); -return page; +return pte; } -static inline void pte_free (struct mm_struct *mm,struct page *page) +static inline void pte_free (struct mm_struct *mm,pgtable_t pgtable) { +struct page *page =virt_to_page (pgtable); +pgtable_pte_page_dtor (page);__free_page (page); }
Quoted 2 lines · Will Deacon
Quoted 2 lines
This series breaks compilation for the ColdFire (with MMU) variant of the m68k family:
That's like the same I had reported by the build robots for sun3, which I fixed by frobbing pgtable_t. That said, this is probably a more consistent change.
One note below:
Quoted 12 lines
arch/m68k/include/asm/mcf_pgalloc.h +1
-4-static inline struct page *pte_alloc_one (struct mm_struct *mm) +static inline pgtable_t pte_alloc_one (struct mm_struct *mm) {struct page *page =alloc_pages (GFP_DMA ,0 );pte_t *pte;@@ -54,20 +55,19 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm)return NULL ; } - pte =kmap (page); -if (pte) { -clear_page (pte);
arch/m68k/include/asm/mcf_pgalloc.h static inline struct page *pte_alloc_one(struct mm_struct *mm) · line 62
Quoted 10 lines
arch/m68k/include/asm/mcf_pgalloc.h +5
-5-__flush_page_to_ram (pte); -flush_tlb_kernel_page (pte); -nocache_page (pte); - } -kunmap (page); + pte =page_address (page); +clear_page (pte); +__flush_page_to_ram (pte); +flush_tlb_kernel_page (pte); +nocache_page (pte);
See how it does the nocache dance ^
arch/m68k/include/asm/mcf_pgalloc.h static inline struct page *pte_alloc_one(struct mm_struct *mm) · line 70
Quoted 10 lines
arch/m68k/include/asm/mcf_pgalloc.h +4
-2-return page; +return pte; } -static inline void pte_free (struct mm_struct *mm,struct page *page) +static inline void pte_free (struct mm_struct *mm,pgtable_t pgtable) { +struct page *page =virt_to_page (pgtable); +
but never sets it cached again!
arch/m68k/include/asm/mcf_pgalloc.h extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address) · line 44
Quoted 3 lines
arch/m68k/include/asm/mcf_pgalloc.h +0
-0pgtable_pte_page_dtor (page);__free_page (page); }
Also, the alloc_one_kernel() also suspicioudly doesn't do the nocache thing.
So either, alloc_one() shouldn't either, or it's all buggered.
Quoted 37 lines · Peter Zijlstra
Quoted 2 lines · Will Deacon
Quoted 2 lines
This series breaks compilation for the ColdFire (with MMU) variant of the m68k family:
That's like the same I had reported by the build robots for sun3, which I fixed by frobbing
pgtable_t. That said, this is probably a more consistent change.One note below:
Quoted 12 lines
arch/m68k/include/asm/mcf_pgalloc.h +1
-4-static inline struct page *pte_alloc_one (struct mm_struct *mm) +static inline pgtable_t pte_alloc_one (struct mm_struct *mm) {struct page *page =alloc_pages (GFP_DMA ,0 );pte_t *pte;@@ -54,20 +55,19 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm)return NULL ; } - pte =kmap (page); -if (pte) { -clear_page (pte);arch/m68k/include/asm/mcf_pgalloc.h static inline struct page *pte_alloc_one(struct mm_struct *mm) · line 62
Quoted 10 lines
arch/m68k/include/asm/mcf_pgalloc.h +5
-5-__flush_page_to_ram (pte); -flush_tlb_kernel_page (pte); -nocache_page (pte); - } -kunmap (page); + pte =page_address (page); +clear_page (pte); +__flush_page_to_ram (pte); +flush_tlb_kernel_page (pte); +nocache_page (pte);See how it does the nocache dance ^
Quoted 1 line
So either,
alloc_one()shouldn't either, or it's all buggered.
Damn, we weren't going to touch coldfire! :-))
So now I found the coldfire docs, and it looks like this thing is a software tlb-miss arch, so there is no reason what so ever for this to be nocache. I'll 'fix' that.
Quoted 38 lines · Peter Zijlstra
Quoted 36 lines · Peter Zijlstra
Quoted 2 lines · Will Deacon
Quoted 2 lines
This series breaks compilation for the ColdFire (with MMU) variant of the m68k family:
That's like the same I had reported by the build robots for sun3, which I fixed by frobbing
pgtable_t. That said, this is probably a more consistent change.One note below:
Quoted 12 lines
arch/m68k/include/asm/mcf_pgalloc.h +1
-4-static inline struct page *pte_alloc_one (struct mm_struct *mm) +static inline pgtable_t pte_alloc_one (struct mm_struct *mm) {struct page *page =alloc_pages (GFP_DMA ,0 );pte_t *pte;@@ -54,20 +55,19 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm)return NULL ; } - pte =kmap (page); -if (pte) { -clear_page (pte);arch/m68k/include/asm/mcf_pgalloc.h static inline struct page *pte_alloc_one(struct mm_struct *mm) · line 62
Quoted 10 lines
arch/m68k/include/asm/mcf_pgalloc.h +5
-5-__flush_page_to_ram (pte); -flush_tlb_kernel_page (pte); -nocache_page (pte); - } -kunmap (page); + pte =page_address (page); +clear_page (pte); +__flush_page_to_ram (pte); +flush_tlb_kernel_page (pte); +nocache_page (pte);See how it does the nocache dance ^
Quoted 7 lines
Quoted 1 line
So either,
alloc_one()shouldn't either, or it's all buggered.Damn, we weren't going to touch coldfire! :-))
So now I found the coldfire docs, and it looks like this thing is a software tlb-miss arch, so there is no reason what so ever for this to be nocache. I'll 'fix' that.
Does that mean we can drop the GFP_DMA too? If so, this all ends up looking very similar to the sun3 code wrt alloc/free and they could probably use the same implementation (since the generic code doesn't like out pgtable_t definition).
Will
Quoted 9 lines · Will Deacon
Quoted 4 lines
Quoted 4 lines
arch/m68k/include/asm/mcf_pgalloc.h extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address) · line 49
Quoted 4 lines
arch/m68k/include/asm/mcf_pgalloc.h +1
-0+static inline pgtable_t pte_alloc_one (struct mm_struct *mm) {struct page *page =alloc_pages (GFP_DMA ,0 );pte_t *pte;Does that mean we can drop the
GFP_DMAtoo? If so, this all ends up looking very similar to the sun3 code wrt alloc/free and they could probably use the same implementation (since the generic code doesn't like outpgtable_tdefinition).
Many software TLB archs have limits on what memory the TLB miss handler itself can access (chicken-egg issues), it might be this is where the GFP_DMA comes from.
I can't quickly find this in the CFV4e docs, but I'm not really reading it carefully either.
Quoted 6 lines · Peter Zijlstra
Quoted 4 lines · Will Deacon
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
arch/m68k/include/asm/mcf_pgalloc.h +1
-0+static inline pgtable_t pte_alloc_one (struct mm_struct *mm) {struct page *page =alloc_pages (GFP_DMA ,0 );pte_t *pte;
Quoted 8 lines
Quoted 4 lines
Does that mean we can drop the
GFP_DMAtoo? If so, this all ends up looking very similar to the sun3 code wrt alloc/free and they could probably use the same implementation (since the generic code doesn't like outpgtable_tdefinition).Many software TLB archs have limits on what memory the TLB miss handler itself can access (chicken-egg issues), it might be this is where the
GFP_DMAcomes from.
Fair enough, that sounds plausible.
Quoted 2 lines
I can't quickly find this in the CFV4e docs, but I'm not really reading it carefully either.
I can't find any code under arch/m68k/ which suggests it, but for now I guess we should stick with the old pgtable_t definition for sun3 with a comment (and keep the GFP_DMA in for coldfire).
Will
Hi Will,
Quoted 15 lines · Will Deacon
Quoted 5 lines · Greg Ungerer
Quoted 4 lines · Peter Zijlstra
In order to faciliate Will's
READ_ONCE()patches:https://lkml.kernel.org/r/[email protected]Quoted 8 lines
Quoted 5 lines
we need to fix m68k/motorola to not have a giant
pmd_t. These patches do so and are tested using ARAnyM/68040.It would be very good if someone can either test or tell us what emulator to use for 020/030.
This series breaks compilation for the ColdFire (with MMU) variant of the m68k family:
Quoted 6 lines
[...]
Quoted 1 line
Easy to reproduce. Build for the
m5475evb_defconfig.I've hacked up a fix below, but I don't know how to test whether it actually works (it does fix the build).
Yep, I can confirm that too.
There is no emulators for the MMU based ColdFires (qemu only supports a non-MMU variant).
I can test on real hardware - but not until Monday when I am back in my lab. I'll report back then.
Quoted 34 lines
However, I also notice that building for
m5475evb_defconfigwith vanilla v5.5 triggers this scary looking warning due to a mismatch between the pgd size and the (8k!) page size:| In function 'pgd_alloc.isra.111', | inlined from 'mm_alloc_pgd' at kernel/fork.c:634:12, | inlined from 'mm_init.isra.112' at kernel/fork.c:1043:6: | ./arch/m68k/include/asm/string.h:72:25: warning: '__builtin_memcpy' forming offset [4097, 8192] is out of the bounds [0, 4096] of object 'kernel_pg_dir' with type 'pgd_t[1024]' {aka 'struct <anonymous>[1024]'} [-Warray-bounds] | #define memcpy(d, s, n) __builtin_memcpy(d, s, n) | ^~~~~~~~~~~~~~~~~~~~~~~~~ | ./arch/m68k/include/asm/mcf_pgalloc.h:93:2: note: in expansion of macro 'memcpy' | memcpy(new_pgd, swapper_pg_dir, PAGE_SIZE); | ^~~~~~I think the correct fix is to add this:
arch/m68k/include/asm/mcf_pgalloc.h +1
-1@@ -90,7 +90,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) new_pgd = (pgd_t *)__get_free_page (GFP_DMA | __GFP_NOWARN);if (!new_pgd)return NULL ; -memcpy (new_pgd, swapper_pg_dir,PAGE_SIZE ); +memcpy (new_pgd, swapper_pg_dir,PTRS_PER_PGD *sizeof (pgd_t));memset (new_pgd,0 ,PAGE_OFFSET >>PGDIR_SHIFT );return new_pgd; }
Quoted 2 lines
but maybe it should be done as a separate patch give that it's not caused by the rework we've been doing.
Indeed I hadn't noticed that before. But good idea, a separate patch would make sense.
Regards
Greg
Quoted 68 lines
Will
--->8
arch/m68k/include/asm/mcf_pgalloc.h +16
-16@@ -28,21 +28,22 @@ extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)return (pmd_t *) pgd; } -#define pmd_populate (mm, pmd, page) (pmd_val(*pmd) = \ - (unsigned long)(page_address(page))) +#define pmd_populate (mm, pmd, pte) (pmd_val(*pmd) = (unsigned long)(pte)) -#define pmd_populate_kernel (mm, pmd, pte) (pmd_val(*pmd) = (unsigned long)(pte)) +#define pmd_populate_kernel pmd_populate -#define pmd_pgtable (pmd) pmd_page(pmd) +#define pmd_pgtable (pmd) pfn_to_virt(pmd_val(pmd) >> PAGE_SHIFT) -static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t page, +static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t pgtable,unsigned long address) { +struct page *page =virt_to_page (pgtable); +pgtable_pte_page_dtor (page);__free_page (page); } -static inline struct page *pte_alloc_one (struct mm_struct *mm) +static inline pgtable_t pte_alloc_one (struct mm_struct *mm) {struct page *page =alloc_pages (GFP_DMA ,0 );pte_t *pte;@@ -54,20 +55,19 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm)return NULL ; } - pte =kmap (page); -if (pte) { -clear_page (pte); -__flush_page_to_ram (pte); -flush_tlb_kernel_page (pte); -nocache_page (pte); - } -kunmap (page); + pte =page_address (page); +clear_page (pte); +__flush_page_to_ram (pte); +flush_tlb_kernel_page (pte); +nocache_page (pte); -return page; +return pte; } -static inline void pte_free (struct mm_struct *mm,struct page *page) +static inline void pte_free (struct mm_struct *mm,pgtable_t pgtable) { +struct page *page =virt_to_page (pgtable); +pgtable_pte_page_dtor (page);__free_page (page); }