2023-10-13 20:26:45

by Moger, Babu

[permalink] [raw]
Subject: [PATCH v13 00/10] x86/resctrl: Miscellaneous resctrl features

These series adds support few minor features.
1. Support assigning multiple tasks to control/mon groups in one command.
2. Add debug mount option for resctrl interface.
3. Add RMID and CLOSID in resctrl interface when mounted with debug option.
4. Moves the default control group creation during the mount instead of during init.
5. Added support for the files for MON groups only
6. While doing these above changes, found that rftype flags needed some cleanup.
They were named inconsistently. Re-arranged them much more cleanly now and added
few comments. Hope it can help future additions.
---
v13:
Pardon me for sending two versions in a week. Hoping to get this series
in v6.7 kernel.
Rebased on top of Maciej patches. Resolved the conflict.
https://lore.kernel.org/lkml/[email protected]/
Resolved the documentation syntax issues. Needed few format changes.
This version is mostly for doc and commit message changes.

v12:
Most of the changes are related commit messages and code comments.
Moved the comments in arch/x86/kernel/cpu/resctrl/internal.h
to Documentation/arch/x86/resctrl.rst. (Boris)
Removed the text "Later patch' from commit message and moved the
text to the patch related to that changes. (Boris)
Added change log to each patch. (Fenghua)

v11:
Patches 1-2: No changes. Added Reviewed-by and fixed tag order. Fixed
the tag order for all the patches.
Patch 3: Corrected the commit messages about RFTYPE_MON_BASE.
Patch 4: Removed only from the text "Files only for CTRL group" in internal.h.
Patches 5-8: No changes.
Patch 9: Commit message change (Reinette). This patch needs Reviewed-by from
Reinette. Rest all have it already.
Patch 10: Removed only from the text "Files for MON group" in internal.h.(Peter)

v10:
Patches 1-2: no code changes. Added "Reviewed-by" from Fenghua.
Patch 3: Added the new flag RFTYPE_MON_BASE [comment for Reinette].
Removed the Reviewed as the patch has changed.
patch 4: No code change. Added "Reviewed-by" from Fenghua.
Patch 5: Removed empty lines in rdt_disable_ctx().
Patch 6: No changes. Added "Reviewed-by".
Patch 7: No changes.
Patch 8: No changes.
Patch 9: New patch. Added support for the files for MON groups only.
Patch 10: Modified. This patch only adds changes for "mon_hw_id" interface.
v9:
Changes since v8:
Split the RMID display in a separate patch. RMID is a special case here as it
should be printed only if monitoring is enabled.
Made rdtgroup_setup_root and rdtgroup_destroy_root as static functions.
Added code to print pid_str in case of task parse error.

v8:
Changes since v7:
Earlier moved both default group initialization and file creation on mount.
Now kept the group initialization as is and only moved the file creation on mount.
Re-organized the RFTYPE flags comments little more to avoid confusion. Thanks
to Reinette for feedback.
Re-factored the rdt_enable_ctx and added rdt_disable_ctx to unwind the errors.
And same call also used in rdt_kill_sb which simplifies the code.
Few other minor text changes.

v7:
Changes since v6:
While moving the default group file creation on mount, I also moved the
initialization of default group data structures. Reinette suggested to move
only the filesystem creation and keep the group initialization as is. Addressed it now.
Added a new function rdt_disable_ctx to unwind the context related features.
Few other minor text changes.

v6:
Changes since v5:
Moved the default group creation during mount instead of kernel init.
The rdt_root creation moved to rdt_get_tree as suggested by Reinette.
https://lore.kernel.org/lkml/[email protected]/
Needed to modify rdtgroup_setup_root to take care of this.
Re-arraged the patches to move the default group creation earlier.
Others are mostly text changes and few minor changes.
Patches are based on tip/master commit 1a2945f27157825a561be7840023e3664111ab2f

v5:
Changes since v4:
Moved the default group creation during mount instead of kernel init.
Tried to address most of the comments on commit log. Added more context and details.
Addressed feedback about the patch4. Removed the code changes and only kept the comments.
I am ok to drop patch4. But I will wait for the comment on that.
There were lots of comments. Hope I did not miss anything. Even if I missed, it is
not intentional.

v4: Changes since v3
Addressed comments from Reinette and others.
Removed newline requirement when adding tasks.
Dropped one of the changes on flags. Kept the flag names mostly same.
Changed the names of closid and rmid to ctrl_hw_id and mon_hw_id respectively.
James had some concerns about adding these files. Addressed it by making these
files x86 specific.
Tried to address Reinette's comment on patch 7. But due to current code design
I could not do it exact way. But changed it little bit to make it easy debug
file additions in the future.

v3: Changes since v2
Still waiting for more comments. While waiting, addressed few comments from Fenghua.
Added few more texts in the documentation about multiple tasks assignment feature.
Added pid in last_cmd_status when applicable.
Introduced static resctrl_debug to save the debug option.
Few minor text changes.

v2: Changes since v1
a. Removed the changes to add the task's threads automatically. It required
book keeping to handle the failures and gets complicated. Removed that change
for now.
b. Added -o debug option to mount in debug mode(comment from Fenghua)
c. Added debug files rmid and closid. Stephane wanted to rename them more
generic to accommodate ARM. It kind of loses meaning if is renamed differently.
Kept it same for now. Will change if he feels strong about it.

v12:https://lore.kernel.org/lkml/[email protected]/
v11:https://lore.kernel.org/lkml/[email protected]/
v10:https://lore.kernel.org/lkml/[email protected]/
v9: https://lore.kernel.org/lkml/[email protected]/
v8: https://lore.kernel.org/lkml/[email protected]/
v7: https://lore.kernel.org/lkml/169178429591.1147205.4030367096506551808.stgit@bmoger-ubuntu/
v6: https://lore.kernel.org/lkml/168980872063.1619861.420806535295905172.stgit@bmoger-ubuntu/
v5: https://lore.kernel.org/lkml/168564586603.527584.10518315376465080920.stgit@bmoger-ubuntu/
v4: https://lore.kernel.org/lkml/168177435378.1758847.8317743523931859131.stgit@bmoger-ubuntu/
v3: https://lore.kernel.org/lkml/167778850105.1053859.14596357862185564029.stgit@bmoger-ubuntu/
v2: https://lore.kernel.org/lkml/167537433143.647488.9641864719195184123.stgit@bmoger-ubuntu/
v1: https://lore.kernel.org/lkml/167278351577.34228.12803395505584557101.stgit@bmoger-ubuntu/

Babu Moger (10):
x86/resctrl: Add multiple tasks to the resctrl group at once
x86/resctrl: Simplify rftype flag definitions
x86/resctrl: Rename rftype flags for consistency
x86/resctrl: Add comments on RFTYPE flags hierarchy
x86/resctrl: Unwind the errors inside rdt_enable_ctx()
x86/resctrl: Move default group file creation to mount
x86/resctrl: Introduce "-o debug" mount option
x86/resctrl: Display CLOSID for resource group
x86/resctrl: Add support for the files for MON groups only
x86/resctrl: Display RMID of resource group

Documentation/arch/x86/resctrl.rst | 97 +++++++++-
arch/x86/kernel/cpu/resctrl/internal.h | 22 +--
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 255 ++++++++++++++++++-------
3 files changed, 291 insertions(+), 83 deletions(-)

--
2.34.1


2023-10-13 20:26:50

by Moger, Babu

[permalink] [raw]
Subject: [PATCH v13 02/10] x86/resctrl: Simplify rftype flag definitions

The rftype flags are bitmaps used for adding files under resctrl
filesystem. Some of these bitmaps have one extra level of indirection
which is not necessary.

Make them all direct definition to be consistent and easier to read.

Signed-off-by: Babu Moger <[email protected]>
Tested-by: Peter Newman <[email protected]>
Reviewed-by: Peter Newman <[email protected]>
Tested-by: Tan Shaopeng <[email protected]>
Reviewed-by: Tan Shaopeng <[email protected]>
Reviewed-by: Fenghua Yu <[email protected]>
Reviewed-by: Reinette Chatre <[email protected]>
Reviewed-by: Ilpo Järvinen <[email protected]>
---
v13: No changes

v12: No changes
---
arch/x86/kernel/cpu/resctrl/internal.h | 9 +++------
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 6 +++++-
2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index c47ef2f13e8e..0ad970c5c867 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -243,12 +243,9 @@ struct rdtgroup {
*/
#define RFTYPE_INFO BIT(0)
#define RFTYPE_BASE BIT(1)
-#define RF_CTRLSHIFT 4
-#define RF_MONSHIFT 5
-#define RF_TOPSHIFT 6
-#define RFTYPE_CTRL BIT(RF_CTRLSHIFT)
-#define RFTYPE_MON BIT(RF_MONSHIFT)
-#define RFTYPE_TOP BIT(RF_TOPSHIFT)
+#define RFTYPE_CTRL BIT(4)
+#define RFTYPE_MON BIT(5)
+#define RFTYPE_TOP BIT(6)
#define RFTYPE_RES_CACHE BIT(8)
#define RFTYPE_RES_MB BIT(9)
#define RF_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL)
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index fe239691628a..09141f1f0b96 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -3260,7 +3260,11 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
goto out_destroy;
}

- files = RFTYPE_BASE | BIT(RF_CTRLSHIFT + rtype);
+ if (rtype == RDTCTRL_GROUP)
+ files = RFTYPE_BASE | RFTYPE_CTRL;
+ else
+ files = RFTYPE_BASE | RFTYPE_MON;
+
ret = rdtgroup_add_files(kn, files);
if (ret) {
rdt_last_cmd_puts("kernfs fill error\n");
--
2.34.1

2023-10-13 20:26:52

by Moger, Babu

[permalink] [raw]
Subject: [PATCH v13 04/10] x86/resctrl: Add comments on RFTYPE flags hierarchy

resctrl uses RFTYPE flags for creating resctrl directory structure.

Definitions and directory structures are not documented. Add
comments to improve the readability and help future additions.

Signed-off-by: Babu Moger <[email protected]>
---
v13: Fixed the format issues in the documentation. Needed few minor format
changes to address the syntax issues.(Reinette)
Removed "Reviewed-by and Tested-by" flags as the patch has changed.

v12: Moved the comments from arch/x86/kernel/cpu/resctrl/internal.h
to Documentation/arch/x86/resctrl.rst. (Boris)
---
Documentation/arch/x86/resctrl.rst | 64 ++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)

diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
index 178ab1d8f747..1163da74f734 100644
--- a/Documentation/arch/x86/resctrl.rst
+++ b/Documentation/arch/x86/resctrl.rst
@@ -369,6 +369,70 @@ When monitoring is enabled all MON groups will also contain:
the sum for all tasks in the CTRL_MON group and all tasks in
MON groups. Please see example section for more details on usage.

