Merge pull request #417 from brauner/2020-06-10/fixes

cpuview: fixes

proc_cpuview: cleanup cpuview_init_head()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: cleanup cpuview_proc_stat()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: fix max_cpu_count()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: fix exact_cpu_count()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: cleanup read_cpu_cfs_param()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: cleanup add_cpu_usage()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: clean up find_or_create_proc_stat_node()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: clean up prune_proc_stat_list()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: clean up expand_proc_stat_node()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: use correct comment style

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: cleanup add_proc_stat_node()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: reduce variable scope in cpuview_free_head()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: use more descriptive labels in add_proc_stat_node()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_cpuview: cleanup new_proc_stat_node()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #416 from brauner/2020-06-09/fixes

proc_fuse: more swap tweaks

proc_fuse: more swap tweaks

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #415 from brauner/2020-06-09/fixes

proc_fuse: cap swap to global values

proc_cpuview: tweak cpuacct.percpu_usage fallback

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_fuse: cap swap to global values

Closes: #412.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #413 from brauner/2020-06-07/swap_fixes

swap fixes

proc_fuse: don't cause invalid swap values

Closes: #412.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_fuse: improve swap calculation a little

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #411 from brauner/2020-06-04/performance_tweaks

fixes

utils: don't leak fds in in_same_namespace()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_fuse: cleanup proc_uptime_read() a little

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #410 from brauner/2020-06-04/performance_tweaks

performance tweaks and leak fixes

proc_fuse: move get_reaper_busy() down

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_loadavg: avoid needless memory allocation

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_loadavg: remove dummy variable

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_loadavg: use must_* alloc helpers

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_fuse: use zalloc()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

lxcfs: free opts on lxcfs binary exit

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

bindings: avoid dynamic stack allocations in clone()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

bindings: wipe initpid cache on library reload

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_loadavg: simplify calc_pid()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_loadavg(): use strdup() in calc_pid()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

macro: use ISO C compatible __typeof__

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_loadavg: replace malloc() with asprintf() in calc_pid()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_loadavg: don't leak getline() memory

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_loadavg: ensure pointer is NULL when passing to calc_pid()

We passed down an uninitialized pointer that we then pass to realloc()
which is problematic since it contains garbage.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_loadavg: don't leak getline() memory in calc_pid()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

bindings: s/get_init_pid_for_task()/scm_init_pid()/g

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #409 from brauner/2020-06-02/proc_stat

cpuview: fix /proc/stat virtualization

cpuview: fix /proc/stat virtualization

Closes: #406.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #408 from brauner/2020-05-28/fixes

bindings: fix init pid hashing

bindings: cleanup init pid verification

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

bindings: cleanup cache locking

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

bindings: use brackets to make logic clearer

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

bindings: make opts pointer const

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

bindings: fix init pid hashing

We were stupidly always hashing entry->ino where entry was just freshly
allocated zeroed-memory so we effectively added stuff to the cache
forever but this meant:
- we never found a match when we hashed the actual inode
- we kept growing the cache
- we leaked memory

Closes: #407.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

coverity: Use build custom build script

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

Merge pull request #405 from joemoore13/patch-1

Fix https://github.com/lxc/lxcfs/issues/404

Fix https://github.com/lxc/lxcfs/issues/404

reset  read_pos=0 after building usage_str

Signed-off-by: Joseph Moore <joemoore1123@gmail.com>

Merge pull request #403 from brauner/2020-04-28/fixes

sysfs_fuse: remove logically dead code

sysfs_fuse: remove logically dead code

Fixes: Coverity 357808.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #402 from brauner/2020-04-28/fixes

sysfs: cpuinfo: show cgroup cpuset value

sysfs: cpuinfo: show cgroup cpuset value

To stop the immediate bleeding.

Closes #401.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #400 from Blub/silence-unlimited-cgv2-no-memlimit

proc_fuse: silence error when we find no memlimit

proc_fuse: silence error when we find no memlimit

We get a positive result with an empty string if we do not
encounter any limits while walking up the cgroup.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

Merge pull request #399 from brauner/2020-04-17/fixes

proc_fuse: improve swap calculation

proc_fuse: improve swap calculation

Stéphane has been running into issues with wrong sawp limits. The logic
he suggested does:
- if memory == memory+swap, we list both at the memlimit for total size
- if memory+swap is larger than memory, then we add the extra amount to
  total swap but still cap to physical swap limit

