csky: Add memory layout 2.5G(user):1.5G(kernel)
Subsystems (6)
[email protected]
maintainerPATCH 1/29 csky: Add memory layout 2.5G(user):1.5G(kernel)
From: Guo Ren <[email protected]>
There are two ways for translating va to pa for csky:
- Use TLB(Translate Lookup Buffer) and PTW (Page Table Walk)
- Use SSEG0/1 (Simple Segment Mapping)
We use tlb mapping 0-2G and 3G-4G virtual address area and SSEG0/1 are for 2G-2.5G and 2.5G-3G translation. We could disable SSEG0 to use 2G-2.5G as TLB user mapping.
--- arch/csky/Kconfig | 16 ++++++++++++++++ arch/csky/abiv1/inc/abi/ckmmu.h | 8 ++++---- arch/csky/abiv2/inc/abi/ckmmu.h | 14 +++++++------- arch/csky/abiv2/inc/abi/entry.h | 19 ++++++++++++++++--- arch/csky/include/asm/memory.h | 2 +- arch/csky/include/asm/mmu_context.h | 8 +------- arch/csky/include/asm/page.h | 2 +- arch/csky/include/asm/pgalloc.h | 2 +- arch/csky/include/asm/pgtable.h | 2 +- arch/csky/include/asm/processor.h | 2 +- arch/csky/include/asm/segment.h | 2 +- arch/csky/kernel/atomic.S | 4 ++++ arch/csky/kernel/entry.S | 10 ++++++++-- arch/csky/kernel/head.S | 10 ++++++++-- arch/csky/kernel/setup.c | 18 ++++++++++++++++-- arch/csky/kernel/smp.c | 7 +++---- arch/csky/kernel/vmlinux.lds.S | 2 +- arch/csky/mm/fault.c | 7 +------ arch/csky/mm/init.c | 29 ++++++++++++++++++++++------- 19 files changed, 113 insertions(+), 51 deletions(-)
arch/csky/Kconfig +16 -0
@@ -192,6 +192,22 @@ config CPU_CK860 endchoice choice + prompt "PAGE OFFSET" + default PAGE_OFFSET_80000000 + +config PAGE_OFFSET_80000000 + bool "PAGE OFFSET 2G (user:kernel = 2:2)" + +config PAGE_OFFSET_A0000000 + bool "PAGE OFFSET 2.5G (user:kernel = 2.5:1.5)" +endchoice + +config PAGE_OFFSET + hex + default 0x80000000 if PAGE_OFFSET_80000000 + default 0xa0000000 if PAGE_OFFSET_A0000000 +choice + prompt "C-SKY PMU type" depends on PERF_EVENTS depends on CPU_CK807 || CPU_CK810 || CPU_CK860
arch/csky/abiv1/inc/abi/ckmmu.h +4 -4
@@ -89,13 +89,13 @@ static inline void tlb_invalid_indexed(void) cpwcr("cpcr8", 0x02000000); } -static inline void setup_pgd (unsigned long pgd,bool kernel) +static inline void setup_pgd (pgd_t *pgd) { -cpwcr ("cpcr29" , pgd |BIT (0 )); +cpwcr ("cpcr29" ,__pa (pgd) |BIT (0 )); } -static inline unsigned long get_pgd (void ) +static inline pgd_t *get_pgd (void ) { -return cprcr ("cpcr29" ) & ~BIT (0 ); +return __va (cprcr ("cpcr29" ) & ~BIT (0 )); }#endif /* __ASM_CSKY_CKMMUV1_H */
arch/csky/abiv2/inc/abi/ckmmu.h +7 -7
@@ -100,16 +100,16 @@ static inline void tlb_invalid_indexed(void) mtcr("cr<8, 15>", 0x02000000); } -static inline void setup_pgd (unsigned long pgd,bool kernel) +static inline void setup_pgd (pgd_t *pgd) { -if (kernel) -mtcr ("cr<28, 15>" , pgd |BIT (0 )); -else -mtcr ("cr<29, 15>" , pgd |BIT (0 )); +#ifdef CONFIG_CPU_HAS_TLBI +mtcr ("cr<28, 15>" ,__pa (pgd) |BIT (0 )); +#endif +mtcr ("cr<29, 15>" ,__pa (pgd) |BIT (0 )); } -static inline unsigned long get_pgd (void ) +static inline pgd_t *get_pgd (void ) { -return mfcr ("cr<29, 15>" ) & ~BIT (0 ); +return __va (mfcr ("cr<29, 15>" ) & ~BIT (0 )); }#endif /* __ASM_CSKY_CKMMUV2_H */
arch/csky/abiv2/inc/abi/entry.h +16 -3
@@ -26,6 +26,9 @@ stw tls, (sp, 0) stw lr, (sp, 4) + RD_MEH lr + WR_MEH lr + mfcr lr, epc movi tls, \epc_inc add lr, tls
@@ -231,6 +234,16 @@ mtcr \rx, cr<8, 15> .endm +#ifdef CONFIG_PAGE_OFFSET_80000000 +#define MSA_SET cr<30, 15> +#define MSA_CLR cr<31, 15> +#endif + +#ifdef CONFIG_PAGE_OFFSET_A0000000 +#define MSA_SET cr<31, 15> +#define MSA_CLR cr<30, 15> +#endif + .macro SETUP_MMU /* Init psr and enable ee */lrw r6,DEFAULT_PSR_VALUE
@@ -281,15 +294,15 @@* 31 - 29 | 28 - 9 | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 * BA Reserved SH WA B SO SEC C D V */ - mfcr r6, cr<30, 15> /* Get MSA0 */ +mfcr r6,MSA_SET /* Get MSA */ 2: lsri r6, 29 lsli r6, 29 addi r6, 0x1ce - mtcr r6, cr<30, 15> /* Set MSA0 */ + mtcr r6, MSA_SET /* Set MSA */ movi r6, 0 - mtcr r6, cr<31, 15> /* Clr MSA1 */ + mtcr r6, MSA_CLR /* Clr MSA *//* enable MMU */ mfcr r6, cr18
arch/csky/include/asm/memory.h +1 -1
@@ -10,7 +10,7 @@#define FIXADDR_TOP _AC(0xffffc000, UL)#define PKMAP_BASE _AC(0xff800000, UL) -#define VMALLOC_START _AC(0xc0008000, UL) +#define VMALLOC_START (PAGE_OFFSET + LOWMEM_LIMIT + (PAGE_SIZE * 8))#define VMALLOC_END (PKMAP_BASE - (PAGE_SIZE * 2))#ifdef CONFIG_HAVE_TCM
arch/csky/include/asm/mmu_context.h +1 -7
@@ -14,12 +14,6 @@#include <linux/sched.h> #include <abi/ckmmu.h> -#define TLBMISS_HANDLER_SETUP_PGD (pgd) \ - setup_pgd(__pa(pgd), false) - -#define TLBMISS_HANDLER_SETUP_PGD_KERNEL (pgd) \ - setup_pgd(__pa(pgd), true) -#define ASID_MASK ((1 << CONFIG_CPU_ASID_BITS) - 1)#define cpu_asid (mm) (atomic64_read(&mm->context.asid) & ASID_MASK)
@@ -36,7 +30,7 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,if (prev != next)check_and_switch_context (next, cpu); -TLBMISS_HANDLER_SETUP_PGD (next->pgd); +setup_pgd (next->pgd);write_mmu_entryhi (next->context.asid.counter);flush_icache_deferred (next);
arch/csky/include/asm/page.h +1 -1
@@ -24,7 +24,7 @@* address region. We use them mapping kernel 1GB direct-map address area and * for more than 1GB of memory we use highmem. */ -#define PAGE_OFFSET 0x80000000 +#define PAGE_OFFSET CONFIG_PAGE_OFFSET#define SSEG_SIZE 0x20000000#define LOWMEM_LIMIT (SSEG_SIZE * 2)
arch/csky/include/asm/pgalloc.h +1 -1
@@ -71,7 +71,7 @@ do { \ } while (0) extern void pagetable_init(void); -extern void pre_mmu_init (void ); +extern void mmu_init (unsigned long min_pfn,unsigned long max_pfn);extern void pre_trap_init (void );#endif /* __ASM_CSKY_PGALLOC_H */
arch/csky/include/asm/pgtable.h +1 -1
@@ -14,7 +14,7 @@#define PGDIR_SIZE (1UL << PGDIR_SHIFT)#define PGDIR_MASK (~(PGDIR_SIZE-1)) -#define USER_PTRS_PER_PGD (0x80000000UL/PGDIR_SIZE) +#define USER_PTRS_PER_PGD (PAGE_OFFSET/PGDIR_SIZE)#define FIRST_USER_ADDRESS 0UL/*
arch/csky/include/asm/processor.h +1 -1
@@ -28,7 +28,7 @@ extern struct cpuinfo_csky cpu_data[];* for a 64 bit kernel expandable to 8192EB, of which the current CSKY * implementations will "only" be able to use 1TB ... */ -#define TASK_SIZE 0x7fff8000UL +#define TASK_SIZE (PAGE_OFFSET - (PAGE_SIZE * 8))#ifdef __KERNEL__#define STACK_TOP TASK_SIZE
arch/csky/include/asm/segment.h +1 -1
@@ -10,7 +10,7 @@ typedef struct {#define KERNEL_DS ((mm_segment_t) { 0xFFFFFFFF }) -#define USER_DS ((mm_segment_t) { 0x80000000UL }) +#define USER_DS ((mm_segment_t) { PAGE_OFFSET })#define get_fs () (current_thread_info()->addr_limit)#define set_fs (x) (current_thread_info()->addr_limit = (x))#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)
arch/csky/kernel/atomic.S +4 -0
@@ -14,6 +14,10 @@ */ ENTRY(csky_cmpxchg) USPTOKSP + + RD_MEH a3 + WR_MEH a3 + mfcr a3, epc addi a3, TRAP0_SIZE
arch/csky/kernel/entry.S +8 -2
@@ -49,6 +49,7 @@ ENTRY(csky_\name) RD_PGDR r6 RD_MEH a3 + WR_MEH a3 #ifdef CONFIG_CPU_HAS_TLBI tlbi.vaas a3 sync.is
@@ -64,10 +65,11 @@ ENTRY(csky_\name) WR_MCIR a2 #endif bclri r6, 0 + lrw a2, PAGE_OFFSET + add r6, a2 lrw a2, va_pa_offset ld.w a2, (a2, 0) subu r6, a2 - bseti r6, 31 mov a2, a3 lsri a2, _PGDIR_SHIFT
@@ -75,10 +77,11 @@ ENTRY(csky_\name) addu r6, a2 ldw r6, (r6) + lrw a2, PAGE_OFFSET + add r6, a2 lrw a2, va_pa_offset ld.w a2, (a2, 0) subu r6, a2 - bseti r6, 31 lsri a3, PTE_INDX_SHIFT lrw a2, PTE_INDX_MSK
@@ -314,6 +317,9 @@ ENTRY(csky_trap) ENTRY(csky_get_tls) USPTOKSP + RD_MEH a0 + WR_MEH a0 + /* increase epc for continue */ mfcr a0, epc addi a0, TRAP0_SIZE
arch/csky/kernel/head.S +8 -2
@@ -21,10 +21,16 @@ END(_start) ENTRY(_start_smp_secondary) SETUP_MMU - /* copy msa1 from CPU0 */ - lrw r6, secondary_msa1 +#ifdef CONFIG_PAGE_OFFSET_80000000 + lrw r6, secondary_msa1 ld.w r6, (r6, 0) mtcr r6, cr<31, 15> +#endif + + lrw r6, secondary_pgd + ld.w r6, (r6, 0) + mtcr r6, cr<28, 15> + mtcr r6, cr<29, 15> /* set stack point */ lrw r6, secondary_stack
arch/csky/kernel/setup.c +16 -2
@@ -45,13 +45,17 @@ static void __init csky_memblock_init(void)if (size >= lowmem_size) { max_low_pfn = min_low_pfn + lowmem_size; +#ifdef CONFIG_PAGE_OFFSET_80000000 write_mmu_msa1 (read_mmu_msa0 () +SSEG_SIZE ); +#endif }else if (size > sseg_size) { max_low_pfn = min_low_pfn + sseg_size; } max_zone_pfn[ZONE_NORMAL ] = max_low_pfn; +mmu_init (min_low_pfn, max_low_pfn); +#ifdef CONFIG_HIGHMEM max_zone_pfn[ZONE_HIGHMEM ] = max_pfn;
@@ -101,16 +105,26 @@ void __init setup_arch(char **cmdline_p)unsigned long va_pa_offset;EXPORT_SYMBOL (va_pa_offset); +static inline unsigned long read_mmu_msa (void ) +{ +#ifdef CONFIG_PAGE_OFFSET_80000000 +return read_mmu_msa0 (); +#endif + +#ifdef CONFIG_PAGE_OFFSET_A0000000 +return read_mmu_msa1 (); +#endif +} + asmlinkage __visible void __init csky_start(unsigned int unused,void *dtb_start) {/* Clean up bss section */ memset (__bss_start,0 , __bss_stop - __bss_start); - va_pa_offset =read_mmu_msa0 () & ~(SSEG_SIZE -1 ); + va_pa_offset =read_mmu_msa () & ~(SSEG_SIZE -1 );pre_trap_init (); -pre_mmu_init ();if (dtb_start ==NULL )early_init_dt_scan (__dtb_start);
arch/csky/kernel/smp.c +3 -4
@@ -203,8 +203,8 @@ volatile unsigned int secondary_hint;volatile unsigned int secondary_hint2;volatile unsigned int secondary_ccr;volatile unsigned int secondary_stack; - -unsigned long secondary_msa1; +volatile unsigned int secondary_msa1; +volatile unsigned int secondary_pgd;int __cpu_up (unsigned int cpu,struct task_struct *tidle) {
@@ -216,6 +216,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) secondary_hint2 =mfcr ("cr<21, 1>" ); secondary_ccr =mfcr ("cr18" ); secondary_msa1 =read_mmu_msa1 (); + secondary_pgd =mfcr ("cr<29, 15>" );/* * Because other CPUs are in reset status, we must flush data
@@ -262,8 +263,6 @@ void csky_start_secondary(void)flush_tlb_all ();write_mmu_pagemask (0 ); -TLBMISS_HANDLER_SETUP_PGD (swapper_pg_dir); -TLBMISS_HANDLER_SETUP_PGD_KERNEL (swapper_pg_dir);#ifdef CONFIG_CPU_HAS_FPU init_fpu ();
arch/csky/kernel/vmlinux.lds.S +1 -1
@@ -33,6 +33,7 @@ SECTIONS .text : AT(ADDR(.text) - LOAD_OFFSET) { _text = .; + VBR_BASE IRQENTRY_TEXT SOFTIRQENTRY_TEXT TEXT_TEXT
@@ -104,7 +105,6 @@ SECTIONS EXCEPTION_TABLE(L1_CACHE_BYTES) BSS_SECTION(L1_CACHE_BYTES, PAGE_SIZE, L1_CACHE_BYTES) - VBR_BASE _end = . ; STABS_DEBUG
arch/csky/mm/fault.c +1 -6
@@ -59,7 +59,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, si_code =SEGV_MAPERR ; -#ifndef CONFIG_CPU_HAS_TLBI /* * We fault-in kernel-space virtual memory on-demand. The * 'reference' page table is init_mm.pgd.
@@ -84,10 +83,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,pmd_t *pmd, *pmd_k;pte_t *pte_k; -unsigned long pgd_base; - - pgd_base = (unsigned long )__va (get_pgd ()); - pgd = (pgd_t *)pgd_base + offset; + pgd =get_pgd () + offset; pgd_k = init_mm.pgd + offset;if (!pgd_present (*pgd_k))
@@ -110,7 +106,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, goto no_context;return ; } -#endif perf_sw_event (PERF_COUNT_SW_PAGE_FAULTS ,1 , regs, address);/*
arch/csky/mm/init.c +22 -7
@@ -28,9 +28,12 @@#include <asm/mmu_context.h> #include <asm/sections.h> #include <asm/tlb.h> +#include <asm/cacheflush.h> pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned_bss; +pte_t kernel_pte_tables[(PTRS_PER_PGD - USER_PTRS_PER_PGD)*PTRS_PER_PTE] __page_aligned_bss; +EXPORT_SYMBOL (invalid_pte_table); unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss;
@@ -130,20 +133,32 @@ void pgd_init(unsigned long *p)for (i =0 ; i <PTRS_PER_PGD ; i++) p[i] =__pa (invalid_pte_table); + +flush_tlb_all (); +local_icache_inv_all (NULL ); } -void __init pre_mmu_init (void ) +void __init mmu_init (unsigned long min_pfn,unsigned long max_pfn) { -/* -* Setup page-table and enable TLB-hardrefill -*/ +int i; + +for (i =0 ; i <USER_PTRS_PER_PGD ; i++) + swapper_pg_dir[i].pgd =__pa (invalid_pte_table); + +for (i =USER_PTRS_PER_PGD ; i <PTRS_PER_PGD ; i++) + swapper_pg_dir[i].pgd = +__pa (kernel_pte_tables + (PTRS_PER_PTE * (i -USER_PTRS_PER_PGD ))); + +for (i = min_pfn; i < max_pfn; i++) +set_pte (&kernel_pte_tables[i -PFN_DOWN (va_pa_offset)],pfn_pte (i,PAGE_KERNEL )); +flush_tlb_all (); -pgd_init ((unsigned long *)swapper_pg_dir); -TLBMISS_HANDLER_SETUP_PGD (swapper_pg_dir); -TLBMISS_HANDLER_SETUP_PGD_KERNEL (swapper_pg_dir); +local_icache_inv_all (NULL );/* Setup page mask to 4k */ write_mmu_pagemask (0 ); + +setup_pgd (swapper_pg_dir); } void __init fixrange_init(unsigned long start, unsigned long end,
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 2/29 csky: Fixup perf probe failed
From: Guo Ren <[email protected]>
Current perf init will failed with:
[ 1.452433] csky-pmu: probe of soc:pmu failed with error -16
This patch fix it up with adding CPUHP_AP_PERF_CSKY_ONLINE in cpuhotplug.h.
--- arch/csky/kernel/perf_event.c | 2 +- include/linux/cpuhotplug.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
arch/csky/kernel/perf_event.c +1 -1
@@ -1319,7 +1319,7 @@ int csky_pmu_device_probe(struct platform_device *pdev,pr_notice ("[perf] PMU request irq fail!\n" ); } - ret =cpuhp_setup_state (CPUHP_AP_PERF_ONLINE ,"AP_PERF_ONLINE" , + ret =cpuhp_setup_state (CPUHP_AP_PERF_CSKY_ONLINE ,"AP_PERF_ONLINE" , csky_pmu_starting_cpu, csky_pmu_dying_cpu);if (ret) {
include/linux/cpuhotplug.h +1 -0
@@ -185,6 +185,7 @@ enum cpuhp_state {CPUHP_AP_PERF_POWERPC_TRACE_IMC_ONLINE , CPUHP_AP_PERF_POWERPC_HV_24x7_ONLINE,CPUHP_AP_PERF_POWERPC_HV_GPCI_ONLINE , +CPUHP_AP_PERF_CSKY_ONLINE ,CPUHP_AP_WATCHDOG_ONLINE ,CPUHP_AP_WORKQUEUE_ONLINE , CPUHP_AP_RCUTREE_ONLINE,
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 3/29 csky: Fixup show_regs doesn't contain regs->usp
In reply to [email protected]From: Guo Ren <[email protected]>
Current show_regs didn't display regs->usp and it confused debug. So fixup wrong SP display and add PT_REGS.
--- arch/csky/kernel/ptrace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/csky/kernel/ptrace.c +3 -2
@@ -363,9 +363,10 @@ void show_regs(struct pt_regs *fp)pr_info ("PC: 0x%08lx (%pS)\n" , (long )fp->pc, (void *)fp->pc);pr_info ("LR: 0x%08lx (%pS)\n" , (long )fp->lr, (void *)fp->lr); -pr_info ("SP: 0x%08lx\n" , (long )fp); -pr_info ("orig_a0: 0x%08lx\n" , fp->orig_a0); +pr_info ("SP: 0x%08lx\n" , (long )fp->usp);pr_info ("PSR: 0x%08lx\n" , (long )fp->sr); +pr_info ("orig_a0: 0x%08lx\n" , fp->orig_a0); +pr_info ("PT_REGS: 0x%08lx\n" , (long )fp);pr_info (" a0: 0x%08lx a1: 0x%08lx a2: 0x%08lx a3: 0x%08lx\n" , fp->a0, fp->a1, fp->a2, fp->a3);
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 4/29 csky: Remove custom asm/atomic.h implementation
In reply to [email protected]From: Guo Ren <[email protected]>
Use generic atomic implementation based on cmpxchg. So remove csky asm/atomic.h.
--- arch/csky/include/asm/atomic.h | 212 --------------------------------- 1 file changed, 212 deletions(-) delete mode 100644 arch/csky/include/asm/atomic.h
arch/csky/include/asm/atomic.h deleted +0 -212
@@ -1,212 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#ifndef __ASM_CSKY_ATOMIC_H -#define __ASM_CSKY_ATOMIC_H - -#include <linux/version.h> -#include <asm/cmpxchg.h> -#include <asm/barrier.h> - -#ifdef CONFIG_CPU_HAS_LDSTEX - -#define __atomic_add_unless __atomic_add_unless -static inline int __atomic_add_unless(atomic_t *v, int a, int u) -{ - unsigned long tmp, ret; - - smp_mb(); - - asm volatile ( - "1: ldex.w %0, (%3) \n" - " mov %1, %0 \n" - " cmpne %0, %4 \n" - " bf 2f \n" - " add %0, %2 \n" - " stex.w %0, (%3) \n" - " bez %0, 1b \n" - "2: \n" - : "=&r" (tmp), "=&r" (ret) - : "r" (a), "r"(&v->counter), "r"(u) - : "memory"); - - if (ret != u) - smp_mb(); - - return ret; -} - -#define ATOMIC_OP(op, c_op) \ -static inline void atomic_##op(int i, atomic_t *v) \ -{ \ - unsigned long tmp; \ - \ - asm volatile ( \ - "1: ldex.w %0, (%2) \n" \ - " " #op " %0, %1 \n" \ - " stex.w %0, (%2) \n" \ - " bez %0, 1b \n" \ - : "=&r" (tmp) \ - : "r" (i), "r"(&v->counter) \ - : "memory"); \ -} - -#define ATOMIC_OP_RETURN(op, c_op) \ -static inline int atomic_##op##_return(int i, atomic_t *v) \ -{ \ - unsigned long tmp, ret; \ - \ - smp_mb(); \ - asm volatile ( \ - "1: ldex.w %0, (%3) \n" \ - " " #op " %0, %2 \n" \ - " mov %1, %0 \n" \ - " stex.w %0, (%3) \n" \ - " bez %0, 1b \n" \ - : "=&r" (tmp), "=&r" (ret) \ - : "r" (i), "r"(&v->counter) \ - : "memory"); \ - smp_mb(); \ - \ - return ret; \ -} - -#define ATOMIC_FETCH_OP(op, c_op) \ -static inline int atomic_fetch_##op(int i, atomic_t *v) \ -{ \ - unsigned long tmp, ret; \ - \ - smp_mb(); \ - asm volatile ( \ - "1: ldex.w %0, (%3) \n" \ - " mov %1, %0 \n" \ - " " #op " %0, %2 \n" \ - " stex.w %0, (%3) \n" \ - " bez %0, 1b \n" \ - : "=&r" (tmp), "=&r" (ret) \ - : "r" (i), "r"(&v->counter) \ - : "memory"); \ - smp_mb(); \ - \ - return ret; \ -} - -#else /* CONFIG_CPU_HAS_LDSTEX */ - -#include <linux/irqflags.h> - -#define __atomic_add_unless __atomic_add_unless -static inline int __atomic_add_unless(atomic_t *v, int a, int u) -{ - unsigned long tmp, ret, flags; - - raw_local_irq_save(flags); - - asm volatile ( - " ldw %0, (%3) \n" - " mov %1, %0 \n" - " cmpne %0, %4 \n" - " bf 2f \n" - " add %0, %2 \n" - " stw %0, (%3) \n" - "2: \n" - : "=&r" (tmp), "=&r" (ret) - : "r" (a), "r"(&v->counter), "r"(u) - : "memory"); - - raw_local_irq_restore(flags); - - return ret; -} - -#define ATOMIC_OP(op, c_op) \ -static inline void atomic_##op(int i, atomic_t *v) \ -{ \ - unsigned long tmp, flags; \ - \ - raw_local_irq_save(flags); \ - \ - asm volatile ( \ - " ldw %0, (%2) \n" \ - " " #op " %0, %1 \n" \ - " stw %0, (%2) \n" \ - : "=&r" (tmp) \ - : "r" (i), "r"(&v->counter) \ - : "memory"); \ - \ - raw_local_irq_restore(flags); \ -} - -#define ATOMIC_OP_RETURN(op, c_op) \ -static inline int atomic_##op##_return(int i, atomic_t *v) \ -{ \ - unsigned long tmp, ret, flags; \ - \ - raw_local_irq_save(flags); \ - \ - asm volatile ( \ - " ldw %0, (%3) \n" \ - " " #op " %0, %2 \n" \ - " stw %0, (%3) \n" \ - " mov %1, %0 \n" \ - : "=&r" (tmp), "=&r" (ret) \ - : "r" (i), "r"(&v->counter) \ - : "memory"); \ - \ - raw_local_irq_restore(flags); \ - \ - return ret; \ -} - -#define ATOMIC_FETCH_OP(op, c_op) \ -static inline int atomic_fetch_##op(int i, atomic_t *v) \ -{ \ - unsigned long tmp, ret, flags; \ - \ - raw_local_irq_save(flags); \ - \ - asm volatile ( \ - " ldw %0, (%3) \n" \ - " mov %1, %0 \n" \ - " " #op " %0, %2 \n" \ - " stw %0, (%3) \n" \ - : "=&r" (tmp), "=&r" (ret) \ - : "r" (i), "r"(&v->counter) \ - : "memory"); \ - \ - raw_local_irq_restore(flags); \ - \ - return ret; \ -} - -#endif /* CONFIG_CPU_HAS_LDSTEX */ - -#define atomic_add_return atomic_add_return -ATOMIC_OP_RETURN(add, +) -#define atomic_sub_return atomic_sub_return -ATOMIC_OP_RETURN(sub, -) - -#define atomic_fetch_add atomic_fetch_add -ATOMIC_FETCH_OP(add, +) -#define atomic_fetch_sub atomic_fetch_sub -ATOMIC_FETCH_OP(sub, -) -#define atomic_fetch_and atomic_fetch_and -ATOMIC_FETCH_OP(and, &) -#define atomic_fetch_or atomic_fetch_or -ATOMIC_FETCH_OP(or, |) -#define atomic_fetch_xor atomic_fetch_xor -ATOMIC_FETCH_OP(xor, ^) - -#define atomic_and atomic_and -ATOMIC_OP(and, &) -#define atomic_or atomic_or -ATOMIC_OP(or, |) -#define atomic_xor atomic_xor -ATOMIC_OP(xor, ^) - -#undef ATOMIC_FETCH_OP -#undef ATOMIC_OP_RETURN -#undef ATOMIC_OP - -#include <asm-generic/atomic.h> - -#endif /* __ASM_CSKY_ATOMIC_H */
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 5/29 csky: Fixup barrier design
In reply to [email protected]From: Guo Ren <[email protected]>
Remove shareable bit for ordering barrier, just keep ordering in current hart is enough for SMP. Using three continuous sync.is as PTW barrier to prevent speculative PTW in 860 microarchitecture.
--- arch/csky/include/asm/barrier.h | 82 ++++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 22 deletions(-)
arch/csky/include/asm/barrier.h +60 -22
@@ -8,6 +8,61 @@#define nop () asm volatile ("nop\n":::"memory") +#ifdef CONFIG_SMP + +/* +* bar.brwarws: ordering barrier for all load/store instructions +* before/after +* +* |31|30 26|25 21|20 16|15 10|9 5|4 0| +* 1 10000 00000 00000 100001 00001 0 bw br aw ar +* +* b: before +* a: after +* r: read +* w: write +* +* Here are all combinations: +* +* bar.brw +* bar.br +* bar.bw +* bar.arw +* bar.ar +* bar.aw +* bar.brwarw +* bar.brarw +* bar.bwarw +* bar.brwar +* bar.brwaw +* bar.brar +* bar.bwaw +*/ +#define __bar_brw () asm volatile (".long 0x842cc000\n":::"memory") +#define __bar_br () asm volatile (".long 0x8424c000\n":::"memory") +#define __bar_bw () asm volatile (".long 0x8428c000\n":::"memory") +#define __bar_arw () asm volatile (".long 0x8423c000\n":::"memory") +#define __bar_ar () asm volatile (".long 0x8421c000\n":::"memory") +#define __bar_aw () asm volatile (".long 0x8422c000\n":::"memory") +#define __bar_brwarw () asm volatile (".long 0x842fc000\n":::"memory") +#define __bar_brarw () asm volatile (".long 0x8427c000\n":::"memory") +#define __bar_bwarw () asm volatile (".long 0x842bc000\n":::"memory") +#define __bar_brwar () asm volatile (".long 0x842dc000\n":::"memory") +#define __bar_brwaw () asm volatile (".long 0x842ec000\n":::"memory") +#define __bar_brar () asm volatile (".long 0x8425c000\n":::"memory") +#define __bar_brar () asm volatile (".long 0x8425c000\n":::"memory") +#define __bar_bwaw () asm volatile (".long 0x842ac000\n":::"memory") + +#define __smp_mb () __bar_brwarw() +#define __smp_rmb () __bar_brar() +#define __smp_wmb () __bar_bwaw() + +#define ACQUIRE_FENCE ".long 0x8427c000\n" +#define __smp_acquire_fence () __bar_brarw() +#define __smp_release_fence () __bar_brwaw() + +#endif /* CONFIG_SMP */ +/* * sync: completion barrier, all sync.xx instructions * guarantee the last response recieved by bus transaction
@@ -15,31 +70,14 @@* sync.s: inherit from sync, but also shareable to other cores * sync.i: inherit from sync, but also flush cpu pipeline * sync.is: the same with sync.i + sync.s -* -* bar.brwarw: ordering barrier for all load/store instructions before it -* bar.brwarws: ordering barrier for all load/store instructions before it -* and shareable to other cores -* bar.brar: ordering barrier for all load instructions before it -* bar.brars: ordering barrier for all load instructions before it -* and shareable to other cores -* bar.bwaw: ordering barrier for all store instructions before it -* bar.bwaws: ordering barrier for all store instructions before it -* and shareable to other cores */ +#define mb () asm volatile ("sync\n":::"memory")#ifdef CONFIG_CPU_HAS_CACHEV2 -#define mb () asm volatile ("sync.s\n":::"memory") - -#ifdef CONFIG_SMP -#define __smp_mb () asm volatile ("bar.brwarws\n":::"memory") -#define __smp_rmb () asm volatile ("bar.brars\n":::"memory") -#define __smp_wmb () asm volatile ("bar.bwaws\n":::"memory") -#endif /* CONFIG_SMP */ - -#define sync_is () asm volatile ("sync.is\n":::"memory") - -#else /* !CONFIG_CPU_HAS_CACHEV2 */ -#define mb () asm volatile ("sync\n":::"memory") +/* +* Using three sync.is to prevent speculative PTW +*/ +#define sync_is () asm volatile ("sync.is\nsync.is\nsync.is\n":::"memory")#endif #include <asm-generic/barrier.h>
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 6/29 csky: Fixup futex SMP implementation
In reply to [email protected]From: Guo Ren <[email protected]>
Arnd said:
I would guess that for csky, this is a mistake, as the architecture is fairly new and should be able to implement it.
Guo reply:
The c610, c807, c810 don't support SMP, so futex_cmpxchg_enabled = 1 with asm-generic's implementation.
For c860, there is no HAVE_FUTEX_CMPXCHG and cmpxchg_inatomic/inuser implementation, so futex_cmpxchg_enabled = 0.
Thx for point it out, we'll implement cmpxchg_inatomic/inuser for C860 and still use asm-generic for non-smp CPUs.
LTP test:
futex_wait01 1 TPASS : futex_wait(): errno=ETIMEDOUT(110): Connection timed out futex_wait01 2 TPASS : futex_wait(): errno=EAGAIN/EWOULDBLOCK(11): Resource temporarily unavailable futex_wait01 3 TPASS : futex_wait(): errno=ETIMEDOUT(110): Connection timed out futex_wait01 4 TPASS : futex_wait(): errno=EAGAIN/EWOULDBLOCK(11): Resource temporarily unavailable futex_wait02 1 TPASS : futex_wait() woken up futex_wait03 1 TPASS : futex_wait() woken up futex_wait04 1 TPASS : futex_wait() returned -1: errno=EAGAIN/EWOULDBLOCK(11): Resource temporarily unavailable
--- arch/csky/Kconfig | 1 + arch/csky/include/asm/futex.h | 121 ++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 arch/csky/include/asm/futex.h
arch/csky/Kconfig +1 -0
@@ -48,6 +48,7 @@ config CSKY select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_ERROR_INJECTION + select HAVE_FUTEX_CMPXCHG if FUTEX && SMP select HAVE_FTRACE_MCOUNT_RECORD select HAVE_KERNEL_GZIP select HAVE_KERNEL_LZO
arch/csky/include/asm/futex.h new file +121 -0
121 lines not on this page · raw message
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 7/29 csky: Fixup asm/cmpxchg.h with correct ordering barrier
In reply to [email protected]From: Guo Ren <[email protected]>
Optimize the performance of cmpxchg by using more fine-grained acquire/release barriers.
--- arch/csky/include/asm/cmpxchg.h | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
arch/csky/include/asm/cmpxchg.h +17 -10
@@ -3,12 +3,12 @@#ifndef __ASM_CSKY_CMPXCHG_H#define __ASM_CSKY_CMPXCHG_H -#ifdef CONFIG_CPU_HAS_LDSTEX +#ifdef CONFIG_SMP #include <asm/barrier.h> extern void __bad_xchg (void ); -#define __xchg (new, ptr, size) \ +#define __xchg_relaxed (new, ptr, size) \ ({ \ __typeof__(ptr) __ptr = (ptr); \ __typeof__(new) __new = (new); \
@@ -16,7 +16,6 @@ extern void __bad_xchg(void);unsigned long tmp; \switch (size) { \case 4 : \ -smp_mb (); \ asmvolatile ( \"1: ldex.w %0, (%3) \n" \ " mov %1, %2 \n" \
@@ -25,7 +24,6 @@ extern void __bad_xchg(void); : "=&r" (__ret), "=&r" (tmp) \ : "r" (__new), "r"(__ptr) \ :); \ -smp_mb (); \break ; \default : \__bad_xchg (); \
@@ -33,9 +31,10 @@ extern void __bad_xchg(void); __ret; \ }) -#define xchg (ptr, x) (__xchg((x), (ptr), sizeof(*(ptr)))) +#define xchg_relaxed (ptr, x) \ + (__xchg_relaxed((x), (ptr), sizeof(*(ptr)))) -#define __cmpxchg (ptr, old, new, size) \ +#define __cmpxchg_relaxed (ptr, old, new, size) \ ({ \ __typeof__(ptr) __ptr = (ptr); \ __typeof__(new) __new = (new); \
@@ -44,7 +43,6 @@ extern void __bad_xchg(void); __typeof__(*(ptr)) __ret; \switch (size) { \case 4 : \ -smp_mb (); \ asmvolatile ( \"1: ldex.w %0, (%3) \n" \ " cmpne %0, %4 \n" \
@@ -56,7 +54,6 @@ extern void __bad_xchg(void); : "=&r" (__ret), "=&r" (__tmp) \ : "r" (__new), "r"(__ptr), "r"(__old) \ :); \ -smp_mb (); \break ; \default : \__bad_xchg (); \
@@ -64,8 +61,18 @@ extern void __bad_xchg(void); __ret; \ }) -#define cmpxchg (ptr, o, n) \ - (__cmpxchg((ptr), (o), (n), sizeof(*(ptr)))) +#define cmpxchg_relaxed (ptr, o, n) \ + (__cmpxchg_relaxed((ptr), (o), (n), sizeof(*(ptr)))) + +#define cmpxchg (ptr, o, n) \ +({ \ + __typeof__(*(ptr)) __ret; \ + __smp_release_fence(); \ + __ret = cmpxchg_relaxed(ptr, o, n); \ + __smp_acquire_fence(); \ + __ret; \ +}) +#else #include <asm-generic/cmpxchg.h> #endif
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 8/29 csky: Cleanup asm/spinlock.h
In reply to [email protected]From: Guo Ren <[email protected]>
There are two implementation of spinlock in arch/csky:
- simple one (NR_CPU = 1,2)
- tick's one (NR_CPU = 3,4)
Remove the simple one.
There is already smp_mb in spinlock, so remove the definition of smp_mb__after_spinlock.
--- arch/csky/Kconfig | 2 +- arch/csky/include/asm/spinlock.h | 167 ------------------------- arch/csky/include/asm/spinlock_types.h | 10 -- 3 files changed, 1 insertion(+), 178 deletions(-)
arch/csky/Kconfig +1 -1
@@ -7,7 +7,7 @@ config CSKY select ARCH_HAS_SYNC_DMA_FOR_CPU select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_USE_BUILTIN_BSWAP - select ARCH_USE_QUEUED_RWLOCKS if NR_CPUS>2 + select ARCH_USE_QUEUED_RWLOCKS select ARCH_WANT_FRAME_POINTERS if !CPU_CK610 select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT select COMMON_CLK
arch/csky/include/asm/spinlock.h +0 -167
177 lines not on this page · raw message
arch/csky/include/asm/spinlock_types.h +0 -10
@@ -22,16 +22,6 @@ typedef struct {#define __ARCH_SPIN_LOCK_UNLOCKED { { 0 } } -#ifdef CONFIG_QUEUED_RWLOCKS #include <asm-generic/qrwlock_types.h> -#else /* CONFIG_NR_CPUS > 2 */ - -typedef struct { -u32 lock; -}arch_rwlock_t ; - -#define __ARCH_RW_LOCK_UNLOCKED { 0 } - -#endif /* CONFIG_QUEUED_RWLOCKS */ #endif /* __ASM_CSKY_SPINLOCK_TYPES_H */
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 9/29 csky: Fixup PTE global for 2.5:1.5 virtual memory
In reply to [email protected]From: Guo Ren <[email protected]>
Fixup commit c2d1adfa9a24 "csky: Add memory layout 2.5G(user):1.5G (kernel)". That patch broke the global bit in PTE.
C-SKY TLB's entry contain two pages:
vpn, vpn + 1 -> ppn0, ppn1
All PPN's attributes contain global bit and final global is PPN0.G & PPN1.G. So we must keep PPN0.G and PPN1.G same in one TLB's entry.
--- arch/csky/include/asm/pgtable.h | 2 +- arch/csky/mm/init.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
arch/csky/include/asm/pgtable.h +1 -1
@@ -34,7 +34,7 @@#define pmd_page (pmd) (pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT))#define pte_clear (mm, addr, ptep) set_pte((ptep), \ - (((unsigned int) addr & PAGE_OFFSET) ? __pte(_PAGE_GLOBAL) : __pte(0))) + (((unsigned int) addr >= PAGE_OFFSET) ? __pte(_PAGE_GLOBAL) : __pte(0)))#define pte_none (pte) (!(pte_val(pte) & ~_PAGE_GLOBAL))#define pte_present (pte) (pte_val(pte) & _PAGE_PRESENT)#define pte_pfn (x) ((unsigned long)((x).pte_low >> PAGE_SHIFT))
arch/csky/mm/init.c +7 -1
@@ -30,9 +30,12 @@#include <asm/tlb.h> #include <asm/cacheflush.h> +#define PTRS_KERN_TABLE \ + ((PTRS_PER_PGD - USER_PTRS_PER_PGD) * PTRS_PER_PTE) + pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned_bss; -pte_t kernel_pte_tables[(PTRS_PER_PGD - USER_PTRS_PER_PGD)*PTRS_PER_PTE] __page_aligned_bss; +pte_t kernel_pte_tables[PTRS_KERN_TABLE] __page_aligned_bss;EXPORT_SYMBOL (invalid_pte_table);unsigned long empty_zero_page[PAGE_SIZE /sizeof (unsigned long )]
@@ -149,6 +152,9 @@ void __init mmu_init(unsigned long min_pfn, unsigned long max_pfn) swapper_pg_dir[i].pgd =__pa (kernel_pte_tables + (PTRS_PER_PTE * (i -USER_PTRS_PER_PGD ))); +for (i =0 ; i <PTRS_KERN_TABLE ; i++) +set_pte (&kernel_pte_tables[i],__pte (_PAGE_GLOBAL)); +for (i = min_pfn; i < max_pfn; i++)set_pte (&kernel_pte_tables[i -PFN_DOWN (va_pa_offset)],pfn_pte (i,PAGE_KERNEL ));
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 10/29 csky: Remove prologue of page fault handler in entry.S
In reply to [email protected]From: Guo Ren <[email protected]>
There is a prologue on page fault handler which marking pages dirty and/or accessed in page attributes, but all of these have been handled in handle_pte_fault.
- Add flush_tlb_one in vmalloc page fault instead of prologue.
- Using cmxchg_fixup C codes in do_page_fault instead of ASM one.
--- arch/csky/kernel/atomic.S | 20 +------- arch/csky/kernel/entry.S | 104 +------------------------------------- arch/csky/kernel/traps.c | 10 ++-- arch/csky/mm/fault.c | 45 +++++++++++++++-- 4 files changed, 48 insertions(+), 131 deletions(-)
arch/csky/kernel/atomic.S +2 -18
@@ -40,11 +40,11 @@ ENTRY(csky_cmpxchg) 2: sync.is #else -1: +GLOBAL(csky_cmpxchg_ldw) ldw a3, (a2) cmpne a0, a3 bt16 3f -2: +GLOBAL(csky_cmpxchg_stw) stw a1, (a2) 3: #endif
@@ -59,19 +59,3 @@ ENTRY(csky_cmpxchg) KSPTOUSP rte END(csky_cmpxchg) - -#ifndef CONFIG_CPU_HAS_LDSTEX -/* - * Called from tlbmodified exception - */ -ENTRY(csky_cmpxchg_fixup) - mfcr a0, epc - lrw a1, 2b - cmpne a1, a0 - bt 1f - subi a1, (2b - 1b) - stw a1, (sp, LSAVE_PC) -1: - rts -END(csky_cmpxchg_fixup) -#endif
arch/csky/kernel/entry.S +2 -102
123 lines not on this page · raw message
arch/csky/kernel/traps.c +4 -6
@@ -39,9 +39,7 @@ asmlinkage void csky_cmpxchg(void); asmlinkage void csky_get_tls(void); asmlinkage void csky_irq(void); -asmlinkage void csky_tlbinvalidl(void); -asmlinkage void csky_tlbinvalids(void); -asmlinkage void csky_tlbmodified(void); +asmlinkage void csky_pagefault(void);/* Defined in head.S */ asmlinkage void _start_smp_secondary(void);
@@ -66,9 +64,9 @@ void __init trap_init(void)VEC_INIT (VEC_TRAP3 , csky_get_tls);/* setup MMU TLB exception */ -VEC_INIT (VEC_TLBINVALIDL , csky_tlbinvalidl); -VEC_INIT (VEC_TLBINVALIDS , csky_tlbinvalids); -VEC_INIT (VEC_TLBMODIFIED , csky_tlbmodified); +VEC_INIT (VEC_TLBINVALIDL , csky_pagefault); +VEC_INIT (VEC_TLBINVALIDS , csky_pagefault); +VEC_INIT (VEC_TLBMODIFIED , csky_pagefault);#ifdef CONFIG_CPU_HAS_FPU init_fpu ();
arch/csky/mm/fault.c +40 -5
80 lines not on this page · raw message
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 11/29 csky: Add kmemleak support
In reply to [email protected]From: Guo Ren <[email protected]>
Here is the log after enabled:
[ 1.798972] kmemleak: Kernel memory leak detector initialized (mem pool available: 15851) [ 1.798983] kmemleak: Automatic memory scanning thread started
--- arch/csky/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/csky/Kconfig +1 -0
@@ -43,6 +43,7 @@ config CSKY select HAVE_CONTEXT_TRACKING select HAVE_VIRT_CPU_ACCOUNTING_GEN select HAVE_DEBUG_BUGVERBOSE + select HAVE_DEBUG_KMEMLEAK select HAVE_DYNAMIC_FTRACE select HAVE_DYNAMIC_FTRACE_WITH_REGS select HAVE_FUNCTION_TRACER
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 12/29 csky: Fix TLB maintenance synchronization problem
In reply to [email protected]From: Guo Ren <[email protected]>
TLB invalidate didn't contain a barrier operation in csky cpu and we need to prevent previous PTW response after TLB invalidation instruction. Of cause, the ASID changing also needs to take care of the issue.
CPU0 CPU1
=============== ===============set_pte
sync_is() -> See the previous set_pte for all harts tlbi.vas -> Invalidate all harts TLB entry & flush pipeline
--- arch/csky/abiv1/inc/abi/ckmmu.h | 3 ++- arch/csky/abiv2/inc/abi/ckmmu.h | 35 ++++++++++++++++++++---- arch/csky/include/asm/mmu_context.h | 3 +-- arch/csky/mm/init.c | 2 +- arch/csky/mm/tlb.c | 42 ++++++++++++++++++++++++----- 5 files changed, 69 insertions(+), 16 deletions(-)
arch/csky/abiv1/inc/abi/ckmmu.h +2 -1
@@ -89,9 +89,10 @@ static inline void tlb_invalid_indexed(void)cpwcr ("cpcr8" ,0x02000000 ); } -static inline void setup_pgd (pgd_t *pgd) +static inline void setup_pgd (pgd_t *pgd,int asid) {cpwcr ("cpcr29" ,__pa (pgd) |BIT (0 )); +write_mmu_entryhi (asid); }static inline pgd_t *get_pgd (void )
arch/csky/abiv2/inc/abi/ckmmu.h +30 -5
@@ -78,8 +78,13 @@ static inline void tlb_read(void)static inline void tlb_invalid_all (void ) {#ifdef CONFIG_CPU_HAS_TLBI - asmvolatile ("tlbi.alls\n" :::"memory" );sync_is (); + asmvolatile ( +"tlbi.alls \n" +"sync.i \n" + : + : + :"memory" );#else mtcr ("cr<8, 15>" ,0x04000000 );#endif
@@ -88,8 +93,13 @@ static inline void tlb_invalid_all(void)static inline void local_tlb_invalid_all (void ) {#ifdef CONFIG_CPU_HAS_TLBI - asmvolatile ("tlbi.all\n" :::"memory" );sync_is (); + asmvolatile ( +"tlbi.all \n" +"sync.i \n" + : + : + :"memory" );#else tlb_invalid_all ();#endif
@@ -100,12 +110,27 @@ static inline void tlb_invalid_indexed(void)mtcr ("cr<8, 15>" ,0x02000000 ); } -static inline void setup_pgd (pgd_t *pgd) +#define NOP32 ".long 0x4820c400\n" + +static inline void setup_pgd (pgd_t *pgd,int asid) {#ifdef CONFIG_CPU_HAS_TLBI -mtcr ("cr<28, 15>" ,__pa (pgd) |BIT (0 )); +sync_is (); +#else +mb (); +#endif + asmvolatile ( +#ifdef CONFIG_CPU_HAS_TLBI + "mtcr %1, cr<28, 15> \n" #endif -mtcr ("cr<29, 15>" ,__pa (pgd) |BIT (0 )); +"mtcr %1, cr<29, 15> \n" +"mtcr %0, cr< 4, 15> \n" +".rept 64 \n" +NOP32 +".endr \n" + : + :"r" (asid),"r" (__pa (pgd) |BIT (0 )) + :"memory" ); }static inline pgd_t *get_pgd (void )
arch/csky/include/asm/mmu_context.h +1 -2
@@ -30,8 +30,7 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,if (prev != next)check_and_switch_context (next, cpu); -setup_pgd (next->pgd); -write_mmu_entryhi (next->context.asid.counter); +setup_pgd (next->pgd, next->context.asid.counter);flush_icache_deferred (next); }
arch/csky/mm/init.c +1 -1
@@ -164,7 +164,7 @@ void __init mmu_init(unsigned long min_pfn, unsigned long max_pfn)/* Setup page mask to 4k */ write_mmu_pagemask (0 ); -setup_pgd (swapper_pg_dir); +setup_pgd (swapper_pg_dir,0 ); } void __init fixrange_init(unsigned long start, unsigned long end,
arch/csky/mm/tlb.c +35 -7
80 lines not on this page · raw message
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 13/29 csky: Add show_tlb for CPU_CK860 debug
In reply to [email protected]From: Guo Ren <[email protected]>
Print all 1024 jtlb entries and 16 iutlb entries and 16 dutlb entries in show_regs.
--- arch/csky/kernel/ptrace.c | 121 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+)
arch/csky/kernel/ptrace.c +121 -0
@@ -22,6 +22,7 @@#include <asm/asm-offsets.h> #include <abi/regdef.h> +#include <abi/ckmmu.h> #define CREATE_TRACE_POINTS #include <trace/events/syscalls.h>
@@ -343,6 +344,124 @@ asmlinkage void syscall_trace_exit(struct pt_regs *regs)trace_sys_exit (regs,syscall_get_return_value (current, regs)); } +#ifdef CONFIG_CPU_CK860 +static void show_iutlb (void ) +{ +int entry, i; +unsigned long flags; +unsigned long oldpid; +unsigned long entryhi[16 ], entrylo0[16 ], entrylo1[16 ]; + + oldpid =read_mmu_entryhi (); + + entry =0x8000 ; + +local_irq_save (flags); + +for (i =0 ; i <16 ; i++) { +write_mmu_index (entry); +tlb_read (); + entryhi[i] =read_mmu_entryhi (); + entrylo0[i] =read_mmu_entrylo0 (); + entrylo1[i] =read_mmu_entrylo1 (); + + entry++; + } + +local_irq_restore (flags); + +write_mmu_entryhi (oldpid); + +printk ("\n\n\n" ); +for (i =0 ; i <16 ; i++) +printk ("iutlb[%d]: entryhi - 0x%lx; entrylo0 - 0x%lx;" +" entrylo1 - 0x%lx\n" , + i, entryhi[i], entrylo0[i], entrylo1[i]); +printk ("\n\n\n" ); +} + +static void show_dutlb (void ) +{ +int entry, i; +unsigned long flags; +unsigned long oldpid; +unsigned long entryhi[16 ], entrylo0[16 ], entrylo1[16 ]; + + oldpid =read_mmu_entryhi (); + + entry =0x4000 ; + +local_irq_save (flags); + +for (i =0 ; i <16 ; i++) { +write_mmu_index (entry); +tlb_read (); + entryhi[i] =read_mmu_entryhi (); + entrylo0[i] =read_mmu_entrylo0 (); + entrylo1[i] =read_mmu_entrylo1 (); + + entry++; + } + +local_irq_restore (flags); + +write_mmu_entryhi (oldpid); + +printk ("\n\n\n" ); +for (i =0 ; i <16 ; i++) +printk ("dutlb[%d]: entryhi - 0x%lx; entrylo0 - 0x%lx;" +" entrylo1 - 0x%lx\n" , + i, entryhi[i], entrylo0[i], entrylo1[i]); +printk ("\n\n\n" ); +} + +static unsigned long entryhi[1024 ], entrylo0[1024 ], entrylo1[1024 ]; +static void show_jtlb (void ) +{ +int entry; +unsigned long flags; +unsigned long oldpid; + + oldpid =read_mmu_entryhi (); + + entry =0 ; + +local_irq_save (flags); +while (entry <1024 ) { +write_mmu_index (entry); +tlb_read (); + entryhi[entry] =read_mmu_entryhi (); + entrylo0[entry] =read_mmu_entrylo0 (); + entrylo1[entry] =read_mmu_entrylo1 (); + + entry++; + } +local_irq_restore (flags); + +write_mmu_entryhi (oldpid); + +printk ("\n\n\n" ); + +for (entry =0 ; entry <1024 ; entry++) +printk ("jtlb[%x]: entryhi - 0x%lx; entrylo0 - 0x%lx;" +" entrylo1 - 0x%lx\n" , + entry, entryhi[entry], entrylo0[entry], entrylo1[entry]); +printk ("\n\n\n" ); +} + +static void show_tlb (void ) +{ +show_iutlb (); +show_dutlb (); +show_jtlb (); +} +#else +static void show_tlb (void ) +{ +return ; +} +#endif +void show_regs (struct pt_regs *fp) {pr_info ("\nCURRENT PROCESS:\n\n" );
@@ -396,5 +515,7 @@ void show_regs(struct pt_regs *fp) fp->regs[8], fp->regs[9]);#endif +show_tlb (); +return ; }
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 14/29 csky: Fixup FAULT_FLAG_XXX param for handle_mm_fault
In reply to [email protected]From: Guo Ren <[email protected]>
The past code only passes the FAULT_FLAG_WRITE into handle_mm_fault and missing USER & DEFAULT & RETRY.
The patch references to arch/riscv/mm/fault.c, but there is no FAULT_FLAG_INSTRUCTION in csky hw.
--- arch/csky/mm/fault.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
arch/csky/mm/fault.c +21 -2
@@ -80,6 +80,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs)struct vm_area_struct *vma =NULL ;struct task_struct *tsk = current;struct mm_struct *mm = tsk->mm; +unsigned int flags =FAULT_FLAG_DEFAULT ;int si_code;int fault;unsigned long address =read_mmu_entryhi () &PAGE_MASK ;
@@ -150,6 +151,13 @@ asmlinkage void do_page_fault(struct pt_regs *regs)if (in_atomic () || !mm) goto bad_area_nosemaphore; +if (user_mode (regs)) + flags |=FAULT_FLAG_USER ; + +if (is_write (regs)) + flags |=FAULT_FLAG_WRITE ; + +retry:mmap_read_lock (mm); vma =find_vma (mm, address);if (!vma)
@@ -180,8 +188,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs)* make sure we exit gracefully rather than endlessly redo * the fault. */ - fault =handle_mm_fault (vma, address,is_write (regs) ?FAULT_FLAG_WRITE :0 , - regs); + fault =handle_mm_fault (vma, address, flags, regs);if (unlikely (fault &VM_FAULT_ERROR )) {if (fault &VM_FAULT_OOM ) goto out_of_memory;
@@ -191,6 +198,18 @@ asmlinkage void do_page_fault(struct pt_regs *regs) goto bad_area;BUG (); } + +if (unlikely ((fault &VM_FAULT_RETRY ) && (flags &FAULT_FLAG_ALLOW_RETRY ))) { + flags |=FAULT_FLAG_TRIED ; + +/* +* No need to mmap_read_unlock(mm) as we would +* have already released it in __lock_page_or_retry +* in mm/filemap.c. +*/ + goto retry; + } +mmap_read_unlock (mm);return ;
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 15/29 csky: Fixup update_mmu_cache called with user io mapping
In reply to [email protected]From: Guo Ren <[email protected]>
The function update_mmu_cache could be called by user-io mapping. There is no space of struct page in mem_map for the pte. Just ignore the user-io mmaping in update_mmu_cache.
--- arch/csky/abiv2/cacheflush.c | 3 +++ 1 file changed, 3 insertions(+)
arch/csky/abiv2/cacheflush.c +3 -0
@@ -12,6 +12,9 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,unsigned long addr;struct page *page; +if (!pfn_valid (pte_pfn (*pte))) +return ; + page =pfn_to_page (pte_pfn (*pte));if (page ==ZERO_PAGE (0 ))return ;
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 16/29 csky: Add faulthandler_disabled() check
In reply to [email protected]From: Guo Ren <[email protected]>
Similar to other architectures:
In addition to in_atomic, we also need pagefault_disabled() to check.
--- arch/csky/mm/fault.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/csky/mm/fault.c +2 -2
@@ -143,12 +143,11 @@ asmlinkage void do_page_fault(struct pt_regs *regs)return ; } -perf_sw_event (PERF_COUNT_SW_PAGE_FAULTS ,1 , regs, address);/* * If we're in an interrupt or have no user * context, we must not take the fault.. */ -if (in_atomic () || !mm) +if (unlikely (faulthandler_disabled () || !mm)) goto bad_area_nosemaphore;if (user_mode (regs))
@@ -157,6 +156,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs)if (is_write (regs)) flags |=FAULT_FLAG_WRITE ; +perf_sw_event (PERF_COUNT_SW_PAGE_FAULTS ,1 , regs, address); retry:mmap_read_lock (mm); vma =find_vma (mm, address);
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 17/29 csky: Fixup do_page_fault parent irq status
In reply to [email protected]From: Guo Ren <[email protected]>
We must succeed parent's context irq status in page fault handler.
--- arch/csky/kernel/entry.S | 2 +- arch/csky/mm/fault.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)
arch/csky/kernel/entry.S +1 -1
@@ -42,7 +42,7 @@ ENTRY(csky_pagefault) SAVE_ALL 0 zero_fp context_tracking - psrset ee, ie + psrset ee mov a0, sp jbsr do_page_fault jmpi ret_from_exception
arch/csky/mm/fault.c +4 -0
@@ -143,6 +143,10 @@ asmlinkage void do_page_fault(struct pt_regs *regs)return ; } +/* Enable interrupts if they were enabled in the parent context. */ +if (likely (regs->sr &BIT (6 ))) +local_irq_enable (); +/* * If we're in an interrupt or have no user * context, we must not take the fault..
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 18/29 csky: Sync riscv mm/fault.c for easy maintenance
In reply to [email protected]From: Guo Ren <[email protected]>
Sync arch/riscv/mm/fault.c into arch/csky for easy maintenance. Here are the patches related to the modification:
cac4d1d "riscv/mm/fault: Move no context handling to no_context()" ac416a7 "riscv/mm/fault: Move vmalloc fault handling to vmalloc_fault()" 6c11ffb "riscv/mm/fault: Move fault error handling to mm_fault_error()" afb8c6f "riscv/mm/fault: Move access error check to function" bda281d "riscv/mm/fault: Simplify fault error handling" a51271d "riscv/mm/fault: Move bad area handling to bad_area()"
--- arch/csky/include/asm/bug.h | 2 + arch/csky/mm/fault.c | 342 ++++++++++++++++++++---------------- 2 files changed, 189 insertions(+), 155 deletions(-)
arch/csky/include/asm/bug.h +2 -0
@@ -21,6 +21,8 @@ do { \struct pt_regs ;void die (struct pt_regs *regs,const char *str); +void do_trap (struct pt_regs *regs,int signo,int code,unsigned long addr); +void show_regs (struct pt_regs *regs);void show_code (struct pt_regs *regs);
arch/csky/mm/fault.c +187 -155
409 lines not on this page · raw message
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 19/29 csky: mm: abort uaccess retries upon fatal signal
In reply to [email protected]From: Guo Ren <[email protected]>
Pick up the patch from the 'Link' made by Mark Rutland. Keep the same with x86, arm, arm64, arc, sh, power.
--- arch/csky/mm/fault.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/csky/mm/fault.c +4 -1
@@ -279,8 +279,11 @@ asmlinkage void do_page_fault(struct pt_regs *regs)* signal first. We do not need to release the mmap_lock because it * would already be released in __lock_page_or_retry in mm/filemap.c. */ -if (fault_signal_pending (fault, regs)) +if (fault_signal_pending (fault, regs)) { +if (!user_mode (regs)) +no_context (regs, addr);return ; + }if (unlikely ((fault &VM_FAULT_RETRY ) && (flags &FAULT_FLAG_ALLOW_RETRY ))) { flags |=FAULT_FLAG_TRIED ;
Signature · 1 line
2.17.1
Mark Rutland
reviewerRe: [PATCH 19/29] csky: mm: abort uaccess retries upon fatal signal
Quoted 17 lines · On Thu, Jan 21, 2021 at 02:53:39PM +0800, [email protected] wrote:
From: Guo Ren <[email protected]>
Pick up the patch from the 'Link' made by Mark Rutland. Keep the same with x86, arm, arm64, arc, sh, power.
Signed-off-by Guo Ren <[email protected]>Cc Mark Rutland <[email protected]>--- arch/csky/mm/fault.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)arch/csky/mm/fault.c +0
-0
arch/csky/mm/fault.c asmlinkage void do_page_fault(struct pt_regs *regs) · line 286
Quoted 9 lines
arch/csky/mm/fault.c +4
-1@@ -279,8 +279,11 @@ asmlinkage void do_page_fault(struct pt_regs *regs)* signal first. We do not need to release the mmap_lock because it * would already be released in __lock_page_or_retry in mm/filemap.c. */ -if (fault_signal_pending (fault, regs)) +if (fault_signal_pending (fault, regs)) { +if (!user_mode (regs)) +no_context (regs, addr);return ; + }
FWIW, this looks right to me -- I assumed you've tested with the test-case in the linked email?
It looks like a number of other architectures are still broken here. :/
I'll go and poke them...
Thanks,
Mark.
Quoted 5 lines
arch/csky/mm/fault.c +0
-0if (unlikely ((fault &VM_FAULT_RETRY ) && (flags &FAULT_FLAG_ALLOW_RETRY ))) { flags |=FAULT_FLAG_TRIED ;Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 20/29 csky: Reconstruct VDSO framework
In reply to [email protected]From: Guo Ren <[email protected]>
Reconstruct vdso framework to support future vsyscall, vgettimeofday features. These are very important features to reduce system calls into the kernel for performance improvement.
The patch is reference RISC-V's
--- arch/csky/abiv1/inc/abi/vdso.h | 18 ++-- arch/csky/abiv2/inc/abi/vdso.h | 20 +---- arch/csky/include/asm/vdso.h | 19 ++++- arch/csky/kernel/Makefile | 2 +- arch/csky/kernel/signal.c | 4 +- arch/csky/kernel/vdso.c | 123 +++++++++++++++------------ arch/csky/kernel/vdso/.gitignore | 4 + arch/csky/kernel/vdso/Makefile | 67 +++++++++++++++ arch/csky/kernel/vdso/note.S | 12 +++ arch/csky/kernel/vdso/rt_sigreturn.S | 14 +++ arch/csky/kernel/vdso/so2s.sh | 5 ++ arch/csky/kernel/vdso/vdso.S | 16 ++++ arch/csky/kernel/vdso/vdso.lds.S | 54 ++++++++++++ 13 files changed, 269 insertions(+), 89 deletions(-) create mode 100644 arch/csky/kernel/vdso/.gitignore create mode 100644 arch/csky/kernel/vdso/Makefile create mode 100644 arch/csky/kernel/vdso/note.S create mode 100644 arch/csky/kernel/vdso/rt_sigreturn.S create mode 100755 arch/csky/kernel/vdso/so2s.sh create mode 100644 arch/csky/kernel/vdso/vdso.S create mode 100644 arch/csky/kernel/vdso/vdso.lds.S
arch/csky/abiv1/inc/abi/vdso.h +5 -13
@@ -1,17 +1,9 @@/* SPDX-License-Identifier: GPL-2.0 */ -#include <linux/uaccess.h> +#ifndef __ABI_CSKY_VDSO_H +#define __ABI_CSKY_VDSO_H -static inline int setup_vdso_page (unsigned short *ptr) -{ -int err =0 ; +/* movi r1, 127; addi r1, (139 - 127) */ +#define SET_SYSCALL_ID .long 0x20b167f1 -/* movi r1, 127 */ - err |=__put_user (0x67f1 , ptr +0 ); -/* addi r1, (139 - 127) */ - err |=__put_user (0x20b1 , ptr +1 ); -/* trap 0 */ - err |=__put_user (0x0008 , ptr +2 ); - -return err; -} +#endif /* __ABI_CSKY_VDSO_H */
arch/csky/abiv2/inc/abi/vdso.h +3 -17
@@ -3,21 +3,7 @@#ifndef __ABI_CSKY_VDSO_H#define __ABI_CSKY_VDSO_H -#include <linux/uaccess.h> +/* movi r7, 173 */ +#define SET_SYSCALL_ID .long 0x008bea07 -static inline int setup_vdso_page (unsigned short *ptr) -{ -int err =0 ; - -/* movi r7, 173 */ - err |=__put_user (0xea07 , ptr); - err |=__put_user (0x008b , ptr+1 ); - -/* trap 0 */ - err |=__put_user (0xc000 , ptr+2 ); - err |=__put_user (0x2020 , ptr+3 ); - -return err; -} - -#endif /* __ABI_CSKY_STRING_H */ +#endif /* __ABI_CSKY_VDSO_H */
arch/csky/include/asm/vdso.h +16 -3
@@ -3,10 +3,23 @@#ifndef __ASM_CSKY_VDSO_H#define __ASM_CSKY_VDSO_H -#include <abi/vdso.h> +#include <linux/types.h> -struct csky_vdso { -unsigned short rt_signal_retcode[4 ]; +struct vdso_data { }; +/* +* The VDSO symbols are mapped into Linux so we can just use regular symbol +* addressing to get their offsets in userspace. The symbols are mapped at an +* offset of 0, but since the linker must support setting weak undefined +* symbols to the absolute address 0 it also happens to support other low +* addresses even when the code model suggests those low addresses would not +* otherwise be availiable. +*/ +#define VDSO_SYMBOL (base, name) \ +({ \ + extern const char __vdso_##name[]; \ + (void __user *)((unsigned long)(base) + __vdso_##name); \ +}) +#endif /* __ASM_CSKY_VDSO_H */
arch/csky/kernel/Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only extra-y := head.o vmlinux.lds -obj-y += entry.o atomic.o signal.o traps.o irq.o time.o vdso.o +obj-y += entry.o atomic.o signal.o traps.o irq.o time.o vdso.o vdso/ obj-y += power.o syscall.o syscall_table.o setup.o obj-y += process.o cpu-probe.o ptrace.o stacktrace.o obj-y += probes/
arch/csky/kernel/signal.c +2 -2
@@ -134,7 +134,6 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs) {struct rt_sigframe *frame;int err =0 ; -struct csky_vdso *vdso = current->mm->context.vdso; frame =get_sigframe (ksig, regs,sizeof (*frame));if (!access_ok (frame,sizeof (*frame)))
@@ -152,7 +151,8 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)return -EFAULT ;/* Set up to return from userspace. */ - regs->lr = (unsigned long )(vdso->rt_signal_retcode); + regs->lr = (unsigned long )VDSO_SYMBOL ( + current->mm->context.vdso, rt_sigreturn);/* * Set up registers for signal handler.
arch/csky/kernel/vdso.c +70 -53
156 lines not on this page · raw message
arch/csky/kernel/vdso/.gitignore new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only +vdso.lds +*.tmp +vdso-syms.S
arch/csky/kernel/vdso/Makefile new file +67 -0
67 lines not on this page · raw message
arch/csky/kernel/vdso/note.S new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text. + * Here we can supply some information useful to userland. + */ + +#include <linux/elfnote.h> +#include <linux/version.h> + +ELFNOTE_START(Linux, 0, "a") + .long LINUX_VERSION_CODE +ELFNOTE_END
arch/csky/kernel/vdso/rt_sigreturn.S new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <linux/linkage.h> +#include <asm/unistd.h> +#include <abi/vdso.h> + + .text +ENTRY(__vdso_rt_sigreturn) + .cfi_startproc + .cfi_signal_frame + SET_SYSCALL_ID + trap 0 + .cfi_endproc +ENDPROC(__vdso_rt_sigreturn)
arch/csky/kernel/vdso/so2s.sh new file +5 -0
@@ -0,0 +1,5 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0+ + +sed 's!\([0-9a-f]*\) T \([a-z0-9_]*\)\(@@LINUX_5.10\)*!.global \2\n.set \2,0x\1!' \ +| grep '^\.'
arch/csky/kernel/vdso/vdso.S new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <linux/init.h> +#include <linux/linkage.h> +#include <asm/page.h> + + __PAGE_ALIGNED_DATA + + .globl vdso_start, vdso_end + .balign PAGE_SIZE +vdso_start: + .incbin "arch/csky/kernel/vdso/vdso.so" + .balign PAGE_SIZE +vdso_end: + + .previous
arch/csky/kernel/vdso/vdso.lds.S new file +54 -0
54 lines not on this page · raw message
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 21/29 csky: Fix a size determination in gpr_get()
In reply to [email protected]From: Zhenzhong Duan <[email protected]>
"*" is missed in size determination as we are passing register set rather than a pointer.
--- arch/csky/kernel/ptrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/csky/kernel/ptrace.c +1 -1
@@ -84,7 +84,7 @@ static int gpr_get(struct task_struct *target,/* Abiv1 regs->tls is fake and we need sync here. */ regs->tls =task_thread_info (target)->tp_value; -return membuf_write (&to, regs,sizeof (regs)); +return membuf_write (&to, regs,sizeof (*regs)); } static int gpr_set(struct task_struct *target,
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 22/29 csky: remove unused including <linux/version.h>
In reply to [email protected]From: Tian Tao <[email protected]>
Remove including <linux/version.h> that don't need it.
--- arch/csky/include/asm/thread_info.h | 1 - 1 file changed, 1 deletion(-)
arch/csky/include/asm/thread_info.h +0 -1
@@ -6,7 +6,6 @@#ifndef __ASSEMBLY__ -#include <linux/version.h> #include <asm/types.h> #include <asm/page.h> #include <asm/processor.h>
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 23/29 csky: Fixup _PAGE_ACCESSED for default pgprot
In reply to [email protected]From: Guo Ren <[email protected]>
When the system memory is exhausted, linux will trigger kswapd to shrink memory page cache. We found the csky's .text file mapping pages would be reclaimed earlier than arm's elf. Because csky doesn't give _PAGE_ACCESSED for default pgprot and in zap_pte_range
if (pte_young(ptent) &&
likely(!(vma->vm_flags & VM_SEQ_READ)))
mark_page_accessed(page);mark_page_accessed will put the pages into active lru list.
[ 3.652722] delete busybox page from inactive file list Call Trace: [<9012a376>] dump_stack+0xe/0x24 [<9012a370>] dump_stack+0x8/0x24 [<9005b780>] activate_page+0x2b4/0x2d4 [<90132502>] vsnprintf+0x2c6/0x374 [<9005b880>] mark_page_accessed+0xe0/0x150 [<9006903e>] unmap_page_range+0x166/0x33c [<90021844>] get_signal+0x98/0x3b4 [<90069232>] unmap_single_vma+0x1e/0x24 [<90069462>] unmap_vmas+0x26/0x40 [<9006d3d8>] exit_mmap+0x60/0xbc [<9006a140>] handle_mm_fault+0x700/0xcec [<900426b2>] ktime_get_with_offset+0x86/0x130 [<90017566>] mmput+0x2e/0x90 [<9001a30a>] do_exit+0x13e/0x6f0 [<90015448>] page_fault_end+0x14/0x74 [<9001b4bc>] SyS_exit_group+0x0/0xc [<9001b47c>] do_group_exit+0x2c/0x6c [<9001b4c8>] __wake_up_parent+0x0/0x20 [<9001399e>] csky_systemcall+0x6e/0x72
csky will throw the pages at first and keep them in active lru list later after real accessed, but arm would keep them in active lru list at the beginning.
The following are statistics of different architecture styles:
Default _PAGE_ACCESSED: alpha, arm, arm64, ia64, m68k, microblaze,
openrisc, powerpc, riscv, sh, um, x86, xtensa
Not def _PAGE_ACCESSED: arc, c6x, h8300, hexgon, mips, s390, nds32,
nios2, parisc, sparc
--- arch/csky/include/asm/pgtable.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
arch/csky/include/asm/pgtable.h +9 -7
@@ -63,18 +63,20 @@* read. Also, write permissions imply read permissions. This is the closest * we can get by reasonable means.. */ -#define PAGE_NONE __pgprot(_PAGE_PRESENT | _CACHE_CACHED) -#define PAGE_SHARED __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \ +#define _PAGE_BASE (_PAGE_PRESENT | _PAGE_ACCESSED) + +#define PAGE_NONE __pgprot(_PAGE_BASE | _CACHE_CACHED) +#define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_READ | _PAGE_WRITE | \ _CACHE_CACHED) -#define PAGE_COPY __pgprot(_PAGE_PRESENT | _PAGE_READ | _CACHE_CACHED) -#define PAGE_READONLY __pgprot(_PAGE_PRESENT | _PAGE_READ | _CACHE_CACHED) -#define PAGE_KERNEL __pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \ +#define PAGE_COPY __pgprot(_PAGE_BASE | _PAGE_READ | _CACHE_CACHED) +#define PAGE_READONLY __pgprot(_PAGE_BASE | _PAGE_READ | _CACHE_CACHED) +#define PAGE_KERNEL __pgprot(_PAGE_BASE | __READABLE | __WRITEABLE | \ _PAGE_GLOBAL | _CACHE_CACHED) -#define PAGE_USERIO __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \ +#define PAGE_USERIO __pgprot(_PAGE_BASE | _PAGE_READ | _PAGE_WRITE | \ _CACHE_CACHED)#define _PAGE_IOREMAP \ - (_PAGE_PRESENT | __READABLE | __WRITEABLE | _PAGE_GLOBAL | \ + (_PAGE_BASE | __READABLE | __WRITEABLE | _PAGE_GLOBAL | \ _CACHE_UNCACHED | _PAGE_SO)#define __P000 PAGE_NONE
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 24/29 csky: Coding convention del unnecessary definition
In reply to [email protected]From: Guo Ren <[email protected]>
Remove _PAGE_IOREMAP, __READABLE, __WRITEABLE, abi/pgtable-bits.h definition, they are no use at all.
--- arch/csky/abiv1/inc/abi/pgtable-bits.h | 17 ++------ arch/csky/abiv2/inc/abi/pgtable-bits.h | 14 +----- arch/csky/include/asm/pgtable.h | 59 +++++++++++++------------- 3 files changed, 35 insertions(+), 55 deletions(-)
arch/csky/abiv1/inc/abi/pgtable-bits.h +4 -13
@@ -5,33 +5,24 @@#define __ASM_CSKY_PGTABLE_BITS_H/* implemented in software */ -#define _PAGE_ACCESSED (1<<3) -#define PAGE_ACCESSED_BIT (3) - +#define _PAGE_PRESENT (1<<0)#define _PAGE_READ (1<<1)#define _PAGE_WRITE (1<<2) -#define _PAGE_PRESENT (1<<0) - +#define _PAGE_ACCESSED (1<<3)#define _PAGE_MODIFIED (1<<4) -#define PAGE_MODIFIED_BIT (4)/* implemented in hardware */ #define _PAGE_GLOBAL (1<<6) -#define _PAGE_VALID (1<<7) -#define PAGE_VALID_BIT (7) -#define _PAGE_DIRTY (1<<8) -#define PAGE_DIRTY_BIT (8)#define _PAGE_CACHE (3<<9)#define _PAGE_UNCACHE (2<<9)#define _PAGE_SO _PAGE_UNCACHE -#define _CACHE_MASK (7<<9) -#define _CACHE_CACHED (_PAGE_VALID | _PAGE_CACHE) -#define _CACHE_UNCACHED (_PAGE_VALID | _PAGE_UNCACHE) +#define _CACHE_CACHED _PAGE_CACHE +#define _CACHE_UNCACHED _PAGE_UNCACHE#define HAVE_ARCH_UNMAPPED_AREA
arch/csky/abiv2/inc/abi/pgtable-bits.h +2 -12
@@ -6,32 +6,22 @@/* implemented in software */ #define _PAGE_ACCESSED (1<<7) -#define PAGE_ACCESSED_BIT (7) -#define _PAGE_READ (1<<8)#define _PAGE_WRITE (1<<9)#define _PAGE_PRESENT (1<<10) -#define _PAGE_MODIFIED (1<<11) -#define PAGE_MODIFIED_BIT (11)/* implemented in hardware */ #define _PAGE_GLOBAL (1<<0) -#define _PAGE_VALID (1<<1) -#define PAGE_VALID_BIT (1) -#define _PAGE_DIRTY (1<<2) -#define PAGE_DIRTY_BIT (2)#define _PAGE_SO (1<<5)#define _PAGE_BUF (1<<6) -#define _PAGE_CACHE (1<<3) -#define _CACHE_MASK _PAGE_CACHE -#define _CACHE_CACHED (_PAGE_VALID | _PAGE_CACHE | _PAGE_BUF) -#define _CACHE_UNCACHED (_PAGE_VALID) +#define _CACHE_CACHED (_PAGE_CACHE | _PAGE_BUF) +#define _CACHE_UNCACHED (0)#endif /* __ASM_CSKY_PGTABLE_BITS_H */
arch/csky/include/asm/pgtable.h +29 -30
81 lines not on this page · raw message
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 25/29 csky: Fixup swapon
In reply to [email protected]From: Guo Ren <[email protected]>
Current csky's swappon is broken by wrong swap PTE entry format. Now redesign the new format for abiv1 & abiv2 and make swappon + zram work properly on csky machines.
C-SKY PTE has VALID, DIRTY to emulate PRESENT, READ, WRITE, EXEC attributes. GLOBAL bit is shared by two pages in the same tlb entry. So we need to keep GLOBAL, VALID, PRESENT zero in swp_pte.
To distinguish PAGE_NONE and swp_pte, we need to use an additional bit (abiv1 is _PAGE_READ, abiv2 is _PAGE_WRITE).
--- arch/csky/abiv1/inc/abi/pgtable-bits.h | 22 ++++++++++++++++++++++ arch/csky/abiv2/inc/abi/pgtable-bits.h | 22 ++++++++++++++++++++++ arch/csky/include/asm/pgtable.h | 17 ++++++++--------- 3 files changed, 52 insertions(+), 9 deletions(-)
arch/csky/abiv1/inc/abi/pgtable-bits.h +22 -0
@@ -24,6 +24,28 @@#define _CACHE_CACHED _PAGE_CACHE#define _CACHE_UNCACHED _PAGE_UNCACHE +#define _PAGE_PROT_NONE _PAGE_READ + +/* +* Encode and decode a swap entry +* +* Format of swap PTE: +* bit 0: _PAGE_PRESENT (zero) +* bit 1: _PAGE_READ (zero) +* bit 2 - 5: swap type[0 - 3] +* bit 6: _PAGE_GLOBAL (zero) +* bit 7: _PAGE_VALID (zero) +* bit 8: swap type[4] +* bit 9 - 31: swap offset +*/ +#define __swp_type (x) ((((x).val >> 2) & 0xf) | \ + (((x).val >> 4) & 0x10)) +#define __swp_offset (x) ((x).val >> 9) +#define __swp_entry (type, offset) ((swp_entry_t) { \ + ((type & 0xf) << 2) | \ + ((type & 0x10) << 4) | \ + ((offset) << 9)}) +#define HAVE_ARCH_UNMAPPED_AREA #endif /* __ASM_CSKY_PGTABLE_BITS_H */
arch/csky/abiv2/inc/abi/pgtable-bits.h +22 -0
@@ -24,4 +24,26 @@#define _CACHE_CACHED (_PAGE_CACHE | _PAGE_BUF)#define _CACHE_UNCACHED (0) +#define _PAGE_PROT_NONE _PAGE_WRITE + +/* +* Encode and decode a swap entry +* +* Format of swap PTE: +* bit 0: _PAGE_GLOBAL (zero) +* bit 1: _PAGE_VALID (zero) +* bit 2 - 6: swap type +* bit 7 - 8: swap offset[0 - 1] +* bit 9: _PAGE_WRITE (zero) +* bit 10: _PAGE_PRESENT (zero) +* bit 11 - 31: swap offset[2 - 22] +*/ +#define __swp_type (x) (((x).val >> 2) & 0x1f) +#define __swp_offset (x) ((((x).val >> 7) & 0x3) | \ + (((x).val >> 9) & 0x7ffffc)) +#define __swp_entry (type, offset) ((swp_entry_t) { \ + ((type & 0x1f) << 2) | \ + ((offset & 0x3) << 7) | \ + ((offset & 0x7ffffc) << 9)}) +#endif /* __ASM_CSKY_PGTABLE_BITS_H */
arch/csky/include/asm/pgtable.h +8 -9
@@ -41,13 +41,6 @@#define pfn_pte (pfn, prot) __pte(((unsigned long long)(pfn) << PAGE_SHIFT) \ | pgprot_val(prot)) -#define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED | \ - _CACHE_MASK) - -#define __swp_type (x) (((x).val >> 4) & 0xff) -#define __swp_offset (x) ((x).val >> 12) -#define __swp_entry (type, offset) ((swp_entry_t) {((type) << 4) | \ - ((offset) << 12) })#define __pte_to_swp_entry (pte) ((swp_entry_t) { pte_val(pte) })#define __swp_entry_to_pte (x) ((pte_t) { (x).val })
@@ -61,8 +54,7 @@*/ #define _PAGE_BASE (_PAGE_PRESENT | _PAGE_ACCESSED) -#define PAGE_NONE __pgprot(_PAGE_BASE | \ - _CACHE_CACHED) +#define PAGE_NONE __pgprot(_PAGE_PROT_NONE)#define PAGE_READ __pgprot(_PAGE_BASE | _PAGE_READ | \ _CACHE_CACHED)#define PAGE_WRITE __pgprot(_PAGE_BASE | _PAGE_READ | _PAGE_WRITE | \
@@ -78,6 +70,13 @@ _PAGE_GLOBAL | \ _CACHE_UNCACHED | _PAGE_SO) +#define _PAGE_CHG_MASK (~(unsigned long) \ + (_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \ + _CACHE_MASK | _PAGE_GLOBAL)) + +#define MAX_SWAPFILES_CHECK () \ + BUILD_BUG_ON(MAX_SWAPFILES_SHIFT != 5) +#define __P000 PAGE_NONE#define __P001 PAGE_READ#define __P010 PAGE_READ
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 26/29 csky: kprobe: fix code in simulate without 'long'
In reply to [email protected]From: Guo Ren <[email protected]>
The type of 'val' is 'unsigned long' in simulate_blz32, so 'val < 0' can't be true.
Cast 'val' to 'long' here to determine branch token or not,
Fixup instructions: bnezad32, bhsz32, bhz32, blsz32, blz32
--- arch/csky/kernel/probes/simulate-insn.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
arch/csky/kernel/probes/simulate-insn.c +7 -15
@@ -274,9 +274,9 @@ void __kprobes simulate_bnezad32(u32 opcode, long addr, struct pt_regs *regs) { unsigned long tmp = opcode & 0x1f; -unsigned long val; +long val; -csky_insn_reg_get_val (regs, tmp, &val); +csky_insn_reg_get_val (regs, tmp, (unsigned long *)&val); val -=1 ;
@@ -286,7 +286,7 @@ simulate_bnezad32(u32 opcode, long addr, struct pt_regs *regs) }else instruction_pointer_set (regs, addr +4 ); -csky_insn_reg_set_val (regs, tmp, val); +csky_insn_reg_set_val (regs, tmp, (unsigned long )val); }void __kprobes
@@ -297,13 +297,11 @@ simulate_bhsz32(u32 opcode, long addr, struct pt_regs *regs)csky_insn_reg_get_val (regs, tmp, &val); -if (val >=0 ) { +if ((long ) val >=0 ) {instruction_pointer_set (regs, addr +sign_extend32 ((opcode &0xffff0000 ) >>15 ,15 )); }else instruction_pointer_set (regs, addr +4 ); - -csky_insn_reg_set_val (regs, tmp, val); }void __kprobes
@@ -314,13 +312,11 @@ simulate_bhz32(u32 opcode, long addr, struct pt_regs *regs)csky_insn_reg_get_val (regs, tmp, &val); -if (val >0 ) { +if ((long ) val >0 ) {instruction_pointer_set (regs, addr +sign_extend32 ((opcode &0xffff0000 ) >>15 ,15 )); }else instruction_pointer_set (regs, addr +4 ); - -csky_insn_reg_set_val (regs, tmp, val); }void __kprobes
@@ -331,13 +327,11 @@ simulate_blsz32(u32 opcode, long addr, struct pt_regs *regs)csky_insn_reg_get_val (regs, tmp, &val); -if (val <=0 ) { +if ((long ) val <=0 ) {instruction_pointer_set (regs, addr +sign_extend32 ((opcode &0xffff0000 ) >>15 ,15 )); }else instruction_pointer_set (regs, addr +4 ); - -csky_insn_reg_set_val (regs, tmp, val); }void __kprobes
@@ -348,13 +342,11 @@ simulate_blz32(u32 opcode, long addr, struct pt_regs *regs)csky_insn_reg_get_val (regs, tmp, &val); -if (val <0 ) { +if ((long ) val <0 ) {instruction_pointer_set (regs, addr +sign_extend32 ((opcode &0xffff0000 ) >>15 ,15 )); }else instruction_pointer_set (regs, addr +4 ); - -csky_insn_reg_set_val (regs, tmp, val); }void __kprobes
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 27/29 csky: Add VDSO with GENERIC_GETTIMEOFDAY, GENERIC_TIME_VSYSCALL, HAVE_GENERIC_VDSO
In reply to [email protected]From: Guo Ren <[email protected]>
It could help to reduce the latency of the time-related functions in user space.
We have referenced arm's and riscv's implementation for the patch.
--- arch/csky/Kconfig | 4 + arch/csky/abiv1/inc/abi/regdef.h | 5 + arch/csky/abiv2/inc/abi/regdef.h | 5 + arch/csky/include/asm/clocksource.h | 8 ++ arch/csky/include/asm/vdso.h | 2 + arch/csky/include/asm/vdso/clocksource.h | 9 ++ arch/csky/include/asm/vdso/gettimeofday.h | 114 ++++++++++++++++++++++ arch/csky/include/asm/vdso/processor.h | 12 +++ arch/csky/include/asm/vdso/vsyscall.h | 22 +++++ arch/csky/kernel/perf_event.c | 2 +- arch/csky/kernel/vdso.c | 4 + arch/csky/kernel/vdso/Makefile | 9 +- arch/csky/kernel/vdso/vdso.lds.S | 4 + arch/csky/kernel/vdso/vgettimeofday.c | 28 ++++++ 14 files changed, 225 insertions(+), 3 deletions(-) create mode 100644 arch/csky/include/asm/clocksource.h create mode 100644 arch/csky/include/asm/vdso/clocksource.h create mode 100644 arch/csky/include/asm/vdso/gettimeofday.h create mode 100644 arch/csky/include/asm/vdso/processor.h create mode 100644 arch/csky/include/asm/vdso/vsyscall.h create mode 100644 arch/csky/kernel/vdso/vgettimeofday.c
arch/csky/Kconfig +4 -0
@@ -35,6 +35,9 @@ config CSKY select GENERIC_IRQ_MULTI_HANDLER select GENERIC_SCHED_CLOCK select GENERIC_SMP_IDLE_THREAD + select GENERIC_TIME_VSYSCALL + select GENERIC_VDSO_32 + select GENERIC_GETTIMEOFDAY select GX6605S_TIMER if CPU_CK610 select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_AUDITSYSCALL
@@ -46,6 +49,7 @@ config CSKY select HAVE_DEBUG_KMEMLEAK select HAVE_DYNAMIC_FTRACE select HAVE_DYNAMIC_FTRACE_WITH_REGS + select HAVE_GENERIC_VDSO select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_ERROR_INJECTION
arch/csky/abiv1/inc/abi/regdef.h +5 -0
@@ -4,7 +4,12 @@#ifndef __ASM_CSKY_REGDEF_H#define __ASM_CSKY_REGDEF_H +#ifdef __ASSEMBLY__#define syscallid r1 +#else +#define syscallid "r1" +#endif +#define regs_syscallid (regs) regs->regs[9]#define regs_fp (regs) regs->regs[2]
arch/csky/abiv2/inc/abi/regdef.h +5 -0
@@ -4,7 +4,12 @@#ifndef __ASM_CSKY_REGDEF_H#define __ASM_CSKY_REGDEF_H +#ifdef __ASSEMBLY__#define syscallid r7 +#else +#define syscallid "r7" +#endif +#define regs_syscallid (regs) regs->regs[3]#define regs_fp (regs) regs->regs[4]
arch/csky/include/asm/clocksource.h new file +8 -0
@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_VDSO_CSKY_CLOCKSOURCE_H +#define __ASM_VDSO_CSKY_CLOCKSOURCE_H + +#include <asm/vdso/clocksource.h> + +#endif
arch/csky/include/asm/vdso.h +2 -0
@@ -5,8 +5,10 @@#include <linux/types.h> +#ifndef GENERIC_TIME_VSYSCALL struct vdso_data { }; +#endif /* * The VDSO symbols are mapped into Linux so we can just use regular symbol
arch/csky/include/asm/vdso/clocksource.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_VDSO_CSKY_CLOCKSOURCE_H +#define __ASM_VDSO_CSKY_CLOCKSOURCE_H + +#define VDSO_ARCH_CLOCKMODES \ + VDSO_CLOCKMODE_ARCHTIMER + +#endif /* __ASM_VDSO_CSKY_CLOCKSOURCE_H */
arch/csky/include/asm/vdso/gettimeofday.h new file +114 -0
114 lines not on this page · raw message
arch/csky/include/asm/vdso/processor.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __ASM_VDSO_CSKY_PROCESSOR_H +#define __ASM_VDSO_CSKY_PROCESSOR_H + +#ifndef __ASSEMBLY__ + +#define cpu_relax () barrier() + +#endif /* __ASSEMBLY__ */ + +#endif /* __ASM_VDSO_CSKY_PROCESSOR_H */
arch/csky/include/asm/vdso/vsyscall.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_VDSO_CSKY_VSYSCALL_H +#define __ASM_VDSO_CSKY_VSYSCALL_H + +#ifndef __ASSEMBLY__ + +#include <vdso/datapage.h> + +extern struct vdso_data *vdso_data; + +static __always_inline struct vdso_data *__csky_get_k_vdso_data(void) +{ +return vdso_data; +} +#define __arch_get_k_vdso_data __csky_get_k_vdso_data + +#include <asm-generic/vdso/vsyscall.h> + +#endif /* !__ASSEMBLY__ */ + +#endif /* __ASM_VDSO_CSKY_VSYSCALL_H */
arch/csky/kernel/perf_event.c +1 -1
@@ -87,7 +87,7 @@ static int csky_pmu_irq; })/* cycle counter */ -static uint64_t csky_pmu_read_cc (void ) +uint64_t csky_pmu_read_cc (void ) {uint32_t lo, hi, tmp;uint64_t result;
arch/csky/kernel/vdso.c +4 -0
@@ -8,7 +8,11 @@#include <linux/slab.h> #include <asm/page.h> +#ifdef GENERIC_TIME_VSYSCALL +#include <vdso/datapage.h> +#else #include <asm/vdso.h> +#endif extern char vdso_start[], vdso_end[];
arch/csky/kernel/vdso/Makefile +7 -2
@@ -6,12 +6,17 @@ ARCH_REL_TYPE_ABS := R_CKCORE_ADDR32|R_CKCORE_JUMP_SLOT include $(srctree)/lib/vdso/Makefile # Symbols present in the vdso -vdso-syms = rt_sigreturn +vdso-syms += rt_sigreturn +vdso-syms += vgettimeofday # Files to link into the vdso obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o -ccflags-y := -fno-stack-protector +ifneq ($(c-gettimeofday-y),) + CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) +endif + +ccflags-y := -fno-stack-protector -DBUILD_VDSO32 # Build rules targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.lds vdso-dummy.o
arch/csky/kernel/vdso/vdso.lds.S +4 -0
@@ -49,6 +49,10 @@ VERSION LINUX_5.10 { global: __vdso_rt_sigreturn; + __vdso_clock_gettime; + __vdso_clock_gettime64; + __vdso_gettimeofday; + __vdso_clock_getres; local: *; }; }
arch/csky/kernel/vdso/vgettimeofday.c new file +28 -0
@@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include <linux/time.h> +#include <linux/types.h> + +int __vdso_clock_gettime (clockid_t clock, +struct old_timespec32 *ts) +{ +return __cvdso_clock_gettime32 (clock, ts); +} + +int __vdso_clock_gettime64 (clockid_t clock, +struct __kernel_timespec *ts) +{ +return __cvdso_clock_gettime (clock, ts); +} + +int __vdso_gettimeofday (struct __kernel_old_timeval *tv, +struct timezone *tz) +{ +return __cvdso_gettimeofday (tv, tz); +} + +int __vdso_clock_getres (clockid_t clock_id, +struct old_timespec32 *res) +{ +return __cvdso_clock_getres_time32 (clock_id, res); +}
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 28/29 csky: Using set_max_mapnr api
In reply to [email protected]From: Guo Ren <[email protected]>
Using set_max_mapnr API instead of setting the value directly.
--- arch/csky/mm/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/csky/mm/init.c +2 -2
@@ -86,9 +86,9 @@ void __init mem_init(void)#ifdef CONFIG_HIGHMEM unsigned long tmp; - max_mapnr = highend_pfn; +set_max_mapnr (highend_pfn);#else - max_mapnr = max_low_pfn; +set_max_mapnr (max_low_pfn);#endif high_memory = (void *)__va (max_low_pfn <<PAGE_SHIFT );
Signature · 1 line
2.17.1
[email protected]
maintainerPATCH 29/29 csky: Fixup pfn_valid error with wrong max_mapnr
In reply to [email protected]From: Guo Ren <[email protected]>
The max_mapnr is the number of PFNs, not absolute PFN offset.
--- arch/csky/mm/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/csky/mm/init.c +2 -2
@@ -86,9 +86,9 @@ void __init mem_init(void)#ifdef CONFIG_HIGHMEM unsigned long tmp; -set_max_mapnr (highend_pfn); +set_max_mapnr (highend_pfn -ARCH_PFN_OFFSET );#else -set_max_mapnr (max_low_pfn); +set_max_mapnr (max_low_pfn -ARCH_PFN_OFFSET );#endif high_memory = (void *)__va (max_low_pfn <<PAGE_SHIFT );
Signature · 1 line
2.17.1