+RESCTRL filesystem implementation notes
+=======================================
+RESCTRL filesystem has two main components
+ a. info
+ b. base
+
+ /sys/fs/resctrl/
+ |
+ -> info
+ |
+ | (Top level directory named "info". Contains files that
+ | provide details on control and monitoring resources")
+ |
+ -> base
+
+ (Root directory associated with default resource group as
+ well as directories created by user for MON and CTRL groups.
+ Contains files to interact with MON and CTRL groups)
+
+ Note: resctrl uses flags for files, not for directories.
+ Directories are created based on the resource type. Added
+ directories below for better understanding. The RFTYPE flags
+ are defined in arch/x86/kernel/cpu/resctrl/internal.h.
+
+ info directory structure
+
+ -> RFTYPE_INFO
+ Directory: info
+
+ -> RFTYPE_TOP (Files in top level of info directory)
+ File: last_cmd_status
+
+ -> RFTYPE_MON (Files for all monitoring resources)
+ Directory: L3_MON
+ Files: mon_features, num_rmids
+
+ -> RFTYPE_RES_CACHE (Files for cache monitoring resources)
+ Directory: L3_MON
+ Files: max_threshold_occupancy,
+ mbm_total_bytes_config,
+ mbm_local_bytes_config
+
+ -> RFTYPE_CTRL (Files for all control resources)
+ Directories: L2, L3, MB, SMBA, L2CODE, L2DATA, L3CODE, L3DATA
+ File: num_closids
+
+ -> RFTYPE_RES_CACHE (Files for cache control resources)
+ Directories: L2, L3, L2CODE, L2DATA, L3CODE, L3DATA
+ Files: bit_usage, cbm_mask, min_cbm_bits,
+ shareable_bits
+
+ -> RFTYPE_RES_MB (Files for memory control resources)
+ Directories: MB, SMBA
+ Files: bandwidth_gran, delay_linear,
+ min_bandwidth, thread_throttle_mode
+
+ base directory structure
+
+ -> RFTYPE_BASE (Files common for both MON and CTRL groups)
+ Files: cpus, cpus_list, tasks
+
+ -> RFTYPE_CTRL (Files for CTRL group)
+ Files: mode, schemata, size
+
Resource allocation rules
-------------------------

--
2.34.1

2023-10-13 20:27:01

by Moger, Babu

[permalink] [raw]
Subject: [PATCH v13 01/10] x86/resctrl: Add multiple tasks to the resctrl group at once

The resctrl task assignment for monitor or control group needs to be
done one at a time. For example:

$mount -t resctrl resctrl /sys/fs/resctrl/
$mkdir /sys/fs/resctrl/ctrl_grp1
$echo 123 > /sys/fs/resctrl/ctrl_grp1/tasks
$echo 456 > /sys/fs/resctrl/ctrl_grp1/tasks
$echo 789 > /sys/fs/resctrl/ctrl_grp1/tasks

This is not user-friendly when dealing with hundreds of tasks.

Support multiple task assignment in one command with tasks ids separated
by commas. For example:
$echo 123,456,789 > /sys/fs/resctrl/ctrl_grp1/tasks

Signed-off-by: Babu Moger <[email protected]>
Tested-by: Peter Newman <[email protected]>
Reviewed-by: Peter Newman <[email protected]>
Tested-by: Tan Shaopeng <[email protected]>
Reviewed-by: Tan Shaopeng <[email protected]>
Reviewed-by: Fenghua Yu <[email protected]>
Reviewed-by: Reinette Chatre <[email protected]>
Reviewed-by: Ilpo Järvinen <[email protected]>
---
v13: No changes

v12: No changes
---
Documentation/arch/x86/resctrl.rst | 9 ++++++++-
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 25 ++++++++++++++++++++++---
2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
index 4c6421e2aa31..178ab1d8f747 100644
--- a/Documentation/arch/x86/resctrl.rst
+++ b/Documentation/arch/x86/resctrl.rst
@@ -306,7 +306,14 @@ All groups contain the following files:
"tasks":
Reading this file shows the list of all tasks that belong to
this group. Writing a task id to the file will add a task to the
- group. If the group is a CTRL_MON group the task is removed from
+ group. Multiple tasks can be added by separating the task ids
+ with commas. Tasks will be assigned sequentially. Multiple
+ failures are not supported. A single failure encountered while
+ attempting to assign a task will cause the operation to abort and
+ already added tasks before the failure will remain in the group.
+ Failures will be logged to /sys/fs/resctrl/info/last_cmd_status.
+
+ If the group is a CTRL_MON group the task is removed from
whichever previous CTRL_MON group owned the task and also from
any MON group that owned the task. If the group is a MON group,
then the task must already belong to the CTRL_MON parent of this
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 09848ff11f7b..fe239691628a 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -696,11 +696,10 @@ static ssize_t rdtgroup_tasks_write(struct kernfs_open_file *of,
char *buf, size_t nbytes, loff_t off)
{
struct rdtgroup *rdtgrp;
+ char *pid_str;
int ret = 0;
pid_t pid;

- if (kstrtoint(strstrip(buf), 0, &pid) || pid < 0)
- return -EINVAL;
rdtgrp = rdtgroup_kn_lock_live(of->kn);
if (!rdtgrp) {
rdtgroup_kn_unlock(of->kn);
@@ -715,7 +714,27 @@ static ssize_t rdtgroup_tasks_write(struct kernfs_open_file *of,
goto unlock;
}

- ret = rdtgroup_move_task(pid, rdtgrp, of);
+ while (buf && buf[0] != '\0' && buf[0] != '\n') {
+ pid_str = strim(strsep(&buf, ","));
+
+ if (kstrtoint(pid_str, 0, &pid)) {
+ rdt_last_cmd_printf("Task list parsing error pid %s\n", pid_str);
+ ret = -EINVAL;
+ break;
+ }
+
+ if (pid < 0) {
+ rdt_last_cmd_printf("Invalid pid %d\n", pid);
+ ret = -EINVAL;
+ break;
+ }
+
+ ret = rdtgroup_move_task(pid, rdtgrp, of);
+ if (ret) {
+ rdt_last_cmd_printf("Error while processing task %d\n", pid);
+ break;
+ }
+ }

unlock:
rdtgroup_kn_unlock(of->kn);
--
2.34.1

2023-10-13 20:27:14

by Moger, Babu

[permalink] [raw]
Subject: [PATCH v13 05/10] x86/resctrl: Unwind the errors inside rdt_enable_ctx()

rdt_enable_ctx() enables the features provided during resctrl mount.

Additions to rdt_enable_ctx() are required to also modify error paths
of rdt_enable_ctx() callers to ensure correct unwinding if errors
are encountered after calling rdt_enable_ctx(). This is error prone.

Introduce rdt_disable_ctx() to refactor the error unwinding of
rdt_enable_ctx() to simplify future additions. This also simplifies
cleanup in rdt_kill_sb().

Suggested-by: Reinette Chatre <[email protected]>
Signed-off-by: Babu Moger <[email protected]>
Tested-by: Peter Newman <[email protected]>
Reviewed-by: Peter Newman <[email protected]>
Tested-by: Tan Shaopeng <[email protected]>
Reviewed-by: Tan Shaopeng <[email protected]>
Reviewed-by: Fenghua Yu <[email protected]>
Reviewed-by: Reinette Chatre <[email protected]>
Reviewed-by: Ilpo Järvinen <[email protected]>
---
v13: No changes.

v12: Removed the redundant comment about cdp_disable_all().(Boris)
---
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 53 ++++++++++++++++----------
1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 125d12d8f4b9..d1b5fd70ccbb 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -2308,14 +2308,6 @@ int resctrl_arch_set_cdp_enabled(enum resctrl_res_level l, bool enable)
return 0;
}

-static void cdp_disable_all(void)
-{
- if (resctrl_arch_get_cdp_enabled(RDT_RESOURCE_L3))
- resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L3, false);
- if (resctrl_arch_get_cdp_enabled(RDT_RESOURCE_L2))
- resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L2, false);
-}
-
/*
* We don't allow rdtgroup directories to be created anywhere
* except the root directory. Thus when looking for the rdtgroup
@@ -2395,19 +2387,42 @@ static int mkdir_mondata_all(struct kernfs_node *parent_kn,
struct rdtgroup *prgrp,
struct kernfs_node **mon_data_kn);

+static void rdt_disable_ctx(void)
+{
+ resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L3, false);
+ resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L2, false);
+ set_mba_sc(false);
+}
+
static int rdt_enable_ctx(struct rdt_fs_context *ctx)
{
int ret = 0;

- if (ctx->enable_cdpl2)
+ if (ctx->enable_cdpl2) {
ret = resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L2, true);
+ if (ret)
+ goto out_done;
+ }

- if (!ret && ctx->enable_cdpl3)
+ if (ctx->enable_cdpl3) {
ret = resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L3, true);
+ if (ret)
+ goto out_cdpl2;
+ }

- if (!ret && ctx->enable_mba_mbps)
+ if (ctx->enable_mba_mbps) {
ret = set_mba_sc(true);
+ if (ret)
+ goto out_cdpl3;
+ }
+
+ return 0;

+out_cdpl3:
+ resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L3, false);
+out_cdpl2:
+ resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L2, false);
+out_done:
return ret;
}

@@ -2515,13 +2530,13 @@ static int rdt_get_tree(struct fs_context *fc)
}

ret = rdt_enable_ctx(ctx);
- if (ret < 0)
- goto out_cdp;
+ if (ret)
+ goto out;

ret = schemata_list_create();
if (ret) {
schemata_list_destroy();
- goto out_mba;
+ goto out_ctx;
}

closid_init();
@@ -2580,11 +2595,8 @@ static int rdt_get_tree(struct fs_context *fc)
kernfs_remove(kn_info);
out_schemata_free:
schemata_list_destroy();
-out_mba:
- if (ctx->enable_mba_mbps)
- set_mba_sc(false);
-out_cdp:
- cdp_disable_all();
+out_ctx:
+ rdt_disable_ctx();
out:
rdt_last_cmd_clear();
mutex_unlock(&rdtgroup_mutex);
@@ -2816,12 +2828,11 @@ static void rdt_kill_sb(struct super_block *sb)
cpus_read_lock();
mutex_lock(&rdtgroup_mutex);

- set_mba_sc(false);
+ rdt_disable_ctx();

/*Put everything back to default values. */
for_each_alloc_capable_rdt_resource(r)
reset_all_ctrls(r);
- cdp_disable_all();
rmdir_all_sub();
rdt_pseudo_lock_release();
rdtgroup_default.mode = RDT_MODE_SHAREABLE;
--
2.34.1

2023-10-13 20:27:25

by Moger, Babu

[permalink] [raw]
Subject: [PATCH v13 08/10] x86/resctrl: Display CLOSID for resource group

In x86, hardware uses CLOSID to identify a control group. When a user
creates a control group this information is not visible to the user.
It can help resctrl debugging.

Add CLOSID(ctrl_hw_id) to the control groups display in resctrl
interface. Users can see this detail when resctrl is mounted with
"-o debug" option.

Other architectures do not use "CLOSID". Use the names ctrl_hw_id
to refer to "CLOSID" in an effort to keep the naming generic.

For example:
$cat /sys/fs/resctrl/ctrl_grp1/ctrl_hw_id
1

Signed-off-by: Babu Moger <[email protected]>
Tested-by: Peter Newman <[email protected]>
Reviewed-by: Peter Newman <[email protected]>
Tested-by: Tan Shaopeng <[email protected]>
Reviewed-by: Tan Shaopeng <[email protected]>
Reviewed-by: Fenghua Yu <[email protected]>
Reviewed-by: Reinette Chatre <[email protected]>
Reviewed-by: Ilpo Järvinen <[email protected]>
---
v13: No changes.

v12: Moved the comments about RFTYPE_DEBUG to resctrl.rst. (Boris)
---
Documentation/arch/x86/resctrl.rst | 7 +++++++
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 23 +++++++++++++++++++++++
2 files changed, 30 insertions(+)

diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
index 0438880e38c5..07225d9c0b0f 100644
--- a/Documentation/arch/x86/resctrl.rst
+++ b/Documentation/arch/x86/resctrl.rst
@@ -359,6 +359,10 @@ When control is enabled all CTRL_MON groups will also contain:
file. On successful pseudo-locked region creation the mode will
automatically change to "pseudo-locked".

+"ctrl_hw_id":
+ Available only with debug option. The identifier used by hardware
+ for the control group. On x86 this is the CLOSID.
+
When monitoring is enabled all MON groups will also contain:

"mon_data":
@@ -436,6 +440,9 @@ RESCTRL filesystem has two main components
-> RFTYPE_CTRL (Files for CTRL group)
Files: mode, schemata, size

+ -> RFTYPE_DEBUG (Files to help resctrl debugging)
+ File: ctrl_hw_id
+
Resource allocation rules
-------------------------

diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 84e0f45578dd..5814a0bf3cea 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -779,6 +779,22 @@ static int rdtgroup_tasks_show(struct kernfs_open_file *of,
return ret;
}

