Merge pull request #485 from mtstickney/proc_meminfo_slab_padding

Fix padding for Slab entry in /proc/meminfo

Fix padding for Slab entry in /proc/meminfo

The padding used for the 'Slab' entry of /proc/meminfo is three bytes
shorter than the padding used by the kernel. Since we report the host's
file size as the size of the lxcfs file, this means reads would be three
bytes short of the reported file length. In some cases this causes the
client to receive three additional NUL bytes at the end of the file,
which can cause various problems.

Signed-off-by: Matthew Stickney <fiendishlinux@gmail.com>

Merge pull request #484 from brauner/2021-10-07.fixes

lxcfs: fix version and usage handling

build: generate lxcfs.spec file

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

lxcfs: fix version and usage handling

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

Merge pull request #483 from Sn0rt/bugfix/version-loss

Bugfix: fix lxcfs --version or -v loss

lxcfs: fix lxcfs CLI -v and no arg output

Signed-off-by: sn0rt <wangguohao.2009@gmail.com>

Merge pull request #481 from brauner/2021-09-23.fixes

README: update build instructions

README: update build instructions

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

Merge pull request #479 from moweiraul/master

fix  package name

README: Fix package name

Signed-off-by: Mowei Jiang <moweiraul@gmail.com>

Merge pull request #477 from brauner/2021-09-14.fixes

build: improvements

build: remove pointless prefixdir validation

Meson will handle this internall and treat a non-absolute path as an
error.

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

build: require fuse >= 2.6

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

build: use correct minimal meson version requirement

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

build: introduce common dependency variable

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

build: remove -shared

This is already handled by the shared_library() method.

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

build: use dependency() for fuse detection

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

build: remove -std=gnu11

It is already set in default_options.

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

Merge pull request #476 from brauner/2021-09-13.fixes

build: fixes

build: fix data directories

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

build: move some options to default_options

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

Merge pull request #474 from brauner/2021-09-01.meson

meson: add meson support

build: remove autotools

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

github: fix workflows for meson

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

build: add meson

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

tests: fix build warnings

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

tests: rely on config.h only for fuse versioning

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

proc_cpuview: fix unused variable warning

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

macro: fix bracket warnings in non-debug mode

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

tree-wide: fix some ifdef checks

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

tree-wide: fix type comparisons

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

tree-wide: fix prototypes

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

tree-wide: fix fuse header inclusion

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

tree-wide: include own header file first

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

src: rely on config.h for fuse version

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

Merge pull request #473 from brauner/2021-08-31.fixes

proc_cpuview: unlock mutex in all error paths

proc_cpuview: unlock mutex in all error paths

Fixes: #472
Reported-by: ycaibb@gmail.com
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #468 from brauner/2021-06-15.fixes

cgroup_fuse: replace potentially problematic terminology

cgroup_fuse: replace potentially problematic terminology

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

Merge pull request #467 from simondeziel/shellcheck

lxc.mount.hook: shellcheck fixes

lxc.mount.hook: reduce calls to basename

Signed-off-by: Simon Deziel <simon@sdeziel.info>

lxc.mount.hook: make shellcheck clean

Signed-off-by: Simon Deziel <simon@sdeziel.info>

Merge pull request #466 from brauner/2021-05-31.fixes

proc_fuse: don't spam log needlessly

proc_fuse: don't spam log needlessly

Fixes: https://discuss.linuxcontainers.org/t/lxcfs-spamming-syslog-with-logs-lxc-payload-container-has-unexpected-cpu-time-unable-to-determine-idle-time
Fixes: https://github.com/lxc/lxcfs/issues/464
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #465 from brauner/2021-05-26.sysfs.cpu

sys: virtualize /sys/devices/system/cpu/cpu*

sysfs_fuse: account for liblxcfs reload with identical lxcfs binary

This makes LXCFS upgradable from the old-style
/sys/devices/system/cpu/online virtualization to the new full
/sys/devices/system/cpu virtualization.

The special case this is handling is an upgrade where the LXCFS binary
itself is not replaced, only the liblxcfs shared library is replaced.

The original patch earlier in this series added several new fuse methods
e.g. .readlink() and .opendir() that required changes in the lxcfs.c
code itself while also modifying existing ones like .open() and .read().
This leads to inconsistency as .open() would end up being resolved to
the modified sys_open() implementation whereas .readlink() doesn't exist
as .readlink() wasn't registered with fuse. This causes the
virtualization to be broken.

Abuse the .init() method of fuse to indicate the sys_cpu works and also
make it possible to version struct lxcfs_opts.

If liblxcfs is reloaded virtualization of /sys/devices/system/cpu/online
will continue to work as before. In order to gain access to the new full
/sys/devices/system/cpu/ virtualzation a restart is needed.

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

