From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B39B9CA101F for ; Fri, 12 Sep 2025 11:25:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=b4amr0MoArY0+6XsGMRQC1rmuDWEk+BS83wLlPuXv+s=; b=4bQ8SdTjs1ZAOz35FbUuyYN0eI Kq0h1ba8Q6v/1EbUFDaib3N/xfXD+FurI7ST8e9VclNCT9y+io3k+56eApaQqgyszlhYz/c0h1H28 cpcTcpJO1v02HfZqpsfo2GoKs9ouxViv1jlC2YTaPvwsz5lv57l43GfmA7FMfZzw+Di2ga/Eix00w g6l7+kcBWvJL4KqzElyyybGA6CBy6ELPIQRqlh+5So+A6ejadKA7UYDFb1POHCgjoDsOenSgNJD6t YNVjEZcl/MRYDo6nBlazm8/s0S8+nXc011d7IWEXX4+40N7xbuK8Qdbwzofu988pk7xkua7BgQtrP meKmKt2A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ux1uK-00000008sEH-3mub; Fri, 12 Sep 2025 11:25:36 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ux1uI-00000008sCm-1JeE for linux-arm-kernel@lists.infradead.org; Fri, 12 Sep 2025 11:25:35 +0000 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 E17BD1515; Fri, 12 Sep 2025 04:25:24 -0700 (PDT) Received: from [10.1.196.46] (e134344.arm.com [10.1.196.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BB7013F63F; Fri, 12 Sep 2025 04:25:28 -0700 (PDT) Message-ID: Date: Fri, 12 Sep 2025 12:25:27 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 15/29] arm_mpam: Reset MSC controls from cpu hp callbacks To: James Morse , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org Cc: D Scott Phillips OS , carl@os.amperecomputing.com, lcherian@marvell.com, bobo.shaobowang@huawei.com, tan.shaopeng@fujitsu.com, baolin.wang@linux.alibaba.com, Jamie Iles , Xin Hao , peternewman@google.com, dfustini@baylibre.com, amitsinght@marvell.com, David Hildenbrand , Dave Martin , Koba Ko , Shanker Donthineni , fenghuay@nvidia.com, baisheng.gao@unisoc.com, Jonathan Cameron , Rob Herring , Rohit Mathew , Rafael Wysocki , Len Brown , Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Catalin Marinas , Will Deacon , Greg Kroah-Hartman , Danilo Krummrich References: <20250910204309.20751-1-james.morse@arm.com> <20250910204309.20751-16-james.morse@arm.com> From: Ben Horgan Content-Language: en-US In-Reply-To: <20250910204309.20751-16-james.morse@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250912_042534_450881_0DA90C2A X-CRM114-Status: GOOD ( 32.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi James, On 9/10/25 21:42, James Morse wrote: > When a CPU comes online, it may bring a newly accessible MSC with > it. Only the default partid has its value reset by hardware, and > even then the MSC might not have been reset since its config was > previously dirtyied. e.g. Kexec. > > Any in-use partid must have its configuration restored, or reset. > In-use partids may be held in caches and evicted later. > > MSC are also reset when CPUs are taken offline to cover cases where > firmware doesn't reset the MSC over reboot using UEFI, or kexec > where there is no firmware involvement. > > If the configuration for a RIS has not been touched since it was > brought online, it does not need resetting again. > > To reset, write the maximum values for all discovered controls. > > CC: Rohit Mathew > Signed-off-by: James Morse > --- > Changes since RFC: > * Last bitmap write will always be non-zero. > * Dropped READ_ONCE() - teh value can no longer change. > * Write 0 to proporitional stride, remove the bwa_fract variable. > * Removed nested srcu lock, the assert should cover it. > --- > drivers/resctrl/mpam_devices.c | 117 ++++++++++++++++++++++++++++++++ > drivers/resctrl/mpam_internal.h | 8 +++ > 2 files changed, 125 insertions(+) > > diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c > index cd8e95fa5fd6..0353313cf284 100644 > --- a/drivers/resctrl/mpam_devices.c > +++ b/drivers/resctrl/mpam_devices.c > @@ -7,6 +7,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -777,8 +778,110 @@ static int mpam_msc_hw_probe(struct mpam_msc *msc) > return 0; > } > > +static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, u16 wd) > +{ > + u32 num_words, msb; > + u32 bm = ~0; > + int i; > + > + lockdep_assert_held(&msc->part_sel_lock); > + > + if (wd == 0) > + return; > + > + /* > + * Write all ~0 to all but the last 32bit-word, which may > + * have fewer bits... > + */ > + num_words = DIV_ROUND_UP(wd, 32); > + for (i = 0; i < num_words - 1; i++, reg += sizeof(bm)) > + __mpam_write_reg(msc, reg, bm); > + > + /* > + * ....and then the last (maybe) partial 32bit word. When wd is a > + * multiple of 32, msb should be 31 to write a full 32bit word. > + */ > + msb = (wd - 1) % 32; > + bm = GENMASK(msb, 0); > + __mpam_write_reg(msc, reg, bm); > +} > + > +static void mpam_reset_ris_partid(struct mpam_msc_ris *ris, u16 partid) > +{ > + struct mpam_msc *msc = ris->vmsc->msc; > + struct mpam_props *rprops = &ris->props; > + > + mpam_assert_srcu_read_lock_held(); > + > + mutex_lock(&msc->part_sel_lock); > + __mpam_part_sel(ris->ris_idx, partid, msc); > + > + if (mpam_has_feature(mpam_feat_cpor_part, rprops)) > + mpam_reset_msc_bitmap(msc, MPAMCFG_CPBM, rprops->cpbm_wd); > + > + if (mpam_has_feature(mpam_feat_mbw_part, rprops)) > + mpam_reset_msc_bitmap(msc, MPAMCFG_MBW_PBM, rprops->mbw_pbm_bits); > + > + if (mpam_has_feature(mpam_feat_mbw_min, rprops)) > + mpam_write_partsel_reg(msc, MBW_MIN, 0); > + > + if (mpam_has_feature(mpam_feat_mbw_max, rprops)) > + mpam_write_partsel_reg(msc, MBW_MAX, MPAMCFG_MBW_MAX_MAX); > + > + if (mpam_has_feature(mpam_feat_mbw_prop, rprops)) > + mpam_write_partsel_reg(msc, MBW_PROP, 0); If mpam_feat_ccap_part is already in enum mpam_device_features then the reset would belong here but I expect it is better just to introduce mpam_feat_ccap_part later (patch 21). I also commented on this feature introduction split on patch 13. > + mutex_unlock(&msc->part_sel_lock); > +} > + > +static void mpam_reset_ris(struct mpam_msc_ris *ris) > +{ > + u16 partid, partid_max; > + > + mpam_assert_srcu_read_lock_held(); > + > + if (ris->in_reset_state) > + return; > + > + spin_lock(&partid_max_lock); > + partid_max = mpam_partid_max; > + spin_unlock(&partid_max_lock); > + for (partid = 0; partid < partid_max; partid++) > + mpam_reset_ris_partid(ris, partid); > +} > + > +static void mpam_reset_msc(struct mpam_msc *msc, bool online) > +{ > + struct mpam_msc_ris *ris; > + > + mpam_assert_srcu_read_lock_held(); Unneeded? Checked in list_for_each_entry_srcu().> + > + list_for_each_entry_srcu(ris, &msc->ris, msc_list, srcu_read_lock_held(&mpam_srcu)) { > + mpam_reset_ris(ris); > + > + /* > + * Set in_reset_state when coming online. The reset state > + * for non-zero partid may be lost while the CPUs are offline. > + */ > + ris->in_reset_state = online; > + } > +} > + > static int mpam_cpu_online(unsigned int cpu) > { > + int idx; > + struct mpam_msc *msc; > + > + idx = srcu_read_lock(&mpam_srcu); > + list_for_each_entry_srcu(msc, &mpam_all_msc, all_msc_list, > + srcu_read_lock_held(&mpam_srcu)) { > + if (!cpumask_test_cpu(cpu, &msc->accessibility)) > + continue; > + > + if (atomic_fetch_inc(&msc->online_refs) == 0) > + mpam_reset_msc(msc, true); > + } > + srcu_read_unlock(&mpam_srcu, idx); > + > return 0; > } > > @@ -818,6 +921,20 @@ static int mpam_discovery_cpu_online(unsigned int cpu) > > static int mpam_cpu_offline(unsigned int cpu) > { > + int idx; > + struct mpam_msc *msc; > + > + idx = srcu_read_lock(&mpam_srcu); > + list_for_each_entry_srcu(msc, &mpam_all_msc, all_msc_list, > + srcu_read_lock_held(&mpam_srcu)) { > + if (!cpumask_test_cpu(cpu, &msc->accessibility)) > + continue; > + > + if (atomic_dec_and_test(&msc->online_refs)) > + mpam_reset_msc(msc, false); > + } > + srcu_read_unlock(&mpam_srcu, idx); > + > return 0; > } > > diff --git a/drivers/resctrl/mpam_internal.h b/drivers/resctrl/mpam_internal.h > index eace5ba871f3..6e047fbd3512 100644 > --- a/drivers/resctrl/mpam_internal.h > +++ b/drivers/resctrl/mpam_internal.h > @@ -5,6 +5,7 @@ > #define MPAM_INTERNAL_H > > #include > +#include > #include > #include > #include > @@ -45,6 +46,7 @@ struct mpam_msc { > struct pcc_mbox_chan *pcc_chan; > u32 nrdy_usec; > cpumask_t accessibility; > + atomic_t online_refs; > > /* > * probe_lock is only taken during discovery. After discovery these > @@ -223,6 +225,7 @@ struct mpam_msc_ris { > u8 ris_idx; > u64 idr; > struct mpam_props props; > + bool in_reset_state; > > cpumask_t affinity; > > @@ -242,6 +245,11 @@ struct mpam_msc_ris { > extern struct srcu_struct mpam_srcu; > extern struct list_head mpam_classes; > > +static inline void mpam_assert_srcu_read_lock_held(void) > +{ > + WARN_ON_ONCE(!srcu_read_lock_held((&mpam_srcu))); > +} > + > /* System wide partid/pmg values */ > extern u16 mpam_partid_max; > extern u8 mpam_pmg_max; Thanks, Ben