Report swapinfo by ben-grande · Pull Request #140 · QubesOS/qubes-linux-utils

ben-grande · 2026-06-25T15:14:51Z

Allows distinguishing how much memory the qube is using from what is assigned by using "meminfo - swapinfo".

Tested briefly.

codecov-commenter · 2026-06-25T15:34:00Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 71.24%. Comparing base (0dc52ab) to head (4575219).
⚠️ Report is 4 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #140   +/-   ##
=======================================
  Coverage   71.24%   71.24%           
=======================================
  Files           6        6           
  Lines         991      991           
=======================================
  Hits          706      706           
  Misses        285      285

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

For: QubesOS/qubes-linux-utils#140

marmarek · 2026-07-10T10:18:49Z

+		sprintf(used_mem_buf, "%lld", used_mem);
+		sprintf(used_swap_buf, "%lld", used_swap);


Redundant calls.

marmarek · 2026-07-10T10:22:52Z

+		syslog(LOG_DAEMON | LOG_ERR, "error writing meminfo to xenstore ?");
+		exit(1);
+	}
+	if (!xs_write(xs, XBT_NULL, "memory/swapinfo", swap, strlen(swap))) {


Note to self: this can be merged only after core-admin part, which sets necessary xenstore access.

marmarek · 2026-07-10T10:37:23Z

+    char *swap;
+} UsedMem;
+
+UsedMem parse(const char *meminfo_buf, const char* dom_current_buf)


FWIW the usual method in C for returning more results is to either return a pointer to a structure (usually dynamically allocated via malloc), or add output parameters (pointers to where function should write result). In case of a simple structure like this, compiler will do the latter for you here, so it can stay this way, but keep in mind it wont be efficient code in more complex cases.

ben-grande · 2026-07-13T09:40:55Z

+		return (UsedMem){ .mem = used_mem_buf, .swap = used_swap_buf };
 	}
-	return NULL;
+	return (UsedMem){ .mem = NULL, .swap = NULL };


Report swap change if above threshold despite memory being below its threshold.

ben-grande · 2026-07-13T09:41:06Z

-	if (meminfo_data)
-		send_to_qmemman(xs, meminfo_data);
+	UsedMem meminfo_data = parse(meminfo_buf, dom_current_buf);
+	if (meminfo_data.mem && meminfo_data.mem[0])


https://github.com/QubesOS/qubes-linux-utils/pull/140/changes#r3569568589

Although both values can be lied by the qube, we can distinguish the "memory types" being used in client tools. For: QubesOS/qubes-linux-utils#140

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

