MAINTAINERS: csky: Add mailing list for csky
Subsystems (2)
[email protected]
maintainerPATCH 1/5 MAINTAINERS: csky: Add mailing list for csky
From: Guo Ren <[email protected]>
Add mailing list and it's convenient for maintain C-SKY subsystem.
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -3553,6 +3553,7 @@ F: sound/pci/oxygen/ C-SKY ARCHITECTURE M: Guo Ren <[email protected]> +L: [email protected] T: git https://github.com/c-sky/csky-linux.git S: Supported F: arch/csky/
Signature · 1 line
2.17.0
[email protected]
maintainerPATCH 2/5 csky: Initial stack protector support
From: Mao Han <[email protected]>
This is a basic -fstack-protector support without per-task canary switching. The protector will report something like when stack corruption is detected:
It's tested with strcpy local array overflow in sys_kill and get:
stack-protector: Kernel stack is corrupted in: sys_kill+0x23c/0x23c
TODO:
- Support task switch for different cannary
--- arch/csky/Kconfig | 1 + arch/csky/include/asm/stackprotector.h | 29 ++++++++++++++++++++++++++ arch/csky/kernel/process.c | 6 ++++++ 3 files changed, 36 insertions(+) create mode 100644 arch/csky/include/asm/stackprotector.h
arch/csky/Kconfig +1 -0
@@ -48,6 +48,7 @@ config CSKY select HAVE_PERF_USER_STACK_DUMP select HAVE_DMA_API_DEBUG select HAVE_DMA_CONTIGUOUS + select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS select MAY_HAVE_SPARSE_IRQ select MODULES_USE_ELF_RELA if MODULES
arch/csky/include/asm/stackprotector.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_STACKPROTECTOR_H +#define _ASM_STACKPROTECTOR_H 1 + +#include <linux/random.h> +#include <linux/version.h> + +extern unsigned long __stack_chk_guard; + +/* +* Initialize the stackprotector canary value. +* +* NOTE: this must only be called from functions that never return, +* and it must always be inlined. +*/ +static __always_inline void boot_init_stack_canary(void) +{ +unsigned long canary; + +/* Try to get a semi random initial value. */ +get_random_bytes (&canary,sizeof (canary)); + canary ^=LINUX_VERSION_CODE ; + canary &=CANARY_MASK ; + + current->stack_canary = canary; + __stack_chk_guard = current->stack_canary; +} + +#endif /* __ASM_SH_STACKPROTECTOR_H */
arch/csky/kernel/process.c +6 -0
@@ -16,6 +16,12 @@struct cpuinfo_csky cpu_data[NR_CPUS ]; +#ifdef CONFIG_STACKPROTECTOR +#include <linux/stackprotector.h> +unsigned long __stack_chk_guard__read_mostly ; +EXPORT_SYMBOL (__stack_chk_guard); +#endif + asmlinkage void ret_from_fork(void); asmlinkage void ret_from_kernel_thread(void);
Signature · 1 line
2.17.0
[email protected]
maintainerPATCH 3/5 csky: Tightly-Coupled Memory or Sram support
In reply to [email protected]From: Guo Ren <[email protected]>
The implementation are not only used by TCM but also used by sram on SOC bus. It follow existed linux tcm software interface, so that old tcm application codes could be re-used directly.
Software interface list in asm/tcm.h:
- Variables/Const: __tcmdata, __tcmconst
- Functions: __tcmfunc, __tcmlocalfunc
- Malloc/Free: tcm_alloc, tcm_free
In linux menuconfig:
- Choose a TCM contain instrctions + data or separated in ITCM/DTCM.
- Determine TCM_BASE (DTCM_BASE) in phyiscal address.
- Determine size of TCM or ITCM(DTCM) in page counts.
Here is hello tcm example from Documentation/arm/tcm.rst which could be directly used:
/* Uninitialized data */
static u32 __tcmdata tcmvar;
/* Initialized data */
static u32 __tcmdata tcmassigned = 0x2BADBABEU; /* Constant */
static const u32 __tcmconst tcmconst = 0xCAFEBABEU;
static void __tcmlocalfunc tcm_to_tcm(void)
{
int i;
for (i = 0; i < 100; i++)
tcmvar ++;
}static void __tcmfunc hello_tcm(void)
{
/* Some abstract code that runs in ITCM */
int i;
for (i = 0; i < 100; i++) {
tcmvar ++;
}
tcm_to_tcm();
}static void __init test_tcm(void)
{
u32 *tcmem;
int i;
hello_tcm();
printk("Hello TCM executed from ITCM RAM\n");
printk("TCM variable from testrun: %u @ %p\n", tcmvar, &tcmvar);
tcmvar = 0xDEADBEEFU;
printk("TCM variable: 0x%x @ %p\n", tcmvar, &tcmvar);
printk("TCM assigned variable: 0x%x @ %p\n", tcmassigned, &tcmassigned);
printk("TCM constant: 0x%x @ %p\n", tcmconst, &tcmconst);
/* Allocate some TCM memory from the pool */
tcmem = tcm_alloc(20);
if (tcmem) {
printk("TCM Allocated 20 bytes of TCM @ %p\n", tcmem);
tcmem[0] = 0xDEADBEEFU;
tcmem[1] = 0x2BADBABEU;
tcmem[2] = 0xCAFEBABEU;
tcmem[3] = 0xDEADBEEFU;
tcmem[4] = 0x2BADBABEU;
for (i = 0; i < 5; i++)
printk("TCM tcmem[%d] = %08x\n", i, tcmem[i]);
tcm_free(tcmem, 20);
}
}TODO:
- Separate fixup mapping from highmem
- Support abiv1
--- arch/csky/Kconfig | 35 ++++++++ arch/csky/include/asm/fixmap.h | 5 +- arch/csky/include/asm/memory.h | 22 +++++ arch/csky/include/asm/tcm.h | 24 +++++ arch/csky/kernel/vmlinux.lds.S | 49 +++++++++++ arch/csky/mm/Makefile | 1 + arch/csky/mm/tcm.c | 156 +++++++++++++++++++++++++++++++++ 7 files changed, 291 insertions(+), 1 deletion(-) create mode 100644 arch/csky/include/asm/memory.h create mode 100644 arch/csky/include/asm/tcm.h create mode 100644 arch/csky/mm/tcm.c
arch/csky/Kconfig +35 -0
@@ -188,6 +188,41 @@ config CPU_PM_STOP bool "stop" endchoice +menuconfig HAVE_TCM + bool "Tightly-Coupled/Sram Memory" + depends on HIGHMEM + select GENERIC_ALLOCATOR + help + The implementation are not only used by TCM (Tightly-Coupled Meory) + but also used by sram on SOC bus. It follow existed linux tcm + software interface, so that old tcm application codes could be + re-used directly. + +if HAVE_TCM +config ITCM_RAM_BASE + hex "ITCM ram base" + default 0xffffffff + +config ITCM_NR_PAGES + int "Page count of ITCM size: NR*4KB" + range 1 256 + default 32 + +config HAVE_DTCM + bool "DTCM Support" + +config DTCM_RAM_BASE + hex "DTCM ram base" + depends on HAVE_DTCM + default 0xffffffff + +config DTCM_NR_PAGES + int "Page count of DTCM size: NR*4KB" + depends on HAVE_DTCM + range 1 256 + default 32 +endif + config CPU_HAS_VDSP bool "CPU has VDSP coprocessor" depends on CPU_HAS_FPU && CPU_HAS_FPUV2
arch/csky/include/asm/fixmap.h +4 -1
@@ -5,12 +5,16 @@#define __ASM_CSKY_FIXMAP_H#include <asm/page.h> +#include <asm/memory.h> #ifdef CONFIG_HIGHMEM #include <linux/threads.h> #include <asm/kmap_types.h> #endif enum fixed_addresses { +#ifdef CONFIG_HAVE_TCM +FIX_TCM =TCM_NR_PAGES , +#endif #ifdef CONFIG_HIGHMEM FIX_KMAP_BEGIN ,FIX_KMAP_END =FIX_KMAP_BEGIN + (KM_TYPE_NR *NR_CPUS ) -1 ,
@@ -18,7 +22,6 @@ enum fixed_addresses { __end_of_fixed_addresses }; -#define FIXADDR_TOP 0xffffc000#define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
arch/csky/include/asm/memory.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_CSKY_MEMORY_H +#define __ASM_CSKY_MEMORY_H + +#include <linux/compiler.h> +#include <linux/const.h> +#include <linux/types.h> +#include <linux/sizes.h> + +#define FIXADDR_TOP _AC(0xffffc000, UL) + +#ifdef CONFIG_HAVE_TCM +#ifdef CONFIG_HAVE_DTCM +#define TCM_NR_PAGES (CONFIG_ITCM_NR_PAGES + CONFIG_DTCM_NR_PAGES) +#else +#define TCM_NR_PAGES (CONFIG_ITCM_NR_PAGES) +#endif +#define FIXADDR_TCM _AC(FIXADDR_TOP - (TCM_NR_PAGES * PAGE_SIZE), UL) +#endif + +#endif
arch/csky/include/asm/tcm.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_CSKY_TCM_H +#define __ASM_CSKY_TCM_H + +#ifndef CONFIG_HAVE_TCM +#error "You should not be including tcm.h unless you have a TCM!" +#endif + +#include <linux/compiler.h> + +/* Tag variables with this */ +#define __tcmdata __section(.tcm.data) +/* Tag constants with this */ +#define __tcmconst __section(.tcm.rodata) +/* Tag functions inside TCM called from outside TCM with this */ +#define __tcmfunc __section(.tcm.text) noinline +/* Tag function inside TCM called from inside TCM with this */ +#define __tcmlocalfunc __section(.tcm.text) + +void *tcm_alloc (size_t len); +void tcm_free (void *addr,size_t len); + +#endif
arch/csky/kernel/vmlinux.lds.S +49 -0
61 lines not on this page · raw message
arch/csky/mm/Makefile +1 -0
@@ -14,3 +14,4 @@ obj-y += syscache.o obj-y += tlb.o obj-y += asid.o obj-y += context.o +obj-$(CONFIG_HAVE_TCM) += tcm.o
arch/csky/mm/tcm.c new file +156 -0
156 lines not on this page · raw message
Signature · 1 line
2.17.0
[email protected]
maintainerPATCH 4/5 csky: Separate fixaddr_init from highmem
In reply to [email protected]From: Guo Ren <[email protected]>
After fixaddr_init is separated from highmem, we could use tcm without highmem selected. (610 (abiv1) don't support highmem, but it could use tcm now.)
--- arch/csky/Kconfig | 1 - arch/csky/include/asm/fixmap.h | 4 +++ arch/csky/include/asm/memory.h | 3 ++ arch/csky/include/asm/pgtable.h | 6 +--- arch/csky/kernel/setup.c | 2 ++ arch/csky/mm/highmem.c | 64 +++------------------------------ arch/csky/mm/init.c | 47 ++++++++++++++++++++++++ 7 files changed, 61 insertions(+), 66 deletions(-)
arch/csky/Kconfig +0 -1
@@ -190,7 +190,6 @@ endchoice menuconfig HAVE_TCM bool "Tightly-Coupled/Sram Memory" - depends on HIGHMEM select GENERIC_ALLOCATOR help The implementation are not only used by TCM (Tightly-Coupled Meory)
arch/csky/include/asm/fixmap.h +4 -0
@@ -27,4 +27,8 @@ enum fixed_addresses {#include <asm-generic/fixmap.h> +extern void fixrange_init (unsigned long start,unsigned long end, +pgd_t *pgd_base); +extern void __init fixaddr_init (void ); +#endif /* __ASM_CSKY_FIXMAP_H */
arch/csky/include/asm/memory.h +3 -0
@@ -9,6 +9,9 @@#include <linux/sizes.h> #define FIXADDR_TOP _AC(0xffffc000, UL) +#define PKMAP_BASE _AC(0xff800000, UL) +#define VMALLOC_START _AC(0xc0008000, UL) +#define VMALLOC_END (PKMAP_BASE - (PAGE_SIZE * 2))#ifdef CONFIG_HAVE_TCM #ifdef CONFIG_HAVE_DTCM
arch/csky/include/asm/pgtable.h +1 -5
@@ -5,6 +5,7 @@#define __ASM_CSKY_PGTABLE_H#include <asm/fixmap.h> +#include <asm/memory.h> #include <asm/addrspace.h> #include <abi/pgtable-bits.h> #include <asm-generic/pgtable-nopmd.h>
@@ -16,11 +17,6 @@#define USER_PTRS_PER_PGD (0x80000000UL/PGDIR_SIZE)#define FIRST_USER_ADDRESS 0UL -#define PKMAP_BASE (0xff800000) - -#define VMALLOC_START (0xc0008000) -#define VMALLOC_END (PKMAP_BASE - 2*PAGE_SIZE) -/* * C-SKY is two-level paging structure: */
arch/csky/kernel/setup.c +2 -0
@@ -133,6 +133,8 @@ void __init setup_arch(char **cmdline_p)sparse_init (); +fixaddr_init (); +#ifdef CONFIG_HIGHMEM kmap_init ();#endif
arch/csky/mm/highmem.c +4 -60
89 lines not on this page · raw message
arch/csky/mm/init.c +47 -0
50 lines not on this page · raw message
Signature · 1 line
2.17.0
[email protected]
maintainerPATCH 5/5 csky/mm: Fixup export invalid_pte_table symbol
In reply to [email protected]From: Guo Ren <[email protected]>
There is no present bit in csky pmd hardware, so we need to prepare invalid_pte_table for empty pmd entry and the functions (pmd_none & pmd_present) in pgtable.h need invalid_pte_talbe to get result. If a module use these functions, we need export the symbol for it.
--- arch/csky/mm/init.c | 1 + 1 file changed, 1 insertion(+)
arch/csky/mm/init.c +1 -0
@@ -31,6 +31,7 @@ pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned_bss; +EXPORT_SYMBOL (invalid_pte_table); unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss;EXPORT_SYMBOL (empty_zero_page);
Signature · 1 line
2.17.0