From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8FF5C34752A; Thu, 2 Jul 2026 16:23:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783009389; cv=none; b=T8J5ffxQikcPcBBg8h84caHyxJipuuSF8qwrhRm1XQzwGGQeZolMRGu0iQur/AvvB3Qa9tj5DrBeUhmVxh+KIJgHpmEG26hJTMGa0DAQC+ZmumbcGiU3x7rlboK9EGKJZUealNcEyFlsX1sOa8dj2jF8EJtZqo9ggJf7fUDQxJo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783009389; c=relaxed/simple; bh=E3qBwhFsBsdUPol7MPlnsl1yxVk4BqYRKMOrLM+NQHs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dXKBIyAnQrTMJNsBLZPfbZnvuK2Mgl2+zAfTlj92dNEX13vQHZuoMF71WF03oIufwKQaS0mm9ExjLyYVFR7pBd/B41/W15Mo/Ba7U31US27UDwIFz0C//e/Ijew9sLYsIkWyLFvld+QgjyhdCGMLsZrsA9galiVzvzx22AS2INc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=afFbRGNE; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="afFbRGNE" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0F57235C7; Thu, 2 Jul 2026 09:23:00 -0700 (PDT) Received: from e142021.fritz.box (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A9EC03F673; Thu, 2 Jul 2026 09:23:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1783009384; bh=E3qBwhFsBsdUPol7MPlnsl1yxVk4BqYRKMOrLM+NQHs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=afFbRGNEU2Z3Ns7rMmvQVXUcoBRCmgq5yxmvG7FMc/ZxWi7diLvhtyZSPnMc/4+oI v9LHaUAuGABHUNZB7fZPFw79Q4uuqJqRGZt18aCqw5BMc7svq+6nNeldBLs2rKQtGo knStHp8pFEPsMiOyYLfsTwYXAteyqiRjTryahzRU= From: Andre Przywara To: Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Catalin Marinas , Will Deacon , "Rafael J . Wysocki" , Len Brown , James Morse , Ben Horgan , Reinette Chatre , Fenghua Yu Cc: Jonathan Cameron , Srivathsa L Rao , Ganapatrao Kulkarni , Trilok Soni , Srinivas Ramana , Niyas Sait , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 06/15] arm_mpam: propagate MSC read errors for __ris_msmon_read() Date: Thu, 2 Jul 2026 18:22:20 +0200 Message-ID: <20260702162229.4008659-7-andre.przywara@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260702162229.4008659-1-andre.przywara@arm.com> References: <20260702162229.4008659-1-andre.przywara@arm.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Allow the function for RIS accesses to return an error, and propagate read errors from the lower level up. Signed-off-by: Andre Przywara --- drivers/resctrl/mpam_devices.c | 35 +++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c index b259fe20a614..d18c7be86aaa 100644 --- a/drivers/resctrl/mpam_devices.c +++ b/drivers/resctrl/mpam_devices.c @@ -1285,9 +1285,14 @@ static u64 mpam_msmon_overflow_val(enum mpam_device_features type, return overflow_val; } +/* + * This function might be called via smp_call_function_any(), so propagate + * errors inside the arg struct. + */ static void __ris_msmon_read(void *arg) { u64 now; + int ret; u32 now32; bool nrdy = false; bool config_mismatch; @@ -1326,7 +1331,9 @@ static void __ris_msmon_read(void *arg) * Read the existing configuration to avoid re-writing the same values. * This saves waiting for 'nrdy' on subsequent reads. */ - read_msmon_ctl_flt_vals(m, &cur_ctl, &cur_flt); + ret = read_msmon_ctl_flt_vals(m, &cur_ctl, &cur_flt); + if (ret) + goto out_unlock; if (mpam_feat_msmon_mbwu_31counter == m->type) overflow = cur_ctl & MSMON_CFG_x_CTL_OFLOW_STATUS; @@ -1351,7 +1358,9 @@ static void __ris_msmon_read(void *arg) switch (m->type) { case mpam_feat_msmon_csu: - mpam_read_monsel_reg(msc, CSU, &now32); + ret = mpam_read_monsel_reg(msc, CSU, &now32); + if (ret) + goto out_unlock; nrdy = now32 & MSMON___NRDY; now = FIELD_GET(MSMON___VALUE, now32); @@ -1371,7 +1380,9 @@ static void __ris_msmon_read(void *arg) else now = FIELD_GET(MSMON___L_VALUE, now); } else { - mpam_read_monsel_reg(msc, MBWU, &now32); + ret = mpam_read_monsel_reg(msc, MBWU, &now32); + if (ret) + goto out_unlock; nrdy = now32 & MSMON___NRDY; now = FIELD_GET(MSMON___VALUE, now32); } @@ -1402,10 +1413,15 @@ static void __ris_msmon_read(void *arg) if (nrdy) m->err = -EBUSY; - if (m->err) - return; + if (!m->err) + *m->val += now; + + return; - *m->val += now; +out_unlock: + mpam_mon_sel_unlock(msc); + + m->err = ret; } static int _msmon_read(struct mpam_component *comp, struct mon_read *arg) @@ -1729,6 +1745,7 @@ static int mpam_restore_mbwu_state(void *_ris) { int i; u64 val; + int ret = 0; struct mon_read mwbu_arg; struct mpam_msc_ris *ris = _ris; struct mpam_class *class = ris->vmsc->comp->class; @@ -1741,10 +1758,14 @@ static int mpam_restore_mbwu_state(void *_ris) mwbu_arg.val = &val; __ris_msmon_read(&mwbu_arg); + if (mwbu_arg.err) { + ret = mwbu_arg.err; + break; + } } } - return 0; + return ret; } /* Call with MSC cfg_lock held */ -- 2.43.0