kernel: events: use offset_in_page macro
Subsystems (2)
PATCH 1/1 kernel: events: use offset_in_page macro
From: Xu Wang <[email protected]>
Use offset_in_page macro instead of (addr & ~PAGE_MASK).
Signed-off-by Xu Wang <[email protected]>
--- kernel/events/uprobes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/events/uprobes.c +3 -3
@@ -244,14 +244,14 @@ bool __weak is_trap_insn(uprobe_opcode_t *insn)static void copy_from_page (struct page *page,unsigned long vaddr,void *dst,int len) {void *kaddr =kmap_atomic (page); -memcpy (dst, kaddr + (vaddr & ~PAGE_MASK ), len); +memcpy (dst, kaddr +offset_in_page (vaddr), len);kunmap_atomic (kaddr); }static void copy_to_page (struct page *page,unsigned long vaddr,const void *src,int len) {void *kaddr =kmap_atomic (page); -memcpy (kaddr + (vaddr & ~PAGE_MASK ), src, len); +memcpy (kaddr +offset_in_page (vaddr), src, len);kunmap_atomic (kaddr); }
@@ -387,7 +387,7 @@ __update_ref_ctr(struct mm_struct *mm, unsigned long vaddr, short d) } kaddr =kmap_atomic (page); - ptr = kaddr + (vaddr & ~PAGE_MASK ); + ptr = kaddr +offset_in_page (vaddr);if (unlikely (*ptr + d <0 )) { pr_warn("ref_ctr going negative. vaddr: 0x%lx, "
Signature · 1 line
2.17.1
Peter Zijlstra
maintainerQuoted 1 line · Chen Ni
Use
offset_in_pagemacro instead of (addr & ~PAGE_MASK).
Shees, so now we're replacing a trivial expression with something that's actually longer to type? How does that make sense?
Quoted 2 lines
kernel/events/uprobes.c +1
-1-memcpy (dst, kaddr + (vaddr & ~PAGE_MASK ), len); +memcpy (dst, kaddr +offset_in_page (vaddr), len);