diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2024-10-01 16:25:03 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2024-10-07 09:28:45 +0200 |
| commit | 6c74ca7aa81a23c613b8ca52bfe0a4b3734dd287 (patch) | |
| tree | 1ae77521cf9b948f14608c71aa84c3d863bb8eca | |
| parent | 7a166094bd2b1c084fd215747f9cd05a853d66c9 (diff) | |
| download | lwn-6c74ca7aa81a23c613b8ca52bfe0a4b3734dd287.tar.gz lwn-6c74ca7aa81a23c613b8ca52bfe0a4b3734dd287.zip | |
uprobes: fold xol_take_insn_slot() into xol_get_insn_slot()
After the previous change xol_take_insn_slot() becomes trivial, kill it.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20241001142503.GA13633@redhat.com
| -rw-r--r-- | kernel/events/uprobes.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index a1c801e8333c..2a0059464383 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1641,28 +1641,19 @@ static unsigned long xol_get_slot_nr(struct xol_area *area) } /* - * - search for a free slot. - */ -static unsigned long xol_take_insn_slot(struct xol_area *area) -{ - unsigned long slot_nr; - - wait_event(area->wq, (slot_nr = xol_get_slot_nr(area)) < UINSNS_PER_PAGE); - - return area->vaddr + slot_nr * UPROBE_XOL_SLOT_BYTES; -} - -/* * xol_get_insn_slot - allocate a slot for xol. */ static bool xol_get_insn_slot(struct uprobe *uprobe, struct uprobe_task *utask) { struct xol_area *area = get_xol_area(); + unsigned long slot_nr; if (!area) return false; - utask->xol_vaddr = xol_take_insn_slot(area); + wait_event(area->wq, (slot_nr = xol_get_slot_nr(area)) < UINSNS_PER_PAGE); + + utask->xol_vaddr = area->vaddr + slot_nr * UPROBE_XOL_SLOT_BYTES; arch_uprobe_copy_ixol(area->page, utask->xol_vaddr, &uprobe->arch.ixol, sizeof(uprobe->arch.ixol)); return true; |