We came to the conclusion that this is currently the best approach as we
show the mem limit as both Memory and Swap so advertising twice as much
as allowed but there's no way around that really or we'd need to
dynamically update both MemTotal and SwapTotal based on what's used to
keep MemTotal+SwapTotal == limit that's certainly doable but it will be
somewhat racy and also likely confused userspace more than mis-reporting
swap.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #398 from brauner/2020-04-17/fixes

cgroups: simplify cgroup_walkup_to_root()

cgroups: simplify cgroup_walkup_to_root()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #397 from brauner/2020-04-17/fixes

cgroups: please Coverity

cgroups: please Coverity

Fixes: Coverity 355759.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #396 from brauner/2020-04-16/fixes

cgroups: more cgroup2 fun

tests: correctly skip readdir test

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

cgroups: more cgroup2 fun

Try too read a valid value from a given cgroup file. If it is a legacy
cgroup hierarchy and we fail to find a valid value we terminate early
and report an error.
The cgroup2 hierarchy however, has different semantics. In a few
controller files it will show the value "max" or simply leave it
completely empty thereby indicating that no limit has been set for this
particular cgroup.  However, that doesn't mean that there's no limit. A
cgroup further up the hierarchy could have a limit set that also applies
to the cgroup we are interested in. So for the unified cgroup hierarchy
we need to keep walking towards the cgroup2 root cgroup and try to parse
a valid value.

Fixes: #389.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #395 from brauner/2020-04-16/fixes

bindings: use zalloc()

bindings: use zalloc()

Fixes: Coverity 355747.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #394 from brauner/2020-04-16/fixes

fixes

utils: fix recv_creds()

Fixes: Coverity 355704.
Fixes: Coverity 355718.
Fixes: Coverity 355738.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

lxcfs: don't cause a uaf

Fixes: Coverity 355711.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

cgroup_fuse: be cautios when dereferencing d->controller

Fixes: Coverity 355712.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

bindings: do not falsely return

This may also explain some of the performance regressions that Blub\0
reported.

Fixes: Coverity 355716.
Cc: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

cgroup_fuse: s/clone/lxcfs_clone/g

Fixes: Coverity 355713.
Fixes: Coverity 355723.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

lxcfs: remove fl.* prefix

Fixes: Coverity 355708.
Fixes: Coverity 355702.
Fixes: Coverity 355729.
Fixes: Coverity 355735.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

cgroup_fuse: do not double-close

Fixes: Coverity 355703.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

.travis: fix coverity

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #393 from brauner/2020-04-15/coverity

memory_utils: make it easier for Coverity

memory_utils: make it easier for Coverity

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #391 from Blub/relaxed-locking

relax init pid store locking a bit

Merge pull request #392 from brauner/2020-04-15/coverity

travis: enable coverity integration

travis: enable coverity integration

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

relax init pid store locking a bit

So we don't keep holding it throughout the expensive the
fork/clone/send cycle of figuring out a namespace's init
pid.

Also change some functions to pass the init namespace inode
instead of the process' struct stat, so that it is obvious
that we don't use other parts of the stat info. The reason
is that we previously acquired the store lock before doing
the call to `stat()` and therefore it may not be immediately
obvious that things such as the timestamps found inside the
`struct stat` are not contributing to any race between the
multiple acquisitions of the store lock.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

Merge pull request #388 from DarkDimius/patch-1

Fix #387. Include `:` in matching of lines in /proc/meminfo

Fix #387. Include `:` in matching of lines in /proc/meminfo

Some lines of /proc/meminfo can be prefixes of the other,
e.g. `Writeback:` and `WritebackTmp:`

This means that in order to to precise match, the code should always match up until `:`

Signed-off-by: Dmitry Petrashko <dark@d-d.me>

Merge pull request #386 from stgraber/master

tests: Handle different lib paths

tests: Handle different lib paths

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

Merge pull request #385 from brauner/2020-03-24/fixes

proc_fuse: fix swap calculations

proc_fuse: fix swap calculations

The sscanf() line got removed on accident.

Closes #384.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #383 from brauner/2020-03-20/fixes

tree-wide: add and use syscall_numbers.h

tree-wide: add and use syscall_numbers.h

The same thing that I did for LXC.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #382 from brauner/2020-03-20/fixes

proc_fuse: improve /proc/meminfo

proc_fuse: improve /proc/uptime virtualization

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_fuse: memory virtualization improvements

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

proc_fuse: improve /proc/meminfo

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #380 from brauner/2020-03-18/fixes

cgroup_fuse: actually make asz check mean something

cgroup_fuse: actually make asz check mean something

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>