parisc: Add defines for various space register
Helge Deller
maintainerPATCH 1/4 parisc: Add defines for various space register
Provide defines for space registers (SR_KERNEL, SR_USER, ...) which should be used instead of hardcoding the values.
--- arch/parisc/include/asm/assembly.h | 6 ++++++ 1 file changed, 6 insertions(+)
arch/parisc/include/asm/assembly.h +6 -0
@@ -47,6 +47,12 @@#define PRIV_USER 3#define PRIV_KERNEL 0 +/* Space register used inside kernel */ +#define SR_KERNEL 0 +#define SR_TEMP1 1 +#define SR_TEMP2 2 +#define SR_USER 3 +#ifdef __ASSEMBLY__#ifdef CONFIG_64BIT
--
2.34.1
Helge Deller
maintainerPATCH 2/4 parisc: Use SR_USER and SR_KERNEL in get_user() and put_user()
Instead of hardcoding the space registers as strings, use the SR_USER and SR_KERNEL constants to form the space register in the access functions.
--- arch/parisc/include/asm/uaccess.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
arch/parisc/include/asm/uaccess.h +14 -14
@@ -79,18 +79,18 @@ struct exception_table_entry {#define __get_user (val, ptr) \ ({ \ - __get_user_internal("%%sr3,", val, ptr); \ + __get_user_internal(SR_USER, val, ptr); \ })#define __get_user_asm (sr, val, ldx, ptr) \ { \ register long __gu_val; \ \ - __asm__("1: " ldx " 0(" sr "%2),%0\n" \ + __asm__("1: " ldx " 0(%%sr%2,%3),%0\n" \ "9:\n" \ ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b) \ : "=r"(__gu_val), "+r"(__gu_err) \ - : "r"(ptr)); \ + : "i"(sr), "r"(ptr)); \ \ (val) = (__force __typeof__(*(ptr))) __gu_val; \ }
@@ -100,7 +100,7 @@ struct exception_table_entry { { \type __z; \long __err; \ - __err =__get_user_internal ("%%sr0," , __z, (type *)(src)); \ + __err =__get_user_internal (SR_KERNEL , __z, (type *)(src)); \if (unlikely (__err)) \ goto err_label; \else \
@@ -118,13 +118,13 @@ struct exception_table_entry { } __gu_tmp; \ \ __asm__(" copy %%r0,%R0\n" \ -"1: ldw 0(" sr"%2),%0\n" \ -"2: ldw 4(" sr"%2),%R0\n" \ +"1: ldw 0(%%sr%2,%3),%0\n" \ +"2: ldw 4(%%sr%2,%3),%R0\n" \"9:\n" \ ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b) \ASM_EXCEPTIONTABLE_ENTRY_EFAULT (2b ,9b ) \ : "=&r"(__gu_tmp.l), "+r"(__gu_err) \ -: " r"(ptr)); \ +: " i"(sr), " r"(ptr)); \ \ (val) = __gu_tmp.t; \ }
@@ -151,14 +151,14 @@ struct exception_table_entry { ({ \ __typeof__(&*(ptr)) __ptr = ptr; \ __typeof__(*(__ptr)) __x = (__typeof__(*(__ptr)))(x); \ -__put_user_internal ("%%sr3," , __x, __ptr); \ +__put_user_internal (SR_USER , __x, __ptr); \ })#define __put_kernel_nofault (dst, src, type, err_label) \ { \ type __z = *(type *)(src); \ long __err; \ - __err = __put_user_internal("%%sr0,", __z, (type *)(dst)); \ + __err = __put_user_internal(SR_KERNEL, __z, (type *)(dst)); \ if (unlikely(__err)) \ goto err_label; \ }
@@ -178,24 +178,24 @@ struct exception_table_entry {#define __put_user_asm (sr, stx, x, ptr) \ __asm__ __volatile__ ( \ - "1: " stx " %2,0(" sr "%1)\n" \ + "1: " stx " %1,0(%%sr%2,%3)\n" \ "9:\n" \ ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b) \ : "+r"(__pu_err) \ - : "r"(ptr), "r"(x)) + : "r"(x), "i"(sr), "r"(ptr))#if !defined(CONFIG_64BIT )#define __put_user_asm64 (sr, __val, ptr) do { \ __asm__ __volatile__ ( \ - "1: stw %2,0(" sr "%1)\n" \ - "2: stw %R2,4(" sr "%1)\n" \ + "1: stw %1,0(%%sr%2,%3)\n" \ + "2: stw %R1,4(%%sr%2,%3)\n" \ "9:\n" \ ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b) \ ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 9b) \ : "+r"(__pu_err) \ - : "r"(ptr), "r"(__val)); \ + : "r"(__val), "i"(sr), "r"(ptr)); \ } while (0)#endif /* !defined(CONFIG_64BIT) */
--
2.34.1
Helge Deller
maintainerPATCH 3/4 parisc: Use constants to encode the space registers like SR_KERNEL
In reply to Helge DellerInstead of hardcoding various space registers, use the space register constants. Introduce SR_TEMP1 and SR_TEMP2 for %sr1 and %sr2.
--- arch/parisc/include/asm/cache.h | 11 ++++------- arch/parisc/include/asm/mmu_context.h | 2 +- arch/parisc/include/asm/pgtable.h | 6 +++--- arch/parisc/include/asm/special_insns.h | 4 ++-- arch/parisc/kernel/cache.c | 8 ++++---- arch/parisc/kernel/pci-dma.c | 4 ++-- arch/parisc/lib/memcpy.c | 16 ++++++++-------- 7 files changed, 24 insertions(+), 27 deletions(-)
arch/parisc/include/asm/cache.h +4 -7
@@ -39,16 +39,13 @@ extern int icache_stride;extern struct pdc_cache_info cache_info;void parisc_setup_cache_timing (void ); -#define pdtlb (addr) asm volatile("pdtlb 0(%%sr1,%0)" \ +#define pdtlb (sr, addr) asm volatile("pdtlb 0(%%sr%0,%1)" \ ALTERNATIVE(ALT_COND_NO_SMP, INSN_PxTLB) \ - : : "r" (addr) : "memory") -#define pitlb (addr) asm volatile("pitlb 0(%%sr1,%0)" \ + : : "i"(sr), "r" (addr) : "memory") +#define pitlb (sr, addr) asm volatile("pitlb 0(%%sr%0,%1)" \ ALTERNATIVE(ALT_COND_NO_SMP, INSN_PxTLB) \ ALTERNATIVE(ALT_COND_NO_SPLIT_TLB, INSN_NOP) \ - : : "r" (addr) : "memory") -#define pdtlb_kernel (addr) asm volatile("pdtlb 0(%0)" \ - ALTERNATIVE(ALT_COND_NO_SMP, INSN_PxTLB) \ - : : "r" (addr) : "memory") + : : "i"(sr), "r" (addr) : "memory")#define asm_io_fdc (addr) asm volatile("fdc %%r0(%0)" \ ALTERNATIVE(ALT_COND_NO_DCACHE, INSN_NOP) \
arch/parisc/include/asm/mmu_context.h +1 -1
@@ -43,7 +43,7 @@ static inline unsigned long __space_to_prot(mm_context_t context)static inline void load_context (mm_context_t context) { -mtsp (context.space_id,3 ); +mtsp (context.space_id,SR_USER );mtctl (__space_to_prot (context),8 ); }
arch/parisc/include/asm/pgtable.h +3 -3
@@ -70,9 +70,9 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)unsigned long flags;purge_tlb_start (flags); -mtsp (mm->context.space_id,1 ); -pdtlb (addr); -pitlb (addr); +mtsp (mm->context.space_id,SR_TEMP1 ); +pdtlb (SR_TEMP1 , addr); +pitlb (SR_TEMP1 , addr);purge_tlb_end (flags); }
arch/parisc/include/asm/special_insns.h +2 -2
@@ -55,8 +55,8 @@ static inline void set_eiem(unsigned long val)#define mfsp (reg) ({ \ unsigned long cr; \ __asm__ __volatile__( \ - "mfsp " #reg ",%0" : \ - "=r" (cr) \ + "mfsp %%sr%1,%0" \ + : "=r" (cr) : "i"(reg) \ ); \ cr; \ })
arch/parisc/kernel/cache.c +4 -4
@@ -457,7 +457,7 @@ void flush_kernel_dcache_page_addr(void *addr)flush_kernel_dcache_page_asm (addr);purge_tlb_start (flags); -pdtlb_kernel (addr); +pdtlb (SR_KERNEL , addr);purge_tlb_end (flags); }EXPORT_SYMBOL (flush_kernel_dcache_page_addr);
@@ -496,9 +496,9 @@ int __flush_tlb_range(unsigned long sid, unsigned long start,but cause a purge request to be broadcast to other TLBs. */ while (start < end) {purge_tlb_start (flags); -mtsp (sid,1 ); -pdtlb (start); -pitlb (start); +mtsp (sid,SR_TEMP1 ); +pdtlb (SR_TEMP1 , start); +pitlb (SR_TEMP1 , start);purge_tlb_end (flags); start +=PAGE_SIZE ; }
arch/parisc/kernel/pci-dma.c +2 -2
@@ -91,7 +91,7 @@ static inline int map_pte_uncached(pte_t * pte,printk (KERN_ERR "map_pte_uncached: page already exists\n" );purge_tlb_start (flags);set_pte (pte,__mk_pte (*paddr_ptr,PAGE_KERNEL_UNC )); -pdtlb_kernel (orig_vaddr); +pdtlb (SR_KERNEL , orig_vaddr);purge_tlb_end (flags); vaddr +=PAGE_SIZE ; orig_vaddr +=PAGE_SIZE ;
@@ -175,7 +175,7 @@ static inline void unmap_uncached_pte(pmd_t * pmd, unsigned long vaddr,pte_clear (&init_mm, vaddr, pte);purge_tlb_start (flags); -pdtlb_kernel (orig_vaddr); +pdtlb (SR_KERNEL , orig_vaddr);purge_tlb_end (flags); vaddr +=PAGE_SIZE ; orig_vaddr +=PAGE_SIZE ;
arch/parisc/lib/memcpy.c +8 -8
@@ -13,8 +13,8 @@#include <linux/compiler.h> #include <linux/uaccess.h> -#define get_user_space () (uaccess_kernel() ? 0 : mfsp(3)) -#define get_kernel_space () (0) +#define get_user_space () mfsp(SR_USER) +#define get_kernel_space () SR_KERNEL/* Returns 0 for success, otherwise, returns number of bytes not transferred. */ extern unsigned long pa_memcpy(void *dst, const void *src,
@@ -23,8 +23,8 @@ extern unsigned long pa_memcpy(void *dst, const void *src,unsigned long raw_copy_to_user (void __user *dst,const void *src,unsigned long len) { -mtsp (get_kernel_space (),1 ); -mtsp (get_user_space (),2 ); +mtsp (get_kernel_space (),SR_TEMP1 ); +mtsp (get_user_space (),SR_TEMP2 );return pa_memcpy ((void __force *)dst, src, len); }EXPORT_SYMBOL (raw_copy_to_user);
@@ -32,16 +32,16 @@ EXPORT_SYMBOL(raw_copy_to_user);unsigned long raw_copy_from_user (void *dst,const void __user *src,unsigned long len) { -mtsp (get_user_space (),1 ); -mtsp (get_kernel_space (),2 ); +mtsp (get_user_space (),SR_TEMP1 ); +mtsp (get_kernel_space (),SR_TEMP2 );return pa_memcpy (dst, (void __force *)src, len); }EXPORT_SYMBOL (raw_copy_from_user);void *memcpy (void * dst,const void *src,size_t count) { -mtsp (get_kernel_space (),1 ); -mtsp (get_kernel_space (),2 ); +mtsp (get_kernel_space (),SR_TEMP1 ); +mtsp (get_kernel_space (),SR_TEMP2 );pa_memcpy (dst, src, count);return dst; }
--
2.34.1
Helge Deller
maintainerPATCH 4/4 parisc: Reduce code size by optimizing get_current() function calls
In reply to Helge DellerThe get_current() code uses the mfctl() macro to get the pointer to the current task struct from %cr30. The problem with the mfctl() macro is, that it is marked volatile which is basically correct, because mfctl() is used to get e.g. the current internal timer or interrupt flags as well.
But specifically the task struct pointer (%cr30) doesn't change over time when the kernel executes code for a task.
So, by dropping the volatile when retrieving %cr30 the compiler is now able to get this value only once and optimize the generated code a lot.
A bloat-o-meter comparism shows that this patch saves ~5kB kernel code on a 32-bit kernel and ~6kB kernel code on a 64-bit kernel.
--- arch/parisc/include/asm/current.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/parisc/include/asm/current.h +5 -3
@@ -2,14 +2,16 @@#ifndef _ASM_PARISC_CURRENT_H#define _ASM_PARISC_CURRENT_H -#include <asm/special_insns.h> -#ifndef __ASSEMBLY__struct task_struct ; static __always_inline struct task_struct *get_current(void) { -return (struct task_struct *)mfctl (30 ); +struct task_struct *ts; + +/* do not use mfctl() macro as it is marked volatile */ + asm("mfctl %%cr30,%0" :"=r" (ts) ); +return ts; }#define current get_current()
--
2.34.1