Merge upstream branch 'main'#59
Open
github-actions[bot] wants to merge 16 commits into
Open
Conversation
storage_copy builds a struct lxc_storage on the stack, and returns a pointer to that on success to its caller. That's could be a huge issue, except that its only caller quickly makes a copy of the -> src and then releases it. Still, to avoid a future user actually overwriting the struct and then continuing to use it, let's fix this now. There's no point returning the whole lxc_storage struct anyway. Just return a copy of the bdev->src. Signed-off-by: Serge Hallyn <serge@hallyn.com>
Fix return from fn stack
Emulate the cgroup1 behavior by calculating memory.kmem.usage_in_bytes and memory.usage_in_bytes using information provided in memory.stat and use cpu.stat/usage_usec instead of cpuacct.usage. Signed-off-by: Petr Malat <oss@malat.biz> [ alex: rebase & whitespace fix ] Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@futurfusion.io>
Create separate structs for each controller class. This will make it easier to add cgroupv2 support. No functional changes. Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Recalculate the usec to nanoseconds and USER_HZ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
The USER_HZ depends on the kernel configuration. Get it run-time instead of assume it is 100 HZ. Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Signed-off-by: Devon Schwartz <devon.s.schwartz@gmail.com>
…ant for lxc-top -b Signed-off-by: Devon Schwartz <devon.s.schwartz@gmail.com>
Signed-off-by: Devon Schwartz <devon.s.schwartz@gmail.com>
Signed-off-by: Devon Schwartz <devon.s.schwartz@gmail.com>
tools: lxc-info: Print memory and cpu utilization on cgroup2 system
Fixed cgroup2 path issue in LXC-Top
Fixes: #4468 Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@futurfusion.io>
templates/lxc-busybox: handle container names with spaces
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge branch 'lxc:main' into main