proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 01:52:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cgroup2: move bpf device cgroup program to struct cgroup_ops

Browse Source 
Cc: stable-4.0
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2020-12-27 12:18:13 +01:00
parent c1c9193cfc
commit 31b84c7a02
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/cgroups/cgfsng.c
View File

@ -1027,7 +1027,7 @@ __cgfsng_ops static void cgfsng_payload_destroy(struct cgroup_ops *ops,
} }
#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX #ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
ret = bpf_program_cgroup_detach(handler->conf->cgroup2_devices); ret = bpf_program_cgroup_detach(handler->cgroup_ops->cgroup2_devices);
if (ret < 0) if (ret < 0)
WARN("Failed to detach bpf program from cgroup"); WARN("Failed to detach bpf program from cgroup");
#endif #endif
@ -3028,8 +3028,8 @@ __cgfsng_ops static bool cgfsng_devices_activate(struct cgroup_ops *ops, struct
return log_error_errno(false, ENOMEM, "Failed to attach bpf program"); return log_error_errno(false, ENOMEM, "Failed to attach bpf program");
/* Replace old bpf program. */ /* Replace old bpf program. */
devices_old = move_ptr(conf->cgroup2_devices); devices_old = move_ptr(ops->cgroup2_devices);
conf->cgroup2_devices = move_ptr(devices); ops->cgroup2_devices = move_ptr(devices);
devices = move_ptr(devices_old); devices = move_ptr(devices_old);
#endif #endif
return true; return true;

15
src/lxc/cgroups/cgroup2_devices.c
View File

@ -439,17 +439,18 @@ int bpf_program_cgroup_detach(struct bpf_program *prog)
prog->attached_path); prog->attached_path);
} }
free(prog->attached_path); TRACE("Detached bpf program from cgroup %s", prog->attached_path);
prog->attached_path = NULL; free_disarm(prog->attached_path);
return 0; return 0;
} }
void lxc_clear_cgroup2_devices(struct lxc_conf *conf) void bpf_device_program_free(struct cgroup_ops *ops)
{ {
if (conf->cgroup2_devices) { if (ops->cgroup2_devices) {
(void)bpf_program_cgroup_detach(conf->cgroup2_devices); (void)bpf_program_cgroup_detach(ops->cgroup2_devices);
(void)bpf_program_free(conf->cgroup2_devices); (void)bpf_program_free(ops->cgroup2_devices);
ops->cgroup2_devices = NULL;
} }
} }

5
src/lxc/cgroups/cgroup2_devices.h
View File

@ -15,6 +15,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "cgroup.h"
#include "compiler.h" #include "compiler.h"
#include "conf.h" #include "conf.h"
#include "config.h" #include "config.h"
@ -61,7 +62,7 @@ __hidden extern int bpf_program_cgroup_attach(struct bpf_program *prog, int type
uint32_t flags); uint32_t flags);
__hidden extern int bpf_program_cgroup_detach(struct bpf_program *prog); __hidden extern int bpf_program_cgroup_detach(struct bpf_program *prog);
__hidden extern void bpf_program_free(struct bpf_program *prog); __hidden extern void bpf_program_free(struct bpf_program *prog);
__hidden extern void lxc_clear_cgroup2_devices(struct lxc_conf *conf); __hidden extern void bpf_device_program_free(struct cgroup_ops *ops);
__hidden extern bool bpf_devices_cgroup_supported(void); __hidden extern bool bpf_devices_cgroup_supported(void);
static inline void __auto_bpf_program_free__(struct bpf_program **prog) static inline void __auto_bpf_program_free__(struct bpf_program **prog)
@ -119,7 +120,7 @@ static inline void bpf_program_free(struct bpf_program *prog)
{ {
} }
static inline void lxc_clear_cgroup2_devices(struct lxc_conf *conf) static inline void bpf_device_program_free(struct cgroup_ops *ops)
{ {
} }

7
src/lxc/commands.c
View File

@ -1198,7 +1198,8 @@ static int lxc_cmd_add_bpf_device_cgroup_callback(int fd, struct lxc_cmd_req *re
__do_bpf_program_free struct bpf_program *devices = NULL; __do_bpf_program_free struct bpf_program *devices = NULL;
struct lxc_cmd_rsp rsp = {0}; struct lxc_cmd_rsp rsp = {0};
struct lxc_conf *conf = handler->conf; struct lxc_conf *conf = handler->conf;
struct hierarchy *unified = handler->cgroup_ops->unified; struct cgroup_ops *cgroup_ops = handler->cgroup_ops;
struct hierarchy *unified = cgroup_ops->unified;
int ret; int ret;
struct lxc_list *it; struct lxc_list *it;
struct device_item *device; struct device_item *device;
@ -1249,8 +1250,8 @@ static int lxc_cmd_add_bpf_device_cgroup_callback(int fd, struct lxc_cmd_req *re
goto respond; goto respond;
/* Replace old bpf program. */ /* Replace old bpf program. */
devices_old = move_ptr(conf->cgroup2_devices); devices_old = move_ptr(cgroup_ops->cgroup2_devices);
conf->cgroup2_devices = move_ptr(devices); cgroup_ops->cgroup2_devices = move_ptr(devices);
devices = move_ptr(devices_old); devices = move_ptr(devices_old);
rsp.ret = 0; rsp.ret = 0;

2
src/lxc/conf.c
View File

@ -36,7 +36,6 @@
#include "af_unix.h" #include "af_unix.h"
#include "caps.h" #include "caps.h"
#include "cgroup.h" #include "cgroup.h"
#include "cgroup2_devices.h"
#include "conf.h" #include "conf.h"
#include "config.h" #include "config.h"
#include "confile.h" #include "confile.h"
@ -3842,7 +3841,6 @@ void lxc_conf_free(struct lxc_conf *conf)
lxc_clear_cgroups(conf, "lxc.cgroup", CGROUP_SUPER_MAGIC); lxc_clear_cgroups(conf, "lxc.cgroup", CGROUP_SUPER_MAGIC);
lxc_clear_cgroups(conf, "lxc.cgroup2", CGROUP2_SUPER_MAGIC); lxc_clear_cgroups(conf, "lxc.cgroup2", CGROUP2_SUPER_MAGIC);
lxc_clear_devices(conf); lxc_clear_devices(conf);
lxc_clear_cgroup2_devices(conf);
lxc_clear_hooks(conf, "lxc.hook"); lxc_clear_hooks(conf, "lxc.hook");
lxc_clear_mount_entries(conf); lxc_clear_mount_entries(conf);
lxc_clear_idmaps(conf); lxc_clear_idmaps(conf);

1
src/lxc/conf.h
View File

@ -299,7 +299,6 @@ struct lxc_conf {
struct { struct {
struct lxc_list cgroup; struct lxc_list cgroup;
struct lxc_list cgroup2; struct lxc_list cgroup2;
struct bpf_program *cgroup2_devices;
/* This should be reimplemented as a hashmap. */ /* This should be reimplemented as a hashmap. */
struct lxc_list devices; struct lxc_list devices;
}; };