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 F2469205AA1; Fri, 29 Aug 2025 14:30:26 +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=1756477829; cv=none; b=papLHrHuKkPqXQIA7Oe+6EyZIBgm718fH70c2kcgmx5CFzWk6ZZD1GRrgmgGYlmheHS2dG2fJkL/vwhumE/0VpIaM7A5X1sEkVLVExXKwK/L8ZK8EzXP3W/IKbRhqbiFahaFQSfMn/3AVcV1w06KDC9f4WZA+hBAiTQyRxVm1no= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756477829; c=relaxed/simple; bh=qubuGzVfMaLFSQG/gjHJt9Hipl9/9FCZ0mhroHks2Qo=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=loPRN74sBGEIBILkkCuKJKGl34ZSWA3UZXT8/gj2dqgx6F3Ifd3GUVc8OoCQj5aBvRJkgCXCCT3a+Jy9/AP4sOGmYQD1xnVppbSoLrm1PuidmIM3QqFbi2pZAzoG9OGmB32zVj+UxoKxPuQrd8Rcvxg295BD65ahKlB1lwRirz4= 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; 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 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 CE48B19F0; Fri, 29 Aug 2025 07:30:17 -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 0CD023F694; Fri, 29 Aug 2025 07:30:20 -0700 (PDT) Message-ID: Date: Fri, 29 Aug 2025 15:30:19 +0100 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 21/33] arm_mpam: Extend reset logic to allow devices to be reset any time To: James Morse , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, devicetree@vger.kernel.org Cc: shameerali.kolothum.thodi@huawei.com, 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 , Rex Nie , 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 , Krzysztof Kozlowski , Conor Dooley , Catalin Marinas , Will Deacon , Greg Kroah-Hartman , Danilo Krummrich References: <20250822153048.2287-1-james.morse@arm.com> <20250822153048.2287-22-james.morse@arm.com> From: Ben Horgan Content-Language: en-US In-Reply-To: <20250822153048.2287-22-james.morse@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi James, On 8/22/25 16:30, James Morse wrote: > cpuhp callbacks aren't the only time the MSC configuration may need to > be reset. Resctrl has an API call to reset a class. > If an MPAM error interrupt arrives it indicates the driver has > misprogrammed an MSC. The safest thing to do is reset all the MSCs > and disable MPAM. > > Add a helper to reset RIS via their class. Call this from mpam_disable(), > which can be scheduled from the error interrupt handler. > > Signed-off-by: James Morse > --- > drivers/resctrl/mpam_devices.c | 62 +++++++++++++++++++++++++++++++-- > drivers/resctrl/mpam_internal.h | 1 + > 2 files changed, 61 insertions(+), 2 deletions(-) > > diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c > index 759244966736..3516cbe8623e 100644 > --- a/drivers/resctrl/mpam_devices.c > +++ b/drivers/resctrl/mpam_devices.c > @@ -915,8 +915,6 @@ static int mpam_reset_ris(void *arg) > u16 partid, partid_max; > struct mpam_msc_ris *ris = arg; > > - mpam_assert_srcu_read_lock_held(); > - > if (ris->in_reset_state) > return 0; > > @@ -1569,6 +1567,66 @@ static void mpam_enable_once(void) > mpam_partid_max + 1, mpam_pmg_max + 1); > } > > +static void mpam_reset_component_locked(struct mpam_component *comp) > +{ > + int idx; > + struct mpam_msc *msc; > + struct mpam_vmsc *vmsc; > + struct mpam_msc_ris *ris; > + > + might_sleep(); > + lockdep_assert_cpus_held(); > + > + idx = srcu_read_lock(&mpam_srcu); > + list_for_each_entry_rcu(vmsc, &comp->vmsc, comp_list) { > + msc = vmsc->msc; > + > + list_for_each_entry_rcu(ris, &vmsc->ris, vmsc_list) { > + if (!ris->in_reset_state) > + mpam_touch_msc(msc, mpam_reset_ris, ris); > + ris->in_reset_state = true; > + } > + } > + srcu_read_unlock(&mpam_srcu, idx); > +} > + > +static void mpam_reset_class_locked(struct mpam_class *class) > +{ > + int idx; > + struct mpam_component *comp; > + > + lockdep_assert_cpus_held(); > + > + idx = srcu_read_lock(&mpam_srcu); > + list_for_each_entry_rcu(comp, &class->components, class_list) > + mpam_reset_component_locked(comp); > + srcu_read_unlock(&mpam_srcu, idx); > +} > + > +static void mpam_reset_class(struct mpam_class *class) > +{ > + cpus_read_lock(); > + mpam_reset_class_locked(class); > + cpus_read_unlock(); > +} > + > +/* > + * Called in response to an error IRQ. > + * All of MPAMs errors indicate a software bug, restore any modified > + * controls to their reset values. > + */ > +void mpam_disable(void) > +{ > + int idx; > + struct mpam_class *class; > + > + idx = srcu_read_lock(&mpam_srcu); > + list_for_each_entry_srcu(class, &mpam_classes, classes_list, > + srcu_read_lock_held(&mpam_srcu)) Why do you use list_for_each_entry_srcu() here when in other places you use list_for_each_entry_rcu()? > + mpam_reset_class(class); > + srcu_read_unlock(&mpam_srcu, idx); > +} > + > /* > * Enable mpam once all devices have been probed. > * Scheduled by mpam_discovery_cpu_online() once all devices have been created. > diff --git a/drivers/resctrl/mpam_internal.h b/drivers/resctrl/mpam_internal.h > index 466d670a01eb..b30fee2b7674 100644 > --- a/drivers/resctrl/mpam_internal.h > +++ b/drivers/resctrl/mpam_internal.h > @@ -281,6 +281,7 @@ extern u8 mpam_pmg_max; > > /* Scheduled work callback to enable mpam once all MSC have been probed */ > void mpam_enable(struct work_struct *work); > +void mpam_disable(void); > > int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32 cache_level, > cpumask_t *affinity); Thanks, Ben