+static int rdtgroup_closid_show(struct kernfs_open_file *of,
+ struct seq_file *s, void *v)
+{
+ struct rdtgroup *rdtgrp;
+ int ret = 0;
+
+ rdtgrp = rdtgroup_kn_lock_live(of->kn);
+ if (rdtgrp)
+ seq_printf(s, "%u\n", rdtgrp->closid);
+ else
+ ret = -ENOENT;
+ rdtgroup_kn_unlock(of->kn);
+
+ return ret;
+}
+
#ifdef CONFIG_PROC_CPU_RESCTRL

/*
@@ -1881,6 +1897,13 @@ static struct rftype res_common_files[] = {
.seq_show = rdt_has_sparse_bitmasks_show,
.fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,
},
+ {
+ .name = "ctrl_hw_id",
+ .mode = 0444,
+ .kf_ops = &rdtgroup_kf_single_ops,
+ .seq_show = rdtgroup_closid_show,
+ .fflags = RFTYPE_CTRL_BASE | RFTYPE_DEBUG,
+ },

};

--
2.34.1

2023-10-13 20:27:41

by Moger, Babu

[permalink] [raw]
Subject: [PATCH v13 10/10] x86/resctrl: Display RMID of resource group

In x86, hardware uses RMID to identify a monitoring group. When a user
creates a monitor group these details are not visible. These details
can help resctrl debugging.

Add RMID(mon_hw_id) to the monitor groups display in resctrl interface.
Users can see these details when resctrl is mounted with "-o debug" option.

Add RFTYPE_MON_BASE that complements existing RFTYPE_CTRL_BASE and
represents files belonging to monitoring groups.

Other architectures do not use "RMID". Use the name mon_hw_id to refer
to "RMID" in an effort to keep the naming generic.

For example:
$cat /sys/fs/resctrl/mon_groups/mon_grp1/mon_hw_id
3

Signed-off-by: Babu Moger <[email protected]>
Tested-by: Peter Newman <[email protected]>
Reviewed-by: Peter Newman <[email protected]>
Tested-by: Tan Shaopeng <[email protected]>
Reviewed-by: Tan Shaopeng <[email protected]>
Reviewed-by: Fenghua Yu <[email protected]>
Reviewed-by: Reinette Chatre <[email protected]>
Reviewed-by: Ilpo Järvinen <[email protected]>
---
v13: Minor commit message update. (Reinette).

v12: Moved the comments from arch/x86/kernel/cpu/resctrl/internal.h
to Documentation/arch/x86/resctrl.rst. (Boris)
Moved RFTYPE_MON_BASE definition here where it is being used. (Boris)
---
Documentation/arch/x86/resctrl.rst | 12 ++++++++++++
arch/x86/kernel/cpu/resctrl/internal.h | 1 +
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 23 +++++++++++++++++++++++
3 files changed, 36 insertions(+)

diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
index 07225d9c0b0f..d1538b480b22 100644
--- a/Documentation/arch/x86/resctrl.rst
+++ b/Documentation/arch/x86/resctrl.rst
@@ -376,6 +376,10 @@ When monitoring is enabled all MON groups will also contain:
the sum for all tasks in the CTRL_MON group and all tasks in
MON groups. Please see example section for more details on usage.

+"mon_hw_id":
+ Available only with debug option. The identifier used by hardware
+ for the monitor group. On x86 this is the RMID.
+
RESCTRL filesystem implementation notes
=======================================
RESCTRL filesystem has two main components
@@ -440,6 +444,14 @@ RESCTRL filesystem has two main components
-> RFTYPE_CTRL (Files for CTRL group)
Files: mode, schemata, size

+ -> RFTYPE_MON (Files for MON group)
+
+ -> RFTYPE_DEBUG (Files to help resctrl debugging)
+ File: mon_hw_id
+
+ -> RFTYPE_CTRL (Files for CTRL group)
+ Files: mode, schemata, size
+
-> RFTYPE_DEBUG (Files to help resctrl debugging)
File: ctrl_hw_id

diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index b816b902b5c0..a4f1aa15f0a2 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -254,6 +254,7 @@ struct rdtgroup {
#define RFTYPE_MON_INFO (RFTYPE_INFO | RFTYPE_MON)
#define RFTYPE_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP)
#define RFTYPE_CTRL_BASE (RFTYPE_BASE | RFTYPE_CTRL)
+#define RFTYPE_MON_BASE (RFTYPE_BASE | RFTYPE_MON)

/* List of all resource groups */
extern struct list_head rdt_all_groups;
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 5f6d6ba63a2e..69a1de92384a 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -795,6 +795,22 @@ static int rdtgroup_closid_show(struct kernfs_open_file *of,
return ret;
}

+static int rdtgroup_rmid_show(struct kernfs_open_file *of,
+ struct seq_file *s, void *v)
+{
+ struct rdtgroup *rdtgrp;
+ int ret = 0;
+
+ rdtgrp = rdtgroup_kn_lock_live(of->kn);
+ if (rdtgrp)
+ seq_printf(s, "%u\n", rdtgrp->mon.rmid);
+ else
+ ret = -ENOENT;
+ rdtgroup_kn_unlock(of->kn);
+
+ return ret;
+}
+
#ifdef CONFIG_PROC_CPU_RESCTRL

