Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: James Morse <james.morse@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>, Ben Horgan <ben.horgan@arm.com>,
	Andre Przywara <andre.przywara@arm.com>,
	Fuad Tabba <fuad.tabba@linux.dev>, Gavin Shan <gshan@redhat.com>,
	James Morse <james.morse@arm.com>
Subject: [PATCH 07/27] arm_mpam: Initialize all of struct mon_read in mpam_restore_mbwu_state()
Date: Fri,  2 Oct 2026 18:39:20 +0100	[thread overview]
Message-ID: <20261002173941.292319-8-james.morse@arm.com> (raw)
In-Reply-To: <20261002173941.292319-1-james.morse@arm.com>

From: Ben Horgan <ben.horgan@arm.com>

m->err and *m->val may be read before initialization in __ris_msmon_read()
when called from mpam_restore_mbwu_state().

Initialize the whole struct mon_read in mpam_restore_mbwu_state() and fix
the spelling of mbwu in the name.

Fixes: 41e8a14950e1 ("arm_mpam: Track bandwidth counter state for power management")
Signed-off-by: Ben Horgan <ben.horgan@arm.com>
Tested-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: James Morse <james.morse@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
---
 drivers/resctrl/mpam_devices.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c
index a3d58a51dc73..2369f814de48 100644
--- a/drivers/resctrl/mpam_devices.c
+++ b/drivers/resctrl/mpam_devices.c
@@ -1655,7 +1655,7 @@ static int mpam_restore_mbwu_state(void *_ris)
 {
 	int i;
 	u64 val;
-	struct mon_read mwbu_arg;
+	struct mon_read mbwu_arg;
 	struct mpam_msc_ris *ris = _ris;
 	struct msmon_mbwu_state *mbwu_state;
 	struct mpam_msc *msc = ris->vmsc->msc;
@@ -1672,14 +1672,17 @@ static int mpam_restore_mbwu_state(void *_ris)
 			continue;
 		}
 
-		mwbu_arg.ris = ris;
-		mwbu_arg.ctx = &mbwu_state->cfg;
-		mwbu_arg.type = mpam_msmon_choose_counter(class);
-		mwbu_arg.val = &val;
+		val = 0;
+		mbwu_arg = (struct mon_read) {
+			.ris = ris,
+			.ctx = &mbwu_state->cfg,
+			.type = mpam_msmon_choose_counter(class),
+			.val = &val,
+		};
 
 		mbwu_state->reset_on_next_read = true;
 
-		__ris_msmon_read_locked(&mwbu_arg);
+		__ris_msmon_read_locked(&mbwu_arg);
 
 		mpam_mon_sel_unlock(msc);
 	}
-- 
2.53.0



  parent reply	other threads:[~2026-10-02 17:40 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-02 17:39 [GIT PULL/PATCH 00/27] MPAM driver changes for v7.4 James Morse
2026-10-02 17:39 ` [PATCH 01/27] arm_mpam: Move MPAMF_ECR write helpers to allow reuse James Morse
2026-10-02 17:39 ` [PATCH 02/27] arm_mpam: Restore the error interrupt enable from mpam_cpu_online() James Morse
2026-10-02 17:39 ` [PATCH 03/27] arm_mpam: Set mpam_feat_msmon_mbwu_31counter when there are bandwidth counters James Morse
2026-10-02 17:39 ` [PATCH 04/27] arm_mpam: Add missing mon_sel locking in MBWU save and restore James Morse
2026-10-02 17:39 ` [PATCH 05/27] arm_mpam: Ensure MBWU counters are reset on restore James Morse
2026-10-02 17:39 ` [PATCH 06/27] arm_mpam: Use __ris_msmon_read() for saving MBWU state James Morse
2026-10-02 18:52   ` Ben Horgan
2026-10-02 18:54     ` Catalin Marinas
2026-10-02 17:39 ` James Morse [this message]
2026-10-02 17:39 ` [PATCH 08/27] arm_mpam: resctrl: Correct check that existing class is L3 James Morse
2026-10-02 17:39 ` [PATCH 09/27] arm_mpam: resctrl: Make read_mon_cdp_safe() self consistent James Morse
2026-10-02 17:39 ` [PATCH 10/27] arm_mpam: Don't loop forever if there is the maximum possible amount of PARTIDs James Morse
2026-10-02 17:39 ` [PATCH 11/27] arm_mpam: Switch to kvzmalloc_objs() for allocation of component cfg James Morse
2026-10-02 17:39 ` [PATCH 12/27] arm_mpam: resctrl: Don't stop early when tearing down a class James Morse
2026-10-02 17:39 ` [PATCH 13/27] MAINTAINERS: Add mpam.rst to the MPAM DRIVER entry James Morse
2026-10-02 17:39 ` [PATCH 15/27] arm_mpam: let low level MSC accessors return an error James Morse
2026-10-02 17:39 ` [PATCH 16/27] arm_mpam: propagate MSC access errors for hw_probe functions James Morse
2026-10-02 17:39 ` [PATCH 17/27] arm_mpam: propagate MSC access errors for MBWU counters James Morse
2026-10-02 17:39 ` [PATCH 18/27] arm_mpam: propagate MSC access errors for msmon helpers James Morse
2026-10-02 17:39 ` [PATCH 19/27] arm_mpam: propagate MSC access errors for __ris_msmon_read() James Morse
2026-10-02 17:39 ` [PATCH 20/27] arm_mpam: propagate MSC access errors for state saving function James Morse
2026-10-02 17:39 ` [PATCH 21/27] arm_mpam: propagate MSC access errors for mpam_reprogram_ris_partid() James Morse
2026-10-02 17:39 ` [PATCH 22/27] arm_mpam: propagate MSC access errors for interrupt control James Morse
2026-10-02 17:39 ` [PATCH 23/27] arm_mpam: propagate MSC access errors in mpam_reset_class_locked() James Morse
2026-10-02 17:39 ` [PATCH 24/27] arm_mpam: prepare mon_sel locking for MPAM-Fb James Morse
2026-10-02 17:39 ` [PATCH 25/27] arm_mpam: add MPAM-Fb MSC firmware access support James Morse
2026-10-02 17:39 ` [PATCH 26/27] arm_mpam: change MPAM-Fb error IRQ to use a threaded IRQ handler James Morse
2026-10-02 17:39 ` [PATCH 27/27] arm_mpam: detect and enable MPAM-Fb PCC support James Morse
2026-10-02 19:02 ` [GIT PULL/PATCH 00/27] MPAM driver changes for v7.4 Catalin Marinas

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=20261002173941.292319-8-james.morse@arm.com \
    --to=james.morse@arm.com \
    --cc=andre.przywara@arm.com \
    --cc=ben.horgan@arm.com \
    --cc=catalin.marinas@arm.com \
    --cc=fuad.tabba@linux.dev \
    --cc=gshan@redhat.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=will@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