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>,
Reinette Chatre <reinette.chatre@intel.com>,
ilpo.jarvinen@linux.intel.com, x86@kernel.org,
linux-kernel@vger.kernel.org
Subject: [tip: x86/cache] x86/resctrl: Simplify rftype flag definitions
Date: Tue, 17 Oct 2023 12:18:02 -0000 [thread overview]
Message-ID: <169754508232.3135.14616801148439548823.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20231017002308.134480-3-babu.moger@amd.com>
The following commit has been merged into the x86/cache branch of tip:
Commit-ID: 6846dc1a31d1894a7acf52d8442fe73b34091022
Gitweb: https://git.kernel.org/tip/6846dc1a31d1894a7acf52d8442fe73b34091022
Author: Babu Moger <babu.moger@amd.com>
AuthorDate: Tue, 03 Oct 2023 18:54:22 -05:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Tue, 17 Oct 2023 11:51:16 +02:00
x86/resctrl: Simplify rftype flag definitions
The rftype flags are bitmaps used for adding files under the resctrl
filesystem. Some of these bitmap defines have one extra level of
indirection which is not necessary.
Drop the RF_* defines and simplify the macros.
[ bp: Massage commit message. ]
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: Reinette Chatre <reinette.chatre@intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.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-3-babu.moger@amd.com
---
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 c47ef2f..0ad970c 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 fe23969..09141f1 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");
next prev parent 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-bot2 for Babu Moger [this message]
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: x86/cache] x86/resctrl: Add support for the files of " tip-bot2 for Babu Moger
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=169754508232.3135.14616801148439548823.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®