]>
git.proxmox.com Git - mirror_lxcfs.git/log
Christian Brauner [Mon, 13 Dec 2021 15:27:33 +0000 (16:27 +0100)]
proc_cpuview: use PRIu64 to print uint64_t
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 13 Dec 2021 15:18:08 +0000 (16:18 +0100)]
proc_fuse: use correct type for swap variables
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 13 Dec 2021 15:16:46 +0000 (16:16 +0100)]
build: move global options further up
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 9 Dec 2021 14:12:55 +0000 (15:12 +0100)]
Merge pull request #508 from Blub/2021-12-09/cgv2-swap-meminfo
make meminfo and swaps cgroupv2 aware
Wolfgang Bumiller [Thu, 9 Dec 2021 10:37:04 +0000 (11:37 +0100)]
make meminfo and swaps cgroupv2 aware
and deduplicate the corresponding code
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Christian Brauner [Tue, 7 Dec 2021 09:08:48 +0000 (10:08 +0100)]
Merge pull request #506 from Sn0rt/empty-cgroup-if-set-unified_cgroup_hierarchy=1
empty cgroup dir if set unified_cgroup_hierarchy=1
Guohao Wang [Sun, 5 Dec 2021 08:45:00 +0000 (16:45 +0800)]
empty cgroup dir if set unified_cgroup_hierarchy=1
Signed-off-by: Guohao Wang <wangguohao.2009@gmail.com>
Christian Brauner [Tue, 9 Nov 2021 12:51:25 +0000 (13:51 +0100)]
Merge pull request #501 from phanhuy1502/detect-disable-cfs-quota
Skip cpu revise when cfs quota is disable
Nguyen Phan Huy [Tue, 9 Nov 2021 10:58:28 +0000 (18:58 +0800)]
Skip cpu revise when cfs quota is disable
Signed-off-by: Nguyen Phan Huy <phanhuy1502@gmail.com>
Stéphane Graber [Fri, 5 Nov 2021 13:34:18 +0000 (09:34 -0400)]
Merge pull request #499 from brauner/2021-11-05.fixes
build: fixes
Christian Brauner [Fri, 5 Nov 2021 12:30:28 +0000 (13:30 +0100)]
build: use jinja2 templating
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 5 Nov 2021 09:49:38 +0000 (10:49 +0100)]
build: add LXCFSTARGETDIR to configuration data
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 20 Oct 2021 18:13:01 +0000 (20:13 +0200)]
Merge pull request #496 from Foxboron/morten/fix-src
meson: Include lxcfs_fuse.h into source files
Morten Linderud [Wed, 20 Oct 2021 17:46:25 +0000 (19:46 +0200)]
meson: Include lxcfs_fuse.h into source files
Signed-off-by: Morten Linderud <morten@linderud.pw>
Stéphane Graber [Wed, 20 Oct 2021 12:44:04 +0000 (08:44 -0400)]
Merge pull request #495 from brauner/2021-10-20.fixes
build: fixes
Christian Brauner [Wed, 20 Oct 2021 08:37:13 +0000 (10:37 +0200)]
github/workflows: meson compile -C build everywhere
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 20 Oct 2021 08:28:50 +0000 (10:28 +0200)]
build: add share/ directory
This was somehow missing until now.
Fixes: #494
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 20 Oct 2021 08:16:31 +0000 (10:16 +0200)]
build: remove newline
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Tue, 19 Oct 2021 15:04:13 +0000 (11:04 -0400)]
Merge pull request #493 from brauner/2021-10-19.fixes.2
sysfs: fix cpumasks
Christian Brauner [Tue, 19 Oct 2021 14:37:20 +0000 (16:37 +0200)]
sysfs: fix cpumasks
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Tue, 19 Oct 2021 13:23:03 +0000 (09:23 -0400)]
Merge pull request #491 from brauner/2021-10-19.fixes
lxcfs: fixes
Christian Brauner [Tue, 19 Oct 2021 08:19:38 +0000 (10:19 +0200)]
macro: cast to correct integer types
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 19 Oct 2021 08:19:09 +0000 (10:19 +0200)]
meson: use shared_module()
The liblxcfs library is supposed to be dlopen()ed.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 19 Oct 2021 12:29:34 +0000 (14:29 +0200)]
Merge pull request #492 from Sn0rt/doc/reload-dot-so-file
doc: guide for reload share libary file
sn0rt [Tue, 19 Oct 2021 10:36:34 +0000 (18:36 +0800)]
doc: guide for reload share libary file
Signed-off-by: sn0rt <wangguohao.2009@gmail.com>
Christian Brauner [Thu, 14 Oct 2021 19:15:35 +0000 (21:15 +0200)]
Merge pull request #488 from stgraber/master
github: Drop 16.04
Stéphane Graber [Thu, 14 Oct 2021 16:52:56 +0000 (12:52 -0400)]
github: Drop 16.04
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Thu, 14 Oct 2021 15:39:59 +0000 (11:39 -0400)]
Merge pull request #487 from brauner/2021-10-14.fixes
tree-wide: build fixes
Christian Brauner [Thu, 14 Oct 2021 15:17:13 +0000 (17:17 +0200)]
build: add __STDC_FORMAT_MACROS
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 14 Oct 2021 15:13:15 +0000 (17:13 +0200)]
tree-wide: use a single fuse header
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 14 Oct 2021 15:04:14 +0000 (17:04 +0200)]
tree-wide: set _GNU_SOURCE in meson.build
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 14 Oct 2021 14:58:22 +0000 (16:58 +0200)]
tree-wide: fix HAVE_FUSE3 checks
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Mon, 11 Oct 2021 14:30:23 +0000 (10:30 -0400)]
Merge pull request #486 from brauner/2021-10-11.fixes
cpuview: log non-fatal error in verbose mode only
Christian Brauner [Mon, 11 Oct 2021 08:22:40 +0000 (10:22 +0200)]
cpuview: log non-fatal error in verbose mode only
Fixes: #482
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 11 Oct 2021 08:12:50 +0000 (10:12 +0200)]
Merge pull request #485 from mtstickney/proc_meminfo_slab_padding
Fix padding for Slab entry in /proc/meminfo
Matthew Stickney [Sat, 9 Oct 2021 04:14:27 +0000 (00:14 -0400)]
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>
Stéphane Graber [Thu, 7 Oct 2021 15:48:38 +0000 (11:48 -0400)]
Merge pull request #484 from brauner/2021-10-07.fixes
lxcfs: fix version and usage handling
Christian Brauner [Thu, 7 Oct 2021 13:21:52 +0000 (15:21 +0200)]
build: generate lxcfs.spec file
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 7 Oct 2021 08:31:40 +0000 (10:31 +0200)]
lxcfs: fix version and usage handling
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 7 Oct 2021 08:30:09 +0000 (10:30 +0200)]
Merge pull request #483 from Sn0rt/bugfix/version-loss
Bugfix: fix lxcfs --version or -v loss
sn0rt [Tue, 5 Oct 2021 10:53:36 +0000 (18:53 +0800)]
lxcfs: fix lxcfs CLI -v and no arg output
Signed-off-by: sn0rt <wangguohao.2009@gmail.com>
Stéphane Graber [Thu, 23 Sep 2021 09:46:48 +0000 (05:46 -0400)]
Merge pull request #481 from brauner/2021-09-23.fixes
README: update build instructions
Christian Brauner [Thu, 23 Sep 2021 09:10:52 +0000 (11:10 +0200)]
README: update build instructions
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Mon, 20 Sep 2021 10:29:07 +0000 (06:29 -0400)]
Merge pull request #479 from moweiraul/master
fix package name
moweiraul [Mon, 20 Sep 2021 09:48:33 +0000 (17:48 +0800)]
README: Fix package name
Signed-off-by: Mowei Jiang <moweiraul@gmail.com>
Stéphane Graber [Tue, 14 Sep 2021 13:17:10 +0000 (09:17 -0400)]
Merge pull request #477 from brauner/2021-09-14.fixes
build: improvements
Christian Brauner [Tue, 14 Sep 2021 08:32:31 +0000 (10:32 +0200)]
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>
Christian Brauner [Tue, 14 Sep 2021 08:26:28 +0000 (10:26 +0200)]
build: require fuse >= 2.6
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 14 Sep 2021 08:23:10 +0000 (10:23 +0200)]
build: use correct minimal meson version requirement
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 14 Sep 2021 08:17:45 +0000 (10:17 +0200)]
build: introduce common dependency variable
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 14 Sep 2021 08:16:09 +0000 (10:16 +0200)]
build: remove -shared
This is already handled by the shared_library() method.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 14 Sep 2021 08:14:39 +0000 (10:14 +0200)]
build: use dependency() for fuse detection
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 14 Sep 2021 08:05:48 +0000 (10:05 +0200)]
build: remove -std=gnu11
It is already set in default_options.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Mon, 13 Sep 2021 12:39:54 +0000 (08:39 -0400)]
Merge pull request #476 from brauner/2021-09-13.fixes
build: fixes
Christian Brauner [Mon, 13 Sep 2021 08:38:47 +0000 (10:38 +0200)]
build: fix data directories
Fixes: #475
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 13 Sep 2021 08:27:07 +0000 (10:27 +0200)]
build: move some options to default_options
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Thu, 2 Sep 2021 15:42:26 +0000 (11:42 -0400)]
Merge pull request #474 from brauner/2021-09-01.meson
meson: add meson support
Christian Brauner [Thu, 2 Sep 2021 14:46:00 +0000 (16:46 +0200)]
build: remove autotools
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 2 Sep 2021 15:15:17 +0000 (17:15 +0200)]
github: fix workflows for meson
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 2 Sep 2021 15:06:10 +0000 (17:06 +0200)]
build: add meson
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 2 Sep 2021 14:42:13 +0000 (16:42 +0200)]
tests: fix build warnings
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 2 Sep 2021 14:41:51 +0000 (16:41 +0200)]
tests: rely on config.h only for fuse versioning
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 2 Sep 2021 15:02:51 +0000 (17:02 +0200)]
proc_cpuview: fix unused variable warning
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 2 Sep 2021 15:02:24 +0000 (17:02 +0200)]
macro: fix bracket warnings in non-debug mode
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 2 Sep 2021 15:01:52 +0000 (17:01 +0200)]
tree-wide: fix some ifdef checks
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 2 Sep 2021 15:01:20 +0000 (17:01 +0200)]
tree-wide: fix type comparisons
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 2 Sep 2021 14:59:52 +0000 (16:59 +0200)]
tree-wide: fix prototypes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 2 Sep 2021 14:58:35 +0000 (16:58 +0200)]
tree-wide: fix fuse header inclusion
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 2 Sep 2021 14:56:31 +0000 (16:56 +0200)]
tree-wide: include own header file first
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 2 Sep 2021 14:48:53 +0000 (16:48 +0200)]
src: rely on config.h for fuse version
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Tue, 31 Aug 2021 14:03:33 +0000 (10:03 -0400)]
Merge pull request #473 from brauner/2021-08-31.fixes
proc_cpuview: unlock mutex in all error paths
Christian Brauner [Tue, 31 Aug 2021 13:45:21 +0000 (15:45 +0200)]
proc_cpuview: unlock mutex in all error paths
Fixes: #472
Reported-by: ycaibb@gmail.com
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Wolfgang Bumiller [Tue, 15 Jun 2021 08:27:11 +0000 (10:27 +0200)]
Merge pull request #468 from brauner/2021-06-15.fixes
cgroup_fuse: replace potentially problematic terminology
Christian Brauner [Tue, 15 Jun 2021 08:00:13 +0000 (10:00 +0200)]
cgroup_fuse: replace potentially problematic terminology
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 2 Jun 2021 13:00:31 +0000 (15:00 +0200)]
Merge pull request #467 from simondeziel/shellcheck
lxc.mount.hook: shellcheck fixes
Simon Deziel [Wed, 2 Jun 2021 12:54:08 +0000 (08:54 -0400)]
lxc.mount.hook: reduce calls to basename
Signed-off-by: Simon Deziel <simon@sdeziel.info>
Simon Deziel [Wed, 2 Jun 2021 12:50:16 +0000 (08:50 -0400)]
lxc.mount.hook: make shellcheck clean
Signed-off-by: Simon Deziel <simon@sdeziel.info>
Stéphane Graber [Mon, 31 May 2021 15:13:03 +0000 (11:13 -0400)]
Merge pull request #466 from brauner/2021-05-31.fixes
proc_fuse: don't spam log needlessly
Christian Brauner [Mon, 31 May 2021 14:26:23 +0000 (16:26 +0200)]
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>
Stéphane Graber [Thu, 27 May 2021 18:50:20 +0000 (14:50 -0400)]
Merge pull request #465 from brauner/2021-05-26.sysfs.cpu
sys: virtualize /sys/devices/system/cpu/cpu*
Christian Brauner [Thu, 27 May 2021 15:23:06 +0000 (17:23 +0200)]
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>
Christian Brauner [Thu, 27 May 2021 15:17:24 +0000 (17:17 +0200)]
bindings: fix struct lxcfs_opts by making it versioned
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 27 May 2021 15:02:40 +0000 (17:02 +0200)]
cpuset_parse: drop unneeded dependencies
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 26 May 2021 16:13:24 +0000 (18:13 +0200)]
sysfs_fuse: create proper directories
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 26 May 2021 15:55:01 +0000 (17:55 +0200)]
bindings: introduce lxcfs_has_opt() helper
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 26 May 2021 12:30:20 +0000 (14:30 +0200)]
lxcfs: remove obsolete logging
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 26 May 2021 11:26:04 +0000 (13:26 +0200)]
lxc.mount.hook: adapt to new /sys/devices/system/cpu virtualization
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 26 May 2021 09:15:27 +0000 (11:15 +0200)]
sys: rework get_st_mode()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Zhiwei Li [Tue, 18 May 2021 07:03:01 +0000 (15:03 +0800)]
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>
Stéphane Graber [Fri, 14 May 2021 12:55:27 +0000 (08:55 -0400)]
Merge pull request #461 from brauner/2021-05-13.fixes
lxcfs: rework option parsing
hailin84 [Thu, 6 May 2021 08:18:06 +0000 (16:18 +0800)]
lxcfs: rework argument parsing
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 17 Mar 2021 21:35:30 +0000 (22:35 +0100)]
Merge pull request #451 from stgraber/master
Switch to Github Actions
Stéphane Graber [Wed, 17 Mar 2021 21:24:32 +0000 (17:24 -0400)]
Switch to Github Actions
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Christian Brauner [Wed, 17 Mar 2021 14:56:02 +0000 (15:56 +0100)]
Merge pull request #449 from alliedtelesis/fix_fuse3_file_size
Determine the file size from the current system file size
Scott Parlane [Tue, 16 Mar 2021 02:53:31 +0000 (15:53 +1300)]
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>
Stéphane Graber [Thu, 28 Jan 2021 13:23:49 +0000 (08:23 -0500)]
Merge pull request #443 from brauner/2021-01-28/fixes
proc_cpuview: release lock before returning
Christian Brauner [Thu, 28 Jan 2021 10:07:16 +0000 (11:07 +0100)]
proc_cpuview: release lock before returning
Fixes: #442
Cc: stable-4.0
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 18 Dec 2020 22:56:49 +0000 (23:56 +0100)]
Merge pull request #441 from timgates42/bugfix_typo_through
docs: fix simple typo, throuh -> through
Tim Gates [Thu, 17 Dec 2020 09:13:31 +0000 (20:13 +1100)]
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>
Christian Brauner [Thu, 10 Dec 2020 17:51:58 +0000 (18:51 +0100)]
Merge pull request #440 from loyou/master
proc_fuse: add /proc/slabinfo with slab accounting memcg