RISC-V: Make our port sparse-clean

palmer-dabbelt · palmer-dabbelt · commit e0e0c87c022b · 2018-06-11T09:09:49.000-07:00
This patch set contains a handful of fixes that clean up the sparse
results for the RISC-V port.  These patches shouldn't have any
functional difference.  The patches:

* Use NULL instead of 0.
* Clean up __user annotations.
* Split __copy_user into two functions, to make the __user annotations
  valid.

Signed-off-by: Palmer Dabbelt &lt;palmer@dabbelt.com&gt;
diff --git a/arch/riscv/include/asm/cacheflush.h b/arch/riscv/include/asm/cacheflush.h
@@ -47,7 +47,7 @@ static inline void flush_dcache_page(struct page *page)
 
 #else /* CONFIG_SMP */
 
-#define flush_icache_all() sbi_remote_fence_i(0)
+#define flush_icache_all() sbi_remote_fence_i(NULL)
 void flush_icache_mm(struct mm_struct *mm, bool local);
 
 #endif /* CONFIG_SMP */
diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h
@@ -49,7 +49,7 @@ static inline void flush_tlb_range(struct vm_area_struct *vma,
 
 #include <asm/sbi.h>
 
-#define flush_tlb_all() sbi_remote_sfence_vma(0, 0, -1)
+#define flush_tlb_all() sbi_remote_sfence_vma(NULL, 0, -1)
 #define flush_tlb_page(vma, addr) flush_tlb_range(vma, addr, 0)
 #define flush_tlb_range(vma, start, end) \
 	sbi_remote_sfence_vma(mm_cpumask((vma)->vm_mm)->bits, \
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
@@ -392,19 +392,21 @@ do {								\
 })
 
 
-extern unsigned long __must_check __copy_user(void __user *to,
+extern unsigned long __must_check __asm_copy_to_user(void __user *to,
+	const void *from, unsigned long n);
+extern unsigned long __must_check __asm_copy_from_user(void *to,
 	const void __user *from, unsigned long n);
 
 static inline unsigned long
 raw_copy_from_user(void *to, const void __user *from, unsigned long n)
 {
-	return __copy_user(to, from, n);
+	return __asm_copy_to_user(to, from, n);
 }
 
 static inline unsigned long
 raw_copy_to_user(void __user *to, const void *from, unsigned long n)
 {
-	return __copy_user(to, from, n);
+	return __asm_copy_from_user(to, from, n);
 }
 
 extern long strncpy_from_user(char *dest, const char __user *src, long count);
diff --git a/arch/riscv/kernel/riscv_ksyms.c b/arch/riscv/kernel/riscv_ksyms.c
@@ -13,6 +13,7 @@
  * Assembly functions that may be used (directly or indirectly) by modules
  */
 EXPORT_SYMBOL(__clear_user);
-EXPORT_SYMBOL(__copy_user);
+EXPORT_SYMBOL(__asm_copy_to_user);
+EXPORT_SYMBOL(__asm_copy_from_user);
 EXPORT_SYMBOL(memset);
 EXPORT_SYMBOL(memcpy);
diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c
@@ -160,7 +160,7 @@ int is_valid_bugaddr(unsigned long pc)
 
 	if (pc < PAGE_OFFSET)
 		return 0;
-	if (probe_kernel_address((bug_insn_t __user *)pc, insn))
+	if (probe_kernel_address((bug_insn_t *)pc, insn))
 		return 0;
 	return (insn == __BUG_INSN);
 }
diff --git a/arch/riscv/lib/uaccess.S b/arch/riscv/lib/uaccess.S
@@ -13,7 +13,8 @@ _epc:
 	.previous
 	.endm
 
-ENTRY(__copy_user)
+ENTRY(__asm_copy_to_user)
+ENTRY(__asm_copy_from_user)
 
 	/* Enable access to user memory */
 	li t6, SR_SUM
@@ -63,7 +64,8 @@ ENTRY(__copy_user)
 	addi a0, a0, 1
 	bltu a1, a3, 5b
 	j 3b
-ENDPROC(__copy_user)
+ENDPROC(__asm_copy_to_user)
+ENDPROC(__asm_copy_from_user)
 
 
 ENTRY(__clear_user)

Original file line number	Diff line number	Diff line change
`@@ -392,19 +392,21 @@ do { \`
`392`	`392`	`})`
`393`	`393`
`394`	`394`
`395`		`-extern unsigned long __must_check __copy_user(void __user *to,`
	`395`	`+extern unsigned long __must_check __asm_copy_to_user(void __user *to,`
	`396`	`+ const void *from, unsigned long n);`
	`397`	`+extern unsigned long __must_check __asm_copy_from_user(void *to,`
`396`	`398`	`const void __user *from, unsigned long n);`
`397`	`399`
`398`	`400`	`static inline unsigned long`
`399`	`401`	`raw_copy_from_user(void to, const void __user from, unsigned long n)`
`400`	`402`	`{`
`401`		`- return __copy_user(to, from, n);`
	`403`	`+ return __asm_copy_to_user(to, from, n);`
`402`	`404`	`}`
`403`	`405`
`404`	`406`	`static inline unsigned long`
`405`	`407`	`raw_copy_to_user(void __user to, const void from, unsigned long n)`
`406`	`408`	`{`
`407`		`- return __copy_user(to, from, n);`
	`409`	`+ return __asm_copy_from_user(to, from, n);`
`408`	`410`	`}`
`409`	`411`
`410`	`412`	`extern long strncpy_from_user(char dest, const char __user src, long count);`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ int is_valid_bugaddr(unsigned long pc)`
`160`	`160`
`161`	`161`	`if (pc < PAGE_OFFSET)`
`162`	`162`	`return 0;`
`163`		`- if (probe_kernel_address((bug_insn_t __user *)pc, insn))`
	`163`	`+ if (probe_kernel_address((bug_insn_t *)pc, insn))`
`164`	`164`	`return 0;`
`165`	`165`	`return (insn == __BUG_INSN);`
`166`	`166`	`}`