From nobody Mon Feb 9 12:24:14 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (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 5B46323719E for ; Mon, 3 Mar 2025 23:34:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741044891; cv=none; b=qsBaZ/JeNLa65fy48dVaT/SAqQOelcrCBQ/6z/671swWW3MILcdBMSzU76PrhKGyZhsrHY1TUOGmnUrRvGQZPKe8v0LcqMrxE6OTl2dvWTR91Yqv9cGvfneQBMfLGCkCvUMhdElonEUL5uqOlBbneRt986hwwqF7HTWFEkFK7a4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741044891; c=relaxed/simple; bh=yy0dlVhKmEuufnCmp400TE9M9AV853wWbPKFkEusswM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kx4PgHgr6QRl/OXKjOMWr5d9FGZGQRkofhKMJXfafJ4v42WxGP5oVm8obWjlACxrMi8OWb4a1dRxvicjot+bIqYAWrpnwgOtmLap5ZqiHIVzf18Y/yg+oquQ+7/JDD6Up9ua/8IFqZYIaCiRNOkqe/jLC7NRz/0le/DSJGfaIgM= 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=IkK/Bk1c; arc=none smtp.client-ip=192.198.163.17 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="IkK/Bk1c" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741044889; x=1772580889; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yy0dlVhKmEuufnCmp400TE9M9AV853wWbPKFkEusswM=; b=IkK/Bk1cGfXdzvpcec1dJid8a9AEpiaQlpQ/weXE94ZHPT8iESUJ7K1N aBe2vPZCqchyPUFpGspR2COqjIS2D0GuWI+APhuI8E2upuyC2DmiIMsCi MH6HR7+PQPIjXIkzp4LHMw6o7KYgYQknvn1hOsNJzKCuh2psVwVwBMaGJ Tp7J9cbDcdpIzC3jSDX+A+gn34BpV64BjGMbXsWiMBpfR2Q8NjkpBSglR 8USszJup4skOhWXjJ5+Hx73R4WGwRxUdgdX9jM90jN8B5iQ21HCqWO2VF QkqhU0hvsL1UuuUcTpcG/H6cT9bBfGd002FXJNozrA7IJ/ygjoXGbMTQN Q==; X-CSE-ConnectionGUID: 7/SXYnMoSCaAkU91a1plpQ== X-CSE-MsgGUID: 3Nn4IBLmSYuhaVSUYPHtyQ== X-IronPort-AV: E=McAfee;i="6700,10204,11362"; a="41835922" X-IronPort-AV: E=Sophos;i="6.13,330,1732608000"; d="scan'208";a="41835922" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2025 15:34:46 -0800 X-CSE-ConnectionGUID: ZsKdpOW4SA6xeb013sQObw== X-CSE-MsgGUID: vynoUKVTS3iMt5Uohz5NGw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,330,1732608000"; d="scan'208";a="117982286" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2025 15:33:50 -0800 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Maciej Wieczor-Retman , Peter Newman , James Morse , Babu Moger , Drew Fustini , Dave Martin Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [RFC PATCH 04/17] x86/resctrl: Split L3 specific code out of rdtgroup_mondata_show() Date: Mon, 3 Mar 2025 15:33:24 -0800 Message-ID: <20250303233340.333743-5-tony.luck@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250303233340.333743-1-tony.luck@intel.com> References: <20250303233340.333743-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" New monitor resources require different operations to read counters. Move the L3 specific code to a helper function. Signed-off-by: Tony Luck --- arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 79 +++++++++++++---------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cp= u/resctrl/ctrlmondata.c index 536351159cc2..515a9bec05cd 100644 --- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c +++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c @@ -627,31 +627,14 @@ void mon_event_read(struct rmid_read *rr, struct rdt_= resource *r, resctrl_arch_mon_ctx_free(r, evtid, rr->arch_mon_ctx); } =20 -int rdtgroup_mondata_show(struct seq_file *m, void *arg) +static int rdtgroup_l3_data_show(struct seq_file *m, struct rdt_resource *= r, + int domid, struct rdtgroup *rdtgrp, u32 evtid, + bool sum, struct rmid_read *rr) { - struct kernfs_open_file *of =3D m->private; struct rdt_domain_hdr *hdr; - struct rmid_read rr =3D {0}; struct rdt_mon_domain *d; - u32 resid, evtid, domid; - struct rdtgroup *rdtgrp; - struct rdt_resource *r; - union mon_data_bits md; - int ret =3D 0; - - rdtgrp =3D rdtgroup_kn_lock_live(of->kn); - if (!rdtgrp) { - ret =3D -ENOENT; - goto out; - } =20 - md.priv =3D of->kn->priv; - resid =3D md.u.rid; - domid =3D md.u.domid; - evtid =3D md.u.evtid; - r =3D &rdt_resources_all[resid].r_resctrl; - - if (md.u.sum) { + if (sum) { /* * This file requires summing across all domains that share * the L3 cache id that was provided in the "domid" field of the @@ -660,37 +643,67 @@ int rdtgroup_mondata_show(struct seq_file *m, void *a= rg) */ list_for_each_entry(d, &r->mon_domains, hdr.list) { if (d->ci->id =3D=3D domid) { - rr.ci =3D d->ci; - mon_event_read(&rr, r, NULL, rdtgrp, + rr->ci =3D d->ci; + mon_event_read(rr, r, NULL, rdtgrp, &d->ci->shared_cpu_map, evtid, false); goto checkresult; } } - ret =3D -ENOENT; - goto out; + return -ENOENT; } else { /* * This file provides data from a single domain. Search * the resource to find the domain with "domid". */ hdr =3D rdt_find_domain(&r->mon_domains, domid, NULL); - if (!hdr || WARN_ON_ONCE(hdr->type !=3D RESCTRL_MON_DOMAIN)) { - ret =3D -ENOENT; - goto out; - } + if (!hdr || WARN_ON_ONCE(hdr->type !=3D RESCTRL_MON_DOMAIN)) + return -ENOENT; d =3D container_of(hdr, struct rdt_mon_domain, hdr); - mon_event_read(&rr, r, d, rdtgrp, &d->hdr.cpu_mask, evtid, false); + mon_event_read(rr, r, d, rdtgrp, &d->hdr.cpu_mask, evtid, false); } =20 checkresult: =20 - if (rr.err =3D=3D -EIO) + if (rr->err =3D=3D -EIO) seq_puts(m, "Error\n"); - else if (rr.err =3D=3D -EINVAL) + else if (rr->err =3D=3D -EINVAL) seq_puts(m, "Unavailable\n"); else - seq_printf(m, "%llu\n", rr.val); + seq_printf(m, "%llu\n", rr->val); =20 + return 0; +} + +int rdtgroup_mondata_show(struct seq_file *m, void *arg) +{ + struct kernfs_open_file *of =3D m->private; + struct rmid_read rr =3D {0}; + u32 resid, evtid, domid; + struct rdtgroup *rdtgrp; + struct rdt_resource *r; + union mon_data_bits md; + int ret =3D 0; + + rdtgrp =3D rdtgroup_kn_lock_live(of->kn); + if (!rdtgrp) { + ret =3D -ENOENT; + goto out; + } + + md.priv =3D of->kn->priv; + resid =3D md.u.rid; + domid =3D md.u.domid; + evtid =3D md.u.evtid; + r =3D &rdt_resources_all[resid].r_resctrl; + + switch (r->rid) { + case RDT_RESOURCE_L3: + ret =3D rdtgroup_l3_data_show(m, r, domid, rdtgrp, evtid, md.u.sum, &rr); + break; + default: + ret =3D -EINVAL; + break; + } out: rdtgroup_kn_unlock(of->kn); return ret; --=20 2.48.1