From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 98C8B38F for ; Fri, 21 Jul 2023 02:19:06 +0000 (UTC) Received: from mail-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CD361BEF for ; Thu, 20 Jul 2023 19:19:04 -0700 (PDT) Received: by mail-qv1-xf33.google.com with SMTP id 6a1803df08f44-635ddf49421so9163096d6.2 for ; Thu, 20 Jul 2023 19:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689905943; x=1690510743; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=YF3VxUqqaAnI3ZUSCmg8EjPrvIaXaF1p5Xuzhpd1rK4=; b=aQa9Adyyqfi238sr44VokX44ZDIdeGgPdpaU8D7SHV7rVJSOhrA1gWCGVJ27/QgxvK vLLb2NdQ1iE/WWSuQ/gS16PKSGyrZcWfejc2PuFmwDBxCINYK1ciF6kdEblUxbFCGQtq HxAzxKcpVzy//rCs5m1RJCl2ZhoZRjHVCVwQImomrdRUv0kE/NLx52xwJ54PR/rTZMv8 mtpB0CxBQcn0I/lEidAZ9YQEg04FVc3apPqiCkrQhT9m3nuc1EcqWpXe2WnK8xXi9RN1 21UjxUsXnCCAZC5VCmvKiKcLp5gStg2CYFeoG/hvU2tL1vtN+OEYQGHH62dFa9KQIAhM +2NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689905943; x=1690510743; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YF3VxUqqaAnI3ZUSCmg8EjPrvIaXaF1p5Xuzhpd1rK4=; b=ORLwIxVGU9b0gEokY6GIsXOWy8slA7Uduyrr/oCZjI4ctII16EiHLAZonG0jX2R8gt B4UCykvgCPiLpFhoXP1WxXKy7dZHAjfi8o1OuNry0m/wdMbD4wvVts49BQOJQGJdxfm0 yHQStZxwUxF4erf6LJ8aICC3MAQdnEgMnF3WBMSSJW+dy5cQ72AFRbGIBeqtKRM++GYW LkSz+5FYuetfka4Rz0RTQQholO6CmLfDiMVmWHmsNVp4dSe8L3Dw0MWvkFx7pkBkQFQD q8wJvISxk8sQGq8TFJ+j8spuVKMAfCMUeCsNP5QLnKaowALrY9fBzTTH5fcgQAFA2asD F0yg== X-Gm-Message-State: ABy/qLbDtkRV3yKydWjOf7Jy4Tg/53ZHEoWUgspImYuvICxTMO/M0Sbp Qfg/cFCH9/ahCCcz6it2/Oxd+ZN3VheY+F+FpCY= X-Google-Smtp-Source: APBJJlECW/reVHGl0kpp8/Gg5bzt1HwxbTQsiMQ7EgOymLnBru2+m0iz+hnhY6Io913pwuq3w24JcvAau87xhJ5+CZY= X-Received: by 2002:a0c:fa0d:0:b0:637:ae7a:798b with SMTP id q13-20020a0cfa0d000000b00637ae7a798bmr694853qvn.57.1689905943434; Thu, 20 Jul 2023 19:19:03 -0700 (PDT) Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20230720113550.369257-1-jolsa@kernel.org> <20230720113550.369257-5-jolsa@kernel.org> In-Reply-To: <20230720113550.369257-5-jolsa@kernel.org> From: Yafang Shao Date: Fri, 21 Jul 2023 10:18:27 +0800 Message-ID: Subject: Re: [PATCHv4 bpf-next 04/28] bpf: Add cookies support for uprobe_multi link To: Jiri Olsa Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net On Thu, Jul 20, 2023 at 7:36=E2=80=AFPM Jiri Olsa wrote: > > Adding support to specify cookies array for uprobe_multi link. > > The cookies array share indexes and length with other uprobe_multi > arrays (offsets/ref_ctr_offsets). > > The cookies[i] value defines cookie for i-the uprobe and will be > returned by bpf_get_attach_cookie helper when called from ebpf > program hooked to that specific uprobe. > > Acked-by: Andrii Nakryiko > Signed-off-by: Jiri Olsa > --- > include/uapi/linux/bpf.h | 1 + > kernel/bpf/syscall.c | 2 +- > kernel/trace/bpf_trace.c | 45 +++++++++++++++++++++++++++++++--- > tools/include/uapi/linux/bpf.h | 1 + > 4 files changed, 44 insertions(+), 5 deletions(-) > > diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h > index e764af513425..c6fbb0f948f4 100644 > --- a/include/uapi/linux/bpf.h > +++ b/include/uapi/linux/bpf.h > @@ -1604,6 +1604,7 @@ union bpf_attr { > __aligned_u64 path; > __aligned_u64 offsets; > __aligned_u64 ref_ctr_offsets; > + __aligned_u64 cookies; > __u32 cnt; > __u32 flags; > } uprobe_multi; > diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c > index f4c6a265731e..840b622b7db1 100644 > --- a/kernel/bpf/syscall.c > +++ b/kernel/bpf/syscall.c > @@ -4832,7 +4832,7 @@ static int bpf_map_do_batch(const union bpf_attr *a= ttr, > return err; > } > > -#define BPF_LINK_CREATE_LAST_FIELD link_create.kprobe_multi.cookies > +#define BPF_LINK_CREATE_LAST_FIELD link_create.uprobe_multi.cookies Shouldn't it be : #define BPF_LINK_CREATE_LAST_FIELD link_create.uprobe_multi.flags ? other than that, this patch looks good. > static int link_create(union bpf_attr *attr, bpfptr_t uattr) > { > struct bpf_prog *prog; > diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c > index 10284fd46f98..d73a47bd2bbd 100644 > --- a/kernel/trace/bpf_trace.c > +++ b/kernel/trace/bpf_trace.c > @@ -87,6 +87,8 @@ static int bpf_btf_printf_prepare(struct btf_ptr *ptr, = u32 btf_ptr_size, > static u64 bpf_kprobe_multi_cookie(struct bpf_run_ctx *ctx); > static u64 bpf_kprobe_multi_entry_ip(struct bpf_run_ctx *ctx); > > +static u64 bpf_uprobe_multi_cookie(struct bpf_run_ctx *ctx); > + > /** > * trace_call_bpf - invoke BPF program > * @call: tracepoint event > @@ -1099,6 +1101,18 @@ static const struct bpf_func_proto bpf_get_attach_= cookie_proto_kmulti =3D { > .arg1_type =3D ARG_PTR_TO_CTX, > }; > > +BPF_CALL_1(bpf_get_attach_cookie_uprobe_multi, struct pt_regs *, regs) > +{ > + return bpf_uprobe_multi_cookie(current->bpf_ctx); > +} > + > +static const struct bpf_func_proto bpf_get_attach_cookie_proto_umulti = =3D { > + .func =3D bpf_get_attach_cookie_uprobe_multi, > + .gpl_only =3D false, > + .ret_type =3D RET_INTEGER, > + .arg1_type =3D ARG_PTR_TO_CTX, > +}; > + > BPF_CALL_1(bpf_get_attach_cookie_trace, void *, ctx) > { > struct bpf_trace_run_ctx *run_ctx; > @@ -1545,9 +1559,11 @@ kprobe_prog_func_proto(enum bpf_func_id func_id, c= onst struct bpf_prog *prog) > &bpf_get_func_ip_proto_kprobe_multi : > &bpf_get_func_ip_proto_kprobe; > case BPF_FUNC_get_attach_cookie: > - return prog->expected_attach_type =3D=3D BPF_TRACE_KPROBE= _MULTI ? > - &bpf_get_attach_cookie_proto_kmulti : > - &bpf_get_attach_cookie_proto_trace; > + if (prog->expected_attach_type =3D=3D BPF_TRACE_KPROBE_MU= LTI) > + return &bpf_get_attach_cookie_proto_kmulti; > + if (prog->expected_attach_type =3D=3D BPF_TRACE_UPROBE_MU= LTI) > + return &bpf_get_attach_cookie_proto_umulti; > + return &bpf_get_attach_cookie_proto_trace; > default: > return bpf_tracing_func_proto(func_id, prog); > } > @@ -2973,6 +2989,7 @@ struct bpf_uprobe_multi_link; > struct bpf_uprobe { > struct bpf_uprobe_multi_link *link; > loff_t offset; > + u64 cookie; > struct uprobe_consumer consumer; > }; > > @@ -2986,6 +3003,7 @@ struct bpf_uprobe_multi_link { > struct bpf_uprobe_multi_run_ctx { > struct bpf_run_ctx run_ctx; > unsigned long entry_ip; > + struct bpf_uprobe *uprobe; > }; > > static void bpf_uprobe_unregister(struct path *path, struct bpf_uprobe *= uprobes, > @@ -3029,6 +3047,7 @@ static int uprobe_prog_run(struct bpf_uprobe *uprob= e, > struct bpf_uprobe_multi_link *link =3D uprobe->link; > struct bpf_uprobe_multi_run_ctx run_ctx =3D { > .entry_ip =3D entry_ip, > + .uprobe =3D uprobe, > }; > struct bpf_prog *prog =3D link->link.prog; > bool sleepable =3D prog->aux->sleepable; > @@ -3075,6 +3094,14 @@ uprobe_multi_link_ret_handler(struct uprobe_consum= er *con, unsigned long func, s > return uprobe_prog_run(uprobe, func, regs); > } > > +static u64 bpf_uprobe_multi_cookie(struct bpf_run_ctx *ctx) > +{ > + struct bpf_uprobe_multi_run_ctx *run_ctx; > + > + run_ctx =3D container_of(current->bpf_ctx, struct bpf_uprobe_mult= i_run_ctx, run_ctx); > + return run_ctx->uprobe->cookie; > +} > + > int bpf_uprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_= prog *prog) > { > struct bpf_uprobe_multi_link *link =3D NULL; > @@ -3083,6 +3110,7 @@ int bpf_uprobe_multi_link_attach(const union bpf_at= tr *attr, struct bpf_prog *pr > struct bpf_link_primer link_primer; > struct bpf_uprobe *uprobes =3D NULL; > unsigned long __user *uoffsets; > + u64 __user *ucookies; > void __user *upath; > u32 flags, cnt, i; > struct path path; > @@ -3102,7 +3130,7 @@ int bpf_uprobe_multi_link_attach(const union bpf_at= tr *attr, struct bpf_prog *pr > > /* > * path, offsets and cnt are mandatory, > - * ref_ctr_offsets is optional > + * ref_ctr_offsets and cookies are optional > */ > upath =3D u64_to_user_ptr(attr->link_create.uprobe_multi.path); > uoffsets =3D u64_to_user_ptr(attr->link_create.uprobe_multi.offse= ts); > @@ -3112,6 +3140,7 @@ int bpf_uprobe_multi_link_attach(const union bpf_at= tr *attr, struct bpf_prog *pr > return -EINVAL; > > uref_ctr_offsets =3D u64_to_user_ptr(attr->link_create.uprobe_mul= ti.ref_ctr_offsets); > + ucookies =3D u64_to_user_ptr(attr->link_create.uprobe_multi.cooki= es); > > name =3D strndup_user(upath, PATH_MAX); > if (IS_ERR(name)) { > @@ -3144,6 +3173,10 @@ int bpf_uprobe_multi_link_attach(const union bpf_a= ttr *attr, struct bpf_prog *pr > } > > for (i =3D 0; i < cnt; i++) { > + if (ucookies && __get_user(uprobes[i].cookie, ucookies + = i)) { > + err =3D -EFAULT; > + goto error_free; > + } > if (uref_ctr_offsets && __get_user(ref_ctr_offsets[i], ur= ef_ctr_offsets + i)) { > err =3D -EFAULT; > goto error_free; > @@ -3201,4 +3234,8 @@ int bpf_uprobe_multi_link_attach(const union bpf_at= tr *attr, struct bpf_prog *pr > { > return -EOPNOTSUPP; > } > +static u64 bpf_uprobe_multi_cookie(struct bpf_run_ctx *ctx) > +{ > + return 0; > +} > #endif /* CONFIG_UPROBES */ > diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bp= f.h > index 659afbf9bb8b..492072ef5029 100644 > --- a/tools/include/uapi/linux/bpf.h > +++ b/tools/include/uapi/linux/bpf.h > @@ -1604,6 +1604,7 @@ union bpf_attr { > __aligned_u64 path; > __aligned_u64 offsets; > __aligned_u64 ref_ctr_offsets; > + __aligned_u64 cookies; > __u32 cnt; > __u32 flags; > } uprobe_multi; > -- > 2.41.0 > > --=20 Regards Yafang