Unverified Commit eaee5487 authored by Samuel Holland's avatar Samuel Holland Committed by Palmer Dabbelt
Browse files

riscv: Use offset_in_page() in text patching functions 



This is a bit easier to parse than the equivalent bit manipulation.

Reviewed-by: default avatarBjörn Töpel <bjorn@rivosinc.com>
Signed-off-by: default avatarSamuel Holland <samuel.holland@sifive.com>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20240327160520.791322-7-samuel.holland@sifive.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 51781ce8

arch/riscv/kernel/patch.c

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static __always_inline void *patch_map(void *addr, const unsigned int fixmap) 
	BUG_ON(!page);



	return (void *)set_fixmap_offset(fixmap, page_to_phys(page) +

					 (uintaddr & ~PAGE_MASK));

					 offset_in_page(addr));

}



static void patch_unmap(int fixmap)
@@ -65,8 +65,8 @@ NOKPROBE_SYMBOL(patch_unmap); 


static int __patch_insn_set(void *addr, u8 c, size_t len)

{

	bool across_pages = (offset_in_page(addr) + len) > PAGE_SIZE;

	void *waddr = addr;

	bool across_pages = (((uintptr_t)addr & ~PAGE_MASK) + len) > PAGE_SIZE;



	/*

	 * Only two pages can be mapped at a time for writing.
@@ -102,8 +102,8 @@ NOKPROBE_SYMBOL(__patch_insn_set); 


static int __patch_insn_write(void *addr, const void *insn, size_t len)

{

	bool across_pages = (offset_in_page(addr) + len) > PAGE_SIZE;

	void *waddr = addr;

	bool across_pages = (((uintptr_t) addr & ~PAGE_MASK) + len) > PAGE_SIZE;

	int ret;



	/*