From nobody Thu Feb 12 17:28:59 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 0908214C5BE for ; Mon, 10 Jun 2024 18:35:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718044548; cv=none; b=djP4Nw3Xep4l13Fr1s8LDuqjHVf86S+z455Fsd+VK78BAM5Sx06LMSanNiSbKGGiuTxJzs+f7lkqRuLglRanioZqbltM92nLsUKLh9L14vQT9sJQDs5uXbrWtnmZzkEzdX4jqeXplHzDpFmDcgMmCrFM5eNheKMquUQdwwLxJ5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718044548; c=relaxed/simple; bh=HbZOABeY9IHib2lhfpHXCLfQJUXECUmM1y/iDSdOWcc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j4BKhT0LdkzlNygsy85k19kkwLiSTdO30vBaVGl3TeuqGQwA1cThIYuByq+uF7ufjflOooG6HsmLz4Is7+QG3sXYrkCW18EP2JxMVGqk7LBQpo3lhxlr2Gt7H8v/wa67dYrsUth3I323IlYrkluGBiKDYE/LshTct43drqEdLyk= 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=F1a2izRB; arc=none smtp.client-ip=192.198.163.16 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="F1a2izRB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718044547; x=1749580547; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HbZOABeY9IHib2lhfpHXCLfQJUXECUmM1y/iDSdOWcc=; b=F1a2izRBF0lPxkUPyelPvKuGPfW7Ml0z2Irdu3hollGMF0RCXZF5KGXF suXbJpPnwMNDB3AQ1lcWAxGi5dYx3H7zM2JjUZ7DzqYuBjqMlCuoeZUyW IhdMOyiSeD6eYil3hZooHcKi4r479Cjw4c/TT0Hf/7vIbi2hf/42kbMe6 oV8km2G93zOMCH1Tx+1xDUqqdvbZmZW5C0X92c4AeArh48/5GHwesGq04 MNVpprUGt+nfvqH36bMFUzmr+QV2Hk1AIAvCKDHoSpbmU6ZY8/PReyTEU LEz7aOmDwyaDUHfLqd96t5sCq25d0g8uKixLtvAYORvPvDk3QF0Of8dzH g==; X-CSE-ConnectionGUID: Bz6uqeXOSFiOy1Aho0kuDw== X-CSE-MsgGUID: eB5DInbFSfu1jud9HmpNwg== X-IronPort-AV: E=McAfee;i="6600,9927,11099"; a="12004851" X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="12004851" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2024 11:35:38 -0700 X-CSE-ConnectionGUID: J7vgEx3YSZe2gaaHPKSIpg== X-CSE-MsgGUID: SsU8nxY6RlCsTV0dkHrscw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="43576586" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2024 11:35:39 -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 v20 12/18] x86/resctrl: Create Sub-NUMA Cluster (SNC) monitor files Date: Mon, 10 Jun 2024 11:35:22 -0700 Message-ID: <20240610183528.349198-13-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240610183528.349198-1-tony.luck@intel.com> References: <20240610183528.349198-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" When SNC mode is enabled, create subdirectories and files to monitor at the SNC node granularity. Legacy behavior is preserved by tagging the monitor files at the L3 granularity with the "sum" attribute. When the user reads these files the kernel will read monitor data from all SNC nodes that share the same L3 cache instance and return the aggregated value to the user. Note that the "domid" field for files that must sum across SNC domains has the L3 cache instance id, while non-summing files use the domain id. The "sum" files do not need to make a call to mon_event_read() to initialize the MBM counters. This will be handled by initializing the individual SNC nodes that share the L3. Signed-off-by: Tony Luck --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 62 +++++++++++++++++++------- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index 66acbad1c585..fc7f3f139800 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -3022,7 +3022,8 @@ static void rmdir_mondata_subdir_allrdtgrp(struct rdt= _resource *r, } =20 static int mon_add_all_files(struct kernfs_node *kn, struct rdt_mon_domain= *d, - struct rdt_resource *r, struct rdtgroup *prgrp) + struct rdt_resource *r, struct rdtgroup *prgrp, + bool do_sum) { union mon_data_bits priv; struct mon_evt *mevt; @@ -3033,14 +3034,15 @@ static int mon_add_all_files(struct kernfs_node *kn= , struct rdt_mon_domain *d, return -EPERM; =20 priv.u.rid =3D r->rid; - priv.u.domid =3D d->hdr.id; + priv.u.domid =3D do_sum ? d->ci->id : d->hdr.id; + priv.u.sum =3D do_sum; list_for_each_entry(mevt, &r->evt_list, list) { priv.u.evtid =3D mevt->evtid; ret =3D mon_addfile(kn, mevt->name, priv.priv); if (ret) return ret; =20 - if (is_mbm_event(mevt->evtid)) + if (!do_sum && is_mbm_event(mevt->evtid)) mon_event_read(&rr, r, d, prgrp, mevt->evtid, true); } =20 @@ -3051,23 +3053,51 @@ static int mkdir_mondata_subdir(struct kernfs_node = *parent_kn, struct rdt_mon_domain *d, struct rdt_resource *r, struct rdtgroup *prgrp) { - struct kernfs_node *kn; + struct kernfs_node *kn, *ckn; char name[32]; - int ret; + bool snc_mode; + int ret =3D 0; =20 - sprintf(name, "mon_%s_%02d", r->name, d->hdr.id); - /* create the directory */ - kn =3D kernfs_create_dir(parent_kn, name, parent_kn->mode, prgrp); - if (IS_ERR(kn)) - return PTR_ERR(kn); + lockdep_assert_held(&rdtgroup_mutex); =20 - ret =3D rdtgroup_kn_set_ugid(kn); - if (ret) - goto out_destroy; + snc_mode =3D r->mon_scope !=3D RESCTRL_L3_CACHE; + sprintf(name, "mon_%s_%02d", r->name, d->ci->id); + kn =3D kernfs_find_and_get(parent_kn, name); + if (kn) { + /* + * rdtgroup_mutex will prevent this directory from being + * removed. No need to keep this hold. + */ + kernfs_put(kn); + } else { + kn =3D kernfs_create_dir(parent_kn, name, parent_kn->mode, prgrp); + if (IS_ERR(kn)) + return PTR_ERR(kn); =20 - ret =3D mon_add_all_files(kn, d, r, prgrp); - if (ret) - goto out_destroy; + ret =3D rdtgroup_kn_set_ugid(kn); + if (ret) + goto out_destroy; + ret =3D mon_add_all_files(kn, d, r, prgrp, snc_mode); + if (ret) + goto out_destroy; + } + + if (snc_mode) { + sprintf(name, "mon_sub_%s_%02d", r->name, d->hdr.id); + ckn =3D kernfs_create_dir(kn, name, parent_kn->mode, prgrp); + if (IS_ERR(ckn)) { + ret =3D -EINVAL; + goto out_destroy; + } + + ret =3D rdtgroup_kn_set_ugid(ckn); + if (ret) + goto out_destroy; + + ret =3D mon_add_all_files(ckn, d, r, prgrp, false); + if (ret) + goto out_destroy; + } =20 kernfs_activate(kn); return 0; --=20 2.45.0