From: Martin KaFai Lau <martin.lau@linux.dev>
To: thinker.li@gmail.com
Cc: sinquersw@gmail.com, kuifeng@meta.com, netdev@vger.kernel.org,
bpf@vger.kernel.org, ast@kernel.org, song@kernel.org,
kernel-team@meta.com, andrii@kernel.org, drosen@google.com
Subject: Re: [PATCH bpf-next v13 03/14] bpf, net: introduce bpf_struct_ops_desc.
Date: Thu, 14 Dec 2023 18:05:01 -0800 [thread overview]
Message-ID: <b80b0dc5-ebd3-4d6e-8ba8-9fe4d2dbf9d0@linux.dev> (raw)
In-Reply-To: <20231209002709.535966-4-thinker.li@gmail.com>
On 12/8/23 4:26 PM, thinker.li@gmail.com wrote:
> diff --git a/net/bpf/bpf_dummy_struct_ops.c b/net/bpf/bpf_dummy_struct_ops.c
> index 2748f9d77b18..bd753dbccaf6 100644
> --- a/net/bpf/bpf_dummy_struct_ops.c
> +++ b/net/bpf/bpf_dummy_struct_ops.c
> @@ -17,6 +17,8 @@ struct bpf_dummy_ops_test_args {
> struct bpf_dummy_ops_state state;
> };
>
> +static struct btf *bpf_dummy_ops_btf;
> +
> static struct bpf_dummy_ops_test_args *
> dummy_ops_init_args(const union bpf_attr *kattr, unsigned int nr)
> {
> @@ -85,9 +87,13 @@ int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr,
> void *image = NULL;
> unsigned int op_idx;
> int prog_ret;
> + u32 type_id;
s32 type_id;
> int err;
>
> - if (prog->aux->attach_btf_id != st_ops->type_id)
> + type_id = btf_find_by_name_kind(bpf_dummy_ops_btf,
> + bpf_bpf_dummy_ops.name,
> + BTF_KIND_STRUCT);
if (type_id < 0)
return -EINVAL;
> + if (prog->aux->attach_btf_id != type_id)
> return -EOPNOTSUPP;
>
> func_proto = prog->aux->attach_func_proto;
> @@ -142,6 +148,7 @@ int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr,
>
> static int bpf_dummy_init(struct btf *btf)
> {
> + bpf_dummy_ops_btf = btf;
> return 0;
> }
>
> diff --git a/net/ipv4/bpf_tcp_ca.c b/net/ipv4/bpf_tcp_ca.c
> index c7bbd8f3c708..5bb56c9ad4e5 100644
> --- a/net/ipv4/bpf_tcp_ca.c
> +++ b/net/ipv4/bpf_tcp_ca.c
> @@ -20,6 +20,7 @@ static u32 unsupported_ops[] = {
>
> static const struct btf_type *tcp_sock_type;
> static u32 tcp_sock_id, sock_id;
> +static const struct btf_type *tcp_congestion_ops_type;
>
> static int bpf_tcp_ca_init(struct btf *btf)
> {
> @@ -36,6 +37,11 @@ static int bpf_tcp_ca_init(struct btf *btf)
> tcp_sock_id = type_id;
> tcp_sock_type = btf_type_by_id(btf, tcp_sock_id);
>
> + type_id = btf_find_by_name_kind(btf, "tcp_congestion_ops", BTF_KIND_STRUCT);
> + if (type_id < 0)
> + return -EINVAL;
> + tcp_congestion_ops_type = btf_type_by_id(btf, type_id);
> +
> return 0;
> }
>
> @@ -149,7 +155,7 @@ static u32 prog_ops_moff(const struct bpf_prog *prog)
> u32 midx;
>
> midx = prog->expected_attach_type;
> - t = bpf_tcp_congestion_ops.type;
> + t = tcp_congestion_ops_type;
> m = &btf_type_member(t)[midx];
>
> return __btf_member_bit_offset(t, m) / 8;
next prev parent reply other threads:[~2023-12-15 2:05 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-09 0:26 [PATCH bpf-next v13 00/14] Registrating struct_ops types from modules thinker.li
2023-12-09 0:26 ` [PATCH bpf-next v13 01/14] bpf: refactory struct_ops type initialization to a function thinker.li
2023-12-09 0:26 ` [PATCH bpf-next v13 02/14] bpf: get type information with BPF_ID_LIST thinker.li
2023-12-15 1:59 ` Martin KaFai Lau
2023-12-09 0:26 ` [PATCH bpf-next v13 03/14] bpf, net: introduce bpf_struct_ops_desc thinker.li
2023-12-15 2:05 ` Martin KaFai Lau [this message]
2023-12-09 0:26 ` [PATCH bpf-next v13 04/14] bpf: add struct_ops_tab to btf thinker.li
2023-12-15 2:22 ` Martin KaFai Lau
2023-12-15 21:42 ` Kui-Feng Lee
2023-12-16 1:19 ` Martin KaFai Lau
2023-12-16 5:43 ` Kui-Feng Lee
2023-12-16 16:48 ` Martin KaFai Lau
2023-12-17 7:09 ` Kui-Feng Lee
2023-12-09 0:27 ` [PATCH bpf-next v13 05/14] bpf: make struct_ops_map support btfs other than btf_vmlinux thinker.li
2023-12-09 0:27 ` [PATCH bpf-next v13 06/14] bpf: lookup struct_ops types from a given module BTF thinker.li
2023-12-09 0:27 ` [PATCH bpf-next v13 07/14] bpf: pass attached BTF to the bpf_struct_ops subsystem thinker.li
2023-12-15 2:44 ` Martin KaFai Lau
2023-12-15 22:10 ` Kui-Feng Lee
2023-12-16 0:19 ` Martin KaFai Lau
2023-12-16 5:55 ` Kui-Feng Lee
2023-12-16 6:07 ` Kui-Feng Lee
2023-12-16 16:41 ` Martin KaFai Lau
2023-12-16 19:38 ` Kui-Feng Lee
2023-12-09 0:27 ` [PATCH bpf-next v13 08/14] bpf: hold module for bpf_struct_ops_map thinker.li
2023-12-15 5:54 ` Martin KaFai Lau
2023-12-15 23:25 ` Kui-Feng Lee
2023-12-09 0:27 ` [PATCH bpf-next v13 09/14] bpf: validate value_type thinker.li
2023-12-15 6:02 ` Martin KaFai Lau
2023-12-15 23:52 ` Kui-Feng Lee
2023-12-09 0:27 ` [PATCH bpf-next v13 10/14] bpf, net: switch to dynamic registration thinker.li
2023-12-15 6:51 ` Martin KaFai Lau
2023-12-09 0:27 ` [PATCH bpf-next v13 11/14] libbpf: Find correct module BTFs for struct_ops maps and progs thinker.li
2023-12-09 0:27 ` [PATCH bpf-next v13 12/14] bpf: export btf_ctx_access to modules thinker.li
2023-12-09 0:27 ` [PATCH bpf-next v13 13/14] selftests/bpf: test case for register_bpf_struct_ops() thinker.li
2023-12-15 7:17 ` Martin KaFai Lau
2023-12-17 7:32 ` Kui-Feng Lee
2023-12-09 0:27 ` [PATCH bpf-next v13 14/14] bpf: pass btf object id in bpf_map_info thinker.li
2023-12-15 7:46 ` Martin KaFai Lau
2023-12-17 7:35 ` Kui-Feng Lee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b80b0dc5-ebd3-4d6e-8ba8-9fe4d2dbf9d0@linux.dev \
--to=martin.lau@linux.dev \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=drosen@google.com \
--cc=kernel-team@meta.com \
--cc=kuifeng@meta.com \
--cc=netdev@vger.kernel.org \
--cc=sinquersw@gmail.com \
--cc=song@kernel.org \
--cc=thinker.li@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox