mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
bpf: libbpf: retry map creation without the name
[ Upstream commit23499442c3
] Since commit88cda1c9da
("bpf: libbpf: Provide basic API support to specify BPF obj name"), libbpf unconditionally sets bpf_attr->name for maps. Pre v4.14 kernels don't know about map names and return an error about unexpected non-zero data. Retry sys_bpf without a map name to cover older kernels. v2 changes: * check for errno == EINVAL as suggested by Daniel Borkmann Signed-off-by: Stanislav Fomichev <sdf@google.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
0857b8439b
commit
f6d66139f8
1 changed files with 10 additions and 1 deletions
|
@ -77,6 +77,7 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr)
|
|||
{
|
||||
__u32 name_len = create_attr->name ? strlen(create_attr->name) : 0;
|
||||
union bpf_attr attr;
|
||||
int ret;
|
||||
|
||||
memset(&attr, '\0', sizeof(attr));
|
||||
|
||||
|
@ -94,7 +95,15 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr)
|
|||
attr.map_ifindex = create_attr->map_ifindex;
|
||||
attr.inner_map_fd = create_attr->inner_map_fd;
|
||||
|
||||
return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));
|
||||
ret = sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));
|
||||
if (ret < 0 && errno == EINVAL && create_attr->name) {
|
||||
/* Retry the same syscall, but without the name.
|
||||
* Pre v4.14 kernels don't support map names.
|
||||
*/
|
||||
memset(attr.map_name, 0, sizeof(attr.map_name));
|
||||
return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
int bpf_create_map_node(enum bpf_map_type map_type, const char *name,
|
||||
|
|
Loading…
Reference in a new issue