Skip to content

intelrdt: honor default closID #1858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

intelrdt: honor default closID #1858

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e971123
intelrdt: factor common code in a new function
giuseppe Aug 27, 2025
275305f
intelrdt: honor default closID
giuseppe Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions src/libcrun/intelrdt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,18 @@ compare_rdt_configurations (const char *a, const char *b)
return 0;
}

static bool
is_default_clos (const char *name)
{
return strcmp (name, "/") == 0;
}

static int
get_resctrl_path (char **path, const char *file, const char *name, libcrun_error_t *err)
{
return append_paths (path, err, INTEL_RDT_MOUNT_POINT, name, file, NULL);
}

static int
validate_rdt_configuration (const char *name, const char *l3_cache_schema, const char *mem_bw_schema, libcrun_error_t *err)
{
Expand All @@ -176,7 +188,7 @@ validate_rdt_configuration (const char *name, const char *l3_cache_schema, const
char *it, *end;
int ret;

ret = append_paths (&path, err, INTEL_RDT_MOUNT_POINT, name, SCHEMATA_FILE, NULL);
ret = get_resctrl_path (&path, SCHEMATA_FILE, name, err);
if (UNLIKELY (ret < 0))
return ret;

Expand Down Expand Up @@ -259,7 +271,7 @@ resctl_create (const char *name, bool explicit_clos_id, bool *created, const cha
if (ret == 0)
return crun_make_error (err, 0, "the resctl file system is not mounted");

ret = append_paths (&path, err, INTEL_RDT_MOUNT_POINT, name, NULL);
ret = get_resctrl_path (&path, NULL, name, err);
if (UNLIKELY (ret < 0))
return ret;

Expand All @@ -274,7 +286,7 @@ resctl_create (const char *name, bool explicit_clos_id, bool *created, const cha
the group must exist. */
if (explicit_clos_id && is_empty_string (l3_cache_schema) && is_empty_string (mem_bw_schema) && (schemata == NULL))
{
if (exist)
if (exist || is_default_clos (name))
return 0;

return crun_make_error (err, 0, "the resctl group `%s` does not exist", name);
Expand All @@ -284,6 +296,9 @@ resctl_create (const char *name, bool explicit_clos_id, bool *created, const cha
if (exist && (l3_cache_schema != NULL || mem_bw_schema != NULL))
return validate_rdt_configuration (name, l3_cache_schema, mem_bw_schema, err);

if (is_default_clos (name))
return 0;

/* At this point, assume it was created. */
ret = crun_ensure_directory (path, 0755, true, err);
if (UNLIKELY (ret < 0))
Expand All @@ -302,7 +317,7 @@ resctl_move_task_to (const char *name, const char *monitoring_name, pid_t pid, l
int len;
int ret;

ret = append_paths (&path, err, INTEL_RDT_MOUNT_POINT, name, TASKS_FILE, NULL);
ret = get_resctrl_path (&path, TASKS_FILE, name, err);
if (UNLIKELY (ret < 0))
return ret;

Expand Down Expand Up @@ -342,7 +357,7 @@ resctl_update (const char *name, const char *l3_cache_schema, const char *mem_bw
if (l3_cache_schema == NULL && mem_bw_schema == NULL && schemata == NULL)
return 0;

ret = append_paths (&path, err, INTEL_RDT_MOUNT_POINT, name, SCHEMATA_FILE, NULL);
ret = get_resctrl_path (&path, SCHEMATA_FILE, name, err);
if (UNLIKELY (ret < 0))
return ret;

Expand Down Expand Up @@ -394,7 +409,10 @@ resctl_destroy (const char *name, libcrun_error_t *err)
cleanup_free char *path = NULL;
int ret;

ret = append_paths (&path, err, INTEL_RDT_MOUNT_POINT, name, NULL);
if (is_default_clos (name))
return 0;

ret = get_resctrl_path (&path, NULL, name, err);
if (UNLIKELY (ret < 0))
return ret;

Expand Down