From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3433E33A716; Mon, 18 May 2026 11:00:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779102014; cv=none; b=FyFITdfLxlGtBkeNFKzMXjDBlbyBkb+nQKyBc3nponxy317Bwa7yKLXDVuRJrgoneOj/a460XrjN92yxCjBpjZ9S7lzF5sSdYYoK9DFDzS0iwaNddC/EmEbk7T+SLfWP8WUJgOnL0BqCp3uLAfLNBjy5L8wz5fZ2HfBB2hZo/VE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779102014; c=relaxed/simple; bh=pwe3w15mmIl73aXqvc4+Z2tQBuuBDFisy0tWh0fC4yo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IzHkAUQwRTiy88/tuypA32rnXF322XDPjqU3OO/WChHj5Lga0t1wIlQ00exw+9GJ+nPaiU6+gEXKhgdgS2/2TIfuXrJEDwOrNr5Iy36Zea3G6mzF52pV9yIo9zbP5p4gQyXmV8nVEgrJzx4e8P9DUUJF2Zl/Wrnhb5segMlSO58= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RsSRD4kj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RsSRD4kj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE315C2BCC6; Mon, 18 May 2026 11:00:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779102012; bh=pwe3w15mmIl73aXqvc4+Z2tQBuuBDFisy0tWh0fC4yo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RsSRD4kjh//iW9FiCc/beOyVbJB/C+Gr7oD6omLLtbbumrZqQn+sJxVE/CdVUEGdZ xAczr18NOxPNEzvoy8wjfvCsf0TH+uIoT8VqwX33m1/QODfDQsehUN3N3jgpKPoAWE 1ge9X/fVRkTGS/Nd5naVyEnit/d1kSMnL//wlSky+T1LIrUqZlOg4hPMOZ6uNaCw7R z4WIyQFQDDTBfrx9FtBSPWI4id2ydRPKWpLhxLJzaIoz6QBXTx0a8IJCuqPrxNRzpx e5IOCWzbTbq6TgCBoywaIW6u8p1z7/WARQm+jX3JUAfjewAiXX6/I62dBZ1hwVv04l BLqULf044RYGg== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Ingo Molnar , Masami Hiramatsu , Andrii Nakryiko Cc: bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv2 01/11] uprobes/x86: Use proper mm_struct in __in_uprobe_trampoline Date: Mon, 18 May 2026 12:59:47 +0200 Message-ID: <20260518105957.123445-2-jolsa@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260518105957.123445-1-jolsa@kernel.org> References: <20260518105957.123445-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In the unregister path we use __in_uprobe_trampoline check with current->mm for the VMA lookup, which is wrong, because we are in the tracer context, not the traced process. Add mm_struct pointer argument to __in_uprobe_trampoline and changing related callers to pass proper mm_struct pointer. Fixes: ba2bfc97b462 ("uprobes/x86: Add support to optimize uprobes") Signed-off-by: Jiri Olsa --- arch/x86/kernel/uprobes.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index ebb1baf1eb1d..2be6707e3320 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c @@ -761,9 +761,9 @@ void arch_uprobe_clear_state(struct mm_struct *mm) destroy_uprobe_trampoline(tramp); } -static bool __in_uprobe_trampoline(unsigned long ip) +static bool __in_uprobe_trampoline(struct mm_struct *mm, unsigned long ip) { - struct vm_area_struct *vma = vma_lookup(current->mm, ip); + struct vm_area_struct *vma = vma_lookup(mm, ip); return vma && vma_is_special_mapping(vma, &tramp_mapping); } @@ -776,14 +776,14 @@ static bool in_uprobe_trampoline(unsigned long ip) rcu_read_lock(); if (mmap_lock_speculate_try_begin(mm, &seq)) { - found = __in_uprobe_trampoline(ip); + found = __in_uprobe_trampoline(mm, ip); retry = mmap_lock_speculate_retry(mm, seq); } rcu_read_unlock(); if (retry) { mmap_read_lock(mm); - found = __in_uprobe_trampoline(ip); + found = __in_uprobe_trampoline(mm, ip); mmap_read_unlock(mm); } return found; @@ -1044,7 +1044,7 @@ static int copy_from_vaddr(struct mm_struct *mm, unsigned long vaddr, void *dst, return 0; } -static bool __is_optimized(uprobe_opcode_t *insn, unsigned long vaddr) +static bool __is_optimized(struct mm_struct *mm, uprobe_opcode_t *insn, unsigned long vaddr) { struct __packed __arch_relative_insn { u8 op; @@ -1053,7 +1053,7 @@ static bool __is_optimized(uprobe_opcode_t *insn, unsigned long vaddr) if (!is_call_insn(insn)) return false; - return __in_uprobe_trampoline(vaddr + 5 + call->raddr); + return __in_uprobe_trampoline(mm, vaddr + 5 + call->raddr); } static int is_optimized(struct mm_struct *mm, unsigned long vaddr) @@ -1064,7 +1064,7 @@ static int is_optimized(struct mm_struct *mm, unsigned long vaddr) err = copy_from_vaddr(mm, vaddr, &insn, 5); if (err) return err; - return __is_optimized((uprobe_opcode_t *)&insn, vaddr); + return __is_optimized(mm, (uprobe_opcode_t *)&insn, vaddr); } static bool should_optimize(struct arch_uprobe *auprobe) -- 2.53.0