]>
git.proxmox.com Git - mirror_lxcfs.git/log
michuan [Mon, 4 Jul 2022 02:49:49 +0000 (10:49 +0800)]
cgroup v2: return cpuset cpu count when no quota is set
Signed-off-by: michuan <michu_an@126.com>
Christian Brauner [Tue, 24 May 2022 12:31:06 +0000 (14:31 +0200)]
Merge pull request #541 from bytedance/cleanup-getsize
sysfs: cleanup sys_devices_system_cpu_online_getsize
huteng.ht [Tue, 24 May 2022 05:13:01 +0000 (13:13 +0800)]
sysfs: cleanup sys_devices_system_cpu_online_getsize
cleanup useless parameters and local variables, meanwhile,
a compiler warning resolved.
Signed-off-by: huteng.ht <huteng.ht@bytedance.com>
Christian Brauner [Mon, 23 May 2022 08:13:01 +0000 (10:13 +0200)]
Merge pull request #539 from bytedance/calc-online-file-size
sysfs: correct file size of /sys/devices/system/cpu/online.
huteng.ht [Sat, 21 May 2022 11:39:14 +0000 (19:39 +0800)]
sysfs: correct file size of /sys/devices/system/cpu/online.
Calculate accurate size of 'online' file in sys_getattr routine.
Signed-off-by: huteng.ht <huteng.ht@bytedance.com>
Christian Brauner [Mon, 16 May 2022 12:10:47 +0000 (14:10 +0200)]
Merge pull request #537 from dasteihn/sta/commentfix
util: remove doubled comment
Philipp Stanner [Mon, 16 May 2022 11:12:29 +0000 (13:12 +0200)]
util: remove doubled comment
Signed-off-by: Philipp Stanner <stanner@posteo.de>
Christian Brauner [Fri, 13 May 2022 10:09:28 +0000 (12:09 +0200)]
Merge pull request #536 from yrhki/extra-space
proc_fuse: extra space in /proc/stat
Tuomas Yrjölä [Thu, 12 May 2022 22:24:47 +0000 (01:24 +0300)]
proc_fuse: extra space in /proc/stat
Signed-off-by: Tuomas Yrjölä <mail@yrhki.fi>
Christian Brauner [Fri, 29 Apr 2022 07:52:16 +0000 (09:52 +0200)]
Merge pull request #535 from stgraber/master
meson: Syntax nit
Stéphane Graber [Fri, 29 Apr 2022 00:13:38 +0000 (20:13 -0400)]
meson: Syntax nit
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Christian Brauner [Mon, 11 Apr 2022 19:26:50 +0000 (21:26 +0200)]
Merge pull request #533 from stgraber/master
Meson tweaks for init systems
Stéphane Graber [Mon, 11 Apr 2022 18:31:07 +0000 (14:31 -0400)]
meson: Support multiple init systems
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Mon, 11 Apr 2022 14:54:02 +0000 (10:54 -0400)]
init: Fix install paths for sysvinit and openrc
Closes #532
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Christian Brauner [Fri, 8 Apr 2022 05:22:15 +0000 (07:22 +0200)]
Merge pull request #531 from stgraber/master
Fix tests
Stéphane Graber [Thu, 7 Apr 2022 23:51:23 +0000 (19:51 -0400)]
tests: Skip sysfs test on older FUSE versions
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Thu, 7 Apr 2022 23:48:52 +0000 (19:48 -0400)]
github: Re-organize Github Actions
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Christian Brauner [Mon, 4 Apr 2022 15:19:26 +0000 (17:19 +0200)]
Merge pull request #530 from Blub/2022-01-17/optional-fuse-2
support explicit fuse version choice
Wolfgang Bumiller [Mon, 4 Apr 2022 12:10:00 +0000 (14:10 +0200)]
support explicit fuse version choice
We'd like to provide an easy upgrade path which doesn't
cause an lxcfs-reload to crash because the new library was
built against the wrong version.
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Stéphane Graber [Sun, 13 Mar 2022 17:09:32 +0000 (18:09 +0100)]
Merge pull request #526 from brauner/2022-03-13.fixes
sysfs_fuse: fixes
Christian Brauner [Sun, 13 Mar 2022 14:58:44 +0000 (15:58 +0100)]
Merge pull request #528 from thmo/unitdir
Query systemd system unit dir.
Thomas Moschny [Sun, 13 Mar 2022 12:00:56 +0000 (13:00 +0100)]
Query systemd system unit dir.
Signed-off-by: Thomas Moschny <thomas.moschny@gmx.de>
Christian Brauner [Sun, 13 Mar 2022 12:01:05 +0000 (13:01 +0100)]
Merge pull request #527 from Foxboron/morten/fix-libdir
init/meson: Use libdir instead of hardcoded /lib path
Morten Linderud [Sun, 13 Mar 2022 11:36:50 +0000 (12:36 +0100)]
init/meson: Use libdir instead of hardcoded /lib path
Hardcoding `/lib` makes meson create a directory which would conflict on
distros with usrmerge as `/lib` is a symlink. We define `libdir` in the
top-level so we should be using that instead.
Signed-off-by: Morten Linderud <morten@linderud.pw>
Christian Brauner (Microsoft) [Sun, 13 Mar 2022 11:00:34 +0000 (12:00 +0100)]
meson: handle fuse versions with buggy dt_type handling
Link: https://github.com/libfuse/libfuse/pull/591
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
Christian Brauner (Microsoft) [Sun, 13 Mar 2022 10:37:42 +0000 (11:37 +0100)]
github: add fuse3 tests
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
Christian Brauner (Microsoft) [Sun, 13 Mar 2022 10:36:51 +0000 (11:36 +0100)]
meson: bump fuse version
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
Christian Brauner (Microsoft) [Sun, 13 Mar 2022 09:06:02 +0000 (10:06 +0100)]
sysfs_fuse: generate file info for cpu<nr> entries as well
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
Christian Brauner (Microsoft) [Sun, 13 Mar 2022 08:48:27 +0000 (09:48 +0100)]
sysfs_fuse: fix indendation
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
Christian Brauner (Microsoft) [Sun, 13 Mar 2022 08:46:37 +0000 (09:46 +0100)]
utils: add and use opathdir()
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 13 Mar 2022 08:17:57 +0000 (09:17 +0100)]
Merge pull request #525 from stgraber/master
More sysfs fixes
Stéphane Graber [Sun, 13 Mar 2022 03:35:37 +0000 (22:35 -0500)]
tests: Fix sysfs test
For the sysfs test to be useful, we need /sys/devices/system/cpu/ to
actually be mounted.
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Sun, 13 Mar 2022 03:34:15 +0000 (22:34 -0500)]
sysfs: Don't incorrectly filter entries
The filtering logic was completely skipping any entry which was 3
characters or shorter. Instead change the logic to only attempt to parse
those entries longer than 3 characters.
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Sat, 12 Mar 2022 16:14:00 +0000 (17:14 +0100)]
Merge pull request #524 from Foxboron/morten/docs
meson: Include documentation
Stéphane Graber [Sat, 12 Mar 2022 16:12:24 +0000 (17:12 +0100)]
Merge pull request #523 from brauner/2022-03-12.fixes
fuse: set file info for fuse2
Morten Linderud [Sat, 12 Mar 2022 14:58:27 +0000 (15:58 +0100)]
workflows: disable documentation generation
Signed-off-by: Morten Linderud <morten@linderud.pw>
Morten Linderud [Sat, 12 Mar 2022 14:53:51 +0000 (15:53 +0100)]
meson: Include documentation
Documentation was removed from the build system with the migration to
meson. This implements the help2man generation which existed in the
autoconf setup.
Signed-off-by: Morten Linderud <morten@linderud.pw>
Christian Brauner (Microsoft) [Sat, 12 Mar 2022 10:54:41 +0000 (11:54 +0100)]
tests: add test for issue #522
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
Christian Brauner (Microsoft) [Sat, 12 Mar 2022 10:38:06 +0000 (11:38 +0100)]
tree-wide: ensure that file information is set even with legacy fuse
Fixes: #522
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
Christian Brauner (Microsoft) [Sat, 12 Mar 2022 09:55:10 +0000 (10:55 +0100)]
tree-wide: remove struct stat argument from DIR_FILLER and make it static inline
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
Christian Brauner (Microsoft) [Sat, 12 Mar 2022 09:51:58 +0000 (10:51 +0100)]
lxcfs_fuse: ensure lxcfs_fuse_compat.h is included after including fuse header
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
Stéphane Graber [Wed, 9 Mar 2022 16:58:08 +0000 (11:58 -0500)]
Release LXCFS 5.0.0
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Christian Brauner [Wed, 9 Mar 2022 17:20:31 +0000 (18:20 +0100)]
Merge pull request #521 from stgraber/master
Makefile: Fix ordering and add PHONY
Stéphane Graber [Wed, 9 Mar 2022 17:18:06 +0000 (12:18 -0500)]
Makefile: Fix ordering and add PHONY
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Christian Brauner [Wed, 9 Mar 2022 17:14:14 +0000 (18:14 +0100)]
Merge pull request #520 from stgraber/master
More meson tweaks
Stéphane Graber [Wed, 9 Mar 2022 17:09:59 +0000 (12:09 -0500)]
Makefile: Tweak for meson (add dist target)
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Wed, 9 Mar 2022 17:04:30 +0000 (12:04 -0500)]
meson: Set check argument on run_command
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Christian Brauner [Wed, 9 Mar 2022 16:56:25 +0000 (17:56 +0100)]
Merge pull request #519 from stgraber/master
meson: Cleanup build files
Stéphane Graber [Wed, 9 Mar 2022 16:48:12 +0000 (11:48 -0500)]
meson: Cleanup build files
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Mon, 7 Mar 2022 15:09:24 +0000 (16:09 +0100)]
Merge pull request #518 from brauner/2022-03-07.fixes
proc_fuse: improve error message
Christian Brauner (Microsoft) [Mon, 7 Mar 2022 14:23:24 +0000 (15:23 +0100)]
proc_fuse: improve error message
Fixes: #516
Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 31 Jan 2022 12:43:38 +0000 (13:43 +0100)]
Merge pull request #515 from phanhuy1502/preserve-cpu-sum-when-cpu-set-changes
Preseve cpu sum in /proc/stat when cpuset changes
Nguyen Phan Huy [Thu, 27 Jan 2022 11:31:47 +0000 (19:31 +0800)]
Preseve cpu sum in /proc/stat when cpuset changes
Signed-off-by: Nguyen Phan Huy <phanhuy1502@gmail.com>
Stéphane Graber [Mon, 17 Jan 2022 13:46:03 +0000 (08:46 -0500)]
Merge pull request #514 from Blub/2022-01-17/fix-and-reformat-format-strings
fix and reformat format strings
Wolfgang Bumiller [Mon, 17 Jan 2022 09:20:33 +0000 (10:20 +0100)]
fix and reformat format strings
Some of these missed the spaces in between and in order to
make this more readable and apparent, put one field per line
and add comments matching the field names.
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Stéphane Graber [Mon, 13 Dec 2021 15:40:17 +0000 (10:40 -0500)]
Merge pull request #509 from brauner/2021-12-13.fixes
tree-wide: use PRIu64 to print uint64_t
Christian Brauner [Mon, 13 Dec 2021 15:35:10 +0000 (16:35 +0100)]
proc_loadavg: use PRIu64 to print uint64_t
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 13 Dec 2021 15:32:32 +0000 (16:32 +0100)]
proc_fuse: use PRIu64 to print uint64_t
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
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