shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

Merge pull request #34508 from intelfx/work/fix-io-reporting

Browse Source 
core/cgroup: cache IO accounting data when pruning a cgroup
This commit is contained in:
Mike Yuan 2024-09-30 17:38:00 +02:00 committed by GitHub
commit c52b2b6518
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/cgroup.c
View File

@ -3571,12 +3571,17 @@ void unit_prune_cgroup(Unit *u) {
if (!crt || !crt->cgroup_path) if (!crt || !crt->cgroup_path)
return; return;
/* Cache the last CPU and memory usage values before we destroy the cgroup */ /* Cache the last resource usage values before we destroy the cgroup */
(void) unit_get_cpu_usage(u, /* ret = */ NULL); (void) unit_get_cpu_usage(u, /* ret = */ NULL);
for (CGroupMemoryAccountingMetric metric = 0; metric <= _CGROUP_MEMORY_ACCOUNTING_METRIC_CACHED_LAST; metric++) for (CGroupMemoryAccountingMetric metric = 0; metric <= _CGROUP_MEMORY_ACCOUNTING_METRIC_CACHED_LAST; metric++)
(void) unit_get_memory_accounting(u, metric, /* ret = */ NULL); (void) unit_get_memory_accounting(u, metric, /* ret = */ NULL);
/* All IO metrics are read at once from the underlying cgroup, so issue just a single call */
(void) unit_get_io_accounting(u, _CGROUP_IO_ACCOUNTING_METRIC_INVALID, /* ret = */ NULL);
/* We do not cache IP metrics here because the firewall objects are not freed with cgroups */
#if BPF_FRAMEWORK #if BPF_FRAMEWORK
(void) bpf_restrict_fs_cleanup(u); /* Remove cgroup from the global LSM BPF map */ (void) bpf_restrict_fs_cleanup(u); /* Remove cgroup from the global LSM BPF map */
#endif #endif
@ -4858,13 +4863,19 @@ static int unit_get_io_accounting_raw(
int unit_get_io_accounting( int unit_get_io_accounting(
Unit *u, Unit *u,
CGroupIOAccountingMetric metric, CGroupIOAccountingMetric metric,
bool allow_cache,
uint64_t *ret) { uint64_t *ret) {
uint64_t raw[_CGROUP_IO_ACCOUNTING_METRIC_MAX]; uint64_t raw[_CGROUP_IO_ACCOUNTING_METRIC_MAX];
int r; int r;
/* Retrieve an IO account parameter. This will subtract the counter when the unit was started. */ /*
* Retrieve an IO counter, subtracting the value of the counter value at the time the unit was started.
* If ret == NULL and metric == _<...>_INVALID, no return value is expected (refresh the caches only).
*/
assert(u);
assert(metric >= 0 || (!ret && metric == _CGROUP_IO_ACCOUNTING_METRIC_INVALID));
assert(metric < _CGROUP_IO_ACCOUNTING_METRIC_MAX);
if (!UNIT_CGROUP_BOOL(u, io_accounting)) if (!UNIT_CGROUP_BOOL(u, io_accounting))
return -ENODATA; return -ENODATA;
@ -4873,11 +4884,8 @@ int unit_get_io_accounting(
if (!crt) if (!crt)
return -ENODATA; return -ENODATA;
if (allow_cache && crt->io_accounting_last[metric] != UINT64_MAX)
goto done;
r = unit_get_io_accounting_raw(u, crt, raw); r = unit_get_io_accounting_raw(u, crt, raw);
if (r == -ENODATA && crt->io_accounting_last[metric] != UINT64_MAX) if (r == -ENODATA && metric >= 0 && crt->io_accounting_last[metric] != UINT64_MAX)
goto done; goto done;
if (r < 0) if (r < 0)
return r; return r;

2
src/core/cgroup.h
View File

@ -481,7 +481,7 @@ int unit_get_memory_current(Unit *u, uint64_t *ret);
int unit_get_memory_accounting(Unit *u, CGroupMemoryAccountingMetric metric, uint64_t *ret); int unit_get_memory_accounting(Unit *u, CGroupMemoryAccountingMetric metric, uint64_t *ret);
int unit_get_tasks_current(Unit *u, uint64_t *ret); int unit_get_tasks_current(Unit *u, uint64_t *ret);
int unit_get_cpu_usage(Unit *u, nsec_t *ret); int unit_get_cpu_usage(Unit *u, nsec_t *ret);
int unit_get_io_accounting(Unit *u, CGroupIOAccountingMetric metric, bool allow_cache, uint64_t *ret); int unit_get_io_accounting(Unit *u, CGroupIOAccountingMetric metric, uint64_t *ret);
int unit_get_ip_accounting(Unit *u, CGroupIPAccountingMetric metric, uint64_t *ret); int unit_get_ip_accounting(Unit *u, CGroupIPAccountingMetric metric, uint64_t *ret);
int unit_get_effective_limit(Unit *u, CGroupLimitType type, uint64_t *ret); int unit_get_effective_limit(Unit *u, CGroupLimitType type, uint64_t *ret);

2
src/core/dbus-unit.c
View File

@ -1456,7 +1456,7 @@ static int property_get_io_counter(
assert(property); assert(property);
assert_se((metric = cgroup_io_accounting_metric_from_string(property)) >= 0); assert_se((metric = cgroup_io_accounting_metric_from_string(property)) >= 0);
(void) unit_get_io_accounting(u, metric, /* allow_cache= */ false, &value); (void) unit_get_io_accounting(u, metric, &value);
return sd_bus_message_append(reply, "t", value); return sd_bus_message_append(reply, "t", value);
} }

2
src/core/unit.c
View File

@ -2385,7 +2385,7 @@ static int unit_log_resources(Unit *u) {
assert(io_fields[k].journal_field); assert(io_fields[k].journal_field);
(void) unit_get_io_accounting(u, k, k > 0, &value); (void) unit_get_io_accounting(u, k, &value);
if (value == UINT64_MAX) if (value == UINT64_MAX)
continue; continue;