From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-172.mta1.migadu.com (out-172.mta1.migadu.com [95.215.58.172]) (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 6B9262AEF5 for ; Thu, 19 Jun 2025 03:43:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750304635; cv=none; b=IlUylNj8b5MweFkbBBhhDJTievLHxIT+0CBMSqHrTZQbXcpJIid2qBOwOy+kXvanF9Kyt52zYn/Jf40j64VcWVh+KkmI89wEPVNDzCNACpBW81u+5FiEbwtLUsE6tiMin6HQFzYfLdf64VFMdGfRnTOKdSrI/Rp/GtXfgNYs3FE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750304635; c=relaxed/simple; bh=4qm4066NO3d0nvUGzuyq5hkDe1vueoJFWyZUhyDlX+c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tiw97O//cI2mMenPlevyaU44MCHqnQ8wOfbQJ9OYChFEwhkZZg78fia6G5hu6OBbpX8m0SPi7Qu0IvNG7z/batMHzkDlvu570Z100BMebTvwOJqmdlYaq2qQJByDpjlekFTry5zOWG+qZ8R9ZDBum8ZAl/vxGndfFOp3x3iBP1A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=H6BmLHpq; arc=none smtp.client-ip=95.215.58.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="H6BmLHpq" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1750304621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=2+8qhdVi0xuSppAoSeOl7p/Q3cw/zM0qW9gT94k0DoI=; b=H6BmLHpquFroZ3kjXYVqJb1uzvkGd4mHuXnIKgiIyyMOzcDj7qO2H3QNcx8RYFggGSrTRY ZxfFNEQSx8SLfEoRgx3+nbplz3xe1y1gkUOo3lKdXKrzQ4LmNVNV5j0nBVCBFbCcoNn8so paa0ijHkPnzqYXaUx+yCnKSM7cCyXEM= From: Tao Chen To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, mattbobrowski@google.com, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Tao Chen Subject: [PATCH bpf-next v4 1/2] bpf: Add show_fdinfo for uprobe_multi Date: Thu, 19 Jun 2025 11:42:56 +0800 Message-ID: <20250619034257.70520-1-chen.dylane@linux.dev> 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 X-Migadu-Flow: FLOW_OUT Show uprobe_multi link info with fdinfo, the info as follows: link_type: uprobe_multi link_id: 9 prog_tag: e729f789e34a8eca prog_id: 39 type: uprobe_multi uprobe_cnt: 3 pid: 0 path: /home/dylane/bpf/tools/testing/selftests/bpf/test_progs offset ref_ctr_offset cookie 0xa69f13 0x0 3 0xa69f1e 0x0 1 0xa69f29 0x0 2 Signed-off-by: Tao Chen --- kernel/trace/bpf_trace.c | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) Change list: v3 -> v4: - use %pS to print func info.(Alexei) v3: https://lore.kernel.org/bpf/20250616130233.451439-1-chen.dylane@linux.dev v2 -> v3: - show info in one line for multi events.(Jiri) v2: https://lore.kernel.org/bpf/20250615150514.418581-1-chen.dylane@linux.dev v1 -> v2: - replace 'func_cnt' with 'uprobe_cnt'.(Andrii) - print func name is more readable and security for kprobe_multi.(Alexei) v1: https://lore.kernel.org/bpf/20250612115556.295103-1-chen.dylane@linux.dev diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 24b94870b50..2d422f897ac 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -3157,10 +3157,57 @@ static int bpf_uprobe_multi_link_fill_link_info(const struct bpf_link *link, return err; } +#ifdef CONFIG_PROC_FS +static void bpf_uprobe_multi_show_fdinfo(const struct bpf_link *link, + struct seq_file *seq) +{ + struct bpf_uprobe_multi_link *umulti_link; + char *p, *buf; + + umulti_link = container_of(link, struct bpf_uprobe_multi_link, link); + + buf = kmalloc(PATH_MAX, GFP_KERNEL); + if (!buf) + return; + + p = d_path(&umulti_link->path, buf, PATH_MAX); + if (IS_ERR(p)) { + kfree(buf); + return; + } + + seq_printf(seq, + "type:\t%s\n" + "uprobe_cnt:\t%u\n" + "pid:\t%u\n" + "path:\t%s\n", + umulti_link->flags == BPF_F_UPROBE_MULTI_RETURN ? + "uretprobe_multi" : "uprobe_multi", + umulti_link->cnt, + umulti_link->task ? task_pid_nr_ns(umulti_link->task, + task_active_pid_ns(current)) : 0, + p); + + seq_printf(seq, "%-16s %-16s %-16s\n", "offset", "ref_ctr_offset", "cookie"); + for (int i = 0; i < umulti_link->cnt; i++) { + seq_printf(seq, + "%#-16llx %#-16lx %-16llu\n", + umulti_link->uprobes[i].offset, + umulti_link->uprobes[i].ref_ctr_offset, + umulti_link->uprobes[i].cookie); + } + + kfree(buf); +} +#endif + static const struct bpf_link_ops bpf_uprobe_multi_link_lops = { .release = bpf_uprobe_multi_link_release, .dealloc_deferred = bpf_uprobe_multi_link_dealloc, .fill_link_info = bpf_uprobe_multi_link_fill_link_info, +#ifdef CONFIG_PROC_FS + .show_fdinfo = bpf_uprobe_multi_show_fdinfo, +#endif }; static int uprobe_prog_run(struct bpf_uprobe *uprobe, -- 2.48.1