Rework sparc32 page-table layout
cover Rework sparc32 page-table layout
Hi folks,
This series of patches reworks the sparc32 page-table layout so that 'pmd_t' no longer embeds an array of 16 physical pointers, which means that we can finally enforce atomicity for accesses made using READ_ONCE():
https://lkml.kernel.org/r/[email protected]
I've tested this with QEMU by booting Debian Etch. Please take a look!
Cheers,
Will
--->8
Will Deacon (4):
sparc32: mm: Fix argument checking in __srmmu_get_nocache()
sparc32: mm: Restructure sparc32 MMU page-table layout
sparc32: mm: Change pgtable_t type to pte_t * instead of struct page *
sparc32: mm: Reduce allocation size for PMD and PTE tables
arch/sparc/include/asm/page_32.h | 12 ++-- arch/sparc/include/asm/pgalloc_32.h | 11 ++-- arch/sparc/include/asm/pgtable_32.h | 40 +++++++----- arch/sparc/include/asm/pgtsrmmu.h | 36 +---------- arch/sparc/include/asm/viking.h | 5 +- arch/sparc/kernel/head_32.S | 8 +-- arch/sparc/mm/hypersparc.S | 3 +- arch/sparc/mm/srmmu.c | 95 ++++++++++------------------- arch/sparc/mm/viking.S | 5 +- 9 files changed, 85 insertions(+), 130 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/4 sparc32: mm: Fix argument checking in __srmmu_get_nocache()
The 'size' argument to __srmmu_get_nocache() is a number of bytes not a shift value, so fix up the sanity checking to treat it properly.
--- arch/sparc/mm/srmmu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/sparc/mm/srmmu.c +6 -6
@@ -175,18 +175,18 @@ pte_t *pte_offset_kernel(pmd_t *dir, unsigned long address)*/ static void *__srmmu_get_nocache (int size,int align) { -int offset; +int offset, minsz =1 <<SRMMU_NOCACHE_BITMAP_SHIFT ;unsigned long addr; -if (size <SRMMU_NOCACHE_BITMAP_SHIFT ) { +if (size < minsz) {printk (KERN_ERR "Size 0x%x too small for nocache request\n" , size); - size =SRMMU_NOCACHE_BITMAP_SHIFT ; + size = minsz; } -if (size & (SRMMU_NOCACHE_BITMAP_SHIFT -1 )) { -printk (KERN_ERR "Size 0x%x unaligned int nocache request\n" , +if (size & (minsz -1 )) { +printk (KERN_ERR "Size 0x%x unaligned in nocache request\n" , size); - size +=SRMMU_NOCACHE_BITMAP_SHIFT -1 ; + size += minsz -1 ; }BUG_ON (align >SRMMU_NOCACHE_ALIGN_MAX );
Signature · 1 line
2.20.1
PATCH 2/4 sparc32: mm: Restructure sparc32 MMU page-table layout
In reply to Will DeaconThe "SRMMU" supports 4k pages using a fixed three-level walk with a 256-entry PGD and 64-entry PMD/PTE levels. In order to fill a page with a 'pgtable_t', the SRMMU code allocates four native PTE tables into a single PTE allocation and similarly for the PMD level, leading to an array of 16 physical pointers in a 'pmd_t'
This breaks the generic code which assumes READ_ONCE(*pmd) will be word sized.
In a manner similar to ef22d8abd876 ("m68k: mm: Restructure Motorola MMU page-table layout"), this patch implements the native page-table setup directly. This significantly increases the page-table memory overhead, but will be addresses in a subsequent patch.
--- arch/sparc/include/asm/page_32.h | 10 ++--- arch/sparc/include/asm/pgalloc_32.h | 5 ++- arch/sparc/include/asm/pgtable_32.h | 29 +++++++------- arch/sparc/include/asm/pgtsrmmu.h | 36 ++--------------- arch/sparc/include/asm/viking.h | 5 ++- arch/sparc/kernel/head_32.S | 8 ++-- arch/sparc/mm/hypersparc.S | 3 +- arch/sparc/mm/srmmu.c | 60 ++++++++++------------------- arch/sparc/mm/viking.S | 5 ++- 9 files changed, 58 insertions(+), 103 deletions(-)
arch/sparc/include/asm/page_32.h +5 -5
@@ -54,7 +54,7 @@ extern struct sparc_phys_banks sp_banks[SPARC_PHYS_BANKS+1];*/ typedef struct {unsigned long pte; }pte_t ;typedef struct {unsigned long iopte; }iopte_t ; -typedef struct {unsigned long pmdv[16 ]; }pmd_t ; +typedef struct {unsigned long pmd; }pmd_t ;typedef struct {unsigned long pgd; }pgd_t ;typedef struct {unsigned long ctxd; }ctxd_t ;typedef struct {unsigned long pgprot; }pgprot_t ;
@@ -62,7 +62,7 @@ typedef struct { unsigned long iopgprot; } iopgprot_t;#define pte_val (x) ((x).pte)#define iopte_val (x) ((x).iopte) -#define pmd_val (x) ((x).pmdv[0]) +#define pmd_val (x) ((x).pmd)#define pgd_val (x) ((x).pgd)#define ctxd_val (x) ((x).ctxd)#define pgprot_val (x) ((x).pgprot)
@@ -82,7 +82,7 @@ typedef struct { unsigned long iopgprot; } iopgprot_t;*/ typedef unsigned long pte_t ;typedef unsigned long iopte_t ; -typedef struct {unsigned long pmdv[16 ]; }pmd_t ; +typedef unsigned long pmd_t ;typedef unsigned long pgd_t ;typedef unsigned long ctxd_t ;typedef unsigned long pgprot_t ;
@@ -90,14 +90,14 @@ typedef unsigned long iopgprot_t;#define pte_val (x) (x)#define iopte_val (x) (x) -#define pmd_val (x) ((x).pmdv[0]) +#define pmd_val (x) (x)#define pgd_val (x) (x)#define ctxd_val (x) (x)#define pgprot_val (x) (x)#define iopgprot_val (x) (x)#define __pte (x) (x) -#define __pmd (x) ((pmd_t) { { (x) }, }) +#define __pmd (x) (x)#define __iopte (x) (x)#define __pgd (x) (x)#define __ctxd (x) (x)
arch/sparc/include/asm/pgalloc_32.h +3 -2
@@ -60,13 +60,14 @@ pgtable_t pte_alloc_one(struct mm_struct *mm);static inline pte_t *pte_alloc_one_kernel (struct mm_struct *mm) { -return srmmu_get_nocache (PTE_SIZE ,PTE_SIZE ); +return srmmu_get_nocache (SRMMU_PTE_TABLE_SIZE , +SRMMU_PTE_TABLE_SIZE ); }static inline void free_pte_fast (pte_t *pte) { -srmmu_free_nocache (pte,PTE_SIZE ); +srmmu_free_nocache (pte,SRMMU_PTE_TABLE_SIZE ); }#define pte_free_kernel (mm, pte) free_pte_fast(pte)
arch/sparc/include/asm/pgtable_32.h +15 -14
@@ -11,6 +11,16 @@#include <linux/const.h> +#define PMD_SHIFT 18 +#define PMD_SIZE (1UL << PMD_SHIFT) +#define PMD_MASK (~(PMD_SIZE-1)) +#define PMD_ALIGN (__addr) (((__addr) + ~PMD_MASK) & PMD_MASK) + +#define PGDIR_SHIFT 24 +#define PGDIR_SIZE (1UL << PGDIR_SHIFT) +#define PGDIR_MASK (~(PGDIR_SIZE-1)) +#define PGDIR_ALIGN (__addr) (((__addr) + ~PGDIR_MASK) & PGDIR_MASK) +#ifndef __ASSEMBLY__#include <asm-generic/pgtable-nopud.h>
@@ -34,17 +44,10 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);#define pmd_ERROR (e) __builtin_trap()#define pgd_ERROR (e) __builtin_trap() -#define PMD_SHIFT 22 -#define PMD_SIZE (1UL << PMD_SHIFT) -#define PMD_MASK (~(PMD_SIZE-1)) -#define PMD_ALIGN (__addr) (((__addr) + ~PMD_MASK) & PMD_MASK) -#define PGDIR_SHIFT SRMMU_PGDIR_SHIFT -#define PGDIR_SIZE SRMMU_PGDIR_SIZE -#define PGDIR_MASK SRMMU_PGDIR_MASK -#define PTRS_PER_PTE 1024 -#define PTRS_PER_PMD SRMMU_PTRS_PER_PMD -#define PTRS_PER_PGD SRMMU_PTRS_PER_PGD -#define USER_PTRS_PER_PGD PAGE_OFFSET / SRMMU_PGDIR_SIZE +#define PTRS_PER_PTE 64 +#define PTRS_PER_PMD 64 +#define PTRS_PER_PGD 256 +#define USER_PTRS_PER_PGD PAGE_OFFSET / PGDIR_SIZE#define FIRST_USER_ADDRESS 0UL#define PTE_SIZE (PTRS_PER_PTE*4)
@@ -179,9 +182,7 @@ static inline int pmd_none(pmd_t pmd)static inline void pmd_clear (pmd_t *pmdp) { -int i; -for (i =0 ; i <PTRS_PER_PTE /SRMMU_REAL_PTRS_PER_PTE ; i++) -set_pte ((pte_t *)&pmdp->pmdv[i],__pte (0 )); +set_pte ((pte_t *)&pmd_val (*pmdp),__pte (0 )); }static inline int pud_none (pud_t pud)
arch/sparc/include/asm/pgtsrmmu.h +3 -33
@@ -17,39 +17,9 @@/* Number of contexts is implementation-dependent; 64k is the most we support */ #define SRMMU_MAX_CONTEXTS 65536 -/* PMD_SHIFT determines the size of the area a second-level page table entry can map */ -#define SRMMU_REAL_PMD_SHIFT 18 -#define SRMMU_REAL_PMD_SIZE (1UL << SRMMU_REAL_PMD_SHIFT) -#define SRMMU_REAL_PMD_MASK (~(SRMMU_REAL_PMD_SIZE-1)) -#define SRMMU_REAL_PMD_ALIGN (__addr) (((__addr)+SRMMU_REAL_PMD_SIZE-1)&SRMMU_REAL_PMD_MASK) - -/* PGDIR_SHIFT determines what a third-level page table entry can map */ -#define SRMMU_PGDIR_SHIFT 24 -#define SRMMU_PGDIR_SIZE (1UL << SRMMU_PGDIR_SHIFT) -#define SRMMU_PGDIR_MASK (~(SRMMU_PGDIR_SIZE-1)) -#define SRMMU_PGDIR_ALIGN (addr) (((addr)+SRMMU_PGDIR_SIZE-1)&SRMMU_PGDIR_MASK) - -#define SRMMU_REAL_PTRS_PER_PTE 64 -#define SRMMU_REAL_PTRS_PER_PMD 64 -#define SRMMU_PTRS_PER_PGD 256 - -#define SRMMU_REAL_PTE_TABLE_SIZE (SRMMU_REAL_PTRS_PER_PTE*4) -#define SRMMU_PMD_TABLE_SIZE (SRMMU_REAL_PTRS_PER_PMD*4) -#define SRMMU_PGD_TABLE_SIZE (SRMMU_PTRS_PER_PGD*4) - -/* -* To support pagetables in highmem, Linux introduces APIs which -* return struct page* and generally manipulate page tables when -* they are not mapped into kernel space. Our hardware page tables -* are smaller than pages. We lump hardware tabes into big, page sized -* software tables. -* -* PMD_SHIFT determines the size of the area a second-level page table entry -* can map, and our pmd_t is 16 times larger than normal. The values which -* were once defined here are now generic for 4c and srmmu, so they're -* found in pgtable.h. -*/ -#define SRMMU_PTRS_PER_PMD 4 +#define SRMMU_PTE_TABLE_SIZE (PAGE_SIZE) +#define SRMMU_PMD_TABLE_SIZE (PAGE_SIZE) +#define SRMMU_PGD_TABLE_SIZE (PTRS_PER_PGD*4)/* Definition of the values in the ET field of PTD's and PTE's */ #define SRMMU_ET_MASK 0x3
arch/sparc/include/asm/viking.h +3 -2
@@ -10,6 +10,7 @@#include <asm/asi.h> #include <asm/mxcc.h> +#include <asm/pgtable.h> #include <asm/pgtsrmmu.h> /* Bits in the SRMMU control register for GNU/Viking modules.
@@ -227,7 +228,7 @@ static inline unsigned long viking_hwprobe(unsigned long vaddr) : "=r" (val) : "r" (vaddr | 0x200), "i" (ASI_M_FLUSH_PROBE));if ((val &SRMMU_ET_MASK ) =SRMMU_ET_PTE ) { - vaddr &= ~SRMMU_PGDIR_MASK ; + vaddr &= ~PGDIR_MASK ; vaddr >>=PAGE_SHIFT ;return val | (vaddr <<8 ); }
@@ -237,7 +238,7 @@ static inline unsigned long viking_hwprobe(unsigned long vaddr) : "=r" (val) : "r" (vaddr | 0x100), "i" (ASI_M_FLUSH_PROBE));if ((val &SRMMU_ET_MASK ) =SRMMU_ET_PTE ) { - vaddr &= ~SRMMU_REAL_PMD_MASK ; + vaddr &= ~PMD_MASK ; vaddr >>=PAGE_SHIFT ;return val | (vaddr <<8 ); }
arch/sparc/kernel/head_32.S +4 -4
@@ -24,7 +24,7 @@ #include <asm/winmacro.h> #include <asm/thread_info.h> /* TI_UWINMASK */ #include <asm/errno.h> -#include <asm/pgtsrmmu.h> /* SRMMU_PGDIR_SHIFT */ +#include <asm/pgtable.h> /* PGDIR_SHIFT */ #include <asm/export.h> .data
@@ -273,7 +273,7 @@ not_a_sun4: lda [%o1] ASI_M_BYPASS, %o2 ! This is the 0x0 16MB pgd /* Calculate to KERNBASE entry. */ - add %o1, KERNBASE >> (SRMMU_PGDIR_SHIFT - 2), %o3 + add %o1, KERNBASE >> (PGDIR_SHIFT - 2), %o3 /* Poke the entry into the calculated address. */ sta %o2, [%o3] ASI_M_BYPASS
@@ -317,7 +317,7 @@ srmmu_not_viking: sll %g1, 0x8, %g1 ! make phys addr for l1 tbl lda [%g1] ASI_M_BYPASS, %g2 ! get level1 entry for 0x0 - add %g1, KERNBASE >> (SRMMU_PGDIR_SHIFT - 2), %g3 + add %g1, KERNBASE >> (PGDIR_SHIFT - 2), %g3 sta %g2, [%g3] ASI_M_BYPASS ! place at KERNBASE entry b go_to_highmem nop ! wheee....
@@ -341,7 +341,7 @@ leon_remap: sll %g1, 0x8, %g1 ! make phys addr for l1 tbl lda [%g1] ASI_M_BYPASS, %g2 ! get level1 entry for 0x0 - add %g1, KERNBASE >> (SRMMU_PGDIR_SHIFT - 2), %g3 + add %g1, KERNBASE >> (PGDIR_SHIFT - 2), %g3 sta %g2, [%g3] ASI_M_BYPASS ! place at KERNBASE entry b go_to_highmem nop ! wheee....
arch/sparc/mm/hypersparc.S +2 -1
@@ -10,6 +10,7 @@ #include <asm/asm-offsets.h> #include <asm/asi.h> #include <asm/page.h> +#include <asm/pgtable.h> #include <asm/pgtsrmmu.h> #include <linux/init.h>
@@ -293,7 +294,7 @@ hypersparc_flush_tlb_range: cmp %o3, -1 be hypersparc_flush_tlb_range_out #endif - sethi %hi(~((1 << SRMMU_PGDIR_SHIFT) - 1)), %o4 + sethi %hi(~((1 << PGDIR_SHIFT) - 1)), %o4 sta %o3, [%g1] ASI_M_MMUREGS and %o1, %o4, %o1 add %o1, 0x200, %o1
arch/sparc/mm/srmmu.c +20 -40
121 lines not on this page · raw message
arch/sparc/mm/viking.S +3 -2
@@ -13,6 +13,7 @@ #include <asm/asi.h> #include <asm/mxcc.h> #include <asm/page.h> +#include <asm/pgtable.h> #include <asm/pgtsrmmu.h> #include <asm/viking.h>
@@ -157,7 +158,7 @@ viking_flush_tlb_range: cmp %o3, -1 be 2f #endif - sethi %hi(~((1 << SRMMU_PGDIR_SHIFT) - 1)), %o4 + sethi %hi(~((1 << PGDIR_SHIFT) - 1)), %o4 sta %o3, [%g1] ASI_M_MMUREGS and %o1, %o4, %o1 add %o1, 0x200, %o1
@@ -243,7 +244,7 @@ sun4dsmp_flush_tlb_range: ld [%o0 + VMA_VM_MM], %o0 ld [%o0 + AOFF_mm_context], %o3 lda [%g1] ASI_M_MMUREGS, %g5 - sethi %hi(~((1 << SRMMU_PGDIR_SHIFT) - 1)), %o4 + sethi %hi(~((1 << PGDIR_SHIFT) - 1)), %o4 sta %o3, [%g1] ASI_M_MMUREGS and %o1, %o4, %o1 add %o1, 0x200, %o1
Signature · 1 line
2.20.1
PATCH 3/4 sparc32: mm: Change pgtable_t type to pte_t * instead of struct page *
In reply to Will DeaconChange the 'pgtable_t' type for sparc32 so that it represents the uncached virtual address of the PTE table, rather than the underlying 'struct page'.
This allows us to free page table allocations smaller than a page.
--- arch/sparc/include/asm/page_32.h | 2 +- arch/sparc/include/asm/pgalloc_32.h | 6 +++--- arch/sparc/include/asm/pgtable_32.h | 11 +++++++++++ arch/sparc/mm/srmmu.c | 29 +++++++++-------------------- 4 files changed, 24 insertions(+), 24 deletions(-)
arch/sparc/include/asm/page_32.h +1 -1
@@ -106,7 +106,7 @@ typedef unsigned long iopgprot_t;#endif -typedef struct page *pgtable_t ; +typedef pte_t *pgtable_t ;#define TASK_UNMAPPED_BASE 0x50000000
arch/sparc/include/asm/pgalloc_32.h +3 -3
@@ -50,11 +50,11 @@ static inline void free_pmd_fast(pmd_t * pmd)#define pmd_free (mm, pmd) free_pmd_fast(pmd)#define __pmd_free_tlb (tlb, pmd, addr) pmd_free((tlb)->mm, pmd) -void pmd_populate (struct mm_struct *mm,pmd_t *pmdp,struct page *ptep); -#define pmd_pgtable (pmd) pmd_page(pmd) +#define pmd_populate (mm, pmd, pte) pmd_set(pmd, pte) +#define pmd_pgtable (pmd) (pgtable_t)__pmd_page(pmd)void pmd_set (pmd_t *pmdp,pte_t *ptep); -#define pmd_populate_kernel (MM ,PMD ,PTE ) pmd_set(PMD, PTE) +#define pmd_populate_kernel pmd_populatepgtable_t pte_alloc_one (struct mm_struct *mm);
arch/sparc/include/asm/pgtable_32.h +11 -0
@@ -135,6 +135,17 @@ static inline struct page *pmd_page(pmd_t pmd)return pfn_to_page ((pmd_val (pmd) &SRMMU_PTD_PMASK ) >> (PAGE_SHIFT -4 )); } +static inline unsigned long __pmd_page (pmd_t pmd) +{ +unsigned long v; + +if (srmmu_device_memory (pmd_val (pmd))) +BUG (); + + v =pmd_val (pmd) &SRMMU_PTD_PMASK ; +return (unsigned long )__nocache_va (v <<4 ); +} +static inline unsigned long pud_page_vaddr (pud_t pud) {if (srmmu_device_memory (pud_val (pud))) {
arch/sparc/mm/srmmu.c +9 -20
@@ -140,12 +140,6 @@ void pmd_set(pmd_t *pmdp, pte_t *ptep)set_pte ((pte_t *)&pmd_val (*pmdp),__pte (SRMMU_ET_PTD | ptp)); } -void pmd_populate (struct mm_struct *mm,pmd_t *pmdp,struct page *ptep) -{ -unsigned long ptp =page_to_pfn (ptep) << (PAGE_SHIFT -4 );/* watch for overflow */ -set_pte ((pte_t *)&pmd_val (*pmdp),__pte (SRMMU_ET_PTD | ptp)); -} -/* Find an entry in the third-level page table.. */ pte_t *pte_offset_kernel (pmd_t *dir,unsigned long address) {
@@ -364,31 +358,26 @@ pgd_t *get_pgd_fast(void)*/ pgtable_t pte_alloc_one (struct mm_struct *mm) { -unsigned long pte; +pte_t *ptep;struct page *page; -if ((pte = (unsigned long )pte_alloc_one_kernel (mm)) =0 ) +if ((ptep =pte_alloc_one_kernel (mm)) =0 )return NULL ; - page =pfn_to_page (__nocache_pa (pte) >>PAGE_SHIFT ); + page =pfn_to_page (__nocache_pa ((unsigned long )ptep) >>PAGE_SHIFT );if (!pgtable_pte_page_ctor (page)) {__free_page (page);return NULL ; } -return page; +return ptep; } -void pte_free (struct mm_struct *mm,pgtable_t pte) +void pte_free (struct mm_struct *mm,pgtable_t ptep) { -unsigned long p; - -pgtable_pte_page_dtor (pte); - p = (unsigned long )page_address (pte);/* Cached address (for test) */ -if (p =0 ) -BUG (); - p =page_to_pfn (pte) <<PAGE_SHIFT ;/* Physical address */ +struct page *page; -/* free non cached virtual address*/ -srmmu_free_nocache (__nocache_va (p),SRMMU_PTE_TABLE_SIZE ); + page =pfn_to_page (__nocache_pa ((unsigned long )ptep) >>PAGE_SHIFT ); +pgtable_pte_page_dtor (page); +srmmu_free_nocache (ptep,SRMMU_PTE_TABLE_SIZE ); }/* context handling - a dynamically sized pool is used */
Signature · 1 line
2.20.1
PATCH 4/4 sparc32: mm: Reduce allocation size for PMD and PTE tables
In reply to Will DeaconNow that the page table allocator can free page table allocations smaller than PAGE_SIZE, reduce the size of the PMD and PTE allocations to avoid needlessly wasting memory.
--- arch/sparc/include/asm/pgtsrmmu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/sparc/include/asm/pgtsrmmu.h +2 -2
@@ -17,8 +17,8 @@/* Number of contexts is implementation-dependent; 64k is the most we support */ #define SRMMU_MAX_CONTEXTS 65536 -#define SRMMU_PTE_TABLE_SIZE (PAGE_SIZE) -#define SRMMU_PMD_TABLE_SIZE (PAGE_SIZE) +#define SRMMU_PTE_TABLE_SIZE (PTRS_PER_PTE*4) +#define SRMMU_PMD_TABLE_SIZE (PTRS_PER_PMD*4)#define SRMMU_PGD_TABLE_SIZE (PTRS_PER_PGD*4)/* Definition of the values in the ET field of PTD's and PTE's */
Signature · 1 line
2.20.1
Re: [PATCH 1/4] sparc32: mm: Fix argument checking in __srmmu_get_nocache()
In reply to Will DeaconQuoted 24 lines · Will Deacon
The 'size' argument to
__srmmu_get_nocache()is a number of bytes not a shift value, so fix up the sanity checking to treat it properly.Cc "David S. Miller" <[email protected]>Cc Peter Zijlstra <[email protected]>Signed-off-by Will Deacon <[email protected]>--- arch/sparc/mm/srmmu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/sparc/mm/srmmu.c +1
-2@@ -175,18 +175,18 @@ pte_t *pte_offset_kernel(pmd_t *dir, unsigned long address)*/ static void *__srmmu_get_nocache (int size,int align) { -int offset; +int offset, minsz =1 <<SRMMU_NOCACHE_BITMAP_SHIFT ;unsigned long addr; -if (size <SRMMU_NOCACHE_BITMAP_SHIFT ) {
arch/sparc/mm/srmmu.c pte_t *pte_offset_kernel(pmd_t *dir, unsigned long address) · line 187
Quoted 10 lines
arch/sparc/mm/srmmu.c +4
-3+if (size < minsz) {printk (KERN_ERR "Size 0x%x too small for nocache request\n" , size); - size =SRMMU_NOCACHE_BITMAP_SHIFT ; + size = minsz; } -if (size & (SRMMU_NOCACHE_BITMAP_SHIFT -1 )) { - printk(KERN_ERR "Size 0x%x unaligned int nocache request\n", +if (size & (minsz -1 )) { + printk(KERN_ERR "Size 0x%x unaligned in nocache request\n",
Was modifying the printk intentional? int vs in ?
Quoted 9 lines
arch/sparc/mm/srmmu.c +1
-2size); - size +=SRMMU_NOCACHE_BITMAP_SHIFT -1 ; + size += minsz -1 ; }BUG_ON (align >SRMMU_NOCACHE_ALIGN_MAX ); --2.20.1
Signature · 2 lines
Thanks, ~Nick Desaulniers
Re: [PATCH 1/4] sparc32: mm: Fix argument checking in __srmmu_get_nocache()
Quoted 24 lines · Nick Desaulniers
Quoted 23 lines · Will Deacon
The 'size' argument to
__srmmu_get_nocache()is a number of bytes not a shift value, so fix up the sanity checking to treat it properly.Cc "David S. Miller" <[email protected]>Cc Peter Zijlstra <[email protected]>Signed-off-by Will Deacon <[email protected]>--- arch/sparc/mm/srmmu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/sparc/mm/srmmu.c +1
-1@@ -175,18 +175,18 @@ pte_t *pte_offset_kernel(pmd_t *dir, unsigned long address)*/ static void *__srmmu_get_nocache (int size,int align) { -int offset; +int offset, minsz =1 <<SRMMU_NOCACHE_BITMAP_SHIFT ;unsigned long addr;
Quoted 13 lines
arch/sparc/mm/srmmu.c pte_t *pte_offset_kernel(pmd_t *dir, unsigned long address) · line 187
Quoted 11 lines
arch/sparc/mm/srmmu.c +4
-4-if (size <SRMMU_NOCACHE_BITMAP_SHIFT ) { +if (size < minsz) {printk (KERN_ERR "Size 0x%x too small for nocache request\n" , size); - size =SRMMU_NOCACHE_BITMAP_SHIFT ; + size = minsz; } -if (size & (SRMMU_NOCACHE_BITMAP_SHIFT -1 )) { - printk(KERN_ERR "Size 0x%x unaligned int nocache request\n", +if (size & (minsz -1 )) { + printk(KERN_ERR "Size 0x%x unaligned in nocache request\n",Was modifying the printk intentional? int vs in ?
Yes, I think "int" is a typo so I just fixed it up while I was here. Do you prefer the old way? I couldn't parse it at first, but now you mention it I suppose the type of 'size' is int, so *maybe* it makes sense after all!
Will
Re: [PATCH 1/4] sparc32: mm: Fix argument checking in __srmmu_get_nocache()
Quoted 40 lines · Will Deacon
Quoted 24 lines · Nick Desaulniers
Quoted 23 lines · Will Deacon
The 'size' argument to
__srmmu_get_nocache()is a number of bytes not a shift value, so fix up the sanity checking to treat it properly.Cc "David S. Miller" <[email protected]>Cc Peter Zijlstra <[email protected]>Signed-off-by Will Deacon <[email protected]>--- arch/sparc/mm/srmmu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/sparc/mm/srmmu.c +1
-1@@ -175,18 +175,18 @@ pte_t *pte_offset_kernel(pmd_t *dir, unsigned long address)*/ static void *__srmmu_get_nocache (int size,int align) { -int offset; +int offset, minsz =1 <<SRMMU_NOCACHE_BITMAP_SHIFT ;unsigned long addr;Quoted 13 lines
arch/sparc/mm/srmmu.c pte_t *pte_offset_kernel(pmd_t *dir, unsigned long address) · line 187
Quoted 11 lines
arch/sparc/mm/srmmu.c +4
-4-if (size <SRMMU_NOCACHE_BITMAP_SHIFT ) { +if (size < minsz) {printk (KERN_ERR "Size 0x%x too small for nocache request\n" , size); - size =SRMMU_NOCACHE_BITMAP_SHIFT ; + size = minsz; } -if (size & (SRMMU_NOCACHE_BITMAP_SHIFT -1 )) { - printk(KERN_ERR "Size 0x%x unaligned int nocache request\n", +if (size & (minsz -1 )) { + printk(KERN_ERR "Size 0x%x unaligned in nocache request\n",Was modifying the printk intentional? int vs in ?
Quoted 3 lines
Yes, I think "int" is a typo so I just fixed it up while I was here. Do you prefer the old way? I couldn't parse it at first, but now you mention it I suppose the type of 'size' is int, so *maybe* it makes sense after all!
No preference; the code is validating/updating the size which as you noted is an int.
Signature · 2 lines
Thanks, ~Nick Desaulniers