shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-02 09:47:03 +03:00
Code

bpf-foreign: if one program fails, still load the next

Browse Source 
Let's make sure that if we load one program we don't prematurely fail,
and continue with the others still.

(cherry picked from commit f81450f2415f8fd77fc8edb3b4baab966aefa9fd)
(cherry picked from commit 9e1e09066a1ada29f63d95d41a01044cd6ac1633)
(cherry picked from commit f84603fc2134990061026f2d08a50783ab7eaf7a)
This commit is contained in:
Lennart Poettering 2023-06-26 13:04:59 +02:00 committed by Luca Boccassi
parent c9b95b6317
commit 411e40bb72
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/bpf-foreign.c
View File

@ -56,17 +56,20 @@ DEFINE_PRIVATE_HASH_OPS_FULL(bpf_foreign_by_key_hash_ops,
static int attach_programs(Unit *u, const char *path, Hashmap* foreign_by_key, uint32_t attach_flags) {
const BPFForeignKey *key;
BPFProgram *prog;
int r;
int r, ret = 0;
assert(u);
HASHMAP_FOREACH_KEY(prog, key, foreign_by_key) {
r = bpf_program_cgroup_attach(prog, key->attach_type, path, attach_flags);
if (r < 0)
return log_unit_error_errno(u, r, "bpf-foreign: Attaching foreign BPF program to cgroup %s failed: %m", path);
if (r < 0) {
log_unit_error_errno(u, r, "bpf-foreign: Attaching foreign BPF program to cgroup %s failed: %m", path);
if (ret >= 0)
ret = r;
}
}
return 0;
return ret;
}
/*
@ -124,7 +127,7 @@ static int bpf_foreign_prepare(
int bpf_foreign_install(Unit *u) {
_cleanup_free_ char *cgroup_path = NULL;
CGroupContext *cc;
int r;
int r, ret = 0;
assert(u);
@ -138,13 +141,10 @@ int bpf_foreign_install(Unit *u) {
LIST_FOREACH(programs, p, cc->bpf_foreign_programs) {
r = bpf_foreign_prepare(u, p->attach_type, p->bpffs_path);
if (r < 0)
return r;
if (r < 0 && ret >= 0)
ret = r;
}
r = attach_programs(u, cgroup_path, u->bpf_foreign_by_key, BPF_F_ALLOW_MULTI);
if (r < 0)
return r;
return 0;
return ret < 0 ? ret : r;
}