From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=113.46.200.227 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793015401; b=gHHEVuv/O1NhxtiAQxFGhrK5HxoWwssxUJ9CLBqEQd0FzjEpAlHF4Sr6B0pBtb6wDBpw S4r/t+Y+XzvdVVfN590irImWW8UquG+0LkHF+tYSRMXDh2pf9Gjz6q/ZJ3r+85wzeSq5x zFNcye9zO5Z3gpFKgsOk4qKg1YDrMOHGC+LqL43cdtPr/vClx5f2VGhyrkwTLerj0R4k+ ptLMJFISEtiWnVOKP5Ca/hcR2WCrFaH8stFlCtsAgNjI+NRSoRB0kmNPRklzh0J3p/cwS luFfotfc3QG2xUC9bTmOEjVmJ8hiSMOojsylYxlVwNtpGxTDL/uK6KCRj6zW82gad0g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793015401; h=DMARC-Filter:dkim-signature:Received:Received:Received:Message-ID: Date:MIME-Version:User-Agent:Subject:To:CC:References:From: In-Reply-To:Content-Type:Content-Transfer-Encoding:X-Originating-IP: X-ClientProxiedBy; bh=rk1WovkF3sv2NFNM8sIBXD2tHrqmbxPVkrmVTLJoFiI=; b=dzVJROiZGpMyAcfSfZ1PB3CETNWTNLwC+wV3AEUn3ijHclCMkrGtIC3ElmtB1la1O8cF trkql3Uddn07QbOr5bAxkTA4y4MsUizdyMYBoTGfFf6TJ+ko+1J3ikeuOomkhP21Mtd6E 5WhzNHKRoEae1ipU9C+OXD0Um9ixNz7sYMkyceK0qXpIsbaFqHfHU4xjHi5BforNRL+iM pcUA82/MuP63gur39k886sU3rC8jHqJNPG8hHY3tZlbFHF0+Rlc/4CPBwVTWqJBRf9xef Dq66c/PUETR2zSJBsBuKgHanVSmyLHHZbQTyGV0nHzGD8tuvX8FEE78z8fvU5ZvNPfA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.remote-ip=113.46.200.227 Received: from canpmsgout12.his.huawei.com (canpmsgout12.his.huawei.com [113.46.200.227]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5D8D606A31D for ; Mon, 26 Oct 2026 11:49:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C5D8D606A31D Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=rk1WovkF3sv2NFNM8sIBXD2tHrqmbxPVkrmVTLJoFiI=; b=Ty2+RCmY/RhVyQkMoz9C1ddh1eeYM1p12Gzkyw/vKNxwCvrqGE/ZPfYOoraE9D+zGfZGDP7+9 igKkwKwvAjrQ4CejsEyMZ4l48+2g9zlhWLPL+9kFnqd1vmTp2/DSvk55zmucXBXoEX5348j9dv7 ErWyc58JnYjn0ienpcX1WW0= Received: from mail.maildlp.com (unknown [172.19.162.92]) by canpmsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4jCsPH0qycznV09; Mon, 26 Oct 2026 19:49:55 +0800 (CST) Received: from kwepemk200008.china.huawei.com (unknown [7.202.194.74]) by mail.maildlp.com (Postfix) with ESMTPS id 7D99640565; Mon, 26 Oct 2026 19:49:50 +0800 (CST) Received: from [10.67.110.68] (10.67.110.68) by kwepemk200008.china.huawei.com (7.202.194.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Mon, 26 Oct 2026 19:49:49 +0800 Message-ID: Date: Mon, 26 Oct 2026 19:49:49 +0800 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC PATCH v2 04/10] arm_mpam: resctrl: Split control and monitoring domain setup into helpers To: Reinette Chatre , , , , CC: , , , , , , References: <20621c28067916be2709fc4437473f1ccad7e334.1792443633.git.reinette.chatre@intel.com> From: Jinjie Ruan In-Reply-To: <20621c28067916be2709fc4437473f1ccad7e334.1792443633.git.reinette.chatre@intel.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-ClientProxiedBy: kwepems100002.china.huawei.com (7.221.188.206) To kwepemk200008.china.huawei.com (7.202.194.74) 在 2026/10/20 6:07, Reinette Chatre 写道: > mpam_resctrl_alloc_domain() allocates one structure that holds both the > control domain and the monitoring domain of a resource. It sets up > whichever of the two domains the resource supports, with the setup of > both open coded in the function, and undoes the control domain if > setting up the monitoring domain fails. > > Apart from the code that manages domains, every user of the structure > accesses only one of its two domains, so the monitoring domain can be > given a structure of its own. Doing so starts with separating its setup > from that of the control domain. > > Move the setup of each domain into its own helper in preparation for > giving the monitoring domain its own structure as part of supporting > multiple controls per resource. Keep the allocation and the error > handling in mpam_resctrl_alloc_domain() so that a failure to set up the > monitoring domain still undoes the control domain. > > No functional change intended. > > Signed-off-by: Reinette Chatre > --- > drivers/resctrl/mpam_resctrl.c | 116 ++++++++++++++++++++------------- > 1 file changed, 70 insertions(+), 46 deletions(-) > > diff --git a/drivers/resctrl/mpam_resctrl.c b/drivers/resctrl/mpam_resctrl.c > index dc442851fd7e..246560247a28 100644 > --- a/drivers/resctrl/mpam_resctrl.c > +++ b/drivers/resctrl/mpam_resctrl.c > @@ -1615,13 +1615,77 @@ static struct mpam_component *find_component(struct mpam_class *class, int cpu) > return NULL; > } > > +static int mpam_resctrl_setup_ctrl_domain(unsigned int cpu, > + struct rdt_resource *r, > + struct mpam_component *comp, > + struct mpam_resctrl_dom *dom) > +{ > + struct rdt_ctrl_domain *ctrl_d = &dom->resctrl_ctrl_dom; > + int err; > + > + dom->ctrl_comp = comp; > + > + mpam_resctrl_domain_hdr_init(cpu, comp, r->rid, &ctrl_d->hdr); > + ctrl_d->hdr.type = RESCTRL_CTRL_DOMAIN; > + err = resctrl_online_ctrl_domain(r, ctrl_d); > + if (err) > + return err; > + > + mpam_resctrl_domain_insert(&r->ctrl_domains, &ctrl_d->hdr); > + > + return 0; > +} > + > +static int mpam_resctrl_setup_mon_domain(unsigned int cpu, > + struct rdt_resource *r, > + struct mpam_resctrl_dom *dom) > +{ > + struct rdt_l3_mon_domain *mon_d = &dom->resctrl_mon_dom; > + struct mpam_component *any_mon_comp = NULL; > + enum resctrl_event_id eventid; > + struct mpam_resctrl_mon *mon; > + int err; > + > + /* > + * Even if the monitor domain is backed by a different > + * component, the L3 component IDs need to be used... only > + * there may be no ctrl_comp for the L3. > + * Search each event's class list for a component with > + * overlapping CPUs and set up the dom->mon_comp array. > + */ > + > + for_each_mpam_resctrl_mon(mon, eventid) { > + struct mpam_component *mon_comp; > + > + if (!mon->class) > + continue; // dummy resource > + > + mon_comp = find_component(mon->class, cpu); > + dom->mon_comp[eventid] = mon_comp; > + if (mon_comp) > + any_mon_comp = mon_comp; > + } > + if (!any_mon_comp) { > + WARN_ON_ONCE(0); > + return -EFAULT; > + } > + > + mpam_resctrl_domain_hdr_init(cpu, any_mon_comp, r->rid, &mon_d->hdr); > + mon_d->hdr.type = RESCTRL_MON_DOMAIN; > + err = resctrl_online_mon_domain(r, &mon_d->hdr); > + if (err) > + return err; > + > + mpam_resctrl_domain_insert(&r->mon_domains, &mon_d->hdr); > + > + return 0; > +} > + > static void mpam_resctrl_alloc_domain(unsigned int cpu, > struct mpam_resctrl_res *res) > { > int err; > struct mpam_resctrl_dom *dom; > - struct rdt_l3_mon_domain *mon_d; > - struct rdt_ctrl_domain *ctrl_d; > struct mpam_class *class = res->class; > struct mpam_component *comp; > struct rdt_resource *r = &res->resctrl_res; > @@ -1638,57 +1702,17 @@ static void mpam_resctrl_alloc_domain(unsigned int cpu, > return; > > if (r->alloc_capable) { > - dom->ctrl_comp = comp; > - > - ctrl_d = &dom->resctrl_ctrl_dom; > - mpam_resctrl_domain_hdr_init(cpu, comp, r->rid, &ctrl_d->hdr); > - ctrl_d->hdr.type = RESCTRL_CTRL_DOMAIN; > - err = resctrl_online_ctrl_domain(r, ctrl_d); > + err = mpam_resctrl_setup_ctrl_domain(cpu, r, comp, dom); > if (err) > goto free_domain; LGTM Reviewed-by: Jinjie Ruan > - > - mpam_resctrl_domain_insert(&r->ctrl_domains, &ctrl_d->hdr); > } else { > pr_debug("Skipped control domain online - no controls\n"); > } > > if (r->mon_capable) { > - struct mpam_component *any_mon_comp = NULL; > - struct mpam_resctrl_mon *mon; > - enum resctrl_event_id eventid; > - > - /* > - * Even if the monitor domain is backed by a different > - * component, the L3 component IDs need to be used... only > - * there may be no ctrl_comp for the L3. > - * Search each event's class list for a component with > - * overlapping CPUs and set up the dom->mon_comp array. > - */ > - > - for_each_mpam_resctrl_mon(mon, eventid) { > - struct mpam_component *mon_comp; > - > - if (!mon->class) > - continue; // dummy resource > - > - mon_comp = find_component(mon->class, cpu); > - dom->mon_comp[eventid] = mon_comp; > - if (mon_comp) > - any_mon_comp = mon_comp; > - } > - if (!any_mon_comp) { > - WARN_ON_ONCE(0); > - goto offline_ctrl_domain; > - } > - > - mon_d = &dom->resctrl_mon_dom; > - mpam_resctrl_domain_hdr_init(cpu, any_mon_comp, r->rid, &mon_d->hdr); > - mon_d->hdr.type = RESCTRL_MON_DOMAIN; > - err = resctrl_online_mon_domain(r, &mon_d->hdr); > + err = mpam_resctrl_setup_mon_domain(cpu, r, dom); > if (err) > goto offline_ctrl_domain; > - > - mpam_resctrl_domain_insert(&r->mon_domains, &mon_d->hdr); > } else { > pr_debug("Skipped monitor domain online - no monitors\n"); > } > @@ -1697,8 +1721,8 @@ static void mpam_resctrl_alloc_domain(unsigned int cpu, > > offline_ctrl_domain: > if (r->alloc_capable) { > - mpam_resctrl_offline_domain_hdr(cpu, &ctrl_d->hdr); > - resctrl_offline_ctrl_domain(r, ctrl_d); > + mpam_resctrl_offline_domain_hdr(cpu, &dom->resctrl_ctrl_dom.hdr); > + resctrl_offline_ctrl_domain(r, &dom->resctrl_ctrl_dom); > } > free_domain: > kfree(dom); -- Best regards, Jinjie