Commit c3137514 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-6.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Palmer Dabbelt:

 - A fix for a missing icache flush in uprobes, which manifests as at
   least a BFF selftest failure on the Spacemit X1

 - A workaround for build warnings in flush_icache_range()

* tag 'riscv-for-linus-6.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: uprobes: Add missing fence.i after building the XOL buffer
  riscv: Replace function-like macro by static inline function
parents c405e182 7d1d19a1

arch/riscv/include/asm/cacheflush.h

+10 −5
Original line number Diff line number Diff line
@@ -34,11 +34,6 @@ static inline void flush_dcache_page(struct page *page) 
	flush_dcache_folio(page_folio(page));

}



/*

 * RISC-V doesn't have an instruction to flush parts of the instruction cache,

 * so instead we just flush the whole thing.

 */

#define flush_icache_range(start, end) flush_icache_all()

#define flush_icache_user_page(vma, pg, addr, len)	\

do {							\

	if (vma->vm_flags & VM_EXEC)			\
@@ -78,6 +73,16 @@ void flush_icache_mm(struct mm_struct *mm, bool local); 


#endif /* CONFIG_SMP */



/*

 * RISC-V doesn't have an instruction to flush parts of the instruction cache,

 * so instead we just flush the whole thing.

 */

#define flush_icache_range flush_icache_range

static inline void flush_icache_range(unsigned long start, unsigned long end)

{

	flush_icache_all();

}



extern unsigned int riscv_cbom_block_size;

extern unsigned int riscv_cboz_block_size;

void riscv_init_cbo_blocksizes(void);

arch/riscv/kernel/probes/uprobes.c

+2 −8
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, 
	/* Initialize the slot */

	void *kaddr = kmap_atomic(page);

	void *dst = kaddr + (vaddr & ~PAGE_MASK);

	unsigned long start = (unsigned long)dst;



	memcpy(dst, src, len);
@@ -176,13 +177,6 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, 
		*(uprobe_opcode_t *)dst = __BUG_INSN_32;

	}



	flush_icache_range(start, start + len);

	kunmap_atomic(kaddr);



	/*

	 * We probably need flush_icache_user_page() but it needs vma.

	 * This should work on most of architectures by default. If

	 * architecture needs to do something different it can define

	 * its own version of the function.

	 */

	flush_dcache_page(page);

}