/*
@@ -1867,6 +1883,13 @@ static struct rftype res_common_files[] = {
.seq_show = rdtgroup_tasks_show,
.fflags = RFTYPE_BASE,
},
+ {
+ .name = "mon_hw_id",
+ .mode = 0444,
+ .kf_ops = &rdtgroup_kf_single_ops,
+ .seq_show = rdtgroup_rmid_show,
+ .fflags = RFTYPE_MON_BASE | RFTYPE_DEBUG,
+ },
{
.name = "schemata",
.mode = 0644,
--
2.34.1

2023-10-13 20:27:44

by Moger, Babu

[permalink] [raw]
Subject: [PATCH v13 06/10] x86/resctrl: Move default group file creation to mount

The default resource group and its files are created during kernel
init time. Upcoming changes will make some resctrl files optional
based on a mount parameter. If optional files are to be added to the
default group based on the mount option, then each new file needs to
be created separately and call kernfs_activate() again.

Create all files of the default resource group during resctrl
mount, destroyed during unmount, to avoid scattering resctrl
file addition across two separate code flows.

Signed-off-by: Babu Moger <[email protected]>
Tested-by: Peter Newman <[email protected]>
Reviewed-by: Peter Newman <[email protected]>
Tested-by: Tan Shaopeng <[email protected]>
Reviewed-by: Tan Shaopeng <[email protected]>
Reviewed-by: Fenghua Yu <[email protected]>
Reviewed-by: Reinette Chatre <[email protected]>
Reviewed-by: Ilpo Järvinen <[email protected]>
---
v13: No changes

v12: No changes
---
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 58 +++++++++++++++-----------
1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index d1b5fd70ccbb..55da93b5ca53 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -54,6 +54,9 @@ static struct kernfs_node *kn_mondata;
static struct seq_buf last_cmd_status;
static char last_cmd_status_buf[512];

+static int rdtgroup_setup_root(struct rdt_fs_context *ctx);
+static void rdtgroup_destroy_root(void);
+
struct dentry *debugfs_resctrl;

void rdt_last_cmd_clear(void)
@@ -2529,10 +2532,14 @@ static int rdt_get_tree(struct fs_context *fc)
goto out;
}

- ret = rdt_enable_ctx(ctx);
+ ret = rdtgroup_setup_root(ctx);
if (ret)
goto out;

+ ret = rdt_enable_ctx(ctx);
+ if (ret)
+ goto out_root;
+
ret = schemata_list_create();
if (ret) {
schemata_list_destroy();
@@ -2541,6 +2548,12 @@ static int rdt_get_tree(struct fs_context *fc)

closid_init();

+ ret = rdtgroup_add_files(rdtgroup_default.kn, RFTYPE_CTRL_BASE);
+ if (ret)
+ goto out_schemata_free;
+
+ kernfs_activate(rdtgroup_default.kn);
+
ret = rdtgroup_create_info_dir(rdtgroup_default.kn);
if (ret < 0)
goto out_schemata_free;
@@ -2597,6 +2610,8 @@ static int rdt_get_tree(struct fs_context *fc)
schemata_list_destroy();
out_ctx:
rdt_disable_ctx();
+out_root:
+ rdtgroup_destroy_root();
out:
rdt_last_cmd_clear();
mutex_unlock(&rdtgroup_mutex);
@@ -2667,7 +2682,6 @@ static int rdt_init_fs_context(struct fs_context *fc)
if (!ctx)
return -ENOMEM;

- ctx->kfc.root = rdt_root;
ctx->kfc.magic = RDTGROUP_SUPER_MAGIC;
fc->fs_private = &ctx->kfc;
fc->ops = &rdt_fs_context_ops;
@@ -2837,6 +2851,7 @@ static void rdt_kill_sb(struct super_block *sb)
rdt_pseudo_lock_release();
rdtgroup_default.mode = RDT_MODE_SHAREABLE;
schemata_list_destroy();
+ rdtgroup_destroy_root();
static_branch_disable_cpuslocked(&rdt_alloc_enable_key);
static_branch_disable_cpuslocked(&rdt_mon_enable_key);
static_branch_disable_cpuslocked(&rdt_enable_key);
@@ -3718,10 +3733,8 @@ static struct kernfs_syscall_ops rdtgroup_kf_syscall_ops = {
.show_options = rdtgroup_show_options,
};

-static int __init rdtgroup_setup_root(void)
+static int rdtgroup_setup_root(struct rdt_fs_context *ctx)
{
- int ret;
-
rdt_root = kernfs_create_root(&rdtgroup_kf_syscall_ops,
KERNFS_ROOT_CREATE_DEACTIVATED |
KERNFS_ROOT_EXTRA_OPEN_PERM_CHECK,
@@ -3729,6 +3742,20 @@ static int __init rdtgroup_setup_root(void)
if (IS_ERR(rdt_root))
return PTR_ERR(rdt_root);

+ ctx->kfc.root = rdt_root;
+ rdtgroup_default.kn = kernfs_root_to_node(rdt_root);
+
+ return 0;
+}
+
+static void rdtgroup_destroy_root(void)
+{
+ kernfs_destroy_root(rdt_root);
+ rdtgroup_default.kn = NULL;
+}
+
+static void __init rdtgroup_setup_default(void)
+{
mutex_lock(&rdtgroup_mutex);

rdtgroup_default.closid = 0;
@@ -3738,19 +3765,7 @@ static int __init rdtgroup_setup_root(void)

list_add(&rdtgroup_default.rdtgroup_list, &rdt_all_groups);

- ret = rdtgroup_add_files(kernfs_root_to_node(rdt_root), RFTYPE_CTRL_BASE);
- if (ret) {
- kernfs_destroy_root(rdt_root);
- goto out;
- }
-
- rdtgroup_default.kn = kernfs_root_to_node(rdt_root);
- kernfs_activate(rdtgroup_default.kn);
-
-out:
mutex_unlock(&rdtgroup_mutex);
-
- return ret;
}

static void domain_destroy_mon_state(struct rdt_domain *d)
@@ -3872,13 +3887,11 @@ int __init rdtgroup_init(void)
seq_buf_init(&last_cmd_status, last_cmd_status_buf,
sizeof(last_cmd_status_buf));

- ret = rdtgroup_setup_root();
- if (ret)
- return ret;
+ rdtgroup_setup_default();

ret = sysfs_create_mount_point(fs_kobj, "resctrl");
if (ret)
- goto cleanup_root;
+ return ret;

ret = register_filesystem(&rdt_fs_type);
if (ret)
@@ -3911,8 +3924,6 @@ int __init rdtgroup_init(void)

cleanup_mountpoint:
sysfs_remove_mount_point(fs_kobj, "resctrl");
-cleanup_root:
- kernfs_destroy_root(rdt_root);

return ret;
}
@@ -3922,5 +3933,4 @@ void __exit rdtgroup_exit(void)
debugfs_remove_recursive(debugfs_resctrl);
unregister_filesystem(&rdt_fs_type);
sysfs_remove_mount_point(fs_kobj, "resctrl");
- kernfs_destroy_root(rdt_root);
}
--
2.34.1

2023-10-13 20:27:45

by Moger, Babu

[permalink] [raw]
Subject: [PATCH v13 03/10] x86/resctrl: Rename rftype flags for consistency

resctrl associates rftype flags with its files so that files can be chosen
based on the resource, whether it is info or base, and if it is control
or monitor type file. These flags use the RF_ as well as RFTYPE_ prefixes.

Change the prefix to RFTYPE_ for all these flags to be consistent.

Signed-off-by: Babu Moger <[email protected]>
Tested-by: Peter Newman <[email protected]>
Reviewed-by: Peter Newman <[email protected]>
Tested-by: Tan Shaopeng <[email protected]>
Reviewed-by: Tan Shaopeng <[email protected]>
Reviewed-by: Fenghua Yu <[email protected]>
Reviewed-by: Reinette Chatre <[email protected]>
Reviewed-by: Ilpo Järvinen <[email protected]>
---
v13: Changes related to rebase. New file "sparse_masks" flag has been updated.

v12: Moved the RFTYPE_MON_BASE definition to patch 10. (Boris)
---
arch/x86/kernel/cpu/resctrl/internal.h | 10 +++---
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 44 +++++++++++++-------------
2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index 0ad970c5c867..ba4611111212 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -248,10 +248,10 @@ struct rdtgroup {
#define RFTYPE_TOP BIT(6)
#define RFTYPE_RES_CACHE BIT(8)
#define RFTYPE_RES_MB BIT(9)
-#define RF_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL)
-#define RF_MON_INFO (RFTYPE_INFO | RFTYPE_MON)
-#define RF_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP)
-#define RF_CTRL_BASE (RFTYPE_BASE | RFTYPE_CTRL)
+#define RFTYPE_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL)
+#define RFTYPE_MON_INFO (RFTYPE_INFO | RFTYPE_MON)
+#define RFTYPE_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP)
+#define RFTYPE_CTRL_BASE (RFTYPE_BASE | RFTYPE_CTRL)

/* List of all resource groups */
extern struct list_head rdt_all_groups;
@@ -267,7 +267,7 @@ void __exit rdtgroup_exit(void);
* @mode: Access mode
* @kf_ops: File operations
* @flags: File specific RFTYPE_FLAGS_* flags
- * @fflags: File specific RF_* or RFTYPE_* flags
+ * @fflags: File specific RFTYPE_* flags
* @seq_show: Show content of the file
* @write: Write to the file
*/
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 09141f1f0b96..125d12d8f4b9 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -1716,77 +1716,77 @@ static struct rftype res_common_files[] = {
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdt_last_cmd_status_show,
- .fflags = RF_TOP_INFO,
+ .fflags = RFTYPE_TOP_INFO,
},
{
.name = "num_closids",
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdt_num_closids_show,
- .fflags = RF_CTRL_INFO,
+ .fflags = RFTYPE_CTRL_INFO,
},
{
.name = "mon_features",
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdt_mon_features_show,
- .fflags = RF_MON_INFO,
+ .fflags = RFTYPE_MON_INFO,
},
{
.name = "num_rmids",
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdt_num_rmids_show,
- .fflags = RF_MON_INFO,
+ .fflags = RFTYPE_MON_INFO,
},
{
.name = "cbm_mask",
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdt_default_ctrl_show,
- .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE,
+ .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,
},
{
.name = "min_cbm_bits",
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdt_min_cbm_bits_show,
- .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE,
+ .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,
},
{
.name = "shareable_bits",
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdt_shareable_bits_show,
- .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE,
+ .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,
},
{
.name = "bit_usage",
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdt_bit_usage_show,
- .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE,
+ .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,
},
{
.name = "min_bandwidth",
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdt_min_bw_show,
- .fflags = RF_CTRL_INFO | RFTYPE_RES_MB,
+ .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_MB,
},
{
.name = "bandwidth_gran",
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdt_bw_gran_show,
- .fflags = RF_CTRL_INFO | RFTYPE_RES_MB,
+ .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_MB,
},
{
.name = "delay_linear",
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdt_delay_linear_show,
- .fflags = RF_CTRL_INFO | RFTYPE_RES_MB,
+ .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_MB,
},
/*
* Platform specific which (if any) capabilities are provided by
@@ -1805,7 +1805,7 @@ static struct rftype res_common_files[] = {
.kf_ops = &rdtgroup_kf_single_ops,
.write = max_threshold_occ_write,
.seq_show = max_threshold_occ_show,
- .fflags = RF_MON_INFO | RFTYPE_RES_CACHE,
+ .fflags = RFTYPE_MON_INFO | RFTYPE_RES_CACHE,
},
{
.name = "mbm_total_bytes_config",
@@ -1852,7 +1852,7 @@ static struct rftype res_common_files[] = {
.kf_ops = &rdtgroup_kf_single_ops,
.write = rdtgroup_schemata_write,
.seq_show = rdtgroup_schemata_show,
- .fflags = RF_CTRL_BASE,
+ .fflags = RFTYPE_CTRL_BASE,
},
{
.name = "mode",
@@ -1860,21 +1860,21 @@ static struct rftype res_common_files[] = {
.kf_ops = &rdtgroup_kf_single_ops,
.write = rdtgroup_mode_write,
.seq_show = rdtgroup_mode_show,
- .fflags = RF_CTRL_BASE,
+ .fflags = RFTYPE_CTRL_BASE,
},
{
.name = "size",
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdtgroup_size_show,
- .fflags = RF_CTRL_BASE,
+ .fflags = RFTYPE_CTRL_BASE,
},
{
.name = "sparse_masks",
.mode = 0444,
.kf_ops = &rdtgroup_kf_single_ops,
.seq_show = rdt_has_sparse_bitmasks_show,
- .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE,
+ .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE,
},

};
@@ -1931,7 +1931,7 @@ void __init thread_throttle_mode_init(void)
if (!rft)
return;

- rft->fflags = RF_CTRL_INFO | RFTYPE_RES_MB;
+ rft->fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_MB;
}

void __init mbm_config_rftype_init(const char *config)
@@ -1940,7 +1940,7 @@ void __init mbm_config_rftype_init(const char *config)

rft = rdtgroup_get_rftype_by_name(config);
if (rft)
- rft->fflags = RF_MON_INFO | RFTYPE_RES_CACHE;
+ rft->fflags = RFTYPE_MON_INFO | RFTYPE_RES_CACHE;
}

/**
@@ -2075,21 +2075,21 @@ static int rdtgroup_create_info_dir(struct kernfs_node *parent_kn)
if (IS_ERR(kn_info))
return PTR_ERR(kn_info);

- ret = rdtgroup_add_files(kn_info, RF_TOP_INFO);
+ ret = rdtgroup_add_files(kn_info, RFTYPE_TOP_INFO);
if (ret)
goto out_destroy;

/* loop over enabled controls, these are all alloc_capable */
list_for_each_entry(s, &resctrl_schema_all, list) {
r = s->res;
- fflags = r->fflags | RF_CTRL_INFO;
+ fflags = r->fflags | RFTYPE_CTRL_INFO;
ret = rdtgroup_mkdir_info_resdir(s, s->name, fflags);
if (ret)
goto out_destroy;
}

for_each_mon_capable_rdt_resource(r) {
- fflags = r->fflags | RF_MON_INFO;
+ fflags = r->fflags | RFTYPE_MON_INFO;
sprintf(name, "%s_MON", r->name);
ret = rdtgroup_mkdir_info_resdir(r, name, fflags);
if (ret)
@@ -3727,7 +3727,7 @@ static int __init rdtgroup_setup_root(void)

list_add(&rdtgroup_default.rdtgroup_list, &rdt_all_groups);

- ret = rdtgroup_add_files(kernfs_root_to_node(rdt_root), RF_CTRL_BASE);
+ ret = rdtgroup_add_files(kernfs_root_to_node(rdt_root), RFTYPE_CTRL_BASE);
if (ret) {
kernfs_destroy_root(rdt_root);
goto out;
--
2.34.1

2023-10-13 20:27:47

by Moger, Babu

[permalink] [raw]
Subject: [PATCH v13 07/10] x86/resctrl: Introduce "-o debug" mount option

Add "-o debug" option to mount resctrl filesystem in debug mode.
When in debug mode resctrl displays files that have the new
RFTYPE_DEBUG flag to help resctrl debugging.

Signed-off-by: Babu Moger <[email protected]>
Tested-by: Peter Newman <[email protected]>
Reviewed-by: Peter Newman <[email protected]>
Tested-by: Tan Shaopeng <[email protected]>
Reviewed-by: Tan Shaopeng <[email protected]>
Reviewed-by: Fenghua Yu <[email protected]>
Reviewed-by: Reinette Chatre <[email protected]>
Reviewed-by: Ilpo Järvinen <[email protected]>
---
v13: No changes

v12: No changes
---
Documentation/arch/x86/resctrl.rst | 5 ++++-
arch/x86/kernel/cpu/resctrl/internal.h | 2 ++
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 18 ++++++++++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
index 1163da74f734..0438880e38c5 100644
--- a/Documentation/arch/x86/resctrl.rst
+++ b/Documentation/arch/x86/resctrl.rst
@@ -35,7 +35,7 @@ about the feature from resctrl's info directory.

To use the feature mount the file system::

- # mount -t resctrl resctrl [-o cdp[,cdpl2][,mba_MBps]] /sys/fs/resctrl
+ # mount -t resctrl resctrl [-o cdp[,cdpl2][,mba_MBps][,debug]] /sys/fs/resctrl

mount options are:

@@ -46,6 +46,9 @@ mount options are:
"mba_MBps":
Enable the MBA Software Controller(mba_sc) to specify MBA
bandwidth in MBps
+"debug":
+ Make debug files accessible. Available debug files are annotated with
+ "Available only with debug option".

L2 and L3 CDP are controlled separately.

diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index ba4611111212..b816b902b5c0 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -59,6 +59,7 @@ struct rdt_fs_context {
bool enable_cdpl2;
bool enable_cdpl3;
bool enable_mba_mbps;
+ bool enable_debug;
};

static inline struct rdt_fs_context *rdt_fc2context(struct fs_context *fc)
@@ -248,6 +249,7 @@ struct rdtgroup {
#define RFTYPE_TOP BIT(6)
#define RFTYPE_RES_CACHE BIT(8)
#define RFTYPE_RES_MB BIT(9)
+#define RFTYPE_DEBUG BIT(10)
#define RFTYPE_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL)
#define RFTYPE_MON_INFO (RFTYPE_INFO | RFTYPE_MON)
#define RFTYPE_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP)
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 55da93b5ca53..84e0f45578dd 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -59,6 +59,8 @@ static void rdtgroup_destroy_root(void);

struct dentry *debugfs_resctrl;

+static bool resctrl_debug;
+
void rdt_last_cmd_clear(void)
{
lockdep_assert_held(&rdtgroup_mutex);
@@ -1892,6 +1894,9 @@ static int rdtgroup_add_files(struct kernfs_node *kn, unsigned long fflags)

lockdep_assert_held(&rdtgroup_mutex);

+ if (resctrl_debug)
+ fflags |= RFTYPE_DEBUG;
+
for (rft = rfts; rft < rfts + len; rft++) {
if (rft->fflags && ((fflags & rft->fflags) == rft->fflags)) {
ret = rdtgroup_add_file(kn, rft);
@@ -2395,6 +2400,8 @@ static void rdt_disable_ctx(void)
resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L3, false);
resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L2, false);
set_mba_sc(false);
+
+ resctrl_debug = false;
}

static int rdt_enable_ctx(struct rdt_fs_context *ctx)
@@ -2419,6 +2426,9 @@ static int rdt_enable_ctx(struct rdt_fs_context *ctx)
goto out_cdpl3;
}

+ if (ctx->enable_debug)
+ resctrl_debug = true;
+
return 0;

out_cdpl3:
@@ -2623,6 +2633,7 @@ enum rdt_param {
Opt_cdp,
Opt_cdpl2,
Opt_mba_mbps,
+ Opt_debug,
nr__rdt_params
};

@@ -2630,6 +2641,7 @@ static const struct fs_parameter_spec rdt_fs_parameters[] = {
fsparam_flag("cdp", Opt_cdp),
fsparam_flag("cdpl2", Opt_cdpl2),
fsparam_flag("mba_MBps", Opt_mba_mbps),
+ fsparam_flag("debug", Opt_debug),
{}
};

@@ -2655,6 +2667,9 @@ static int rdt_parse_param(struct fs_context *fc, struct fs_parameter *param)
return -EINVAL;
ctx->enable_mba_mbps = true;
return 0;
+ case Opt_debug:
+ ctx->enable_debug = true;
+ return 0;
}

return -EINVAL;
@@ -3723,6 +3738,9 @@ static int rdtgroup_show_options(struct seq_file *seq, struct kernfs_root *kf)
if (is_mba_sc(&rdt_resources_all[RDT_RESOURCE_MBA].r_resctrl))
seq_puts(seq, ",mba_MBps");

+ if (resctrl_debug)
+ seq_puts(seq, ",debug");
+
return 0;
}