bindings: fix  struct lxcfs_opts by making it versioned

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

cpuset_parse: drop unneeded dependencies

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

sysfs_fuse: create proper directories

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

bindings: introduce lxcfs_has_opt() helper

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

lxcfs: remove obsolete logging

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

lxc.mount.hook: adapt to new /sys/devices/system/cpu virtualization

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

sys: rework get_st_mode()

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

sys: virtualize /sys/devices/system/cpu/cpu*

Signed-off-by: Zhiwei Li <cyzz_a102@126.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #461 from brauner/2021-05-13.fixes

lxcfs: rework option parsing

lxcfs: rework argument parsing

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

Merge pull request #451 from stgraber/master

Switch to Github Actions

Switch to Github Actions

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

Merge pull request #449 from alliedtelesis/fix_fuse3_file_size

Determine the file size from the current system file size

Determine the file size from the current system file size

fixes: #448 caused by 25982f5d7e008e6ad13df28af3006ab8286f4c97

Signed-off-by: Scott Parlane <scott.parlane@alliedtelesis.co.nz>

Merge pull request #443 from brauner/2021-01-28/fixes

proc_cpuview: release lock before returning

proc_cpuview: release lock before returning

Fixes: #442
Cc: stable-4.0
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #441 from timgates42/bugfix_typo_through

docs: fix simple typo, throuh -> through

docs: fix simple typo, throuh -> through

There is a small typo in src/proc_cpuview.c.

Should read `through` rather than `throuh`.

Signed-off-by: tgates <tim.gates@iress.com>

Merge pull request #440 from loyou/master

proc_fuse: add /proc/slabinfo with slab accounting memcg

proc_fuse: add /proc/slabinfo with slab accounting memcg

Signed-off-by: Feng Sun <loyou85@gmail.com>

Merge pull request #438 from stgraber/master

Rework swap memory management

swap: Remove now unused variable

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

swap: Make /proc/swaps match /proc/meminfo

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

swap: Tweak meminfo logic

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

swap: Only report usage when swappiness is 0

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

swap: Fix usage reporting

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

cgroups: Add get_memory_swappiness

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

Merge pull request #436 from stgraber/master

README: clarify SWAP

README: clarify SWAP

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

Merge pull request #435 from brauner/2020-11-03/fixes

meminfo: show host swap values when no limit or equal limits are set

meminfo: show host swap values when no limit or equal limits are set

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

Merge pull request #431 from brauner/2020-09-08/diskstats

diskstats: support new fields in 4.18+ kernels

diskstats: support new fields in 4.18+ kernels

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

Merge pull request #426 from alliedtelesis/add_fuse3_support

Add support for fuse3

Set the file size to 4k

In fuse2, the apparant file size is always 4k, however in fuse3
the file size is actually obeyed, so we need to same something
bigger than 0 to get clients to be able to read the file contents.

Signed-off-by: Scott Parlane <scott.parlane@alliedtelesis.co.nz>

rename fuse_compat.h to avoid conflict with system header

Signed-off-by: Scott Parlane <scott.parlane@alliedtelesis.co.nz>

Update options passed to fuse_main

fuse3 doesn't support the direct_io option anymore
and nonempty has been dropped

Signed-off-by: Scott Parlane <scott.parlane@alliedtelesis.co.nz>

Merge pull request #428 from devplayer0/fix-dirname

Fix `get_min_memlimit()` on non-glibc

Fix `get_min_memlimit()` on non-glibc

Signed-off-by: Jack O'Sullivan <j@ckos.ie>
[christian.brauner@ubuntu.com: fix coding style]
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Add support for fuse3

Signed-off-by: Scott Parlane <scott.parlane@alliedtelesis.co.nz>

Merge pull request #425 from ncleaton/master

fix epoll create socket error message

fix epoll create socket error message

Signed-off-by: Nick Cleaton <nick@cleaton.net>

Merge pull request #423 from PeterRK/bugfix

fix type mismatch

fix type mismatch

Signed-off-by: Ruan Kunliang <PeterRK@126.com>

Merge pull request #421 from brauner/2020-07-06/fixes

bindings: provide lxcfs_clone() as wrapper around lxcfs_raw_clone()

proc_fuse: remove unused variable

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

.travis: use RTLD_NOW for tests

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

bindings: provide lxcfs_clone() as wrapper around lxcfs_raw_clone()

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

cgroups: replace leftover reference to legacy terms

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

cgroups: update terminology

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

bindings: update terminology

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

Merge pull request #418 from brauner/2020-06-24/fixes

proc_fuse: provide host values when kernel does not support swap acco…

proc_fuse: provide host values when kernel does not support swap accounting

Link: https://discuss.linuxcontainers.org/t/invalid-swaptotal-in-proc-meminfo-swaptotal-0
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>