From: Kui-Feng Lee <sinquersw@gmail.com>
To: Martin KaFai Lau <martin.lau@linux.dev>, thinker.li@gmail.com
Cc: kuifeng@meta.com, 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 v8 04/10] bpf: hold module for bpf_struct_ops_map.
Date: Tue, 31 Oct 2023 10:46:02 -0700 [thread overview]
Message-ID: <d9e57272-f462-4c11-9b1a-b4257107e3ae@gmail.com> (raw)
In-Reply-To: <ac35bad1-f978-6278-9619-c5e9ed3b76e5@linux.dev>
On 10/30/23 18:21, Martin KaFai Lau wrote:
> On 10/30/23 12:28 PM, thinker.li@gmail.com wrote:
>> @@ -681,9 +697,17 @@ static struct bpf_map
>> *bpf_struct_ops_map_alloc(union bpf_attr *attr)
>> if (!st_ops_desc)
>> return ERR_PTR(-ENOTSUPP);
>> + if (st_ops_desc->btf != btf_vmlinux) {
>> + mod = btf_try_get_module(st_ops_desc->btf);
>> + if (!mod)
>> + return ERR_PTR(-EINVAL);
>> + }
>> +
>> vt = st_ops_desc->value_type;
>> - if (attr->value_size != vt->size)
>> - return ERR_PTR(-EINVAL);
>> + if (attr->value_size != vt->size) {
>> + ret = -EINVAL;
>> + goto errout;
>> + }
>> t = st_ops_desc->type;
>> @@ -694,17 +718,17 @@ static struct bpf_map
>> *bpf_struct_ops_map_alloc(union bpf_attr *attr)
>> (vt->size - sizeof(struct bpf_struct_ops_value));
>> st_map = bpf_map_area_alloc(st_map_size, NUMA_NO_NODE);
>> - if (!st_map)
>> - return ERR_PTR(-ENOMEM);
>> + if (!st_map) {
>> + ret = -ENOMEM;
>> + goto errout;
>> + }
>> st_map->st_ops_desc = st_ops_desc;
>> map = &st_map->map;
>> ret = bpf_jit_charge_modmem(PAGE_SIZE);
>> - if (ret) {
>> - __bpf_struct_ops_map_free(map);
>> - return ERR_PTR(ret);
>> - }
>> + if (ret)
>> + goto errout_free;
>> st_map->image = bpf_jit_alloc_exec(PAGE_SIZE);
>> if (!st_map->image) {
>> @@ -713,23 +737,32 @@ static struct bpf_map
>> *bpf_struct_ops_map_alloc(union bpf_attr *attr)
>> * here.
>> */
>> bpf_jit_uncharge_modmem(PAGE_SIZE);
>> - __bpf_struct_ops_map_free(map);
>> - return ERR_PTR(-ENOMEM);
>> + ret = -ENOMEM;
>> + goto errout_free;
>> }
>> st_map->uvalue = bpf_map_area_alloc(vt->size, NUMA_NO_NODE);
>> st_map->links =
>> bpf_map_area_alloc(btf_type_vlen(t) * sizeof(struct
>> bpf_links *),
>> NUMA_NO_NODE);
>> if (!st_map->uvalue || !st_map->links) {
>> - __bpf_struct_ops_map_free(map);
>> - return ERR_PTR(-ENOMEM);
>> + ret = -ENOMEM;
>> + goto errout_free;
>> }
>> mutex_init(&st_map->lock);
>> set_vm_flush_reset_perms(st_map->image);
>> bpf_map_init_from_attr(map, attr);
>> + module_put(mod);
>> +
>> return map;
>> +
>> +errout_free:
>> + __bpf_struct_ops_map_free(map);
>> + btf = NULL; /* has been released */
>
> btf is not defined. I don't think this patch compiles.
> Something from a latter patch?
Yes, it is defined in the next patch. I will fix it.
>
>> +errout:
>> + module_put(mod);
>> + return ERR_PTR(ret);
>> }
>
next prev parent reply other threads:[~2023-10-31 17:46 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-30 19:28 [PATCH bpf-next v8 00/10] Registrating struct_ops types from modules thinker.li
2023-10-30 19:28 ` [PATCH bpf-next v8 01/10] bpf: refactory struct_ops type initialization to a function thinker.li
2023-10-30 19:28 ` [PATCH bpf-next v8 02/10] bpf, net: introduce bpf_struct_ops_desc thinker.li
2023-10-31 6:40 ` Martin KaFai Lau
2023-10-31 16:00 ` Kui-Feng Lee
2023-10-30 19:28 ` [PATCH bpf-next v8 03/10] bpf: add struct_ops_tab to btf thinker.li
2023-10-31 1:09 ` Martin KaFai Lau
2023-10-31 16:57 ` Kui-Feng Lee
2023-10-30 19:28 ` [PATCH bpf-next v8 04/10] bpf: hold module for bpf_struct_ops_map thinker.li
2023-10-31 1:21 ` Martin KaFai Lau
2023-10-31 17:46 ` Kui-Feng Lee [this message]
2023-10-30 19:28 ` [PATCH bpf-next v8 05/10] bpf: validate value_type thinker.li
2023-10-30 19:28 ` [PATCH bpf-next v8 06/10] bpf: pass attached BTF to the bpf_struct_ops subsystem thinker.li
2023-10-31 1:53 ` Martin KaFai Lau
2023-10-31 20:31 ` Kui-Feng Lee
2023-10-30 19:28 ` [PATCH bpf-next v8 07/10] bpf, net: switch to dynamic registration thinker.li
2023-10-31 6:36 ` Martin KaFai Lau
2023-10-31 23:34 ` Kui-Feng Lee
2023-11-01 0:02 ` Martin KaFai Lau
2023-11-01 0:19 ` Kui-Feng Lee
2023-11-01 0:19 ` Kui-Feng Lee
2023-11-02 0:17 ` Martin KaFai Lau
2023-11-02 0:59 ` Kui-Feng Lee
2023-11-02 1:32 ` Martin KaFai Lau
2023-11-02 4:19 ` Kui-Feng Lee
2023-10-30 19:28 ` [PATCH bpf-next v8 08/10] libbpf: Find correct module BTFs for struct_ops maps and progs thinker.li
2023-10-30 19:28 ` [PATCH bpf-next v8 09/10] bpf: export btf_ctx_access to modules thinker.li
2023-10-30 19:28 ` [PATCH bpf-next v8 10/10] selftests/bpf: test case for register_bpf_struct_ops() thinker.li
2023-10-31 6:59 ` Martin KaFai Lau
2023-11-01 0:30 ` Kui-Feng Lee
2023-11-02 1:43 ` Martin KaFai Lau
2023-11-02 18:26 ` Kui-Feng Lee
2023-10-31 20:45 ` [PATCH bpf-next v8 00/10] Registrating struct_ops types from modules Martin KaFai Lau
2023-11-01 0:48 ` 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=d9e57272-f462-4c11-9b1a-b4257107e3ae@gmail.com \
--to=sinquersw@gmail.com \
--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=martin.lau@linux.dev \
--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