* origin/pr/827: Avoid reads to xenstore keys that are not written Deprecate cpu_usage_raw from Stats event Report more CPU information to QubesHost Report maxmem and fix get_mem variants Hotplug memory for real Skip stubdom_xid query if qube is not HVM Do not require Xen to get VM stats Report amount of swap used Broadcast memory correctly Report vcpu in stats API Pull request description: - online vcpus - time of each vcpu - share all vm_info captured with clients (I presume there is no intent to capture private information internally and not broadcast to clients, as the only place where `get_vm_stats()` is called is from `admin.vm.Stats`. --- Requires: - QubesOS/qubes-linux-utils#140

qubesos-bot · 2026-08-07T07:46:23Z

OpenQA test summary

Complete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2026082013-devel-fedora&flavor=pull-requests

Test run included the following:

New failures, excluding unstable

Compared to: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2026050504-devel&flavor=update

Failed tests

No failures!

Fixed failures

Compared to: https://openqa.qubes-os.org/tests/176874#dependencies
Nothing fixed

Unstable tests

Details

system_tests_dispvm
system_tests/Fail (1/5 times with errors)
- job 191554 Tests qubes.tests.integ.dispvm failed (exit code 1), details report...
system_tests/Failed (1/5 times with errors)
- job 191554 # Test died: Some tests failed at qubesos/tests/system_tests.pm lin...
TC_21_DispVM_Preload/test_015_preload_race_more (1/5 times with errors)
- job 191554 raise TimeoutError from exc_val... TimeoutError

Performance Tests

Performance degradation:

No issues

Remaining performance tests:

No remaining performance tests

marmarek · 2026-08-08T02:11:07Z

+	data->mem = ret_mem;
+	data->swap = ret_swap;


Those two may be uninitialized at this point. Maybe simply set to NULL at the start?

Now ret_mem and ret_swap are being initialized to NULL.

Allows distinguishing how much memory the qube is using from what is assigned by using "meminfo - swapinfo". For: QubesOS/qubes-core-admin#827

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jun 25, 2026

EXPERIMENTAL Report used memory without swap

f670ea7

For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jun 25, 2026

EXPERIMENTAL Report used memory without swap

f82da90

For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 3, 2026

EXPERIMENTAL Report used memory without swap

90c0c5b

For: QubesOS/qubes-linux-utils#140

ben-grande mentioned this pull request Jul 3, 2026

Report more statistics QubesOS/qubes-core-admin#827

Merged

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 6, 2026

EXPERIMENTAL Report used memory without swap

86e699c

For: QubesOS/qubes-linux-utils#140

marmarek requested changes Jul 10, 2026

View reviewed changes

ben-grande commented Jul 13, 2026

View reviewed changes

ben-grande force-pushed the share-swap branch from 49418ad to d12a416 Compare July 13, 2026 13:00

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 14, 2026

Report used memory without swap

34387aa

Although both values can be lied by the qube, we can distinguish the "memory types" being used in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 14, 2026

Report used memory without swap

e498748

Although both values can be lied by the qube, we can distinguish the "memory types" being used in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 16, 2026

Report used memory without swap

af7a111

Although both values can be lied by the qube, we can distinguish the "memory types" being used in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 17, 2026

Report amount of swap used

5ca395b

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 17, 2026

Report amount of swap used

e3d9365

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 21, 2026

Report amount of swap used

e710eec

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 22, 2026

Report amount of swap used

70e4e99

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 22, 2026

Report amount of swap used

4bdedb2

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 22, 2026

Report amount of swap used

d76da46

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 22, 2026

Report amount of swap used

c04a242

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 22, 2026

Report amount of swap used

7474282

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 23, 2026

Report amount of swap used

5d7a23e

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 23, 2026

Report amount of swap used

becbaaa

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 24, 2026

Report amount of swap used

d11fb09

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 24, 2026

Report amount of swap used

40b8979

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 30, 2026

Report amount of swap used

91e35df

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Jul 31, 2026

Report amount of swap used

4f5d8ea

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Aug 1, 2026

Report amount of swap used

9693a3e

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Aug 2, 2026

Report amount of swap used

e6ab0ad

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Aug 3, 2026

Report amount of swap used

19a909a

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

ben-grande added a commit to ben-grande/qubes-core-admin that referenced this pull request Aug 6, 2026

Report amount of swap used

afc9fb8

Although both values can be lied by the qube, we can distinguish the "memory types" in client tools. For: QubesOS/qubes-linux-utils#140

marmarek added the openqa-pending PR to be tested in the next OpenQA run label Aug 6, 2026

qubesos-qa Bot temporarily deployed to qa August 7, 2026 03:16 Inactive

This was referenced Aug 7, 2026

Obtain list of device types dynamically QubesOS/qubes-desktop-linux-manager#327

Merged

appmenus: update menus when template_for_dispvms changes QubesOS/qubes-desktop-linux-common#74

Merged

marmarek requested changes Aug 8, 2026

View reviewed changes

Report swapinfo

4575219

Allows distinguishing how much memory the qube is using from what is assigned by using "meminfo - swapinfo". For: QubesOS/qubes-core-admin#827

ben-grande force-pushed the share-swap branch from d12a416 to 4575219 Compare August 10, 2026 08:30

qubesos-qa Bot deployed to qa August 18, 2026 15:14 Active

marmarek approved these changes Aug 20, 2026

View reviewed changes

marmarek merged commit 2506306 into QubesOS:main Aug 20, 2026
2 of 3 checks passed

Navigation Menu

Uh oh!

Uh oh!

Report swapinfo - #140

Report swapinfo#140
marmarek merged 1 commit into
QubesOS:mainfrom
ben-grande:share-swap

ben-grande commented Jun 25, 2026

Uh oh!

codecov-commenter commented Jun 25, 2026 •

edited

Loading

Uh oh!

marmarek Jul 10, 2026

Uh oh!

marmarek Jul 10, 2026

Uh oh!

marmarek Jul 10, 2026

Uh oh!

ben-grande Jul 13, 2026

Uh oh!

ben-grande Jul 13, 2026

Uh oh!

qubesos-bot commented Aug 7, 2026 •

edited

Loading

Uh oh!

marmarek Aug 8, 2026

Uh oh!

ben-grande Aug 10, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		sprintf(used_mem_buf, "%lld", used_mem);
		sprintf(used_swap_buf, "%lld", used_swap);

Uh oh!

Uh oh!

Conversation

ben-grande commented Jun 25, 2026

Uh oh!

codecov-commenter commented Jun 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

marmarek Jul 10, 2026

Choose a reason for hiding this comment

Uh oh!

marmarek Jul 10, 2026

Choose a reason for hiding this comment

Uh oh!

marmarek Jul 10, 2026

Choose a reason for hiding this comment

Uh oh!

ben-grande Jul 13, 2026

Choose a reason for hiding this comment

Uh oh!

ben-grande Jul 13, 2026

Choose a reason for hiding this comment

Uh oh!

qubesos-bot commented Aug 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

OpenQA test summary

New failures, excluding unstable

Failed tests

Fixed failures

Unstable tests

Performance Tests

Performance degradation:

Remaining performance tests:

Uh oh!

marmarek Aug 8, 2026

Choose a reason for hiding this comment

Uh oh!

ben-grande Aug 10, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov-commenter commented Jun 25, 2026 •

edited

Loading

qubesos-bot commented Aug 7, 2026 •

edited

Loading