Commits · 56cf2a570597dc1a5247c19a3d174100c27c03ca · Chen Yisong / lxc

12 Dec, 2019 2 commits

Merge pull request #3229 from brauner/2019-12-12/cgroup_legacy_layout_regression · 56cf2a57
Stéphane Graber authored Dec 12, 2019
```
cgroups/cgfsng: do not prematurely close file descriptors
```
56cf2a57

cgroups/cgfsng: do not prematurely close file descriptors · 78eb6aa6

authored Dec 12, 2019

When adding the new improved cgroup setup logic I didn't account for the fact
that we need the hierarchy fds up until chown. Add a dedicated cleanup method
to fix this:

lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, , 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, tasks, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, cgroup.procs, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, , 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, tasks, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, cgroup.procs, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, , 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, tasks, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, cgroup.procs, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, , 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, tasks, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, cgroup.procs, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, , 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, tasks, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, cgroup.procs, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, , 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, tasks, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, cgroup.procs, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, , 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, tasks, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, cgroup.procs, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, , 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, tasks, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, cgroup.procs, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, , 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, tasks, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, cgroup.procs, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, , 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, tasks, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, cgroup.procs, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, , 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, tasks, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, cgroup.procs, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, , 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, tasks, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )
lxc b1 20191212205052.712 WARN cgfsng - cgroups/cgfsng.c:fchowmodat:1481 - Bad file descriptor - Failed to fchownat(-9, cgroup.procs, 1000000000, 0, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW )

Closes #3228.
Fixes: 1973b62a ("cgroups/cgfsng: improve cgroup creation and removal")
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

78eb6aa6

11 Dec, 2019 3 commits
- Merge pull request #3226 from brauner/cgroup_removal · 28a41fc2
  Stéphane Graber authored Dec 11, 2019
```
cgroupfs: improve cgroup removal
```
  28a41fc2
- cgroups/cgfsng: improve cgroup creation and removal · 1973b62a
  Christian Brauner authored Dec 11, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  1973b62a
- Merge pull request #3225 from brauner/cgroup_improvements · d0986340
  Stéphane Graber authored Dec 10, 2019
```
cgroups/cgfsng: rework legacy cpuset handling
```
  d0986340
10 Dec, 2019 6 commits
- cgroups/cgfsng: rework cgroup removal · 8e64b673
  Christian Brauner authored Dec 10, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  8e64b673
- cgroups/cgfsng: rework legacy cpuset handling · c5b8049e
  Christian Brauner authored Dec 10, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  c5b8049e
- cgroupfs/cgfsng: pass cgroup to cg_legacy_handle_cpuset_hierarchy() as const char * · f990d3bf
  Christian Brauner authored Dec 10, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  f990d3bf
- Merge pull request #3223 from brauner/flatten_cgroup_hierarchy · dc3cdf28
  Stéphane Graber authored Dec 10, 2019
```
cgroups: flatten hierarchy
```
  dc3cdf28
- cgroups: use explicit unsigned type for bitfield · aaa1ec28
  Christian Brauner authored Dec 10, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  aaa1ec28
- cgroups: flatten hierarchy · fe70edee
  Christian Brauner authored Dec 09, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  fe70edee
09 Dec, 2019 2 commits
- Merge pull request #3222 from brauner/security · e340fefe
  Stéphane Graber authored Dec 09, 2019
```
file_utils: use O_NOCTTY | O_NOFOLLOW
```
  e340fefe
- file_utils: use O_NOCTTY | O_NOFOLLOW · ef6d231f
  Christian Brauner authored Dec 09, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  ef6d231f
08 Dec, 2019 4 commits
- Merge pull request #3218 from brauner/bpf_devices_devpath · 29623594
  Stéphane Graber authored Dec 07, 2019
```
cgroups/devices: enable devpath semantics for cgroup2 device controller
```
  29623594
- cgroups/devices: enable devpath semantics for cgroup2 device controller · cb3fc90c
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  cb3fc90c
- Merge pull request #3217 from brauner/rework_cgroups · 7453799a
  Stéphane Graber authored Dec 07, 2019
```
cgroups, logging: fixes and improvements
```
  7453799a
- cgroups/cgfsng: replace lxc_write_file() · c04a6d4e
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  c04a6d4e
07 Dec, 2019 23 commits
- cgroups/cgfsng: cgfsng_devices_activate() · e552bd1a
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  e552bd1a
- cgroups/cgfsng: rework cgfsng_nrtasks() · 1aae36a9
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  1aae36a9
- cgroups/cgfsng: rework cgfsng_mount() · 9585ccb3
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  9585ccb3
- cgroups/cgfsng: rework cgfsng_chown() · c98bbf71
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  c98bbf71
- cgroups/cgfsng: rework cgfsng_attach() · ab9a452d
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  ab9a452d
- cgroups/cgfsng: rework cgfsng_setup_limits() · 7e31931f
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  7e31931f
- cgroups/cgfsng: rework cgfsng_setup_limits_legacy() · 92ca7eb5
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  92ca7eb5
- cgroups/cgfsng: rework cgfsng_{get,set}() · a358028a
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  a358028a
- cgroups/cgfsng: rework cgfsng_unfreeze() · 6bdf9691
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  6bdf9691
- cgroups/cgfsng: rework cgfsng_get_hierarchies() · aa48a34f
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  aa48a34f
- cgroups/cgfsng: rework cgfsng_num_hierarchies() · e3ffb28b
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  e3ffb28b
- cgroups/cgfsng: rework cgfsng_escape() · 52d08ab0
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  52d08ab0
- cgroups/cgfsng: rework cgfsng_payload_enter() · 4490328e
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  4490328e
- cgroups/cgfsng: rework cgfsng_payload_create() · f3839f12
  Christian Brauner authored Dec 08, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  f3839f12
- tree-wide: s/__unused/__lxc_unused/g · 53675a8d
  Christian Brauner authored Dec 07, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  53675a8d
- cgroups/cgfsng: rework cgroup attach · ad275c16
  Christian Brauner authored Dec 07, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  ad275c16
- cgroups/cgfsng: don't dereference NULL-pointer · 6e8703a4
  Christian Brauner authored Dec 07, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  6e8703a4
- cgroups/cgfsng: log chown_cgroup_wrapper() · 803e4123
  Christian Brauner authored Dec 07, 2019
```
It's becoming more important on cgroup2 to properly delegate cgroups.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  803e4123
- cgroups/cgfsng: rework cgroup2 unprivileged delegation · d606c4e9
  Christian Brauner authored Dec 07, 2019
```
We accidently checked files to delegate for privileged container and not for
unprivileged containers in the pure unified case. Fix that and clean up the
delegation file parsing.

Closes #3206.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  d606c4e9
- cgroups/cgfsng: rework cgfsng_{monitor,payload}_delegate_controllers() · 61fbc369
  Christian Brauner authored Dec 07, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  61fbc369
- cgroups/cgfsng: rework cgfsng_monitor_enter() · 797fa65e
  Christian Brauner authored Dec 07, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  797fa65e
- cgroups/cgfsng: rework cgfsng_monitor_create() · 0d66e29a
  Christian Brauner authored Dec 07, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  0d66e29a
- cgroups/cgfsng: rework cgfsng_monitor_destroy() · b376d3d0
  Christian Brauner authored Dec 07, 2019
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  b376d3d0