--
2.34.1

2023-10-13 20:27:53

by Moger, Babu

[permalink] [raw]
Subject: [PATCH v13 09/10] x86/resctrl: Add support for the files for MON groups only

Files unique to monitoring groups have the RFTYPE_MON flag. When a new
monitoring group is created the resctrl files with flags RFTYPE_BASE
(files common to all resource groups) and RFTYPE_MON (files unique to
monitoring groups) are created to support interacting with the new
monitoring group.

A resource group can support both monitoring and control, also termed
a CTRL_MON resource group. CTRL_MON groups should get both monitoring
and control resctrl files but that is not the case. Only the
RFTYPE_BASE and RFTYPE_CTRL files are created for CTRL_MON groups.

Ensure that files with the RFTYPE_MON flag are created for CTRL_MON groups.

Signed-off-by: Babu Moger <[email protected]>
Tested-by: Peter Newman <[email protected]>
Reviewed-by: Peter Newman <[email protected]>
Tested-by: Tan Shaopeng <[email protected]>
Reviewed-by: Tan Shaopeng <[email protected]>
Reviewed-by: Fenghua Yu <[email protected]>
Reviewed-by: Ilpo Järvinen <[email protected]>
Reviewed-by: Reinette Chatre <[email protected]>
---
v13: Commit message update(adds a blank line). (Reinette)

v12: Removed the comments about the later patch. The text is
moved to patch 10. (Boris)
---
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 5814a0bf3cea..5f6d6ba63a2e 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -2551,6 +2551,7 @@ static void schemata_list_destroy(void)
static int rdt_get_tree(struct fs_context *fc)
{
struct rdt_fs_context *ctx = rdt_fc2context(fc);
+ unsigned long flags = RFTYPE_CTRL_BASE;
struct rdt_domain *dom;
struct rdt_resource *r;
int ret;
@@ -2581,7 +2582,10 @@ static int rdt_get_tree(struct fs_context *fc)

closid_init();

- ret = rdtgroup_add_files(rdtgroup_default.kn, RFTYPE_CTRL_BASE);
+ if (rdt_mon_capable)
+ flags |= RFTYPE_MON;
+
+ ret = rdtgroup_add_files(rdtgroup_default.kn, flags);
if (ret)
goto out_schemata_free;

@@ -3271,8 +3275,8 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
enum rdt_group_type rtype, struct rdtgroup **r)
{
struct rdtgroup *prdtgrp, *rdtgrp;
+ unsigned long files = 0;
struct kernfs_node *kn;
- uint files = 0;
int ret;

prdtgrp = rdtgroup_kn_lock_live(parent_kn);
@@ -3324,10 +3328,13 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
goto out_destroy;
}

- if (rtype == RDTCTRL_GROUP)
+ if (rtype == RDTCTRL_GROUP) {
files = RFTYPE_BASE | RFTYPE_CTRL;
- else
+ if (rdt_mon_capable)
+ files |= RFTYPE_MON;
+ } else {
files = RFTYPE_BASE | RFTYPE_MON;
+ }

