From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (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 ED335161304 for ; Wed, 15 May 2024 22:23:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715811826; cv=none; b=AWZCI0zGZ/FUiVappky5Bntu0uAB4Ahbku80JJnNvBI5JAU6ZyH0Qzni0d0q8XN604G9+FmSOoLttNHNoKsqgNNZ2TcFZSy2654PMe+/sOyreT/6BnKIdDlB4Cpus7mqeInlVmXJqGk9d0PCaSfnD1yaFf7REBcPpFkRRWLeBH8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715811826; c=relaxed/simple; bh=VXHnQvItZ/RdHSdn38gsckqu0vkscAlaujUvcyMHWRs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jVhltW8L3yoZ5f7/nswh3jdrdQyNbwRfPTe35SYaNpyg5hbZxjV5/HgdDd126DxxlOHNJrRfxmBr/+iQx7HJlc4eSEGCWoP75UO7o3+wX72IYVCHYZ2vSfBRDFkJlMESOJI7k4KPYJs1G/23s1Nc+SKiyWdolTUdTnU6D+WbH0M= 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=d6zLVE+J; arc=none smtp.client-ip=198.175.65.15 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="d6zLVE+J" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715811825; x=1747347825; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VXHnQvItZ/RdHSdn38gsckqu0vkscAlaujUvcyMHWRs=; b=d6zLVE+Jvf/97bPZ5HANiziugR0DSLe2fKiv+KTQsziKkHBtLlJz9gYy y9XvkskJInOwMqecGvBmnXfvQcKlJjOsMJ7Ps7D9UExuPIWrZtABlXHlE Zqu4Gy7R1yskXHBSigRup3hOqqs6wVT/EggJ0cBZFNGz5Wf7sUxYNmb5B rBgyLnIGKvHzWR/QXjg7ltydMRgSCNtq1wj8LaE9td+3XkGMbxy9enM9x ISISqxHbnyPLnvbQ6WuyD+kLuffDxf9UxD8/X5ZKrIN/UN4Oj20DMx7oY 7ZW7j6/8Vw1nYGnv0whjnyFNcyMHv/ybh1CwsAIM+HlSQ/PQ00mEiVBhf A==; X-CSE-ConnectionGUID: ffj/VHY+QRWWLmadirfufQ== X-CSE-MsgGUID: aemC2eOlS2O1R9OUoIMfPg== X-IronPort-AV: E=McAfee;i="6600,9927,11074"; a="15671717" X-IronPort-AV: E=Sophos;i="6.08,162,1712646000"; d="scan'208";a="15671717" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 15:23:36 -0700 X-CSE-ConnectionGUID: NuJLDK7/TG6ToQ7Us0EEWQ== X-CSE-MsgGUID: 8qyqqnGYS7SbJlC2Gfs+1w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,162,1712646000"; d="scan'208";a="35989190" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 15:23:36 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Maciej Wieczor-Retman , Peter Newman , James Morse , Babu Moger , Drew Fustini , Dave Martin Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v18 14/17] x86/resctrl: Sum monitor data acrss Sub-NUMA (SNC) nodes when needed Date: Wed, 15 May 2024 15:23:22 -0700 Message-ID: <20240515222326.74166-15-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240515222326.74166-1-tony.luck@intel.com> References: <20240515222326.74166-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When the sumdomains fields is set in the rmid_read structure, walk the list of domains in this resource to find all that share an L3 cache id (rr->display_id). Adjust the RMID value based on which SNC domain is being accessed. Signed-off-by: Tony Luck --- arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 20 +++++++++++--- arch/x86/kernel/cpu/resctrl/monitor.c | 33 ++++++++++++++++++++++- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c index 3b9383612c35..7ab788d47ad3 100644 --- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c +++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c @@ -575,15 +575,27 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg) resid = md.u.rid; domid = md.u.domid; evtid = md.u.evtid; - + rr.sumdomains = md.u.sum; r = &rdt_resources_all[resid].r_resctrl; - hdr = rdt_find_domain(&r->mon_domains, domid, NULL); - if (!hdr || WARN_ON_ONCE(hdr->type != RESCTRL_MON_DOMAIN)) { + + if (rr.sumdomains) { + rr.display_id = domid; + list_for_each_entry(d, &r->mon_domains, hdr.list) { + if (d->display_id == domid) + goto got_domain; + } ret = -ENOENT; goto out; + } else { + hdr = rdt_find_domain(&r->mon_domains, domid, NULL); + if (!hdr || WARN_ON_ONCE(hdr->type != RESCTRL_MON_DOMAIN)) { + ret = -ENOENT; + goto out; + } + d = container_of(hdr, struct rdt_mon_domain, hdr); } - d = container_of(hdr, struct rdt_mon_domain, hdr); +got_domain: mon_event_read(&rr, r, d, rdtgrp, evtid, false); if (rr.err == -EIO) diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c index 0f66825a1ac9..668d2fdf58cd 100644 --- a/arch/x86/kernel/cpu/resctrl/monitor.c +++ b/arch/x86/kernel/cpu/resctrl/monitor.c @@ -546,7 +546,7 @@ static struct mbm_state *get_mbm_state(struct rdt_mon_domain *d, u32 closid, } } -static int __mon_event_count(u32 closid, u32 rmid, struct rmid_read *rr) +static int ___mon_event_count(u32 closid, u32 rmid, struct rmid_read *rr) { struct mbm_state *m; u64 tval = 0; @@ -569,6 +569,37 @@ static int __mon_event_count(u32 closid, u32 rmid, struct rmid_read *rr) return 0; } +static u32 get_node_rmid(struct rdt_resource *r, struct rdt_mon_domain *d, u32 rmid) +{ + int cpu = cpumask_any(&d->hdr.cpu_mask); + + return rmid + (cpu_to_node(cpu) % snc_nodes_per_l3_cache) * r->num_rmid; +} + +static int __mon_event_count(u32 closid, u32 rmid, struct rmid_read *rr) +{ + struct rdt_mon_domain *d; + u32 node_rmid; + int ret = 0; + + if (!rr->sumdomains) { + node_rmid = get_node_rmid(rr->r, rr->d, rmid); + return ___mon_event_count(closid, node_rmid, rr); + } + + list_for_each_entry(d, &rr->r->mon_domains, hdr.list) { + if (d->display_id != rr->display_id) + continue; + rr->d = d; + node_rmid = get_node_rmid(rr->r, d, rmid); + ret = ___mon_event_count(closid, node_rmid, rr); + if (ret) + break; + } + + return ret; +} + /* * mbm_bw_count() - Update bw count from values previously read by * __mon_event_count(). -- 2.44.0