From nobody Sat Nov 23 23:41:00 2024 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 13A351401C; Fri, 8 Nov 2024 13:46:05 +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=1731073566; cv=none; b=F3t3f2LKizO/8PcyGv85Pn8YG8k5gmhV4+FhH4Ks1uIj/q1iMASFWuUcrqpS2eZi9cXvmg01ocfyetp5eGCNImEBcH6lgGZm/IZVWZSerD4Vz3SvYs8ZPKknOxnJXadYxuIVMDkbhDDUqAvgCcX1Oo+tUgzkzbOt2V6fXREypT4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073566; c=relaxed/simple; bh=SIlVpzF+fN/EudeveFUgwhBFLZ4pWdPEzHn7hJDi4Ts=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lDflgDd/i1TgQyl8UFT36OQBYqPLpup2hqYuIKyw0D2Yifjq6F1c2SyU2/C43m2FPe3Lm8i5xXWGvJ6jQ67o5soURO5GfAgUAKLjN36VAGSHPXeHQ+n9yW6OIUGs8Ql9k7WzhvERnUMgMMRabt8k3XQj+tVRUKhFYs61tmC77WQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=X2z+yRJQ; 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="X2z+yRJQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7210EC4CECD; Fri, 8 Nov 2024 13:46:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073565; bh=SIlVpzF+fN/EudeveFUgwhBFLZ4pWdPEzHn7hJDi4Ts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X2z+yRJQ90tspQlpscOn6xFNQsqaxEmlZOIvucrIa1A8A+K/niinEdUvyCrkL3KqT ppR4lZaEe32fQyf5YXasAbAnnkwmlzO+JoZU2Nu4CHf5kzUAQyVJ4bvSvUDKpCAc4U RqqhgbNooURShTiyzmHkw4eaglysbnONO0ELJifvfT59n3Z8kBLzS48OroYfJczXiS zP1C/1qzT1oRym62V3S358Wii5iqYuzyBz3qmPo3Il68h05qsUdsr+F4nODlYd32PQ FRpimNGvZei07PeO1u4StoSd9DWNPQ85QCruwgcfiMV9C89n/kZ/6raDofV0UwBqhH h4JxE840Hhoaw== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 01/13] bpf: Allow return values 0 and 1 for kprobe session Date: Fri, 8 Nov 2024 14:45:32 +0100 Message-ID: <20241108134544.480660-2-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The kprobe session program can return only 0 or 1, instruct verifier to check for that. Fixes: 535a3692ba72 ("bpf: Add support for kprobe session attach") Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- kernel/bpf/verifier.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 7958d6ff6b73..7d8ed377b35d 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -16024,6 +16024,15 @@ static int check_return_code(struct bpf_verifier_e= nv *env, int regno, const char return -ENOTSUPP; } break; + case BPF_PROG_TYPE_KPROBE: + switch (env->prog->expected_attach_type) { + case BPF_TRACE_KPROBE_SESSION: + range =3D retval_range(0, 1); + break; + default: + return 0; + } + break; case BPF_PROG_TYPE_SK_LOOKUP: range =3D retval_range(SK_DROP, SK_PASS); break; --=20 2.47.0 From nobody Sat Nov 23 23:41:00 2024 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 EC4891EF0B9; Fri, 8 Nov 2024 13:46:20 +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=1731073581; cv=none; b=iELuHL/LIBBz4TmgmZlprGHcBDFvzjmPy438IeQ5blYo+8xQxdf0XdskCc2A8Q1bL8oaBZm+wHvBenqPEAlJi+f9EpBZCxbR06jmevFzN1pP90tXECmXmexNY/ufh/H7z1zxM9R2JDNQo8tG2dCISfZ448Y2aZQ1enEmrGg7FGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073581; c=relaxed/simple; bh=knGN9mYSt4oaC3PgJtQg4jNvS9bcAM6Ll/592/RM5X0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pd4syURX+sxOCxYzFdO6ha9Z7NjIazc/MAqZo4IOBkDLpElianmH1KKuuf9LkBZYKrIJaFyb5swX9kUkFMC8IoPrGAZGq6VuVhFbAgV+5utBIJ3DEVNs1fL4mumYgsOwul49by/BnApvt3fXDepPny9kzr9MtoQF2GZY246JCCc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XCi8DshW; 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="XCi8DshW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7212C4CECD; Fri, 8 Nov 2024 13:46:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073580; bh=knGN9mYSt4oaC3PgJtQg4jNvS9bcAM6Ll/592/RM5X0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XCi8DshW+kC5GEljOSF0i4pO79sxCvvMmhhM1IeqJn2p2CJDrWfoy63v8dHnyCuo6 A8drVbXzep16gHR2er0jVawOV71U6XIXRobpmR653fb4LPgjFpLj2KT0f0FmPmw00a wMKxznPW6UFUv3DXCRvCqwnel5ypgMLGv1GhOt9HjC1uIxotCh8HKAHrEeIfkvL1UV Jb2dRhd+WipW9J2oTk/ILAdi6Znn845QzaXzzWG3waaueDOOxiVmEGOqsuDedY5NKh LeSMS6l+bzGivlkUUaKTtRL1Tr0yERIVuax2BmcyQ1i8NEV/UCHt7wPSrMnBzoXuPC 3BXmRfOfHkqCQ== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 02/13] bpf: Force uprobe bpf program to always return 0 Date: Fri, 8 Nov 2024 14:45:33 +0100 Message-ID: <20241108134544.480660-3-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As suggested by Andrii make uprobe multi bpf programs to always return 0, so they can't force uprobe removal. Keeping the int return type for uprobe_prog_run, because it will be used in following session changes. Fixes: 89ae89f53d20 ("bpf: Add multi uprobe link") Suggested-by: Andrii Nakryiko Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- kernel/trace/bpf_trace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 88fd628850ca..db9e2792b42b 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -3229,7 +3229,6 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe, struct bpf_prog *prog =3D link->link.prog; bool sleepable =3D prog->sleepable; struct bpf_run_ctx *old_run_ctx; - int err =3D 0; =20 if (link->task && !same_thread_group(current, link->task)) return 0; @@ -3242,7 +3241,7 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe, migrate_disable(); =20 old_run_ctx =3D bpf_set_run_ctx(&run_ctx.run_ctx); - err =3D bpf_prog_run(link->link.prog, regs); + bpf_prog_run(link->link.prog, regs); bpf_reset_run_ctx(old_run_ctx); =20 migrate_enable(); @@ -3251,7 +3250,7 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe, rcu_read_unlock_trace(); else rcu_read_unlock(); - return err; + return 0; } =20 static bool --=20 2.47.0 From nobody Sat Nov 23 23:41:00 2024 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 2B1D91EF947; Fri, 8 Nov 2024 13:46:40 +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=1731073601; cv=none; b=h9kTWADneoMLciHF4oKsui6AGYQq7FDyISEASvXtPhoQautLvSdR+evAi2cASnITvyFtwCntiR5dxAONWN9zq9X/jz6lATzRbqDRJbi3/vGlMAM6nAAjeOpXDZxZnVoVM+0tVCTwj8cFUynTfn3dYCZdPxFmw0+F664rlqU7848= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073601; c=relaxed/simple; bh=Prd/mhvwmbZhadKXdemCWaeQieuzWuPPto0eA0jYwsw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LZO6Vf0Qkz0mhWLvKKfONz8FU8Pgq44U1dChSVMVa3FmqaZlpEHLZupYcB8zWowqL7H11ghaIZdMVU2gtk+GG9LBueCsfGegsPI5lk0n4gYVe0KsSCghihxMoDrg5mD8yYJJLKJkm0NUJOFhSWireXuXPCTYTE70pmqYr8wQjQU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MUzKbesj; 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="MUzKbesj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78F0BC4CECD; Fri, 8 Nov 2024 13:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073600; bh=Prd/mhvwmbZhadKXdemCWaeQieuzWuPPto0eA0jYwsw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MUzKbesjh/52XOQ2fvDGpPN7JYV8WWLUyochpGkm79C0sGInLsZg5erKZ3YepzKAQ ov3FfM7V4SWUesxPJU1q+aIPGf3aDfcy+KZbUIdIotStJtTvxk2YDZ54btFzZueuWe qi5qmObrApfcHXFzg7T2MDTEyOCw0OrgEfoNp5FprYohjvtc2/0QKMRJbpA8zTeDCI MGXdgtS/UpewfKbLvfcTRntKuJTntKnoPZif2GxN1FrwjvQraCFwz46lJqXZ+QeyXJ eaknsubwqAcwcIQrdgX4XW8WCS1SmJ/JAoHIcD74YqVSObLygfNMfz/1QY35xCX9Ur eBZWLkSOFdv1w== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 03/13] bpf: Add support for uprobe multi session attach Date: Fri, 8 Nov 2024 14:45:34 +0100 Message-ID: <20241108134544.480660-4-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adding support to attach BPF program for entry and return probe of the same function. This is common use case which at the moment requires to create two uprobe multi links. Adding new BPF_TRACE_UPROBE_SESSION attach type that instructs kernel to attach single link program to both entry and exit probe. It's possible to control execution of the BPF program on return probe simply by returning zero or non zero from the entry BPF program execution to execute or not the BPF program on return probe respectively. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- include/uapi/linux/bpf.h | 1 + kernel/bpf/syscall.c | 9 +++++++-- kernel/bpf/verifier.c | 1 + kernel/trace/bpf_trace.c | 36 +++++++++++++++++++++++++--------- tools/include/uapi/linux/bpf.h | 1 + tools/lib/bpf/libbpf.c | 1 + 6 files changed, 38 insertions(+), 11 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index f28b6527e815..4162afc6b5d0 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -1116,6 +1116,7 @@ enum bpf_attach_type { BPF_NETKIT_PRIMARY, BPF_NETKIT_PEER, BPF_TRACE_KPROBE_SESSION, + BPF_TRACE_UPROBE_SESSION, __MAX_BPF_ATTACH_TYPE }; =20 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 8254b2973157..58190ca724a2 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -4103,10 +4103,14 @@ static int bpf_prog_attach_check_attach_type(const = struct bpf_prog *prog, if (prog->expected_attach_type =3D=3D BPF_TRACE_UPROBE_MULTI && attach_type !=3D BPF_TRACE_UPROBE_MULTI) return -EINVAL; + if (prog->expected_attach_type =3D=3D BPF_TRACE_UPROBE_SESSION && + attach_type !=3D BPF_TRACE_UPROBE_SESSION) + return -EINVAL; if (attach_type !=3D BPF_PERF_EVENT && attach_type !=3D BPF_TRACE_KPROBE_MULTI && attach_type !=3D BPF_TRACE_KPROBE_SESSION && - attach_type !=3D BPF_TRACE_UPROBE_MULTI) + attach_type !=3D BPF_TRACE_UPROBE_MULTI && + attach_type !=3D BPF_TRACE_UPROBE_SESSION) return -EINVAL; return 0; case BPF_PROG_TYPE_SCHED_CLS: @@ -5359,7 +5363,8 @@ static int link_create(union bpf_attr *attr, bpfptr_t= uattr) else if (attr->link_create.attach_type =3D=3D BPF_TRACE_KPROBE_MULTI || attr->link_create.attach_type =3D=3D BPF_TRACE_KPROBE_SESSION) ret =3D bpf_kprobe_multi_link_attach(attr, prog); - else if (attr->link_create.attach_type =3D=3D BPF_TRACE_UPROBE_MULTI) + else if (attr->link_create.attach_type =3D=3D BPF_TRACE_UPROBE_MULTI || + attr->link_create.attach_type =3D=3D BPF_TRACE_UPROBE_SESSION) ret =3D bpf_uprobe_multi_link_attach(attr, prog); break; default: diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 7d8ed377b35d..132fc172961f 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -16027,6 +16027,7 @@ static int check_return_code(struct bpf_verifier_en= v *env, int regno, const char case BPF_PROG_TYPE_KPROBE: switch (env->prog->expected_attach_type) { case BPF_TRACE_KPROBE_SESSION: + case BPF_TRACE_UPROBE_SESSION: range =3D retval_range(0, 1); break; default: diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index db9e2792b42b..9c04b1364de2 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -1581,6 +1581,17 @@ static inline bool is_kprobe_session(const struct bp= f_prog *prog) return prog->expected_attach_type =3D=3D BPF_TRACE_KPROBE_SESSION; } =20 +static inline bool is_uprobe_multi(const struct bpf_prog *prog) +{ + return prog->expected_attach_type =3D=3D BPF_TRACE_UPROBE_MULTI || + prog->expected_attach_type =3D=3D BPF_TRACE_UPROBE_SESSION; +} + +static inline bool is_uprobe_session(const struct bpf_prog *prog) +{ + return prog->expected_attach_type =3D=3D BPF_TRACE_UPROBE_SESSION; +} + static const struct bpf_func_proto * kprobe_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *pr= og) { @@ -1598,13 +1609,13 @@ kprobe_prog_func_proto(enum bpf_func_id func_id, co= nst struct bpf_prog *prog) case BPF_FUNC_get_func_ip: if (is_kprobe_multi(prog)) return &bpf_get_func_ip_proto_kprobe_multi; - if (prog->expected_attach_type =3D=3D BPF_TRACE_UPROBE_MULTI) + if (is_uprobe_multi(prog)) return &bpf_get_func_ip_proto_uprobe_multi; return &bpf_get_func_ip_proto_kprobe; case BPF_FUNC_get_attach_cookie: if (is_kprobe_multi(prog)) return &bpf_get_attach_cookie_proto_kmulti; - if (prog->expected_attach_type =3D=3D BPF_TRACE_UPROBE_MULTI) + if (is_uprobe_multi(prog)) return &bpf_get_attach_cookie_proto_umulti; return &bpf_get_attach_cookie_proto_trace; default: @@ -3096,6 +3107,7 @@ struct bpf_uprobe { u64 cookie; struct uprobe *uprobe; struct uprobe_consumer consumer; + bool session; }; =20 struct bpf_uprobe_multi_link { @@ -3267,9 +3279,13 @@ uprobe_multi_link_handler(struct uprobe_consumer *co= n, struct pt_regs *regs, __u64 *data) { struct bpf_uprobe *uprobe; + int ret; =20 uprobe =3D container_of(con, struct bpf_uprobe, consumer); - return uprobe_prog_run(uprobe, instruction_pointer(regs), regs); + ret =3D uprobe_prog_run(uprobe, instruction_pointer(regs), regs); + if (uprobe->session) + return ret ? UPROBE_HANDLER_IGNORE : 0; + return 0; } =20 static int @@ -3279,7 +3295,8 @@ uprobe_multi_link_ret_handler(struct uprobe_consumer = *con, unsigned long func, s struct bpf_uprobe *uprobe; =20 uprobe =3D container_of(con, struct bpf_uprobe, consumer); - return uprobe_prog_run(uprobe, func, regs); + uprobe_prog_run(uprobe, func, regs); + return 0; } =20 static u64 bpf_uprobe_multi_entry_ip(struct bpf_run_ctx *ctx) @@ -3318,7 +3335,7 @@ int bpf_uprobe_multi_link_attach(const union bpf_attr= *attr, struct bpf_prog *pr if (sizeof(u64) !=3D sizeof(void *)) return -EOPNOTSUPP; =20 - if (prog->expected_attach_type !=3D BPF_TRACE_UPROBE_MULTI) + if (!is_uprobe_multi(prog)) return -EINVAL; =20 flags =3D attr->link_create.uprobe_multi.flags; @@ -3394,11 +3411,12 @@ int bpf_uprobe_multi_link_attach(const union bpf_at= tr *attr, struct bpf_prog *pr =20 uprobes[i].link =3D link; =20 - if (flags & BPF_F_UPROBE_MULTI_RETURN) - uprobes[i].consumer.ret_handler =3D uprobe_multi_link_ret_handler; - else + if (!(flags & BPF_F_UPROBE_MULTI_RETURN)) uprobes[i].consumer.handler =3D uprobe_multi_link_handler; - + if (flags & BPF_F_UPROBE_MULTI_RETURN || is_uprobe_session(prog)) + uprobes[i].consumer.ret_handler =3D uprobe_multi_link_ret_handler; + if (is_uprobe_session(prog)) + uprobes[i].session =3D true; if (pid) uprobes[i].consumer.filter =3D uprobe_multi_link_filter; } diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index f28b6527e815..4162afc6b5d0 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -1116,6 +1116,7 @@ enum bpf_attach_type { BPF_NETKIT_PRIMARY, BPF_NETKIT_PEER, BPF_TRACE_KPROBE_SESSION, + BPF_TRACE_UPROBE_SESSION, __MAX_BPF_ATTACH_TYPE }; =20 diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 711173acbcef..faac1c79840d 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -133,6 +133,7 @@ static const char * const attach_type_name[] =3D { [BPF_NETKIT_PRIMARY] =3D "netkit_primary", [BPF_NETKIT_PEER] =3D "netkit_peer", [BPF_TRACE_KPROBE_SESSION] =3D "trace_kprobe_session", + [BPF_TRACE_UPROBE_SESSION] =3D "trace_uprobe_session", }; =20 static const char * const link_type_name[] =3D { --=20 2.47.0 From nobody Sat Nov 23 23:41:00 2024 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 BC6B21EF098; Fri, 8 Nov 2024 13:46:52 +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=1731073612; cv=none; b=AATXtPLZakWq8cS5tsOgFeb00PuhQ+KJp/x5nyfM9qfqO0Yz06ziKTNviqMw2GUAJKB3CD/1h1jQediBth0jE6N1DSGAbG2VDWNSdGm7g2YOw/aBKhbjEdtKYeDveVDZj631PBe4UsA+Mdp1ipo9w3vVNAgZzZcSpr1McGcQ85Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073612; c=relaxed/simple; bh=ZWTmD8ZM8J7T3zsvMkBvLrH1MCjRXUoNEp/NzcoHEvY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V4ohNKCiRWl8pcyavRRoTCNig/3uE+YIabebFeDSMMu6Hg2mDZgxB34P23gtqdhNtYHAj+sNiGeKgv85xdVpaQiUrMGAN/j83Y7no3iwnoP5akIzf+tKpoQU6UYH7Z9UdFFCcetBApw/a/+nzb9+1vYf6CqNUUYwmlsTkUHkkPc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ffyh4FbU; 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="Ffyh4FbU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5987FC4CECD; Fri, 8 Nov 2024 13:46:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073612; bh=ZWTmD8ZM8J7T3zsvMkBvLrH1MCjRXUoNEp/NzcoHEvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ffyh4FbULga/CiSuIWTJv3WTBSuT0weFYaXUuZYlNNTIBLt7V8pbNTDAZ95UhpbvR iZCtayI4HqtmoQLKJlGkPqRgbm2ih3d2rj5xvRUPjDcrBl9qFho8L9opGgvfcYjtuI kQag8bxnQQOcIr1K/gHWPC8zL6WDpu23hjWu0GpHEEqqxxPhG8I913js15zYwDnRlj pV0YsXrw44bRSk4Lw3BJN3RZWmyODhI4mpJPU11wOUxIGGvyORCeoYsStTxof7JGFo rfcXPB/jffRpjGMlT/j2W6oEPE/StGsBNhs4fnZVx1EkzolfRBZ43RAepz8NEt1E3g G2cIb4/IB56bw== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 04/13] bpf: Add support for uprobe multi session context Date: Fri, 8 Nov 2024 14:45:35 +0100 Message-ID: <20241108134544.480660-5-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Placing bpf_session_run_ctx layer in between bpf_run_ctx and bpf_uprobe_multi_run_ctx, so the session data can be retrieved from uprobe_multi link. Plus granting session kfuncs access to uprobe session programs. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- kernel/trace/bpf_trace.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 9c04b1364de2..949a3870946c 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -3120,7 +3120,7 @@ struct bpf_uprobe_multi_link { }; =20 struct bpf_uprobe_multi_run_ctx { - struct bpf_run_ctx run_ctx; + struct bpf_session_run_ctx session_ctx; unsigned long entry_ip; struct bpf_uprobe *uprobe; }; @@ -3231,16 +3231,22 @@ static const struct bpf_link_ops bpf_uprobe_multi_l= ink_lops =3D { =20 static int uprobe_prog_run(struct bpf_uprobe *uprobe, unsigned long entry_ip, - struct pt_regs *regs) + struct pt_regs *regs, + bool is_return, void *data) { struct bpf_uprobe_multi_link *link =3D uprobe->link; struct bpf_uprobe_multi_run_ctx run_ctx =3D { + .session_ctx =3D { + .is_return =3D is_return, + .data =3D data, + }, .entry_ip =3D entry_ip, .uprobe =3D uprobe, }; struct bpf_prog *prog =3D link->link.prog; bool sleepable =3D prog->sleepable; struct bpf_run_ctx *old_run_ctx; + int err; =20 if (link->task && !same_thread_group(current, link->task)) return 0; @@ -3252,8 +3258,8 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe, =20 migrate_disable(); =20 - old_run_ctx =3D bpf_set_run_ctx(&run_ctx.run_ctx); - bpf_prog_run(link->link.prog, regs); + old_run_ctx =3D bpf_set_run_ctx(&run_ctx.session_ctx.run_ctx); + err =3D bpf_prog_run(link->link.prog, regs); bpf_reset_run_ctx(old_run_ctx); =20 migrate_enable(); @@ -3262,7 +3268,7 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe, rcu_read_unlock_trace(); else rcu_read_unlock(); - return 0; + return err; } =20 static bool @@ -3282,7 +3288,7 @@ uprobe_multi_link_handler(struct uprobe_consumer *con= , struct pt_regs *regs, int ret; =20 uprobe =3D container_of(con, struct bpf_uprobe, consumer); - ret =3D uprobe_prog_run(uprobe, instruction_pointer(regs), regs); + ret =3D uprobe_prog_run(uprobe, instruction_pointer(regs), regs, false, d= ata); if (uprobe->session) return ret ? UPROBE_HANDLER_IGNORE : 0; return 0; @@ -3295,7 +3301,7 @@ uprobe_multi_link_ret_handler(struct uprobe_consumer = *con, unsigned long func, s struct bpf_uprobe *uprobe; =20 uprobe =3D container_of(con, struct bpf_uprobe, consumer); - uprobe_prog_run(uprobe, func, regs); + uprobe_prog_run(uprobe, func, regs, true, data); return 0; } =20 @@ -3303,7 +3309,8 @@ static u64 bpf_uprobe_multi_entry_ip(struct bpf_run_c= tx *ctx) { struct bpf_uprobe_multi_run_ctx *run_ctx; =20 - run_ctx =3D container_of(current->bpf_ctx, struct bpf_uprobe_multi_run_ct= x, run_ctx); + run_ctx =3D container_of(current->bpf_ctx, struct bpf_uprobe_multi_run_ct= x, + session_ctx.run_ctx); return run_ctx->entry_ip; } =20 @@ -3311,7 +3318,8 @@ static u64 bpf_uprobe_multi_cookie(struct bpf_run_ctx= *ctx) { struct bpf_uprobe_multi_run_ctx *run_ctx; =20 - run_ctx =3D container_of(current->bpf_ctx, struct bpf_uprobe_multi_run_ct= x, run_ctx); + run_ctx =3D container_of(current->bpf_ctx, struct bpf_uprobe_multi_run_ct= x, + session_ctx.run_ctx); return run_ctx->uprobe->cookie; } =20 @@ -3505,7 +3513,7 @@ static int bpf_kprobe_multi_filter(const struct bpf_p= rog *prog, u32 kfunc_id) if (!btf_id_set8_contains(&kprobe_multi_kfunc_set_ids, kfunc_id)) return 0; =20 - if (!is_kprobe_session(prog)) + if (!is_kprobe_session(prog) && !is_uprobe_session(prog)) return -EACCES; =20 return 0; --=20 2.47.0 From nobody Sat Nov 23 23:41:00 2024 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 41BB71EE022; Fri, 8 Nov 2024 13:47:03 +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=1731073624; cv=none; b=dwhid7nz/0LExaXOwQuS5vlU4+JXYx7nB5NMi4c2+d7ymH5ba2nLxBYfP1A8srUwYCAAUZRY2AE50D7N0N8pMcpe7coPmOKJJlOfNFAt+h5Sq/M7HSxY5L90B4MFGP24L8EoBHGnxJuZ5PDI3GDRzd/hZOUU91c72KBdzbDsR3E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073624; c=relaxed/simple; bh=hldtg96QlFMAXnznWK2J5TwE8+hrcoIkxpw3y2l5W6Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GtHpxmp9UGs81eAHfdtDfm2Dbs/cn35nQjWk5XWIa3krd6aotB/vyUSOdY8WA8es9AJVRzfaG8IJpvSvn0lOBft9ZylGDKwjazw+ZYP/Cr/Rx8yp1vIxjX8UsDgO4oavzy3sSa3K1cXnRZih4HO/qI+ozu1K7VIFXgbme/fAqgg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FvQwNq3W; 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="FvQwNq3W" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6BFCC4CECD; Fri, 8 Nov 2024 13:46:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073623; bh=hldtg96QlFMAXnznWK2J5TwE8+hrcoIkxpw3y2l5W6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FvQwNq3Wp/klCv4bSHjMpn+FKsUTk5Z7rpi7v+SNNoJtoYsAf4mGdyDSxkmtRdm+0 cefDa5bsMOPQkgXiB+nDiteL9sMcKlB0sZ59+CnhF3M6mHHilnAyvuB/NwtmA+W21U 1nsWOZcIJ840dyerF4WiDrbK9OrrSKyIm1Yhhwlx30n0G3XODD2m+BxXFn9bzohonm GCswbKqugWgJcZA2NH7t2q3qZTUXi6yfhyLX7GiurgRyeS20WdESD4DsXkhGkp8tq3 9JUnY1eekzo/xvwzuj6ToC4C6az3p6tMBpmLn5idgcbdJCAeBnRxL8RYlgERzs1Pmb 48uI0m9CAAPzQ== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 05/13] libbpf: Add support for uprobe multi session attach Date: Fri, 8 Nov 2024 14:45:36 +0100 Message-ID: <20241108134544.480660-6-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adding support to attach program in uprobe session mode with bpf_program__attach_uprobe_multi function. Adding session bool to bpf_uprobe_multi_opts struct that allows to load and attach the bpf program via uprobe session. the attachment to create uprobe multi session. Also adding new program loader section that allows: SEC("uprobe.session/bpf_fentry_test*") and loads/attaches uprobe program as uprobe session. Adding sleepable hook (uprobe.session.s) as well. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- tools/lib/bpf/bpf.c | 1 + tools/lib/bpf/libbpf.c | 18 ++++++++++++++++-- tools/lib/bpf/libbpf.h | 4 +++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 2a4c71501a17..becdfa701c75 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -776,6 +776,7 @@ int bpf_link_create(int prog_fd, int target_fd, return libbpf_err(-EINVAL); break; case BPF_TRACE_UPROBE_MULTI: + case BPF_TRACE_UPROBE_SESSION: attr.link_create.uprobe_multi.flags =3D OPTS_GET(opts, uprobe_multi.flag= s, 0); attr.link_create.uprobe_multi.cnt =3D OPTS_GET(opts, uprobe_multi.cnt, 0= ); attr.link_create.uprobe_multi.path =3D ptr_to_u64(OPTS_GET(opts, uprobe_= multi.path, 0)); diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index faac1c79840d..a2bc5bea7ea3 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -9442,8 +9442,10 @@ static const struct bpf_sec_def section_defs[] =3D { SEC_DEF("kprobe.session+", KPROBE, BPF_TRACE_KPROBE_SESSION, SEC_NONE, at= tach_kprobe_session), SEC_DEF("uprobe.multi+", KPROBE, BPF_TRACE_UPROBE_MULTI, SEC_NONE, attach= _uprobe_multi), SEC_DEF("uretprobe.multi+", KPROBE, BPF_TRACE_UPROBE_MULTI, SEC_NONE, att= ach_uprobe_multi), + SEC_DEF("uprobe.session+", KPROBE, BPF_TRACE_UPROBE_SESSION, SEC_NONE, at= tach_uprobe_multi), SEC_DEF("uprobe.multi.s+", KPROBE, BPF_TRACE_UPROBE_MULTI, SEC_SLEEPABLE,= attach_uprobe_multi), SEC_DEF("uretprobe.multi.s+", KPROBE, BPF_TRACE_UPROBE_MULTI, SEC_SLEEPAB= LE, attach_uprobe_multi), + SEC_DEF("uprobe.session.s+", KPROBE, BPF_TRACE_UPROBE_SESSION, SEC_SLEEPA= BLE, attach_uprobe_multi), SEC_DEF("ksyscall+", KPROBE, 0, SEC_NONE, attach_ksyscall), SEC_DEF("kretsyscall+", KPROBE, 0, SEC_NONE, attach_ksyscall), SEC_DEF("usdt+", KPROBE, 0, SEC_USDT, attach_usdt), @@ -11765,7 +11767,9 @@ static int attach_uprobe_multi(const struct bpf_pro= gram *prog, long cookie, stru ret =3D 0; break; case 3: + opts.session =3D str_has_pfx(probe_type, "uprobe.session"); opts.retprobe =3D str_has_pfx(probe_type, "uretprobe.multi"); + *link =3D bpf_program__attach_uprobe_multi(prog, -1, binary_path, func_n= ame, &opts); ret =3D libbpf_get_error(*link); break; @@ -12014,10 +12018,12 @@ bpf_program__attach_uprobe_multi(const struct bpf= _program *prog, const unsigned long *ref_ctr_offsets =3D NULL, *offsets =3D NULL; LIBBPF_OPTS(bpf_link_create_opts, lopts); unsigned long *resolved_offsets =3D NULL; + enum bpf_attach_type attach_type; int err =3D 0, link_fd, prog_fd; struct bpf_link *link =3D NULL; char errmsg[STRERR_BUFSIZE]; char full_path[PATH_MAX]; + bool retprobe, session; const __u64 *cookies; const char **syms; size_t cnt; @@ -12088,12 +12094,20 @@ bpf_program__attach_uprobe_multi(const struct bpf= _program *prog, offsets =3D resolved_offsets; } =20 + retprobe =3D OPTS_GET(opts, retprobe, false); + session =3D OPTS_GET(opts, session, false); + + if (retprobe && session) + return libbpf_err_ptr(-EINVAL); + + attach_type =3D session ? BPF_TRACE_UPROBE_SESSION : BPF_TRACE_UPROBE_MUL= TI; + lopts.uprobe_multi.path =3D path; lopts.uprobe_multi.offsets =3D offsets; lopts.uprobe_multi.ref_ctr_offsets =3D ref_ctr_offsets; lopts.uprobe_multi.cookies =3D cookies; lopts.uprobe_multi.cnt =3D cnt; - lopts.uprobe_multi.flags =3D OPTS_GET(opts, retprobe, false) ? BPF_F_UPRO= BE_MULTI_RETURN : 0; + lopts.uprobe_multi.flags =3D retprobe ? BPF_F_UPROBE_MULTI_RETURN : 0; =20 if (pid =3D=3D 0) pid =3D getpid(); @@ -12107,7 +12121,7 @@ bpf_program__attach_uprobe_multi(const struct bpf_p= rogram *prog, } link->detach =3D &bpf_link__detach_fd; =20 - link_fd =3D bpf_link_create(prog_fd, 0, BPF_TRACE_UPROBE_MULTI, &lopts); + link_fd =3D bpf_link_create(prog_fd, 0, attach_type, &lopts); if (link_fd < 0) { err =3D -errno; pr_warn("prog '%s': failed to attach multi-uprobe: %s\n", diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 91484303849c..b2ce3a72b11d 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -577,10 +577,12 @@ struct bpf_uprobe_multi_opts { size_t cnt; /* create return uprobes */ bool retprobe; + /* create session kprobes */ + bool session; size_t :0; }; =20 -#define bpf_uprobe_multi_opts__last_field retprobe +#define bpf_uprobe_multi_opts__last_field session =20 /** * @brief **bpf_program__attach_uprobe_multi()** attaches a BPF program --=20 2.47.0 From nobody Sat Nov 23 23:41:00 2024 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 E5F131EE022; Fri, 8 Nov 2024 13:47:15 +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=1731073636; cv=none; b=JNwCEdkbmJRHx9+hvqiLSCbckhifHf8iYu2x4jrbKzpqPotkZMs9uyxScxfxMohTJ55kJPs1VO8lQ9ny8mP9ed5fK3IfRHTweyOfNBni8444yyaOSRaHq0fgKfKlLvZDBRYj9kiwu4PTtYsV08cUczhn6zcqklvjNlvm9K7On5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073636; c=relaxed/simple; bh=8GXWW17gG4ieCsIRt49tA/42DlL3aah/7d/aROI27Ps=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cR0y+rOoxxILeL5JLtTsphZpAAtVZ5Ldr1lgRmp/CFvHFbjI/1zkB+uDPtXyTq5MefwiFa35daHy7Unc1lIsII1x4kDJjlJZzfK52sjoo4XmjN3jyHl21y1vt8JiGfgulli1NFxoZuploXV0x4pgMd6140CQ67+MQ9fHIxooNYA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KH7Ny4TY; 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="KH7Ny4TY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62062C4CECD; Fri, 8 Nov 2024 13:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073635; bh=8GXWW17gG4ieCsIRt49tA/42DlL3aah/7d/aROI27Ps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KH7Ny4TYvKTQqoLCvJzQzz2yFvr61Dd/n0m4ZoC+CGGlZ7+8Yf+JDs4/r/DVCVAdI 10nXOcTXH+OKbbqf1R2wVjYqxeBxwNDZYGm6bhHFMY6/Lf+FUwrCpLX/YVamHR6Z9y 42jbMdA5Mo+V4rgfyjGxwlBxW+KUyv/m9Q7G0zUQLsZkKl4+0NfALl0Ok3zYEnqW2X DZ+Slrrs2ZlTnFLvWYxVO7WNe9tJDwD8om/QGAY7zBULBuGejLryL4u03ahZbxrM56 7rcTznKIGK9Jsny48kLP1RaBIhcDjyV8539xyu0lpf8il3Bzc+U2LhQ7Wl2gkEkEa/ XeyerfZ3ikWIw== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 06/13] selftests/bpf: Add uprobe session test Date: Fri, 8 Nov 2024 14:45:37 +0100 Message-ID: <20241108134544.480660-7-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adding uprobe session test and testing that the entry program return value controls execution of the return probe program. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- .../bpf/prog_tests/uprobe_multi_test.c | 47 ++++++++++++ .../bpf/progs/uprobe_multi_session.c | 71 +++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi_session.c diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c b/t= ools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c index 616441fdd7f2..d9c20ca7a833 100644 --- a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c @@ -8,6 +8,7 @@ #include "uprobe_multi_usdt.skel.h" #include "uprobe_multi_consumers.skel.h" #include "uprobe_multi_pid_filter.skel.h" +#include "uprobe_multi_session.skel.h" #include "bpf/libbpf_internal.h" #include "testing_helpers.h" #include "../sdt.h" @@ -1017,6 +1018,50 @@ static void test_pid_filter_process(bool clone_vm) uprobe_multi_pid_filter__destroy(skel); } =20 +static void test_session_skel_api(void) +{ + struct uprobe_multi_session *skel =3D NULL; + LIBBPF_OPTS(bpf_kprobe_multi_opts, opts); + struct bpf_link *link =3D NULL; + int err; + + skel =3D uprobe_multi_session__open_and_load(); + if (!ASSERT_OK_PTR(skel, "uprobe_multi_session__open_and_load")) + goto cleanup; + + skel->bss->pid =3D getpid(); + skel->bss->user_ptr =3D test_data; + + err =3D uprobe_multi_session__attach(skel); + if (!ASSERT_OK(err, "uprobe_multi_session__attach")) + goto cleanup; + + /* trigger all probes */ + skel->bss->uprobe_multi_func_1_addr =3D (__u64) uprobe_multi_func_1; + skel->bss->uprobe_multi_func_2_addr =3D (__u64) uprobe_multi_func_2; + skel->bss->uprobe_multi_func_3_addr =3D (__u64) uprobe_multi_func_3; + + uprobe_multi_func_1(); + uprobe_multi_func_2(); + uprobe_multi_func_3(); + + /* + * We expect 2 for uprobe_multi_func_2 because it runs both entry/return = probe, + * uprobe_multi_func_[13] run just the entry probe. All expected numbers = are + * doubled, because we run extra test for sleepable session. + */ + ASSERT_EQ(skel->bss->uprobe_session_result[0], 2, "uprobe_multi_func_1_re= sult"); + ASSERT_EQ(skel->bss->uprobe_session_result[1], 4, "uprobe_multi_func_2_re= sult"); + ASSERT_EQ(skel->bss->uprobe_session_result[2], 2, "uprobe_multi_func_3_re= sult"); + + /* We expect increase in 3 entry and 1 return session calls -> 4 */ + ASSERT_EQ(skel->bss->uprobe_multi_sleep_result, 4, "uprobe_multi_sleep_re= sult"); + +cleanup: + bpf_link__destroy(link); + uprobe_multi_session__destroy(skel); +} + static void test_bench_attach_uprobe(void) { long attach_start_ns =3D 0, attach_end_ns =3D 0; @@ -1113,4 +1158,6 @@ void test_uprobe_multi_test(void) test_pid_filter_process(false); if (test__start_subtest("filter_clone_vm")) test_pid_filter_process(true); + if (test__start_subtest("session")) + test_session_skel_api(); } diff --git a/tools/testing/selftests/bpf/progs/uprobe_multi_session.c b/too= ls/testing/selftests/bpf/progs/uprobe_multi_session.c new file mode 100644 index 000000000000..30bff90b68dc --- /dev/null +++ b/tools/testing/selftests/bpf/progs/uprobe_multi_session.c @@ -0,0 +1,71 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include "bpf_kfuncs.h" +#include "bpf_misc.h" + +char _license[] SEC("license") =3D "GPL"; + +__u64 uprobe_multi_func_1_addr =3D 0; +__u64 uprobe_multi_func_2_addr =3D 0; +__u64 uprobe_multi_func_3_addr =3D 0; + +__u64 uprobe_session_result[3] =3D {}; +__u64 uprobe_multi_sleep_result =3D 0; + +void *user_ptr =3D 0; +int pid =3D 0; + +static int uprobe_multi_check(void *ctx, bool is_return) +{ + const __u64 funcs[] =3D { + uprobe_multi_func_1_addr, + uprobe_multi_func_2_addr, + uprobe_multi_func_3_addr, + }; + unsigned int i; + __u64 addr; + + if (bpf_get_current_pid_tgid() >> 32 !=3D pid) + return 1; + + addr =3D bpf_get_func_ip(ctx); + + for (i =3D 0; i < ARRAY_SIZE(funcs); i++) { + if (funcs[i] =3D=3D addr) { + uprobe_session_result[i]++; + break; + } + } + + /* only uprobe_multi_func_2 executes return probe */ + if ((addr =3D=3D uprobe_multi_func_1_addr) || + (addr =3D=3D uprobe_multi_func_3_addr)) + return 1; + + return 0; +} + +SEC("uprobe.session//proc/self/exe:uprobe_multi_func_*") +int uprobe(struct pt_regs *ctx) +{ + return uprobe_multi_check(ctx, bpf_session_is_return()); +} + +static __always_inline bool verify_sleepable_user_copy(void) +{ + char data[9]; + + bpf_copy_from_user(data, sizeof(data), user_ptr); + return bpf_strncmp(data, sizeof(data), "test_data") =3D=3D 0; +} + +SEC("uprobe.session.s//proc/self/exe:uprobe_multi_func_*") +int uprobe_sleepable(struct pt_regs *ctx) +{ + if (verify_sleepable_user_copy()) + uprobe_multi_sleep_result++; + return uprobe_multi_check(ctx, bpf_session_is_return()); +} --=20 2.47.0 From nobody Sat Nov 23 23:41:00 2024 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 84CA61EF084; Fri, 8 Nov 2024 13:47:27 +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=1731073647; cv=none; b=hGYd9z/+q5HowozbEULYRFDHioX8G4r6TL/kE+tKAbE9rJ+l3zDBPUSAPFJZ1xcf4MFEiah9qBMxFTkODlWRp3FiyNCQJ1YKdXifrfxhRTuyFxGCM7mZXiZJuMm8lIQ8FyMg7hmL/P7TID7ogtMXafRXMGlRLN1QG5b1VGJKiQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073647; c=relaxed/simple; bh=PSjf47u3YOTCBsa4PtDSDpvo0vyF79XYA2Q5XDd9TxU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HcMsI2yduuzTqcxtem3r/RSbHrmZ/yQuPv9JgLYv0AdtzYUqkiUQqRDZfW9thUznEaXWhv8iRKn06vnp47q6FCO6ixG4dbnO7PgljYfYIWhJfjPa0k1HHMwtvS97u1NDa3IWBJe+vbf0f+A/7U6Qeg3u3LfMyFT7Rm+u+VC9g6c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=d32+GHvX; 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="d32+GHvX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED249C4CED0; Fri, 8 Nov 2024 13:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073647; bh=PSjf47u3YOTCBsa4PtDSDpvo0vyF79XYA2Q5XDd9TxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d32+GHvXZ7xpuam6Qy4zGrbp38HhiJoTO7a08Lj7YPDg9wzCrp/YUr285ji2iwf2r NfP5Tmic8Qc1iYgbTvodtpNRuwIDqi9ee7fsP0Wv0tJfUtlGg3z9GeCjzYZ9QBU0ew ufLM/TPXGVarX/SSNZ5cBzIAPAKa53jQ6r61t/R13SEfxzH+z1QQlih9sUMoK4fsAL bNWwGZ15ZBX5MISgTCWisib/Jt4eAnlj1Ju6n1cI6gLKbwGVmJlhwlbY+2BRaJJoE8 SsSgHsKrnti9u66b7NP9dtfpWBmld+Prd7Ij4sGcLQIoOSloRZQLndH68EpPYsL4J9 ZFVCENxjJt/bg== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 07/13] selftests/bpf: Add uprobe session cookie test Date: Fri, 8 Nov 2024 14:45:38 +0100 Message-ID: <20241108134544.480660-8-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adding uprobe session test that verifies the cookie value get properly propagated from entry to return program. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- .../bpf/prog_tests/uprobe_multi_test.c | 31 ++++++++++++ .../bpf/progs/uprobe_multi_session_cookie.c | 48 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi_session_= cookie.c diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c b/t= ools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c index d9c20ca7a833..986852ec26f5 100644 --- a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c @@ -9,6 +9,7 @@ #include "uprobe_multi_consumers.skel.h" #include "uprobe_multi_pid_filter.skel.h" #include "uprobe_multi_session.skel.h" +#include "uprobe_multi_session_cookie.skel.h" #include "bpf/libbpf_internal.h" #include "testing_helpers.h" #include "../sdt.h" @@ -1062,6 +1063,34 @@ static void test_session_skel_api(void) uprobe_multi_session__destroy(skel); } =20 +static void test_session_cookie_skel_api(void) +{ + struct uprobe_multi_session_cookie *skel =3D NULL; + int err; + + skel =3D uprobe_multi_session_cookie__open_and_load(); + if (!ASSERT_OK_PTR(skel, "uprobe_multi_session_cookie__open_and_load")) + goto cleanup; + + skel->bss->pid =3D getpid(); + + err =3D uprobe_multi_session_cookie__attach(skel); + if (!ASSERT_OK(err, "uprobe_multi_session_cookie__attach")) + goto cleanup; + + /* trigger all probes */ + uprobe_multi_func_1(); + uprobe_multi_func_2(); + uprobe_multi_func_3(); + + ASSERT_EQ(skel->bss->test_uprobe_1_result, 1, "test_uprobe_1_result"); + ASSERT_EQ(skel->bss->test_uprobe_2_result, 2, "test_uprobe_2_result"); + ASSERT_EQ(skel->bss->test_uprobe_3_result, 3, "test_uprobe_3_result"); + +cleanup: + uprobe_multi_session_cookie__destroy(skel); +} + static void test_bench_attach_uprobe(void) { long attach_start_ns =3D 0, attach_end_ns =3D 0; @@ -1160,4 +1189,6 @@ void test_uprobe_multi_test(void) test_pid_filter_process(true); if (test__start_subtest("session")) test_session_skel_api(); + if (test__start_subtest("session_cookie")) + test_session_cookie_skel_api(); } diff --git a/tools/testing/selftests/bpf/progs/uprobe_multi_session_cookie.= c b/tools/testing/selftests/bpf/progs/uprobe_multi_session_cookie.c new file mode 100644 index 000000000000..5befdf944dc6 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/uprobe_multi_session_cookie.c @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include "bpf_kfuncs.h" + +char _license[] SEC("license") =3D "GPL"; + +int pid =3D 0; + +__u64 test_uprobe_1_result =3D 0; +__u64 test_uprobe_2_result =3D 0; +__u64 test_uprobe_3_result =3D 0; + +static int check_cookie(__u64 val, __u64 *result) +{ + __u64 *cookie; + + if (bpf_get_current_pid_tgid() >> 32 !=3D pid) + return 1; + + cookie =3D bpf_session_cookie(); + + if (bpf_session_is_return()) + *result =3D *cookie =3D=3D val ? val : 0; + else + *cookie =3D val; + return 0; +} + +SEC("uprobe.session//proc/self/exe:uprobe_multi_func_1") +int uprobe_1(struct pt_regs *ctx) +{ + return check_cookie(1, &test_uprobe_1_result); +} + +SEC("uprobe.session//proc/self/exe:uprobe_multi_func_2") +int uprobe_2(struct pt_regs *ctx) +{ + return check_cookie(2, &test_uprobe_2_result); +} + +SEC("uprobe.session//proc/self/exe:uprobe_multi_func_3") +int uprobe_3(struct pt_regs *ctx) +{ + return check_cookie(3, &test_uprobe_3_result); +} --=20 2.47.0 From nobody Sat Nov 23 23:41:00 2024 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 488D61EF098; Fri, 8 Nov 2024 13:47:42 +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=1731073663; cv=none; b=ncd+/C2x4uBchwR1+TAhp/N23bLjIqaY0jmLvcWWZ4EZ0DAjEVwauFLV0rdfx3NZMrUBZ4+U7SEUvbDsOA8UiogYm/a9Unff9rt4G9nD7AyDBcklRYfZRZ8IHpejqvfXwEiP9UB4BfrcEtJCl/BFqX+5xQscSKOLSZLrtYJ6vbk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073663; c=relaxed/simple; bh=ha7AcA7R3i4kQJ9vwuQyBMO+nVNqQ1j/M8E3Kb/Bnvc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AqIXYDc3qliWSpdBY1IRgyH9FzjldPi25cin+Z8H9IpmvEbWiamippojEGHN6oz0di0UE07ciraScHM8poTKLBm6KvZsI4i0GNOHKo7dDm8DQpeB7IM90sL4MxenB16BWTWp3MJ/UJLcLyY21mf9dDQkVMsDkHi5LF+2QEC33IM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LVo0EZ2K; 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="LVo0EZ2K" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE1A8C4CECD; Fri, 8 Nov 2024 13:47:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073662; bh=ha7AcA7R3i4kQJ9vwuQyBMO+nVNqQ1j/M8E3Kb/Bnvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LVo0EZ2KAXAlIDzFHiVfNHhvOntmsUA4fBhU9iwB02VqOwKVxSU8j22YYfAGcFDht y0AW80Wli3aNNxowSaySF8m0tSX+IGz9zHscVk34f1f4+7NQNbgeTxMbPhit1iUaYv KfLL4SywbnWnyYJk0qIvcxPIGneYndUQ/cwJ8i8nJ8R0T7fJHrHUT5xdSGmS8Dwoa7 lDearAD6XRlgs1D4XCOeU83GNA2vmGIcAcI9Ph15/HSUG7/2RRLrI1Yq0Jv4YWTDlq 0NWuaQlk4/bo+5vHSnIpP0JRakyw+KQUhe6s59wa50nSNjy56RHV9BC527G2NgZRJX oxilJo0popR9g== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 08/13] selftests/bpf: Add uprobe session recursive test Date: Fri, 8 Nov 2024 14:45:39 +0100 Message-ID: <20241108134544.480660-9-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adding uprobe session test that verifies the cookie value is stored properly when single uprobe-ed function is executed recursively. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- .../bpf/prog_tests/uprobe_multi_test.c | 57 +++++++++++++++++++ .../progs/uprobe_multi_session_recursive.c | 44 ++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi_session_= recursive.c diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c b/t= ools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c index 986852ec26f5..b9448fb63a19 100644 --- a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c @@ -10,6 +10,7 @@ #include "uprobe_multi_pid_filter.skel.h" #include "uprobe_multi_session.skel.h" #include "uprobe_multi_session_cookie.skel.h" +#include "uprobe_multi_session_recursive.skel.h" #include "bpf/libbpf_internal.h" #include "testing_helpers.h" #include "../sdt.h" @@ -36,6 +37,12 @@ noinline void usdt_trigger(void) STAP_PROBE(test, pid_filter_usdt); } =20 +noinline void uprobe_session_recursive(int i) +{ + if (i) + uprobe_session_recursive(i - 1); +} + struct child { int go[2]; int c2p[2]; /* child -> parent channel */ @@ -1091,6 +1098,54 @@ static void test_session_cookie_skel_api(void) uprobe_multi_session_cookie__destroy(skel); } =20 +static void test_session_recursive_skel_api(void) +{ + struct uprobe_multi_session_recursive *skel =3D NULL; + int i, err; + + skel =3D uprobe_multi_session_recursive__open_and_load(); + if (!ASSERT_OK_PTR(skel, "uprobe_multi_session_recursive__open_and_load")) + goto cleanup; + + skel->bss->pid =3D getpid(); + + err =3D uprobe_multi_session_recursive__attach(skel); + if (!ASSERT_OK(err, "uprobe_multi_session_recursive__attach")) + goto cleanup; + + for (i =3D 0; i < ARRAY_SIZE(skel->bss->test_uprobe_cookie_entry); i++) + skel->bss->test_uprobe_cookie_entry[i] =3D i + 1; + + uprobe_session_recursive(5); + + /* + * entry uprobe: + * uprobe_session_recursive(5) { *cookie =3D 1, return 0 + * uprobe_session_recursive(4) { *cookie =3D 2, return 1 + * uprobe_session_recursive(3) { *cookie =3D 3, return 0 + * uprobe_session_recursive(2) { *cookie =3D 4, return 1 + * uprobe_session_recursive(1) { *cookie =3D 5, return 0 + * uprobe_session_recursive(0) { *cookie =3D 6, return 1 + * return uprobe: + * } i =3D 0 not executed + * } i =3D 1 test_uprobe_cookie_return= [0] =3D 5 + * } i =3D 2 not executed + * } i =3D 3 test_uprobe_cookie_return= [1] =3D 3 + * } i =3D 4 not executed + * } i =3D 5 test_uprobe_cookie_return= [2] =3D 1 + */ + + ASSERT_EQ(skel->bss->idx_entry, 6, "idx_entry"); + ASSERT_EQ(skel->bss->idx_return, 3, "idx_return"); + + ASSERT_EQ(skel->bss->test_uprobe_cookie_return[0], 5, "test_uprobe_cookie= _return[0]"); + ASSERT_EQ(skel->bss->test_uprobe_cookie_return[1], 3, "test_uprobe_cookie= _return[1]"); + ASSERT_EQ(skel->bss->test_uprobe_cookie_return[2], 1, "test_uprobe_cookie= _return[2]"); + +cleanup: + uprobe_multi_session_recursive__destroy(skel); +} + static void test_bench_attach_uprobe(void) { long attach_start_ns =3D 0, attach_end_ns =3D 0; @@ -1191,4 +1246,6 @@ void test_uprobe_multi_test(void) test_session_skel_api(); if (test__start_subtest("session_cookie")) test_session_cookie_skel_api(); + if (test__start_subtest("session_cookie_recursive")) + test_session_recursive_skel_api(); } diff --git a/tools/testing/selftests/bpf/progs/uprobe_multi_session_recursi= ve.c b/tools/testing/selftests/bpf/progs/uprobe_multi_session_recursive.c new file mode 100644 index 000000000000..8fbcd69fae22 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/uprobe_multi_session_recursive.c @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include "bpf_kfuncs.h" +#include "bpf_misc.h" + +char _license[] SEC("license") =3D "GPL"; + +int pid =3D 0; + +int idx_entry =3D 0; +int idx_return =3D 0; + +__u64 test_uprobe_cookie_entry[6]; +__u64 test_uprobe_cookie_return[3]; + +static int check_cookie(void) +{ + __u64 *cookie =3D bpf_session_cookie(); + + if (bpf_session_is_return()) { + if (idx_return >=3D ARRAY_SIZE(test_uprobe_cookie_return)) + return 1; + test_uprobe_cookie_return[idx_return++] =3D *cookie; + return 0; + } + + if (idx_entry >=3D ARRAY_SIZE(test_uprobe_cookie_entry)) + return 1; + *cookie =3D test_uprobe_cookie_entry[idx_entry]; + return idx_entry++ % 2; +} + + +SEC("uprobe.session//proc/self/exe:uprobe_session_recursive") +int uprobe_recursive(struct pt_regs *ctx) +{ + if (bpf_get_current_pid_tgid() >> 32 !=3D pid) + return 1; + + return check_cookie(); +} --=20 2.47.0 From nobody Sat Nov 23 23:41:00 2024 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 D2B721EBA1E; Fri, 8 Nov 2024 13:47:54 +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=1731073674; cv=none; b=bvKs/KmpJWhjrZxVqiHWgJL2DSe57SuMvMV2fiB0/XFJbxb3voxhwp/zCcTBdnB2X7r+VUav/idM7kNsSFL35kgYAA2ah7jnF3JnAQtPQp87OB6xJf5x+x+HIysydzCAf5qavtoyqRfnIGTXs+P0y0hqWaR84DuhgzhKJrnhApw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073674; c=relaxed/simple; bh=z2DCLT1FLhrnevYpBg3PNT7Zgn1AasGN0zBJOW7Prv0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j2rsBWtcmKaGHphwTBnLluDZF5A6GWEGa+CnoDqi8JauKQnEgoGygcZ27+XgoTqj42Il06FQOtagEv7dWSewsPLrV78vuTfEw7RnePxGDnEYH6UsUe1zBs62FzS7zsZ2JffzJmwUn3XXMjBuJ+FqHKj5r55Vz/y4RRVIxhGQ6ck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rhwDzYri; 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="rhwDzYri" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 650D1C4CECD; Fri, 8 Nov 2024 13:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073674; bh=z2DCLT1FLhrnevYpBg3PNT7Zgn1AasGN0zBJOW7Prv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rhwDzYriXgz5optmfGpishHClAwOp2Xe3aJkSjuSA7EwFmO41jBfAxCJEPduBdI03 D7wLwjXfUJXD0LMGUhv1/bgsRBtxV8SCVu+E52FyY21DNxm4XSH96fXGovQ776ID2U B/NYqCLjXNPPd/YYxib6CPghEVqccMBWvmArdwgs1kFvRW6b9Y5E+AEM3uGWMUkRU2 9wBkzFfPKdrxydh8CswjLgi+ojCBHNA/77OEsMzM69vpApvnAjNMu7NfEeiwa6n9gA wtOTk7WjskioARZZFvu3UKi+uaRwy6hVW6JNDRtveXc2waKOdr9Qa20HI7B+gm2IVp u05q2upyghhpQ== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 09/13] selftests/bpf: Add uprobe session verifier test for return value Date: Fri, 8 Nov 2024 14:45:40 +0100 Message-ID: <20241108134544.480660-10-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Making sure uprobe.session program can return only [0,1] values. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- .../bpf/prog_tests/uprobe_multi_test.c | 2 ++ .../bpf/progs/uprobe_multi_verifier.c | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi_verifier= .c diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c b/t= ools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c index b9448fb63a19..5dad31d1b606 100644 --- a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c @@ -11,6 +11,7 @@ #include "uprobe_multi_session.skel.h" #include "uprobe_multi_session_cookie.skel.h" #include "uprobe_multi_session_recursive.skel.h" +#include "uprobe_multi_verifier.skel.h" #include "bpf/libbpf_internal.h" #include "testing_helpers.h" #include "../sdt.h" @@ -1248,4 +1249,5 @@ void test_uprobe_multi_test(void) test_session_cookie_skel_api(); if (test__start_subtest("session_cookie_recursive")) test_session_recursive_skel_api(); + RUN_TESTS(uprobe_multi_verifier); } diff --git a/tools/testing/selftests/bpf/progs/uprobe_multi_verifier.c b/to= ols/testing/selftests/bpf/progs/uprobe_multi_verifier.c new file mode 100644 index 000000000000..fe49f2cb5360 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/uprobe_multi_verifier.c @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "vmlinux.h" +#include +#include +#include +#include "bpf_misc.h" + +char _license[] SEC("license") =3D "GPL"; + + +SEC("uprobe.session") +__success +int uprobe_sesison_return_0(struct pt_regs *ctx) +{ + return 0; +} + +SEC("uprobe.session") +__success +int uprobe_sesison_return_1(struct pt_regs *ctx) +{ + return 1; +} + +SEC("uprobe.session") +__failure +__msg("At program exit the register R0 has smin=3D2 smax=3D2 should have b= een in [0, 1]") +int uprobe_sesison_return_2(struct pt_regs *ctx) +{ + return 2; +} --=20 2.47.0 From nobody Sat Nov 23 23:41:00 2024 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 7F03B1E907A; Fri, 8 Nov 2024 13:48:06 +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=1731073686; cv=none; b=F0N7p//AyjMsxDhxDcdRxCvM64WSYUKfLYFp7FmRRKWw9D1NnViT7mVILOqAKBVD7iQe7V5nJWyB8/eIh1AG8Y9fu5oRxzkxKjhiztOi3pDf5DJYcBSTD5OyZOaz7bU/cBeru6m2aySv8umF0rQN/mrE2ewuFYkR3Q2PnKJHvR8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073686; c=relaxed/simple; bh=gsCOCREnwNJgKmtWRm8PgQYUqmPe8Fz7Zkgdxlt1OAA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U/8FmYU093s3ks4zMn5n4r0CVBTWN+DG/6b6cFStkv9UMy98WeUX+7kR6EB4egYLulgOCNof126PgMByBBpusadXVaw7+wITY0Dr0sTc/ipI4yKL31EupUXYkPz77rugG/3NryCkkOSKB30WGFAgSzhWxgb18c6QJhIZYD5CDH8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mWtRywY9; 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="mWtRywY9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11BBBC4CECD; Fri, 8 Nov 2024 13:48:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073686; bh=gsCOCREnwNJgKmtWRm8PgQYUqmPe8Fz7Zkgdxlt1OAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mWtRywY9Vqo9W/SjBgP09mpsNd3tJoosgrLTYQMoxoatB7PFmDZQGiU3fvkP8W2ry IfRfQSc72eISlAE+AOqfZkLL83BAF2+SPcgy+l4uBoVzNUa8Vt+LJyLeeqxSSigSkv v/AWMsokv/3nK+Q2ZxpOayoZrbVUHQ7NAam3RT0ZkEK7HtdV50NR1hW8GkZzdgLtrx /yaluw+zZ6Ch+KmjvN7lPleN3s/Z569FkEO9xMz05TpmSfN8vkhaJt4FgFY8GhOblM BTsFcYcXK3ns2hlpTYdPx1sOUhAYhJTymMT6YMCO1E5/+jVsKd1lTQfg2k/syVdj9m G3IpTyJBCqErQ== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 10/13] selftests/bpf: Add kprobe session verifier test for return value Date: Fri, 8 Nov 2024 14:45:41 +0100 Message-ID: <20241108134544.480660-11-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Making sure kprobe.session program can return only [0,1] values. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- .../bpf/prog_tests/kprobe_multi_test.c | 2 ++ .../bpf/progs/kprobe_multi_verifier.c | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/kprobe_multi_verifier= .c diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/t= ools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c index 960c9323d1e0..66ab1cae923e 100644 --- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c @@ -6,6 +6,7 @@ #include "kprobe_multi_override.skel.h" #include "kprobe_multi_session.skel.h" #include "kprobe_multi_session_cookie.skel.h" +#include "kprobe_multi_verifier.skel.h" #include "bpf/libbpf_internal.h" #include "bpf/hashmap.h" =20 @@ -764,4 +765,5 @@ void test_kprobe_multi_test(void) test_session_skel_api(); if (test__start_subtest("session_cookie")) test_session_cookie_skel_api(); + RUN_TESTS(kprobe_multi_verifier); } diff --git a/tools/testing/selftests/bpf/progs/kprobe_multi_verifier.c b/to= ols/testing/selftests/bpf/progs/kprobe_multi_verifier.c new file mode 100644 index 000000000000..288577e81deb --- /dev/null +++ b/tools/testing/selftests/bpf/progs/kprobe_multi_verifier.c @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "vmlinux.h" +#include +#include +#include +#include "bpf_misc.h" + +char _license[] SEC("license") =3D "GPL"; + + +SEC("kprobe.session") +__success +int kprobe_session_return_0(struct pt_regs *ctx) +{ + return 0; +} + +SEC("kprobe.session") +__success +int kprobe_session_return_1(struct pt_regs *ctx) +{ + return 1; +} + +SEC("kprobe.session") +__failure +__msg("At program exit the register R0 has smin=3D2 smax=3D2 should have b= een in [0, 1]") +int kprobe_session_return_2(struct pt_regs *ctx) +{ + return 2; +} --=20 2.47.0 From nobody Sat Nov 23 23:41:00 2024 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 24CFB1401C; Fri, 8 Nov 2024 13:48:17 +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=1731073698; cv=none; b=SqM4dRL3EYzvzGF7k6kRdbUwwPScu+xpNPyQ2luhIwDHS53Efp9TBbij4GuXJquCQEfI7g3n7pyc1Qmjf7d/siHdrLna0+r5Bnik1/07OBqY5D4AWja+N1OrfBD3nFhLM/+8EAlionAaGrFSULRjwFacw/6ZbFj7cWooWmdsgH8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073698; c=relaxed/simple; bh=3LNaXCCN5bYz0E0+hXQcyWtC+0ealvGqMW8XnmzMv+c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MLAf5+UPOdLueC224GL41sJXCtyBvwjruoulJhc1CTGHi0xOkeO8OsU6Z0JpajCuIuA3SpM4jL+UtSXAWxqivrOmjrpelC2TwsEPk+DDaXW07UHI2sgGBOyM7zFT/ccDBWzV+p7Lo2KOzetuL9qtmhtUsRLfQcgjxSZFc/Rc1m0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fY8RSN89; 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="fY8RSN89" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6BDD8C4CECD; Fri, 8 Nov 2024 13:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073697; bh=3LNaXCCN5bYz0E0+hXQcyWtC+0ealvGqMW8XnmzMv+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fY8RSN89hzpTHclQTW1DjV+SOqabit3tsafc4PFNWb6QQjqlpysnw6gPDA9OvXZSQ NgAbb0I6IIkNf/nTtelqfIgOmYwpVhAAJb1hLPW3n+Qh6oLvSBDCBD4/qba8UCTwiR +qlD8H1OjLfNWJWCv7a2bFQnNq70LF4+v/Wm4hA8TVe07R9VvG9LBqM4AUIrd3dw7E Ymw+z+GTa7+wnwz2BxwtstwjRpw/cwsScTE4BaiqMiZr2GL0851jjB+N5uJ6TNL4Yi dvyOZ2h3olyzxEVfbNuQhyiozlOyVVjD1OWMyUfOrrJyiNZj/7UoA23hCssoAjHPKh v5KOSOt03pzjg== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 11/13] selftests/bpf: Add uprobe session single consumer test Date: Fri, 8 Nov 2024 14:45:42 +0100 Message-ID: <20241108134544.480660-12-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Testing that the session ret_handler bypass works on single uprobe with multiple consumers, each with different session ignore return value. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- .../bpf/prog_tests/uprobe_multi_test.c | 33 ++++++++++++++ .../bpf/progs/uprobe_multi_session_single.c | 44 +++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi_session_= single.c diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c b/t= ools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c index 5dad31d1b606..93f5cabd6d01 100644 --- a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c @@ -9,6 +9,7 @@ #include "uprobe_multi_consumers.skel.h" #include "uprobe_multi_pid_filter.skel.h" #include "uprobe_multi_session.skel.h" +#include "uprobe_multi_session_single.skel.h" #include "uprobe_multi_session_cookie.skel.h" #include "uprobe_multi_session_recursive.skel.h" #include "uprobe_multi_verifier.skel.h" @@ -1071,6 +1072,36 @@ static void test_session_skel_api(void) uprobe_multi_session__destroy(skel); } =20 +static void test_session_single_skel_api(void) +{ + struct uprobe_multi_session_single *skel =3D NULL; + LIBBPF_OPTS(bpf_kprobe_multi_opts, opts); + int err; + + skel =3D uprobe_multi_session_single__open_and_load(); + if (!ASSERT_OK_PTR(skel, "uprobe_multi_session_single__open_and_load")) + goto cleanup; + + skel->bss->pid =3D getpid(); + + err =3D uprobe_multi_session_single__attach(skel); + if (!ASSERT_OK(err, "uprobe_multi_session_single__attach")) + goto cleanup; + + uprobe_multi_func_1(); + + /* + * We expect consumer 0 and 2 to trigger just entry handler (value 1) + * and consumer 1 to hit both (value 2). + */ + ASSERT_EQ(skel->bss->uprobe_session_result[0], 1, "uprobe_session_result_= 0"); + ASSERT_EQ(skel->bss->uprobe_session_result[1], 2, "uprobe_session_result_= 1"); + ASSERT_EQ(skel->bss->uprobe_session_result[2], 1, "uprobe_session_result_= 2"); + +cleanup: + uprobe_multi_session_single__destroy(skel); +} + static void test_session_cookie_skel_api(void) { struct uprobe_multi_session_cookie *skel =3D NULL; @@ -1245,6 +1276,8 @@ void test_uprobe_multi_test(void) test_pid_filter_process(true); if (test__start_subtest("session")) test_session_skel_api(); + if (test__start_subtest("session_single")) + test_session_single_skel_api(); if (test__start_subtest("session_cookie")) test_session_cookie_skel_api(); if (test__start_subtest("session_cookie_recursive")) diff --git a/tools/testing/selftests/bpf/progs/uprobe_multi_session_single.= c b/tools/testing/selftests/bpf/progs/uprobe_multi_session_single.c new file mode 100644 index 000000000000..7c960376ae97 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/uprobe_multi_session_single.c @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include "bpf_kfuncs.h" +#include "bpf_misc.h" + +char _license[] SEC("license") =3D "GPL"; + +__u64 uprobe_session_result[3] =3D {}; +int pid =3D 0; + +static int uprobe_multi_check(void *ctx, int idx) +{ + if (bpf_get_current_pid_tgid() >> 32 !=3D pid) + return 1; + + uprobe_session_result[idx]++; + + /* only consumer 1 executes return probe */ + if (idx =3D=3D 0 || idx =3D=3D 2) + return 1; + + return 0; +} + +SEC("uprobe.session//proc/self/exe:uprobe_multi_func_1") +int uprobe_0(struct pt_regs *ctx) +{ + return uprobe_multi_check(ctx, 0); +} + +SEC("uprobe.session//proc/self/exe:uprobe_multi_func_1") +int uprobe_1(struct pt_regs *ctx) +{ + return uprobe_multi_check(ctx, 1); +} + +SEC("uprobe.session//proc/self/exe:uprobe_multi_func_1") +int uprobe_2(struct pt_regs *ctx) +{ + return uprobe_multi_check(ctx, 2); +} --=20 2.47.0 From nobody Sat Nov 23 23:41:00 2024 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 8B75E1EF935; Fri, 8 Nov 2024 13:48:33 +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=1731073713; cv=none; b=UcYA/eyWVwZjJ5oL//D4BzvNCTlWh7Pg+Fr4EjZptOUD+Ylg3/esXLpIrCeBGKBwWbmf8vHmEUJ8arKmxFP709h8ZKWPsvwwr1NjCBp1bSlOGv5q5f5teKXDWxtnc12YeUJrP7wQhEQC4EXY0xLBBzCWlZeZlw/ipjL6sEUmNZM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073713; c=relaxed/simple; bh=m03RbtHaJ1wSanq35C6qO/NPF0kBT1tb+6ISO1ytOW4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YGUv2atwc4+PI6WQsGy1H0R/lkHoTBn8R9DX7iVJ7RXvqc9+sD3TQP47319pSiYHNYg8snbdmQ+aFRP6zLbbaxLTqUupS54rpRXlEHqkixuoKOJ5NQvONIyGXUB5iWOQzzDVc8Nj4lRz100RkcnZfmBWCygFsBgO6w8Zv20OAX4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aGJdCzle; 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="aGJdCzle" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 010CAC4CECD; Fri, 8 Nov 2024 13:48:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073713; bh=m03RbtHaJ1wSanq35C6qO/NPF0kBT1tb+6ISO1ytOW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aGJdCzlecrywibVbzhuyKuvtSemKstgo8Sy+6c+vUXX79ZNTH/DSCr8N+7PTuF+2h I9hIR6Sj86r4+oIr4mAEQRyYjpeZ4s1EjBZ7/dunowrHTglzdRFGSARAoF8F8KSzvg 5A9vsQUOplKji20dnQjuZ6xkHh4vcvojCWpprcqcgg2nJFf4dUD/FrfiaKcxRbGBUo +mWxWuGG+jg8mlNegsIDPAETwOb6yaLx2UUKhqZQgU/LlSat8SK18rDVcVT7mgPJ+Z bUDPHeK2VcUL1W/BC9y18Owaelr6CsX7f7Gs7GFQqsdDJoOrjUe+D0ph3jX+s4mXr1 WPyKKB78xAdvg== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 12/13] selftests/bpf: Add uprobe sessions to consumer test Date: Fri, 8 Nov 2024 14:45:43 +0100 Message-ID: <20241108134544.480660-13-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adding uprobe session consumers to the consumer test, so we get the session into the test mix. In addition scaling down the test to have just 1 uprobe and 1 uretprobe, otherwise the test time grows and is unsuitable for CI even with threads. Signed-off-by: Jiri Olsa --- .../bpf/prog_tests/uprobe_multi_test.c | 70 +++++++++++++------ .../bpf/progs/uprobe_multi_consumers.c | 6 +- 2 files changed, 52 insertions(+), 24 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c b/t= ools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c index 93f5cabd6d01..0a31ba2d6fb2 100644 --- a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c @@ -799,10 +799,13 @@ static int uprobe_attach(struct uprobe_multi_consumer= s *skel, int idx) return -1; =20 /* - * bit/prog: 0,1 uprobe entry - * bit/prog: 2,3 uprobe return + * bit/prog: 0 uprobe entry + * bit/prog: 1 uprobe return + * bit/prog: 2 uprobe session without return + * bit/prog: 3 uprobe session with return */ - opts.retprobe =3D idx =3D=3D 2 || idx =3D=3D 3; + opts.retprobe =3D idx =3D=3D 1; + opts.session =3D idx =3D=3D 2 || idx =3D=3D 3; =20 *link =3D bpf_program__attach_uprobe_multi(prog, 0, "/proc/self/exe", "uprobe_consumer_test", @@ -867,31 +870,55 @@ static int consumer_test(struct uprobe_multi_consumer= s *skel, goto cleanup; =20 for (idx =3D 0; idx < 4; idx++) { + bool uret_stays, uret_survives; const char *fmt =3D "BUG"; __u64 val =3D 0; =20 - if (idx < 2) { + switch (idx) { + case 0: /* * uprobe entry * +1 if define in 'before' */ if (test_bit(idx, before)) val++; - fmt =3D "prog 0/1: uprobe"; - } else { + fmt =3D "prog 0: uprobe"; + break; + case 1: /* * To trigger uretprobe consumer, the uretprobe under test either staye= d from * before to after (uret_stays + test_bit) or uretprobe instance surviv= ed and * we have uretprobe active in after (uret_survives + test_bit) */ - - bool uret_stays =3D before & after & 0b1100; - bool uret_survives =3D (before & 0b1100) && (after & 0b1100) && (before= & 0b0011); + uret_stays =3D before & after & 0b0110; + uret_survives =3D ((before & 0b0110) && (after & 0b0110) && (before & 0= b1001)); =20 if ((uret_stays || uret_survives) && test_bit(idx, after)) val++; - - fmt =3D "idx 2/3: uretprobe"; + fmt =3D "prog 1: uretprobe"; + break; + case 2: + /* + * session with return + * +1 if defined in 'before' + * +1 if defined in 'after' + */ + if (test_bit(idx, before)) { + val++; + if (test_bit(idx, after)) + val++; + } + fmt =3D "prog 2: session with return"; + break; + case 3: + /* + * session without return + * +1 if defined in 'before' + */ + if (test_bit(idx, before)) + val++; + fmt =3D "prog 3: session with NO return"; + break; } =20 if (!ASSERT_EQ(skel->bss->uprobe_result[idx], val, fmt)) @@ -920,8 +947,10 @@ static void test_consumers(void) * The idea of this test is to try all possible combinations of * uprobes consumers attached on single function. * - * - 2 uprobe entry consumer - * - 2 uprobe exit consumers + * - 1 uprobe entry consumer + * - 1 uprobe exit consumer + * - 1 uprobe session with return + * - 1 uprobe session without return * * The test uses 4 uprobes attached on single function, but that * translates into single uprobe with 4 consumers in kernel. @@ -929,25 +958,24 @@ static void test_consumers(void) * The before/after values present the state of attached consumers * before and after the probed function: * - * bit/prog 0,1 : uprobe entry - * bit/prog 2,3 : uprobe return + * bit/prog 0 : uprobe entry + * bit/prog 1 : uprobe return * * For example for: * - * before =3D 0b0101 - * after =3D 0b0110 + * before =3D 0b01 + * after =3D 0b10 * * it means that before we call 'uprobe_consumer_test' we attach * uprobes defined in 'before' value: * - * - bit/prog 0: uprobe entry - * - bit/prog 2: uprobe return + * - bit/prog 1: uprobe entry * * uprobe_consumer_test is called and inside it we attach and detach * uprobes based on 'after' value: * - * - bit/prog 0: stays untouched - * - bit/prog 2: uprobe return is detached + * - bit/prog 0: is detached + * - bit/prog 1: is attached * * uprobe_consumer_test returns and we check counters values increased * by bpf programs on each uprobe to match the expected count based on diff --git a/tools/testing/selftests/bpf/progs/uprobe_multi_consumers.c b/t= ools/testing/selftests/bpf/progs/uprobe_multi_consumers.c index 7e0fdcbbd242..93752bb5690b 100644 --- a/tools/testing/selftests/bpf/progs/uprobe_multi_consumers.c +++ b/tools/testing/selftests/bpf/progs/uprobe_multi_consumers.c @@ -24,16 +24,16 @@ int uprobe_1(struct pt_regs *ctx) return 0; } =20 -SEC("uprobe.multi") +SEC("uprobe.session") int uprobe_2(struct pt_regs *ctx) { uprobe_result[2]++; return 0; } =20 -SEC("uprobe.multi") +SEC("uprobe.session") int uprobe_3(struct pt_regs *ctx) { uprobe_result[3]++; - return 0; + return 1; } --=20 2.47.0 From nobody Sat Nov 23 23:41:00 2024 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 AAFDA1EB9FA; Fri, 8 Nov 2024 13:48:45 +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=1731073725; cv=none; b=rRx26CTg3TotEOQvMNjPgjxxCuAcxjHpMcxuNEJw/k2Jl8X10L8MEAIH9jf57rNaNSxRYIWFz74wB2GYp6gjRbFcIiMemZouxVXGQ9ZtpFi6j61MmywKby3jkpBihwj7b3j/P28G06XNmeX1PWybYq7S1y2DI5TRdTpOvSea9YM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731073725; c=relaxed/simple; bh=y2Tog37CDq5vumXRee4x6T/zmLQfZs28g05NoM6hSq0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M9FEp3xzPIl0/ptKk94uD2BVBdMWowaCiCOCZy3HKAY4zyIEV26lXPeqJ24/DrHRcfY1glZadJhBY0EnJKPbK+bfIOCH1HrTjM9bdBeEAwL+6ZaSRFOSEdomYX5Ot1UTAMvZvOAUhYbdzVeiABoQqrhM9QSLa/qkuJGmiWWCMCs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AvJaPW2L; 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="AvJaPW2L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD75BC4CECD; Fri, 8 Nov 2024 13:48:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731073725; bh=y2Tog37CDq5vumXRee4x6T/zmLQfZs28g05NoM6hSq0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AvJaPW2L1CCTjghfq2amjC6JDoVXTOgVFGENcUmVgsoAFAGYRK6uU1pbTUgfwpwCh 6YYf9AqurRPPXeR0Q1eaK41Tq6BZYHwSUdSp+abSfE+9WKoM29k9ClTPA2vYJVAQIZ 13oG/FCWNtR2l1622SDXKXzxDKBhUgjL2lmT+avEOtqX7inwa+pit78sJfy5jDp/Ll 0RztyJVVSwAbUPX20L9MQuxBk8MYnUucKcfVtE9C7wlQcnCt9x4FUTfsv6cTwavkHM HNV54ukyEQK8/flhTncBgZx1Se2UGnxgBoIf/CuncqaOqI4A8/xaIOVuGkt0syhx94 dy19EmvrhcGyg== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Steven Rostedt , Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv9 bpf-next 13/13] selftests/bpf: Add threads to consumer test Date: Fri, 8 Nov 2024 14:45:44 +0100 Message-ID: <20241108134544.480660-14-jolsa@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108134544.480660-1-jolsa@kernel.org> References: <20241108134544.480660-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With recent uprobe fix [1] the sync time after unregistering uprobe is much longer and prolongs the consumer test which creates and destroys hundreds of uprobes. This change adds 16 threads (which fits the test logic) and speeds up the test. Before the change: # perf stat --null ./test_progs -t uprobe_multi_test/consumers #421/9 uprobe_multi_test/consumers:OK #421 uprobe_multi_test:OK Summary: 1/1 PASSED, 0 SKIPPED, 0 FAILED Performance counter stats for './test_progs -t uprobe_multi_test/consume= rs': 28.818778973 seconds time elapsed 0.745518000 seconds user 0.919186000 seconds sys After the change: # perf stat --null ./test_progs -t uprobe_multi_test/consumers 2>&1 #421/9 uprobe_multi_test/consumers:OK #421 uprobe_multi_test:OK Summary: 1/1 PASSED, 0 SKIPPED, 0 FAILED Performance counter stats for './test_progs -t uprobe_multi_test/consume= rs': 3.504790814 seconds time elapsed 0.012141000 seconds user 0.751760000 seconds sys [1] commit 87195a1ee332 ("uprobes: switch to RCU Tasks Trace flavor for bet= ter performance") Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- .../bpf/prog_tests/uprobe_multi_test.c | 98 +++++++++++++++---- 1 file changed, 80 insertions(+), 18 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c b/t= ools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c index 0a31ba2d6fb2..2ee17ef1dae2 100644 --- a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c @@ -789,7 +789,7 @@ get_link(struct uprobe_multi_consumers *skel, int link) } } =20 -static int uprobe_attach(struct uprobe_multi_consumers *skel, int idx) +static int uprobe_attach(struct uprobe_multi_consumers *skel, int idx, uns= igned long offset) { struct bpf_program *prog =3D get_program(skel, idx); struct bpf_link **link =3D get_link(skel, idx); @@ -798,6 +798,9 @@ static int uprobe_attach(struct uprobe_multi_consumers = *skel, int idx) if (!prog || !link) return -1; =20 + opts.offsets =3D &offset; + opts.cnt =3D 1; + /* * bit/prog: 0 uprobe entry * bit/prog: 1 uprobe return @@ -807,9 +810,7 @@ static int uprobe_attach(struct uprobe_multi_consumers = *skel, int idx) opts.retprobe =3D idx =3D=3D 1; opts.session =3D idx =3D=3D 2 || idx =3D=3D 3; =20 - *link =3D bpf_program__attach_uprobe_multi(prog, 0, "/proc/self/exe", - "uprobe_consumer_test", - &opts); + *link =3D bpf_program__attach_uprobe_multi(prog, 0, "/proc/self/exe", NUL= L, &opts); if (!ASSERT_OK_PTR(*link, "bpf_program__attach_uprobe_multi")) return -1; return 0; @@ -830,7 +831,8 @@ static bool test_bit(int bit, unsigned long val) =20 noinline int uprobe_consumer_test(struct uprobe_multi_consumers *skel, - unsigned long before, unsigned long after) + unsigned long before, unsigned long after, + unsigned long offset) { int idx; =20 @@ -843,15 +845,43 @@ uprobe_consumer_test(struct uprobe_multi_consumers *s= kel, /* ... and attach all new programs in 'after' state */ for (idx =3D 0; idx < 4; idx++) { if (!test_bit(idx, before) && test_bit(idx, after)) { - if (!ASSERT_OK(uprobe_attach(skel, idx), "uprobe_attach_after")) + if (!ASSERT_OK(uprobe_attach(skel, idx, offset), "uprobe_attach_after")) return -1; } } return 0; } =20 +/* + * We generate 16 consumer_testX functions that will have uprobe installed= on + * and will be called in separate threads. All function pointer are stored= in + * "consumers" section and each thread will pick one function based on ind= ex. + */ + +extern const void *__start_consumers; + +#define __CONSUMER_TEST(func) \ +noinline int func(struct uprobe_multi_consumers *skel, unsigned long befor= e, \ + unsigned long after, unsigned long offset) \ +{ \ + return uprobe_consumer_test(skel, before, after, offset); \ +} \ +void *__ ## func __used __attribute__((section("consumers"))) =3D (void *)= func; + +#define CONSUMER_TEST(func) __CONSUMER_TEST(func) + +#define C1 CONSUMER_TEST(__PASTE(consumer_test, __COUNTER__)) +#define C4 C1 C1 C1 C1 +#define C16 C4 C4 C4 C4 + +C16 + +typedef int (*test_t)(struct uprobe_multi_consumers *, unsigned long, + unsigned long, unsigned long); + static int consumer_test(struct uprobe_multi_consumers *skel, - unsigned long before, unsigned long after) + unsigned long before, unsigned long after, + test_t test, unsigned long offset) { int err, idx, ret =3D -1; =20 @@ -860,12 +890,12 @@ static int consumer_test(struct uprobe_multi_consumer= s *skel, /* 'before' is each, we attach uprobe for every set idx */ for (idx =3D 0; idx < 4; idx++) { if (test_bit(idx, before)) { - if (!ASSERT_OK(uprobe_attach(skel, idx), "uprobe_attach_before")) + if (!ASSERT_OK(uprobe_attach(skel, idx, offset), "uprobe_attach_before"= )) goto cleanup; } } =20 - err =3D uprobe_consumer_test(skel, before, after); + err =3D test(skel, before, after, offset); if (!ASSERT_EQ(err, 0, "uprobe_consumer_test")) goto cleanup; =20 @@ -934,14 +964,46 @@ static int consumer_test(struct uprobe_multi_consumer= s *skel, return ret; } =20 -static void test_consumers(void) +#define CONSUMER_MAX 16 + +/* + * Each thread runs 1/16 of the load by running test for single + * 'before' number (based on thread index) and full scale of + * 'after' numbers. + */ +static void *consumer_thread(void *arg) { + unsigned long idx =3D (unsigned long) arg; struct uprobe_multi_consumers *skel; - int before, after; + unsigned long offset; + const void *func; + int after; =20 skel =3D uprobe_multi_consumers__open_and_load(); if (!ASSERT_OK_PTR(skel, "uprobe_multi_consumers__open_and_load")) - return; + return NULL; + + func =3D *((&__start_consumers) + idx); + + offset =3D get_uprobe_offset(func); + if (!ASSERT_GE(offset, 0, "uprobe_offset")) + goto out; + + for (after =3D 0; after < CONSUMER_MAX; after++) + if (consumer_test(skel, idx, after, func, offset)) + goto out; + +out: + uprobe_multi_consumers__destroy(skel); + return NULL; +} + + +static void test_consumers(void) +{ + pthread_t pt[CONSUMER_MAX]; + unsigned long idx; + int err; =20 /* * The idea of this test is to try all possible combinations of @@ -982,14 +1044,14 @@ static void test_consumers(void) * before/after bits. */ =20 - for (before =3D 0; before < 16; before++) { - for (after =3D 0; after < 16; after++) - if (consumer_test(skel, before, after)) - goto out; + for (idx =3D 0; idx < CONSUMER_MAX; idx++) { + err =3D pthread_create(&pt[idx], NULL, consumer_thread, (void *) idx); + if (!ASSERT_OK(err, "pthread_create")) + break; } =20 -out: - uprobe_multi_consumers__destroy(skel); + while (idx) + pthread_join(pt[--idx], NULL); } =20 static struct bpf_program *uprobe_multi_program(struct uprobe_multi_pid_fi= lter *skel, int idx) --=20 2.47.0