From nobody Wed Oct 8 16:43:50 2025 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1904B2EE5F0 for ; Thu, 26 Jun 2025 16:50:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750956602; cv=none; b=L1jypYMkk7kCLFyKtkb05Qkxih/aGH68G4LQeWnp8xzif4aSo+Xk+pz362JbJzMf3NvbjcJYaHVvfDBG4r62JXNcXZj+v8s1dLaKmax0dQJlBqTrWaNpdgm79rZpEAz0OyCE20EDJloE6b8DSDpdOmA0QigTMAIjtMFQCJsSpS8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750956602; c=relaxed/simple; bh=IBp9Uci+xgu2crt66gFNebWaLtoikj4mqej9J0xq1sI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MsLxT725pQCJYx3iFKNNf3AXDlVwvRrbIJ/sy9X7G+O3v0K57yW9DJU6c8zrVT09Hj//SL/11iQCotdY+h6c9b9RHHoO8mpuZw5jb/0II4nIiOoda+Nz6CvmCM/ATHmiWV94G2tMLcveksrMkbWNcrxbfqqA4fEUyF7lyiB6DCA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Y0DJ78Ej; arc=none smtp.client-ip=198.175.65.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Y0DJ78Ej" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750956601; x=1782492601; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IBp9Uci+xgu2crt66gFNebWaLtoikj4mqej9J0xq1sI=; b=Y0DJ78EjJKBLh2j5uPEd6L3VhcZYg/r21URyeZavnzF9AUAEf2ZoXpRv j8paasZp8WtgFEw8W3zE9pPqk46U8O4zSwHgj+emfg1c69tuDAa8Eobey 4gFzQ23tTflkYokkWixEp0uQNHqUpSjeR0XXShDE5bRJeJ/c2FJDR4IUE fWQcBSK5ewEn2+r2mZ5Vv3eeo5Hug7nZ+Q1hPSO1Yed2lctr1uL+U1yb4 z8KWFDSnDxLmHTIMck3TeKIChgXfinPlkWKzK7OCnyZtbKaUhabnE5/Fi CBr90dCDGNELvma4P39l7s7ATAAY7r5Qz9Pzk45SDMndJ3mTQdfQLTK0L g==; X-CSE-ConnectionGUID: YfqzOUq8SPimP1AGexVMlw== X-CSE-MsgGUID: oUvdwZlPQN6sBvldgGM/9g== X-IronPort-AV: E=McAfee;i="6800,10657,11476"; a="53136409" X-IronPort-AV: E=Sophos;i="6.16,268,1744095600"; d="scan'208";a="53136409" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2025 09:49:56 -0700 X-CSE-ConnectionGUID: /FBH1no5S+em1Mwan9iVnw== X-CSE-MsgGUID: sSt+eNGZSSudCUKw3Qbq3A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,268,1744095600"; d="scan'208";a="153069222" Received: from agluck-desk3.sc.intel.com ([172.25.103.51]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2025 09:49:55 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Maciej Wieczor-Retman , Peter Newman , James Morse , Babu Moger , Drew Fustini , Dave Martin , Anil Keshavamurthy , Chen Yu Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v6 12/30] fs/resctrl: Make event details accessible to functions when reading events Date: Thu, 26 Jun 2025 09:49:21 -0700 Message-ID: <20250626164941.106341-13-tony.luck@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250626164941.106341-1-tony.luck@intel.com> References: <20250626164941.106341-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" All details about a monitor event are kept in the mon_evt structure. Upper levels of code only provide the event id to lower levels. This will become a problem when new attributes are added to the mon_evt structure. Change the mon_data and rmid_read structures to hold a pointer to the mon_evt structure instead of just taking a copy of the event id. No functional change. Signed-off-by: Tony Luck --- fs/resctrl/internal.h | 8 ++++---- fs/resctrl/ctrlmondata.c | 16 ++++++++-------- fs/resctrl/monitor.c | 17 +++++++++-------- fs/resctrl/rdtgroup.c | 6 +++--- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/fs/resctrl/internal.h b/fs/resctrl/internal.h index b12242d20e61..1458fda64423 100644 --- a/fs/resctrl/internal.h +++ b/fs/resctrl/internal.h @@ -90,7 +90,7 @@ extern struct mon_evt mon_event_all[QOS_NUM_EVENTS]; struct mon_data { struct list_head list; enum resctrl_res_level rid; - enum resctrl_event_id evtid; + struct mon_evt *evt; int domid; bool sum; }; @@ -103,7 +103,7 @@ struct mon_data { * @r: Resource describing the properties of the event being read. * @hdr: Header of domain that the counter should be read from. If NULL = then sum all * domains in @r sharing L3 @ci.id - * @evtid: Which monitor event to read. + * @evt: Event associated with the event file. * @first: Initialize MBM counter when true. * @ci_id: Cacheinfo id for L3. Only set when @hdr is NULL. Used when summ= ing domains. * @err: Error encountered when reading counter. @@ -117,7 +117,7 @@ struct rmid_read { struct rdtgroup *rgrp; struct rdt_resource *r; struct rdt_domain_hdr *hdr; - enum resctrl_event_id evtid; + struct mon_evt *evt; bool first; unsigned int ci_id; int err; @@ -353,7 +353,7 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg= ); =20 void mon_event_read(struct rmid_read *rr, struct rdt_resource *r, struct rdt_domain_hdr *hdr, struct rdtgroup *rdtgrp, - cpumask_t *cpumask, int evtid, int first); + cpumask_t *cpumask, struct mon_evt *evt, int first); =20 int resctrl_mon_resource_init(void); =20 diff --git a/fs/resctrl/ctrlmondata.c b/fs/resctrl/ctrlmondata.c index 1d7086509bfa..a99903ac5d27 100644 --- a/fs/resctrl/ctrlmondata.c +++ b/fs/resctrl/ctrlmondata.c @@ -548,7 +548,7 @@ struct rdt_domain_hdr *resctrl_find_domain(struct list_= head *h, int id, =20 void mon_event_read(struct rmid_read *rr, struct rdt_resource *r, struct rdt_domain_hdr *hdr, struct rdtgroup *rdtgrp, - cpumask_t *cpumask, int evtid, int first) + cpumask_t *cpumask, struct mon_evt *evt, int first) { int cpu; =20 @@ -559,11 +559,11 @@ void mon_event_read(struct rmid_read *rr, struct rdt_= resource *r, * Setup the parameters to pass to mon_event_count() to read the data. */ rr->rgrp =3D rdtgrp; - rr->evtid =3D evtid; + rr->evt =3D evt; rr->r =3D r; rr->hdr =3D hdr; rr->first =3D first; - rr->arch_mon_ctx =3D resctrl_arch_mon_ctx_alloc(r, evtid); + rr->arch_mon_ctx =3D resctrl_arch_mon_ctx_alloc(r, evt->evtid); if (IS_ERR(rr->arch_mon_ctx)) { rr->err =3D -EINVAL; return; @@ -582,20 +582,20 @@ void mon_event_read(struct rmid_read *rr, struct rdt_= resource *r, else smp_call_on_cpu(cpu, smp_mon_event_count, rr, false); =20 - resctrl_arch_mon_ctx_free(r, evtid, rr->arch_mon_ctx); + resctrl_arch_mon_ctx_free(r, evt->evtid, rr->arch_mon_ctx); } =20 int rdtgroup_mondata_show(struct seq_file *m, void *arg) { struct kernfs_open_file *of =3D m->private; enum resctrl_res_level resid; - enum resctrl_event_id evtid; struct rdt_domain_hdr *hdr; struct rmid_read rr =3D {0}; struct rdtgroup *rdtgrp; int domid, cpu, ret =3D 0; struct rdt_resource *r; struct cacheinfo *ci; + struct mon_evt *evt; struct mon_data *md; =20 rdtgrp =3D rdtgroup_kn_lock_live(of->kn); @@ -612,7 +612,7 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg) =20 resid =3D md->rid; domid =3D md->domid; - evtid =3D md->evtid; + evt =3D md->evt; r =3D resctrl_arch_get_resource(resid); =20 if (md->sum) { @@ -636,7 +636,7 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg) if (!ci) continue; mon_event_read(&rr, r, NULL, rdtgrp, - &ci->shared_cpu_map, evtid, false); + &ci->shared_cpu_map, evt, false); goto checkresult; } } @@ -652,7 +652,7 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg) ret =3D -ENOENT; goto out; } - mon_event_read(&rr, r, hdr, rdtgrp, &hdr->cpu_mask, evtid, false); + mon_event_read(&rr, r, hdr, rdtgrp, &hdr->cpu_mask, evt, false); } =20 checkresult: diff --git a/fs/resctrl/monitor.c b/fs/resctrl/monitor.c index 28d96147b9f4..6d4191eff391 100644 --- a/fs/resctrl/monitor.c +++ b/fs/resctrl/monitor.c @@ -370,8 +370,8 @@ static int __mon_event_count(u32 closid, u32 rmid, stru= ct rmid_read *rr) RDT_RESOURCE_L3))) return -EINVAL; d =3D container_of(rr->hdr, struct rdt_l3_mon_domain, hdr); - resctrl_arch_reset_rmid(rr->r, d, closid, rmid, rr->evtid); - m =3D get_mbm_state(d, closid, rmid, rr->evtid); + resctrl_arch_reset_rmid(rr->r, d, closid, rmid, rr->evt->evtid); + m =3D get_mbm_state(d, closid, rmid, rr->evt->evtid); if (m) memset(m, 0, sizeof(struct mbm_state)); return 0; @@ -382,7 +382,7 @@ static int __mon_event_count(u32 closid, u32 rmid, stru= ct rmid_read *rr) if (!cpumask_test_cpu(cpu, &rr->hdr->cpu_mask)) return -EINVAL; rr->err =3D resctrl_arch_rmid_read(rr->r, rr->hdr, closid, rmid, - rr->evtid, &tval, rr->arch_mon_ctx); + rr->evt->evtid, &tval, rr->arch_mon_ctx); if (rr->err) return rr->err; =20 @@ -411,7 +411,7 @@ static int __mon_event_count(u32 closid, u32 rmid, stru= ct rmid_read *rr) if (d->ci_id !=3D rr->ci_id) continue; err =3D resctrl_arch_rmid_read(rr->r, &d->hdr, closid, rmid, - rr->evtid, &tval, rr->arch_mon_ctx); + rr->evt->evtid, &tval, rr->arch_mon_ctx); if (!err) { rr->val +=3D tval; ret =3D 0; @@ -445,7 +445,7 @@ static void mbm_bw_count(u32 closid, u32 rmid, struct r= mid_read *rr) if (WARN_ON_ONCE(domain_header_is_valid(rr->hdr, RESCTRL_MON_DOMAIN, RDT_= RESOURCE_L3))) return; d =3D container_of(rr->hdr, struct rdt_l3_mon_domain, hdr); - m =3D get_mbm_state(d, closid, rmid, rr->evtid); + m =3D get_mbm_state(d, closid, rmid, rr->evt->evtid); if (WARN_ON_ONCE(!m)) return; =20 @@ -616,12 +616,13 @@ static void update_mba_bw(struct rdtgroup *rgrp, stru= ct rdt_l3_mon_domain *dom_m static void mbm_update_one_event(struct rdt_resource *r, struct rdt_l3_mon= _domain *d, u32 closid, u32 rmid, enum resctrl_event_id evtid) { + struct mon_evt *evt =3D &mon_event_all[evtid]; struct rmid_read rr =3D {0}; =20 rr.r =3D r; rr.hdr =3D &d->hdr; - rr.evtid =3D evtid; - rr.arch_mon_ctx =3D resctrl_arch_mon_ctx_alloc(rr.r, rr.evtid); + rr.evt =3D evt; + rr.arch_mon_ctx =3D resctrl_arch_mon_ctx_alloc(rr.r, evt->evtid); if (IS_ERR(rr.arch_mon_ctx)) { pr_warn_ratelimited("Failed to allocate monitor context: %ld", PTR_ERR(rr.arch_mon_ctx)); @@ -637,7 +638,7 @@ static void mbm_update_one_event(struct rdt_resource *r= , struct rdt_l3_mon_domai if (is_mba_sc(NULL)) mbm_bw_count(closid, rmid, &rr); =20 - resctrl_arch_mon_ctx_free(rr.r, rr.evtid, rr.arch_mon_ctx); + resctrl_arch_mon_ctx_free(rr.r, evt->evtid, rr.arch_mon_ctx); } =20 static void mbm_update(struct rdt_resource *r, struct rdt_l3_mon_domain *d, diff --git a/fs/resctrl/rdtgroup.c b/fs/resctrl/rdtgroup.c index 39018f6c8b14..a10f2f6825fc 100644 --- a/fs/resctrl/rdtgroup.c +++ b/fs/resctrl/rdtgroup.c @@ -2903,7 +2903,7 @@ static struct mon_data *mon_get_kn_priv(enum resctrl_= res_level rid, int domid, =20 list_for_each_entry(priv, &mon_data_kn_priv_list, list) { if (priv->rid =3D=3D rid && priv->domid =3D=3D domid && - priv->sum =3D=3D do_sum && priv->evtid =3D=3D mevt->evtid) + priv->sum =3D=3D do_sum && priv->evt =3D=3D mevt) return priv; } =20 @@ -2914,7 +2914,7 @@ static struct mon_data *mon_get_kn_priv(enum resctrl_= res_level rid, int domid, priv->rid =3D rid; priv->domid =3D domid; priv->sum =3D do_sum; - priv->evtid =3D mevt->evtid; + priv->evt =3D mevt; list_add_tail(&priv->list, &mon_data_kn_priv_list); =20 return priv; @@ -3079,7 +3079,7 @@ static int mon_add_all_files(struct kernfs_node *kn, = struct rdt_domain_hdr *hdr, return ret; =20 if (r->rid =3D=3D RDT_RESOURCE_L3 && !do_sum && resctrl_is_mbm_event(mev= t->evtid)) - mon_event_read(&rr, r, hdr, prgrp, &hdr->cpu_mask, mevt->evtid, true); + mon_event_read(&rr, r, hdr, prgrp, &hdr->cpu_mask, mevt, true); } =20 return 0; --=20 2.49.0