From: Tony Luck <tony.luck@intel.com>
To: Fenghua Yu <fenghua.yu@intel.com>,
Reinette Chatre <reinette.chatre@intel.com>,
Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>,
Peter Newman <peternewman@google.com>,
James Morse <james.morse@arm.com>,
Babu Moger <babu.moger@amd.com>,
Drew Fustini <dfustini@baylibre.com>,
Dave Martin <Dave.Martin@arm.com>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
patches@lists.linux.dev, Tony Luck <tony.luck@intel.com>
Subject: [PATCH v23 10/19] x86/resctrl: Initialize on-stack struct rmid_read instances
Date: Fri, 28 Jun 2024 14:56:10 -0700 [thread overview]
Message-ID: <20240628215619.76401-11-tony.luck@intel.com> (raw)
In-Reply-To: <20240628215619.76401-1-tony.luck@intel.com>
New semantics rely on some struct rmid_read members having NULL values
to distinguish between the SNC and non-SNC scenarios. resctrl can thus
no longer rely on this struct not being initialized properly.
Initialize all on-stack declarations of struct rmid_read:
rdtgroup_mondata_show()
mbm_update()
mkdir_mondata_subdir()
to ensure that garbage values from the stack are not passed down
to other functions.
Remove redundant rr->val = 0; from mon_event_read() and rr.first = false;
from mbm_update() since the rmid_read structure is cleared by compiler.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
---
arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 3 +--
arch/x86/kernel/cpu/resctrl/monitor.c | 3 +--
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
index 3b9383612c35..4d76ff31a9e0 100644
--- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
+++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
@@ -529,7 +529,6 @@ void mon_event_read(struct rmid_read *rr, struct rdt_resource *r,
rr->evtid = evtid;
rr->r = r;
rr->d = d;
- rr->val = 0;
rr->first = first;
rr->arch_mon_ctx = resctrl_arch_mon_ctx_alloc(r, evtid);
if (IS_ERR(rr->arch_mon_ctx)) {
@@ -557,12 +556,12 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg)
{
struct kernfs_open_file *of = m->private;
struct rdt_domain_hdr *hdr;
+ struct rmid_read rr = {0};
struct rdt_mon_domain *d;
u32 resid, evtid, domid;
struct rdtgroup *rdtgrp;
struct rdt_resource *r;
union mon_data_bits md;
- struct rmid_read rr;
int ret = 0;
rdtgrp = rdtgroup_kn_lock_live(of->kn);
diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
index ff4e74594a19..ca309c93a56b 100644
--- a/arch/x86/kernel/cpu/resctrl/monitor.c
+++ b/arch/x86/kernel/cpu/resctrl/monitor.c
@@ -780,9 +780,8 @@ static void update_mba_bw(struct rdtgroup *rgrp, struct rdt_mon_domain *dom_mbm)
static void mbm_update(struct rdt_resource *r, struct rdt_mon_domain *d,
u32 closid, u32 rmid)
{
- struct rmid_read rr;
+ struct rmid_read rr = {0};
- rr.first = false;
rr.r = r;
rr.d = d;
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 70d41a8fd788..d0443589cd86 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -3029,10 +3029,10 @@ static int mkdir_mondata_subdir(struct kernfs_node *parent_kn,
struct rdt_mon_domain *d,
struct rdt_resource *r, struct rdtgroup *prgrp)
{
+ struct rmid_read rr = {0};
union mon_data_bits priv;
struct kernfs_node *kn;
struct mon_evt *mevt;
- struct rmid_read rr;
char name[32];
int ret;
--
2.45.2
next prev parent reply other threads:[~2024-06-28 21:56 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-28 21:56 [PATCH v23 00/19] Add support for Sub-NUMA cluster (SNC) systems Tony Luck
2024-06-28 21:56 ` [PATCH v23 01/19] x86/resctrl: Prepare for new domain scope Tony Luck
2024-06-28 21:56 ` [PATCH v23 02/19] x86/resctrl: Prepare to split rdt_domain structure Tony Luck
2024-06-28 21:56 ` [PATCH v23 03/19] x86/resctrl: Prepare for different scope for control/monitor operations Tony Luck
2024-06-28 21:56 ` [PATCH v23 04/19] x86/resctrl: Split the rdt_domain and rdt_hw_domain structures Tony Luck
2024-06-28 21:56 ` [PATCH v23 05/19] x86/resctrl: Add node-scope to the options for feature scope Tony Luck
2024-06-28 21:56 ` [PATCH v23 06/19] x86/resctrl: Introduce snc_nodes_per_l3_cache Tony Luck
2024-07-26 19:13 ` Peter Newman
2024-06-28 21:56 ` [PATCH v23 07/19] x86/resctrl: Block use of mba_MBps mount option on Sub-NUMA Cluster (SNC) systems Tony Luck
2024-06-28 21:56 ` [PATCH v23 08/19] x86/resctrl: Prepare for new Sub-NUMA Cluster (SNC) monitor files Tony Luck
2024-06-28 21:56 ` [PATCH v23 09/19] x86/resctrl: Add a new field to struct rmid_read for summation of domains Tony Luck
2024-06-28 21:56 ` Tony Luck [this message]
2024-06-28 21:56 ` [PATCH v23 11/19] x86/resctrl: Refactor mkdir_mondata_subdir() with a helper function Tony Luck
2024-06-28 21:56 ` [PATCH v23 12/19] x86/resctrl: Allocate a new field in union mon_data_bits Tony Luck
2024-06-28 21:56 ` [PATCH v23 13/19] x86/resctrl: Create Sub-NUMA Cluster (SNC) monitor files Tony Luck
2024-06-28 21:56 ` [PATCH v23 14/19] x86/resctrl: Handle removing directories in Sub-NUMA Cluster (SNC) mode Tony Luck
2024-07-02 8:53 ` Borislav Petkov
2024-07-02 17:16 ` Tony Luck
2024-07-02 17:28 ` Borislav Petkov
2024-06-28 21:56 ` [PATCH v23 15/19] x86/resctrl: Fill out rmid_read structure for smp_call*() to read a counter Tony Luck
2024-06-28 21:56 ` [PATCH v23 16/19] x86/resctrl: Make __mon_event_count() handle sum domains Tony Luck
2024-06-28 21:56 ` [PATCH v23 17/19] x86/resctrl: Enable shared RMID mode on Sub-NUMA Cluster (SNC) systems Tony Luck
2024-07-02 8:59 ` Borislav Petkov
2024-06-28 21:56 ` [PATCH v23 18/19] x86/resctrl: Sub-NUMA Cluster (SNC) detection Tony Luck
2024-06-28 21:56 ` [PATCH v23 19/19] x86/resctrl: Update documentation with Sub-NUMA cluster changes Tony Luck
2024-07-01 14:24 ` [PATCH v23 00/19] Add support for Sub-NUMA cluster (SNC) systems Moger, Babu
2024-07-01 16:08 ` Luck, Tony
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=20240628215619.76401-11-tony.luck@intel.com \
--to=tony.luck@intel.com \
--cc=Dave.Martin@arm.com \
--cc=babu.moger@amd.com \
--cc=dfustini@baylibre.com \
--cc=fenghua.yu@intel.com \
--cc=james.morse@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maciej.wieczor-retman@intel.com \
--cc=patches@lists.linux.dev \
--cc=peternewman@google.com \
--cc=reinette.chatre@intel.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