mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Babu Moger" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Babu Moger <babu.moger@amd.com>,
	"Borislav Petkov (AMD)" <bp@alien8.de>,
	Peter Newman <peternewman@google.com>,
	Tan Shaopeng <tan.shaopeng@jp.fujitsu.com>,
	Fenghua Yu <fenghua.yu@intel.com>,
	ilpo.jarvinen@linux.intel.com,
	Reinette Chatre <reinette.chatre@intel.com>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/cache] x86/resctrl: Add support for the files of MON groups only
Date: Tue, 17 Oct 2023 12:17:58 -0000	[thread overview]
Message-ID: <169754507834.3135.8385571109591338616.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20231017002308.134480-9-babu.moger@amd.com>

The following commit has been merged into the x86/cache branch of tip:

Commit-ID:     918f211b5e4e709e91acf856967a850569c96b71
Gitweb:        https://git.kernel.org/tip/918f211b5e4e709e91acf856967a850569c96b71
Author:        Babu Moger <babu.moger@amd.com>
AuthorDate:    Mon, 16 Oct 2023 19:23:07 -05:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Tue, 17 Oct 2023 14:05:24 +02:00

x86/resctrl: Add support for the files of 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 <babu.moger@amd.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Peter Newman <peternewman@google.com>
Reviewed-by: Tan Shaopeng <tan.shaopeng@jp.fujitsu.com>
Reviewed-by: Fenghua Yu <fenghua.yu@intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Tested-by: Peter Newman <peternewman@google.com>
Tested-by: Tan Shaopeng <tan.shaopeng@jp.fujitsu.com>
Link: https://lore.kernel.org/r/20231017002308.134480-9-babu.moger@amd.com
---
 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 5814a0b..5f6d6ba 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) {

  reply	other threads:[~2023-10-17 12:18 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-17  0:22 [PATCH v14 0/9] x86/resctrl: Miscellaneous resctrl features Babu Moger
2023-10-17  0:23 ` [PATCH v14 1/9] x86/resctrl: Add multiple tasks to the resctrl group at once Babu Moger
2023-10-17 12:18   ` [tip: x86/cache] " tip-bot2 for Babu Moger
2023-10-17  0:23 ` [PATCH v14 2/9] x86/resctrl: Simplify rftype flag definitions Babu Moger
2023-10-17 12:18   ` [tip: x86/cache] " tip-bot2 for Babu Moger
2023-10-17  0:23 ` [PATCH v14 3/9] x86/resctrl: Rename rftype flags for consistency Babu Moger
2023-10-17 12:18   ` [tip: x86/cache] " tip-bot2 for Babu Moger
2023-10-17  0:23 ` [PATCH v14 4/9] x86/resctrl: Unwind the errors inside rdt_enable_ctx() Babu Moger
2023-10-17 12:18   ` [tip: x86/cache] x86/resctrl: Unwind properly from rdt_enable_ctx() tip-bot2 for Babu Moger
2023-10-17  0:23 ` [PATCH v14 5/9] x86/resctrl: Move default group file creation to mount Babu Moger
2023-10-17 12:18   ` [tip: x86/cache] " tip-bot2 for Babu Moger
2023-10-17  0:23 ` [PATCH v14 6/9] x86/resctrl: Introduce "-o debug" mount option Babu Moger
2023-10-17 12:17   ` [tip: x86/cache] " tip-bot2 for Babu Moger
2023-10-17  0:23 ` [PATCH v14 7/9] x86/resctrl: Display CLOSID for resource group Babu Moger
2023-10-17 12:17   ` [tip: x86/cache] " tip-bot2 for Babu Moger
2023-10-17  0:23 ` [PATCH v14 8/9] x86/resctrl: Add support for the files for MON groups only Babu Moger
2023-10-17 12:17   ` tip-bot2 for Babu Moger [this message]
2023-10-17  0:23 ` [PATCH v14 9/9] x86/resctrl: Display RMID of resource group Babu Moger
2023-10-17 12:17   ` [tip: x86/cache] " tip-bot2 for Babu Moger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=169754507834.3135.8385571109591338616.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=babu.moger@amd.com \
    --cc=bp@alien8.de \
    --cc=fenghua.yu@intel.com \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=peternewman@google.com \
    --cc=reinette.chatre@intel.com \
    --cc=tan.shaopeng@jp.fujitsu.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®