ret = rdtgroup_add_files(kn, files);
if (ret) {
--
2.34.1

2023-10-13 21:24:24

by Reinette Chatre

[permalink] [raw]
Subject: Re: [PATCH v13 04/10] x86/resctrl: Add comments on RFTYPE flags hierarchy

Hi Babu,

On 10/13/2023 1:25 PM, Babu Moger wrote:
> resctrl uses RFTYPE flags for creating resctrl directory structure.
>
> Definitions and directory structures are not documented. Add
> comments to improve the readability and help future additions.
>
> Signed-off-by: Babu Moger <[email protected]>
> ---
> v13: Fixed the format issues in the documentation. Needed few minor format
> changes to address the syntax issues.(Reinette)
> Removed "Reviewed-by and Tested-by" flags as the patch has changed.
>
> v12: Moved the comments from arch/x86/kernel/cpu/resctrl/internal.h
> to Documentation/arch/x86/resctrl.rst. (Boris)
> ---
> Documentation/arch/x86/resctrl.rst | 64 ++++++++++++++++++++++++++++++
> 1 file changed, 64 insertions(+)
>
> diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
> index 178ab1d8f747..1163da74f734 100644
> --- a/Documentation/arch/x86/resctrl.rst
> +++ b/Documentation/arch/x86/resctrl.rst
> @@ -369,6 +369,70 @@ When monitoring is enabled all MON groups will also contain:
> the sum for all tasks in the CTRL_MON group and all tasks in
> MON groups. Please see example section for more details on usage.
>
> +RESCTRL filesystem implementation notes
> +=======================================
> +RESCTRL filesystem has two main components
> + a. info
> + b. base
> +
> + /sys/fs/resctrl/
> + |
> + -> info
> + |
> + | (Top level directory named "info". Contains files that
> + | provide details on control and monitoring resources")
> + |
> + -> base
> +

Could you please do a "make htmldocs" and then ensure that the output looks sane?
The resulting output does not look right to me. For example, the above turns into
a single line that looks like:

/sys/fs/resctrl/ | -> info | | (Top level directory named "info". Contains files that | provide details on control and monitoring resources") | -> base


The spacing also looks off when viewing this in html.

> + (Root directory associated with default resource group as
> + well as directories created by user for MON and CTRL groups.
> + Contains files to interact with MON and CTRL groups)
> +
> + Note: resctrl uses flags for files, not for directories.
> + Directories are created based on the resource type. Added
> + directories below for better understanding. The RFTYPE flags
> + are defined in arch/x86/kernel/cpu/resctrl/internal.h.
> +
> + info directory structure
> +

You removed the separator in order to pass the syntax issue but now there is
no indication that this is a heading and the content becomes harder to understand.

> + -> RFTYPE_INFO
> + Directory: info
> +
> + -> RFTYPE_TOP (Files in top level of info directory)
> + File: last_cmd_status
> +
> + -> RFTYPE_MON (Files for all monitoring resources)
> + Directory: L3_MON
> + Files: mon_features, num_rmids
> +
> + -> RFTYPE_RES_CACHE (Files for cache monitoring resources)
> + Directory: L3_MON
> + Files: max_threshold_occupancy,
> + mbm_total_bytes_config,
> + mbm_local_bytes_config
> +
> + -> RFTYPE_CTRL (Files for all control resources)
> + Directories: L2, L3, MB, SMBA, L2CODE, L2DATA, L3CODE, L3DATA
> + File: num_closids
> +
> + -> RFTYPE_RES_CACHE (Files for cache control resources)
> + Directories: L2, L3, L2CODE, L2DATA, L3CODE, L3DATA
> + Files: bit_usage, cbm_mask, min_cbm_bits,
> + shareable_bits
> +
> + -> RFTYPE_RES_MB (Files for memory control resources)
> + Directories: MB, SMBA
> + Files: bandwidth_gran, delay_linear,
> + min_bandwidth, thread_throttle_mode
> +
> + base directory structure
> +

Same here.

> + -> RFTYPE_BASE (Files common for both MON and CTRL groups)
> + Files: cpus, cpus_list, tasks
> +
> + -> RFTYPE_CTRL (Files for CTRL group)
> + Files: mode, schemata, size
> +
> Resource allocation rules
> -------------------------
>

Reinette

2023-10-13 21:25:16

by Reinette Chatre

[permalink] [raw]
Subject: Re: [PATCH v13 10/10] x86/resctrl: Display RMID of resource group

Hi Babu,

On 10/13/2023 1:26 PM, Babu Moger wrote:

> @@ -440,6 +444,14 @@ RESCTRL filesystem has two main components
> -> RFTYPE_CTRL (Files for CTRL group)
> Files: mode, schemata, size
>
> + -> RFTYPE_MON (Files for MON group)
> +
> + -> RFTYPE_DEBUG (Files to help resctrl debugging)
> + File: mon_hw_id
> +
> + -> RFTYPE_CTRL (Files for CTRL group)
> + Files: mode, schemata, size
> +
> -> RFTYPE_DEBUG (Files to help resctrl debugging)
> File: ctrl_hw_id
>

Something went wrong during creation of this patch. Notice that the
"RFTYPE_CTRL" at the top is duplicated in the new changes and that
the "RFTYPE_MON" changes were inserted in the wrong place.

Reinette

2023-10-13 21:39:47

by Moger, Babu

[permalink] [raw]
Subject: Re: [PATCH v13 04/10] x86/resctrl: Add comments on RFTYPE flags hierarchy

Hi Reinette,

On 10/13/2023 4:23 PM, Reinette Chatre wrote:
> Hi Babu,
>
> On 10/13/2023 1:25 PM, Babu Moger wrote:
>> resctrl uses RFTYPE flags for creating resctrl directory structure.
>>
>> Definitions and directory structures are not documented. Add
>> comments to improve the readability and help future additions.
>>
>> Signed-off-by: Babu Moger <[email protected]>
>> ---
>> v13: Fixed the format issues in the documentation. Needed few minor format
>> changes to address the syntax issues.(Reinette)
>> Removed "Reviewed-by and Tested-by" flags as the patch has changed.
>>
>> v12: Moved the comments from arch/x86/kernel/cpu/resctrl/internal.h
>> to Documentation/arch/x86/resctrl.rst. (Boris)
>> ---
>> Documentation/arch/x86/resctrl.rst | 64 ++++++++++++++++++++++++++++++
>> 1 file changed, 64 insertions(+)
>>
>> diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
>> index 178ab1d8f747..1163da74f734 100644
>> --- a/Documentation/arch/x86/resctrl.rst
>> +++ b/Documentation/arch/x86/resctrl.rst
>> @@ -369,6 +369,70 @@ When monitoring is enabled all MON groups will also contain:
>> the sum for all tasks in the CTRL_MON group and all tasks in
>> MON groups. Please see example section for more details on usage.
>>
>> +RESCTRL filesystem implementation notes
>> +=======================================
>> +RESCTRL filesystem has two main components
>> + a. info
>> + b. base
>> +
>> + /sys/fs/resctrl/
>> + |
>> + -> info
>> + |
>> + | (Top level directory named "info". Contains files that
>> + | provide details on control and monitoring resources")
>> + |
>> + -> base
>> +
> Could you please do a "make htmldocs" and then ensure that the output looks sane?
> The resulting output does not look right to me. For example, the above turns into
> a single line that looks like:
>
> /sys/fs/resctrl/ | -> info | | (Top level directory named "info". Contains files that | provide details on control and monitoring resources") | -> base
>
>
> The spacing also looks off when viewing this in html.


Yes. Messed up again.  Thought fixing the syntax was enough. Will look
into this.


>
>> + (Root directory associated with default resource group as
>> + well as directories created by user for MON and CTRL groups.
>> + Contains files to interact with MON and CTRL groups)
>> +
>> + Note: resctrl uses flags for files, not for directories.
>> + Directories are created based on the resource type. Added
>> + directories below for better understanding. The RFTYPE flags
>> + are defined in arch/x86/kernel/cpu/resctrl/internal.h.
>> +
>> + info directory structure
>> +
> You removed the separator in order to pass the syntax issue but now there is
> no indication that this is a heading and the content becomes harder to understand.
Yes. I played with this little bit. Dont know how to make this look as
header. Will check it.
>
>> + -> RFTYPE_INFO
>> + Directory: info
>> +
>> + -> RFTYPE_TOP (Files in top level of info directory)
>> + File: last_cmd_status
>> +
>> + -> RFTYPE_MON (Files for all monitoring resources)
>> + Directory: L3_MON
>> + Files: mon_features, num_rmids
>> +
>> + -> RFTYPE_RES_CACHE (Files for cache monitoring resources)
>> + Directory: L3_MON
>> + Files: max_threshold_occupancy,
>> + mbm_total_bytes_config,
>> + mbm_local_bytes_config
>> +
>> + -> RFTYPE_CTRL (Files for all control resources)
>> + Directories: L2, L3, MB, SMBA, L2CODE, L2DATA, L3CODE, L3DATA
>> + File: num_closids
>> +
>> + -> RFTYPE_RES_CACHE (Files for cache control resources)
>> + Directories: L2, L3, L2CODE, L2DATA, L3CODE, L3DATA
>> + Files: bit_usage, cbm_mask, min_cbm_bits,
>> + shareable_bits
>> +
>> + -> RFTYPE_RES_MB (Files for memory control resources)
>> + Directories: MB, SMBA
>> + Files: bandwidth_gran, delay_linear,
>> + min_bandwidth, thread_throttle_mode
>> +
>> + base directory structure
>> +
> Same here.

Yes. Will check it.

thanks

Babu

2023-10-13 21:42:18

by Moger, Babu

[permalink] [raw]
Subject: Re: [PATCH v13 10/10] x86/resctrl: Display RMID of resource group

Hi Reinette,

On 10/13/2023 4:24 PM, Reinette Chatre wrote:
> Hi Babu,
>
> On 10/13/2023 1:26 PM, Babu Moger wrote:
>
>> @@ -440,6 +444,14 @@ RESCTRL filesystem has two main components
>> -> RFTYPE_CTRL (Files for CTRL group)
>> Files: mode, schemata, size
>>
>> + -> RFTYPE_MON (Files for MON group)
>> +
>> + -> RFTYPE_DEBUG (Files to help resctrl debugging)
>> + File: mon_hw_id
>> +
>> + -> RFTYPE_CTRL (Files for CTRL group)
>> + Files: mode, schemata, size
>> +
>> -> RFTYPE_DEBUG (Files to help resctrl debugging)
>> File: ctrl_hw_id
>>
> Something went wrong during creation of this patch. Notice that the
> "RFTYPE_CTRL" at the top is duplicated in the new changes and that
> the "RFTYPE_MON" changes were inserted in the wrong place.

Yes. Thanks for pointing that out.

Will check.

Thanks

Babu

2023-10-14 23:07:26

by Moger, Babu

[permalink] [raw]
Subject: Re: [PATCH v13 04/10] x86/resctrl: Add comments on RFTYPE flags hierarchy

Hi Reinette,

On 10/13/2023 4:39 PM, Moger, Babu wrote:
> Hi Reinette,
>
> On 10/13/2023 4:23 PM, Reinette Chatre wrote:
>> Hi Babu,
>>
>> On 10/13/2023 1:25 PM, Babu Moger wrote:
>>> resctrl uses RFTYPE flags for creating resctrl directory structure.
>>>
>>> Definitions and directory structures are not documented. Add
>>> comments to improve the readability and help future additions.
>>>
>>> Signed-off-by: Babu Moger <[email protected]>
>>> ---
>>> v13: Fixed the format issues in the documentation. Needed few minor
>>> format
>>>       changes to address the syntax issues.(Reinette)
>>>       Removed "Reviewed-by and Tested-by" flags as the patch has
>>> changed.
>>>
>>> v12: Moved the comments from arch/x86/kernel/cpu/resctrl/internal.h
>>>       to Documentation/arch/x86/resctrl.rst. (Boris)
>>> ---
>>>   Documentation/arch/x86/resctrl.rst | 64
>>> ++++++++++++++++++++++++++++++
>>>   1 file changed, 64 insertions(+)
>>>
>>> diff --git a/Documentation/arch/x86/resctrl.rst
>>> b/Documentation/arch/x86/resctrl.rst
>>> index 178ab1d8f747..1163da74f734 100644
>>> --- a/Documentation/arch/x86/resctrl.rst
>>> +++ b/Documentation/arch/x86/resctrl.rst
>>> @@ -369,6 +369,70 @@ When monitoring is enabled all MON groups will
>>> also contain:
>>>       the sum for all tasks in the CTRL_MON group and all tasks in
>>>       MON groups. Please see example section for more details on usage.
>>>   +RESCTRL filesystem implementation notes
>>> +=======================================
>>> +RESCTRL filesystem has two main components
>>> +    a. info
>>> +    b. base
>>> +
>>> +    /sys/fs/resctrl/
>>> +    |
>>> +    -> info
>>> +    |
>>> +    |  (Top level directory named "info". Contains files that
>>> +    |   provide details on control and monitoring resources")
>>> +    |
>>> +    -> base
>>> +
>> Could you please do a "make htmldocs" and then ensure that the output
>> looks sane?
>> The resulting output does not look right to me. For example, the
>> above turns into
>> a single line that looks like:
>>
>> /sys/fs/resctrl/ | -> info | | (Top level directory named "info".
>> Contains files that | provide details on control and monitoring
>> resources") | -> base
>>
>>
>> The spacing also looks off when viewing this in html.
>
I have fixed the all the format issues. Please let me know if it looks
ok. I will send the final version after that.

Attached the patch and also added the diff inline.

Thanks

diff --git a/Documentation/arch/x86/resctrl.rst
b/Documentation/arch/x86/resctrl.rst
index 178ab1d8f747..e990272e9a4f 100644
--- a/Documentation/arch/x86/resctrl.rst
+++ b/Documentation/arch/x86/resctrl.rst
@@ -396,6 +396,67 @@ Resource monitoring rules
 3) Otherwise RDT events for the task will be reported in the root level
    "mon_data" group.

+RESCTRL filesystem implementation notes
+---------------------------------------
+RESCTRL filesystem has two main components.
+
+a. info
+b. base
+
+::
+
+       /sys/fs/resctrl/
+               |
+               |--> info (Top level directory named "info". Contains
files that
+               |          provide details on control and monitoring
resources")
+               |
+               |--> base (Root directory associated with default
resource group as
+                          well as directories created by user for MON
and CTRL groups.
+                          Contains files to interact with MON and CTRL
groups)
+
+               Note: resctrl uses flags for files, not for directories.
Directories
+                     are created based on the resource type. Added the
directories
+                     below for better understanding. The RFTYPE flags
are defined
+                     in arch/x86/kernel/cpu/resctrl/internal.h.
+
+"info directory structure"::
+
+       --> RFTYPE_INFO
+           Directory: info
+               --> RFTYPE_TOP (Files in top level of info directory)
+                   File: last_cmd_status
+
+               --> RFTYPE_MON (Files for all monitoring resources)
+                   Directory: L3_MON
+                       Files: mon_features, num_rmids
+
+                       --> RFTYPE_RES_CACHE (Files for cache monitoring
resources)
+                           Directory: L3_MON
+                               Files: max_threshold_occupancy,
+                                      mbm_total_bytes_config,
+                                      mbm_local_bytes_config
+
+               --> RFTYPE_CTRL (Files for all control resources)
+                   Directories: L2, L3, MB, SMBA, L2CODE, L2DATA,
L3CODE, L3DATA
+                          File: num_closids
+
+                       --> RFTYPE_RES_CACHE (Files for cache control
resources)
+                           Directories: L2, L3, L2CODE, L2DATA, L3CODE,
L3DATA
+                                 Files: bit_usage, cbm_mask, min_cbm_bits,
+                                        shareable_bits
+
+                       --> RFTYPE_RES_MB (Files for memory control
resources)
+                           Directories: MB, SMBA
+                                 Files: bandwidth_gran, delay_linear,
+                                        min_bandwidth, thread_throttle_mode
+
+"base directory structure"::
+
+       --> RFTYPE_BASE (Files common for both MON and CTRL groups)
+           Files: cpus, cpus_list, tasks
+
+               --> RFTYPE_CTRL (Files for CTRL group)
+                   Files: mode, schemata, size

 Notes on cache occupancy monitoring and control
 ===============================================


Attachments:
patch4-10 (3.27 kB)

2023-10-16 20:47:09

by Reinette Chatre

[permalink] [raw]
Subject: Re: [PATCH v13 04/10] x86/resctrl: Add comments on RFTYPE flags hierarchy

Hi Babu,

On 10/14/2023 4:06 PM, Moger, Babu wrote:
> On 10/13/2023 4:39 PM, Moger, Babu wrote:
>> On 10/13/2023 4:23 PM, Reinette Chatre wrote:
>>> On 10/13/2023 1:25 PM, Babu Moger wrote:
>>>> resctrl uses RFTYPE flags for creating resctrl directory structure.
>>>>
>>>> Definitions and directory structures are not documented. Add
>>>> comments to improve the readability and help future additions.
>>>>
>>>> Signed-off-by: Babu Moger <[email protected]>
>>>> ---
>>>> v13: Fixed the format issues in the documentation. Needed few minor format
>>>>       changes to address the syntax issues.(Reinette)
>>>>       Removed "Reviewed-by and Tested-by" flags as the patch has changed.
>>>>
>>>> v12: Moved the comments from arch/x86/kernel/cpu/resctrl/internal.h
>>>>       to Documentation/arch/x86/resctrl.rst. (Boris)
>>>> ---
>>>>   Documentation/arch/x86/resctrl.rst | 64 ++++++++++++++++++++++++++++++
>>>>   1 file changed, 64 insertions(+)
>>>>
>>>> diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
>>>> index 178ab1d8f747..1163da74f734 100644
>>>> --- a/Documentation/arch/x86/resctrl.rst
>>>> +++ b/Documentation/arch/x86/resctrl.rst
>>>> @@ -369,6 +369,70 @@ When monitoring is enabled all MON groups will also contain:
>>>>       the sum for all tasks in the CTRL_MON group and all tasks in
>>>>       MON groups. Please see example section for more details on usage.
>>>>   +RESCTRL filesystem implementation notes
>>>> +=======================================
>>>> +RESCTRL filesystem has two main components
>>>> +    a. info
>>>> +    b. base
>>>> +
>>>> +    /sys/fs/resctrl/
>>>> +    |
>>>> +    -> info
>>>> +    |
>>>> +    |  (Top level directory named "info". Contains files that
>>>> +    |   provide details on control and monitoring resources")
>>>> +    |
>>>> +    -> base
>>>> +
>>> Could you please do a "make htmldocs" and then ensure that the output looks sane?
>>> The resulting output does not look right to me. For example, the above turns into
>>> a single line that looks like:
>>>
>>> /sys/fs/resctrl/ | -> info | | (Top level directory named "info". Contains files that | provide details on control and monitoring resources") | -> base
>>>
>>>
>>> The spacing also looks off when viewing this in html.
>>
> I have fixed the all the format issues. Please let me know if it
> looks ok. I will send the final version after that.
>
> Attached the patch and also added the diff inline.

This still does not look as though you consider how the document
looks after the changes.

Consider the organization. Before your changes (assume numbering starts
at 1):

1. User Interface for Resource Control feature
1.1 Info directory
1.2 Resource alloc and monitor groups
1.2.1 Resource allocation rules
1.2.2 Resource monitoring rules
1.3 Notes on cache occupancy monitoring and control
...

After your changes:

1. User Interface for Resource Control feature
1.1 Info directory
1.2 Resource alloc and monitor groups
1.2.1 Resource allocation rules
1.2.2 Resource monitoring rules
1.2.3 RESCTRL filesystem implementation notes
1.3 Notes on cache occupancy monitoring and control
...

Note how the "RESCTRL filesystem implementation notes" is inserted
as a subsection of resource and monitoring groups. Since the text
describes all files in resctrl (not just resource groups) I expect
that it would not be buried as a subsection of resource groups.

This addition also ignores existing customs. Nowhere in the
entire document will you find "RESCTRL" (well, except for the
config option).

> Thanks
>
> diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
> index 178ab1d8f747..e990272e9a4f 100644
> --- a/Documentation/arch/x86/resctrl.rst
> +++ b/Documentation/arch/x86/resctrl.rst
> @@ -396,6 +396,67 @@ Resource monitoring rules
>  3) Otherwise RDT events for the task will be reported in the root level
>     "mon_data" group.
>
> +RESCTRL filesystem implementation notes
> +---------------------------------------
> +RESCTRL filesystem has two main components.

This documentation was extracted as-is from the header file where it
was next to the flags being documented. With this move all that context
is lost so it may be helpful to summarize what is documented here.

> +
> +a. info
> +b. base
> +
> +::

If I understand correctly, instead of adjusting to the target format you
hardcode all the text as pre-formatted? That may be ok. I cannot speak to
whether this matches expectations of the proposal to move the documentation
here.

> +
> +       /sys/fs/resctrl/
> +               |
> +               |--> info (Top level directory named "info". Contains files that
> +               |          provide details on control and monitoring resources")
> +               |
> +               |--> base (Root directory associated with default resource group as
> +                          well as directories created by user for MON and CTRL groups.
> +                          Contains files to interact with MON and CTRL groups)
> +
> +               Note: resctrl uses flags for files, not for directories. Directories
> +                     are created based on the resource type. Added the directories
> +                     below for better understanding. The RFTYPE flags are defined
> +                     in arch/x86/kernel/cpu/resctrl/internal.h.
> +
> +"info directory structure"::
> +

This unexpected. In your previous response you noted that you did not know
how to make it look like a header. I expected that you would read the manual
to answer your own question but instead you just placed the title in quotes? I do
not see how placing text in quotes create impression that it is a header.
There is syntax to indicate section headers.

Reinette

2023-10-16 21:11:35

by Borislav Petkov

[permalink] [raw]
Subject: Re: [PATCH v13 04/10] x86/resctrl: Add comments on RFTYPE flags hierarchy

On Mon, Oct 16, 2023 at 01:46:42PM -0700, Reinette Chatre wrote:
> This still does not look as though you consider how the document
> looks after the changes.

Looking how this would take longer, Babu, you could leave out the
documentation changes for now and send the rest of the pile which has
been reviewed.

And then you can take your time and do the documentation stuff after
that.

HTH.

--
Regards/Gruss,
Boris.

https://people.kernel.org/tglx/notes-about-netiquette

2023-10-16 21:59:19

by Moger, Babu

[permalink] [raw]
Subject: Re: [PATCH v13 04/10] x86/resctrl: Add comments on RFTYPE flags hierarchy

Hi Boris,

On 10/16/2023 4:10 PM, Borislav Petkov wrote:
> On Mon, Oct 16, 2023 at 01:46:42PM -0700, Reinette Chatre wrote:
>> This still does not look as though you consider how the document
>> looks after the changes.
> Looking how this would take longer, Babu, you could leave out the
> documentation changes for now and send the rest of the pile which has
> been reviewed.
>
> And then you can take your time and do the documentation stuff after
> that.

Yes. Sure. Will send it  ASAP.

Thanks

Babu

2023-10-17 17:48:15

by Moger, Babu

[permalink] [raw]
Subject: Re: [PATCH v13 04/10] x86/resctrl: Add comments on RFTYPE flags hierarchy

Hi Reinette,

Boris pulled rest of the patches. Thank you very much for the feedback and
patience.

I can send this as a separate patch with all the FTYPE documentation
update. This need go later.


On 10/16/23 15:46, Reinette Chatre wrote:
> Hi Babu,
>
> On 10/14/2023 4:06 PM, Moger, Babu wrote:
>> On 10/13/2023 4:39 PM, Moger, Babu wrote:
>>> On 10/13/2023 4:23 PM, Reinette Chatre wrote:
>>>> On 10/13/2023 1:25 PM, Babu Moger wrote:
>>>>> resctrl uses RFTYPE flags for creating resctrl directory structure.
>>>>>
>>>>> Definitions and directory structures are not documented. Add
>>>>> comments to improve the readability and help future additions.
>>>>>
>>>>> Signed-off-by: Babu Moger <[email protected]>
>>>>> ---
>>>>> v13: Fixed the format issues in the documentation. Needed few minor format
>>>>>       changes to address the syntax issues.(Reinette)
>>>>>       Removed "Reviewed-by and Tested-by" flags as the patch has changed.
>>>>>
>>>>> v12: Moved the comments from arch/x86/kernel/cpu/resctrl/internal.h
>>>>>       to Documentation/arch/x86/resctrl.rst. (Boris)
>>>>> ---
>>>>>   Documentation/arch/x86/resctrl.rst | 64 ++++++++++++++++++++++++++++++
>>>>>   1 file changed, 64 insertions(+)
>>>>>
>>>>> diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
>>>>> index 178ab1d8f747..1163da74f734 100644
>>>>> --- a/Documentation/arch/x86/resctrl.rst
>>>>> +++ b/Documentation/arch/x86/resctrl.rst
>>>>> @@ -369,6 +369,70 @@ When monitoring is enabled all MON groups will also contain:
>>>>>       the sum for all tasks in the CTRL_MON group and all tasks in
>>>>>       MON groups. Please see example section for more details on usage.
>>>>>   +RESCTRL filesystem implementation notes
>>>>> +=======================================
>>>>> +RESCTRL filesystem has two main components
>>>>> +    a. info
>>>>> +    b. base
>>>>> +
>>>>> +    /sys/fs/resctrl/
>>>>> +    |
>>>>> +    -> info
>>>>> +    |
>>>>> +    |  (Top level directory named "info". Contains files that
>>>>> +    |   provide details on control and monitoring resources")
>>>>> +    |
>>>>> +    -> base
>>>>> +
>>>> Could you please do a "make htmldocs" and then ensure that the output looks sane?
>>>> The resulting output does not look right to me. For example, the above turns into
>>>> a single line that looks like:
>>>>
>>>> /sys/fs/resctrl/ | -> info | | (Top level directory named "info". Contains files that | provide details on control and monitoring resources") | -> base
>>>>
>>>>
>>>> The spacing also looks off when viewing this in html.
>>>
>> I have fixed the all the format issues. Please let me know if it
>> looks ok. I will send the final version after that.
>>
>> Attached the patch and also added the diff inline.
>
> This still does not look as though you consider how the document
> looks after the changes.
>
> Consider the organization. Before your changes (assume numbering starts
> at 1):
>
> 1. User Interface for Resource Control feature
> 1.1 Info directory
> 1.2 Resource alloc and monitor groups
> 1.2.1 Resource allocation rules
> 1.2.2 Resource monitoring rules
> 1.3 Notes on cache occupancy monitoring and control
> ...
>
> After your changes:
>
> 1. User Interface for Resource Control feature
> 1.1 Info directory
> 1.2 Resource alloc and monitor groups
> 1.2.1 Resource allocation rules
> 1.2.2 Resource monitoring rules
> 1.2.3 RESCTRL filesystem implementation notes
> 1.3 Notes on cache occupancy monitoring and control
> ...
>
> Note how the "RESCTRL filesystem implementation notes" is inserted
> as a subsection of resource and monitoring groups. Since the text
> describes all files in resctrl (not just resource groups) I expect
> that it would not be buried as a subsection of resource groups.

we can make a separate sub chapter for this. Something like this.

1. User Interface for Resource Control feature
1.1 Info directory
1.2 Resource alloc and monitor groups
1.2.1 Resource allocation rules
1.2.2 Resource monitoring rules
1.3 RESCTRL filesystem implementation notes
1.3.1 info directory structure
1.3.2 base directory structure
1.3 Notes on cache occupancy monitoring and control

>
> This addition also ignores existing customs. Nowhere in the
> entire document will you find "RESCTRL" (well, except for the
> config option).

Sure. We can change this to "resctrl"

>
>> Thanks
>>
>> diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
>> index 178ab1d8f747..e990272e9a4f 100644
>> --- a/Documentation/arch/x86/resctrl.rst
>> +++ b/Documentation/arch/x86/resctrl.rst
>> @@ -396,6 +396,67 @@ Resource monitoring rules
>>  3) Otherwise RDT events for the task will be reported in the root level
>>     "mon_data" group.
>>
>> +RESCTRL filesystem implementation notes
>> +---------------------------------------
>> +RESCTRL filesystem has two main components.
>
> This documentation was extracted as-is from the header file where it
> was next to the flags being documented. With this move all that context
> is lost so it may be helpful to summarize what is documented here.

I can move the notes here with some modifications.

>
>> +
>> +a. info
>> +b. base
>> +
>> +::
>
> If I understand correctly, instead of adjusting to the target format you
> hardcode all the text as pre-formatted? That may be ok. I cannot speak to
> whether this matches expectations of the proposal to move the documentation
> here.

I am not sure either.

>
>> +
>> +       /sys/fs/resctrl/
>> +               |
>> +               |--> info (Top level directory named "info". Contains files that
>> +               |          provide details on control and monitoring resources")
>> +               |
>> +               |--> base (Root directory associated with default resource group as
>> +                          well as directories created by user for MON and CTRL groups.
>> +                          Contains files to interact with MON and CTRL groups)
>> +
>> +               Note: resctrl uses flags for files, not for directories. Directories
>> +                     are created based on the resource type. Added the directories
>> +                     below for better understanding. The RFTYPE flags are defined
>> +                     in arch/x86/kernel/cpu/resctrl/internal.h.
>> +
>> +"info directory structure"::
>> +
>
> This unexpected. In your previous response you noted that you did not know
> how to make it look like a header. I expected that you would read the manual
> to answer your own question but instead you just placed the title in quotes? I do
> not see how placing text in quotes create impression that it is a header.
> There is syntax to indicate section headers.

Actually, i have kind of understood all the formatting details. Still
learning though. Attached the patch.
--
Thanks
Babu Moger


Attachments:
0001-x86-resctrl-Add-comments-on-RFTYPE-flags-hierarchy.patch (3.28 kB)

2023-10-17 20:12:38

by Reinette Chatre

[permalink] [raw]
Subject: Re: [PATCH v13 04/10] x86/resctrl: Add comments on RFTYPE flags hierarchy

Hi Babu,

On 10/17/2023 10:47 AM, Moger, Babu wrote:
> Hi Reinette,
>
> Boris pulled rest of the patches. Thank you very much for the feedback and
> patience.
>
> I can send this as a separate patch with all the FTYPE documentation
> update. This need go later.

ok

>
>
> On 10/16/23 15:46, Reinette Chatre wrote:
>> Hi Babu,
>>
>> On 10/14/2023 4:06 PM, Moger, Babu wrote:
>>> On 10/13/2023 4:39 PM, Moger, Babu wrote:
>>>> On 10/13/2023 4:23 PM, Reinette Chatre wrote:
>>>>> On 10/13/2023 1:25 PM, Babu Moger wrote:
>>>>>> resctrl uses RFTYPE flags for creating resctrl directory structure.
>>>>>>
>>>>>> Definitions and directory structures are not documented. Add
>>>>>> comments to improve the readability and help future additions.
>>>>>>
>>>>>> Signed-off-by: Babu Moger <[email protected]>
>>>>>> ---
>>>>>> v13: Fixed the format issues in the documentation. Needed few minor format
>>>>>>       changes to address the syntax issues.(Reinette)
>>>>>>       Removed "Reviewed-by and Tested-by" flags as the patch has changed.
>>>>>>
>>>>>> v12: Moved the comments from arch/x86/kernel/cpu/resctrl/internal.h
>>>>>>       to Documentation/arch/x86/resctrl.rst. (Boris)
>>>>>> ---
>>>>>>   Documentation/arch/x86/resctrl.rst | 64 ++++++++++++++++++++++++++++++
>>>>>>   1 file changed, 64 insertions(+)
>>>>>>
>>>>>> diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
>>>>>> index 178ab1d8f747..1163da74f734 100644
>>>>>> --- a/Documentation/arch/x86/resctrl.rst
>>>>>> +++ b/Documentation/arch/x86/resctrl.rst
>>>>>> @@ -369,6 +369,70 @@ When monitoring is enabled all MON groups will also contain:
>>>>>>       the sum for all tasks in the CTRL_MON group and all tasks in
>>>>>>       MON groups. Please see example section for more details on usage.
>>>>>>   +RESCTRL filesystem implementation notes
>>>>>> +=======================================
>>>>>> +RESCTRL filesystem has two main components
>>>>>> +    a. info
>>>>>> +    b. base
>>>>>> +
>>>>>> +    /sys/fs/resctrl/
>>>>>> +    |
>>>>>> +    -> info
>>>>>> +    |
>>>>>> +    |  (Top level directory named "info". Contains files that
>>>>>> +    |   provide details on control and monitoring resources")
>>>>>> +    |
>>>>>> +    -> base
>>>>>> +
>>>>> Could you please do a "make htmldocs" and then ensure that the output looks sane?
>>>>> The resulting output does not look right to me. For example, the above turns into
>>>>> a single line that looks like:
>>>>>
>>>>> /sys/fs/resctrl/ | -> info | | (Top level directory named "info". Contains files that | provide details on control and monitoring resources") | -> base
>>>>>
>>>>>
>>>>> The spacing also looks off when viewing this in html.
>>>>
>>> I have fixed the all the format issues. Please let me know if it
>>> looks ok. I will send the final version after that.
>>>
>>> Attached the patch and also added the diff inline.
>>
>> This still does not look as though you consider how the document
>> looks after the changes.
>>
>> Consider the organization. Before your changes (assume numbering starts
>> at 1):
>>
>> 1. User Interface for Resource Control feature
>> 1.1 Info directory
>> 1.2 Resource alloc and monitor groups
>> 1.2.1 Resource allocation rules
>> 1.2.2 Resource monitoring rules
>> 1.3 Notes on cache occupancy monitoring and control
>> ...
>>
>> After your changes:
>>
>> 1. User Interface for Resource Control feature
>> 1.1 Info directory
>> 1.2 Resource alloc and monitor groups
>> 1.2.1 Resource allocation rules
>> 1.2.2 Resource monitoring rules
>> 1.2.3 RESCTRL filesystem implementation notes
>> 1.3 Notes on cache occupancy monitoring and control
>> ...
>>
>> Note how the "RESCTRL filesystem implementation notes" is inserted
>> as a subsection of resource and monitoring groups. Since the text
>> describes all files in resctrl (not just resource groups) I expect
>> that it would not be buried as a subsection of resource groups.
>
> we can make a separate sub chapter for this. Something like this.
>
> 1. User Interface for Resource Control feature
> 1.1 Info directory
> 1.2 Resource alloc and monitor groups
> 1.2.1 Resource allocation rules
> 1.2.2 Resource monitoring rules
> 1.3 RESCTRL filesystem implementation notes
> 1.3.1 info directory structure
> 1.3.2 base directory structure
> 1.3 Notes on cache occupancy monitoring and control

ok. Since this is the first addition of any implementation notes
it does set a precedent. In this case it implies that implementation
notes would accompany the feature being described as opposed to all
implementation notes being placed together. I am not aware of
customs in this regard but having consistent text, like
"implementation notes" that a developer can search for is useful.

>>
>> This addition also ignores existing customs. Nowhere in the
>> entire document will you find "RESCTRL" (well, except for the
>> config option).
>
> Sure. We can change this to "resctrl"

Thank you.

>
>>
>>> Thanks
>>>
>>> diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
>>> index 178ab1d8f747..e990272e9a4f 100644
>>> --- a/Documentation/arch/x86/resctrl.rst
>>> +++ b/Documentation/arch/x86/resctrl.rst
>>> @@ -396,6 +396,67 @@ Resource monitoring rules
>>>  3) Otherwise RDT events for the task will be reported in the root level
>>>     "mon_data" group.
>>>
>>> +RESCTRL filesystem implementation notes
>>> +---------------------------------------
>>> +RESCTRL filesystem has two main components.
>>
>> This documentation was extracted as-is from the header file where it
>> was next to the flags being documented. With this move all that context
>> is lost so it may be helpful to summarize what is documented here.
>
> I can move the notes here with some modifications.
>
>>
>>> +
>>> +a. info
>>> +b. base
>>> +
>>> +::
>>
>> If I understand correctly, instead of adjusting to the target format you
>> hardcode all the text as pre-formatted? That may be ok. I cannot speak to
>> whether this matches expectations of the proposal to move the documentation
>> here.
>
> I am not sure either.
>

It seems that since this you decided to stop using pre-formatted text for
some of the text but not all?

>>
>>> +
>>> +       /sys/fs/resctrl/
>>> +               |
>>> +               |--> info (Top level directory named "info". Contains files that
>>> +               |          provide details on control and monitoring resources")
>>> +               |
>>> +               |--> base (Root directory associated with default resource group as
>>> +                          well as directories created by user for MON and CTRL groups.
>>> +                          Contains files to interact with MON and CTRL groups)
>>> +
>>> +               Note: resctrl uses flags for files, not for directories. Directories
>>> +                     are created based on the resource type. Added the directories
>>> +                     below for better understanding. The RFTYPE flags are defined
>>> +                     in arch/x86/kernel/cpu/resctrl/internal.h.
>>> +
>>> +"info directory structure"::
>>> +
>>
>> This unexpected. In your previous response you noted that you did not know
>> how to make it look like a header. I expected that you would read the manual
>> to answer your own question but instead you just placed the title in quotes? I do
>> not see how placing text in quotes create impression that it is a header.
>> There is syntax to indicate section headers.
>
> Actually, i have kind of understood all the formatting details. Still
> learning though. Attached the patch.

In the version I responded to you could have underlined the text with "~"
to turn it into a subsection of appropriate level.
For reference: https://docutils.sourceforge.io/docs/user/rst/quickstart.html

It is inconvenient to work with an attached patch. Please send patches
inline.

> Subject: [PATCH] x86/resctrl: Add comments on RFTYPE flags hierarchy
>
> resctrl uses RFTYPE flags for creating resctrl directory structure.
>
> Definitions and directory structures are not documented. Add
> comments to improve the readability and help future additions.
>

Commit message needs to be reworked considering that it is now
documentation and not just comments added to a header file.

> Signed-off-by: Babu Moger <[email protected]>
> ---
> Documentation/arch/x86/resctrl.rst | 73 ++++++++++++++++++++++++++++++
> 1 file changed, 73 insertions(+)
>
> diff --git a/Documentation/arch/x86/resctrl.rst b/Documentation/arch/x86/resctrl.rst
> index a6279df64a9d..c89a926934fe 100644
> --- a/Documentation/arch/x86/resctrl.rst
> +++ b/Documentation/arch/x86/resctrl.rst
> @@ -407,6 +407,79 @@ Resource monitoring rules
> 3) Otherwise RDT events for the task will be reported in the root level
> "mon_data" group.
>
> +resctrl filesystem implementation notes
> +=======================================
> +
> +This section lists the files and directories under resctrl filesystem to
> +understand filesystem hierarchy. resctrl module uses RFTYPE flags defined
> +in arch/x86/kernel/cpu/resctrl/internal.h to create files. Directories are
> +created based on the resource type.

First sentence can be dropped. It is not clear how it relates to what this
section describes. Also, there is no resctrl module,
so "resctrl module" -> "resctrl". Code moves around, especially nowadays in
resctrl. Noting the flags are enough for a developer to find them, no
need to name the header file.

So just:
resctrl uses RFTYPE flags to create files. Directories are created
based on the resource type.


> +
> +resctrl filesystem has two main components.

"components." -> "components:" ?

> +
> +1) info
> +2) base
> +
> +::
> +

The "::" above means that the text below is pre-formatted. Thus, all that
was needed was to copy the text from what you had in v11 to the new document.
I do not understand how so many issues could have slipped in while doing so
(see below).

> + /sys/fs/resctrl/
> + |
> + |--> info (Top level directory named "info". Contains files that
> + | provide details on control and monitoring resources")

monitoring resources" -> monitoring resources. ?

Also note that the alignment is different between the two sections. Can
the text be aligned to the parenthesis as before to match what is done
below?

> + |
> + --> base (Root directory associated with default resource group as
> + well as directories created by user for MON and CTRL groups.
> + Contains files to interact with MON and CTRL groups)
> +


This is different from what you had before and it now appears as though base is
at a different level from info.

Also, sentence needs to end with a period.


The text above is pre-formatted ...

> +info directory structure
> +------------------------
> +

... but the text below is no longer pre-formatted ? Why is this inconsistent?
I assumed from previous exchange that you switched to pre-formatted to not have
to deal with inconsistent spacing when using the same text in a reStructuredText
doc ... but now you are back to using the same text with the inconsistent spacing.

> + --> RFTYPE_INFO
> + Directory: info
> + --> RFTYPE_TOP (Files in top level of info directory)
> + File: last_cmd_status
> +
> + --> RFTYPE_MON (Files for all monitoring resources)
> + Directory: L3_MON
> + Files: mon_features, num_rmids
> +
> + --> RFTYPE_RES_CACHE (Files for cache monitoring resources)
> + Directory: L3_MON
> + Files: max_threshold_occupancy,
> + mbm_total_bytes_config,
> + mbm_local_bytes_config
> +
> + --> RFTYPE_CTRL (Files for all control resources)
> + Directories: L2, L3, MB, SMBA, L2CODE, L2DATA, L3CODE, L3DATA
> + File: num_closids
> +
> + --> RFTYPE_RES_CACHE (Files for cache control resources)
> + Directories: L2, L3, L2CODE, L2DATA, L3CODE, L3DATA
> + Files: bit_usage, cbm_mask, min_cbm_bits,
> + shareable_bits
> +
> + --> RFTYPE_RES_MB (Files for memory control resources)
> + Directories: MB, SMBA
> + Files: bandwidth_gran, delay_linear,
> + min_bandwidth, thread_throttle_mode
> +
> +base directory structure
> +--------------------------
> +

I am not familiar enough with the syntax to know if the underlining needs to
be precise.

As above, the text below is no longer pre-formatted? This brings some
unexpected views when I try to look at it in the generated html ...

> + --> RFTYPE_BASE (Files common for both MON and CTRL groups)
> + Files: cpus, cpus_list, tasks
> +
> + --> RFTYPE_MON (Files for MON group)
> +
> + --> RFTYPE_DEBUG (Files to help resctrl debugging)
> + File: mon_hw_id
> +
> + --> RFTYPE_CTRL (Files for CTRL group)
> + Files: mode, schemata, size
> +

For some reason the above snippet appears different when attempting a html
view. The "-->" uses a different character and the "Files" line is next to
the flag line, not below. Could you please run "make htmldocs" and confirm
that the generated file looks sane?

> + -> RFTYPE_DEBUG (Files to help resctrl debugging)
> + File: ctrl_hw_id
> +
>
> Notes on cache occupancy monitoring and control
> ===============================================
> --

Reinette