From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (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 86A8C30E0EF for ; Mon, 13 Oct 2025 22:34:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760394859; cv=none; b=tpgv9Kg1gaCx+fTRXEpUVklomYzjKd1ep2etgOy9MdPWUXvzK4wXtOWzitdJLfrFPcANTUQin1iHUZfb0Il+/V96ck3H/PZlCWFPZf7XZzxVUXQvgairItYt+KW3qW2ZCsiaHxY8LR7CXW/XvPZuXfJnZYmPD1yZfsfsu/y6K/Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760394859; c=relaxed/simple; bh=SrLQKiOahXGh/votRoKugf3THJAzzLCFiAsT2JK1dAg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CJPsJFraIysJppvXy9Yh4OINjzshO/FRd5F2kQo1rLY2LLmRBrQETBNL4LCw8z7TU8GpFK11E460hvmbUwn/q+ZRPARQv+8ZqSC0LSKRNKr+hNdAWKH6yID8ZHruJhwVm+aPOk1ERaoOlNNmOfs0COWdMdtbTI/QUme3urPBicM= 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=RQyf/Q3I; arc=none smtp.client-ip=198.175.65.9 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="RQyf/Q3I" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760394857; x=1791930857; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SrLQKiOahXGh/votRoKugf3THJAzzLCFiAsT2JK1dAg=; b=RQyf/Q3IBjX21HTzMBNmhFJUTa/3+pHvaTMJnoagjcrJxIFY3MYs6RIn uq9BBt9K6Fuub7EXqFUitBRJ4i79IPr8wuIw0TCgQoNrjoaN0UOPEpHRo l11tUNk5hjX+LYUD4SanAe+WHOzLvUSjg3KEthHMQ7bW7FNQW+rYnIwB0 ICBIUVkT6mWWX16nOJHVOvyg7n0WgyioZrAXkocyDLqMvpaAmt9Cw07UY fOICbDsPyieqiKwJIAmPgQ1NVsuqmj83ZlNkGjJaLGregp2ZYe6fAB+lB 19xlkl7kPorAshDB3raTgQjQITWi3/3IXRX5O2oTzEdwjMGeEQuCCDYOA g==; X-CSE-ConnectionGUID: K2lkP3mXQayyR2WMlvwO0A== X-CSE-MsgGUID: 5fyPdjgVSauvc4wYmcP2Ag== X-IronPort-AV: E=McAfee;i="6800,10657,11581"; a="85168935" X-IronPort-AV: E=Sophos;i="6.19,226,1754982000"; d="scan'208";a="85168935" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2025 15:34:03 -0700 X-CSE-ConnectionGUID: 3HG9RlruTpyUDeBAGakj5A== X-CSE-MsgGUID: d7P4Oo0PRTm4wwGyamELhg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,226,1754982000"; d="scan'208";a="182145332" Received: from sramkris-mobl1.amr.corp.intel.com (HELO agluck-desk3.intel.com) ([10.124.222.79]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2025 15:34:03 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Maciej Wieczor-Retman , Peter Newman , James Morse , Babu Moger , Drew Fustini , Dave Martin , Chen Yu Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v12 26/31] x86,fs/resctrl: Compute number of RMIDs as minimum across resources Date: Mon, 13 Oct 2025 15:33:40 -0700 Message-ID: <20251013223348.103390-27-tony.luck@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013223348.103390-1-tony.luck@intel.com> References: <20251013223348.103390-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 resctrl assumes that only the L3 resource supports monitor events, so it simply takes the rdt_resource::num_rmid from RDT_RESOURCE_L3 as the system's number of RMIDs. The addition of telemetry events in a different resource breaks that assumption. Compute the number of available RMIDs as the minimum value across all mon_capable resources (analogous to how the number of CLOSIDs is computed across alloc_capable resources). Note that mount time enumeration of the telemetry resource means that this number can be reduced. If this happens, then some memory will be wasted as the allocations for rdt_l3_mon_domain::mbm_states[] and rdt_l3_mon_domain::rmid_busy_llc created during resctrl initialization will be larger than needed. Signed-off-by: Tony Luck Reviewed-by: Reinette Chatre --- arch/x86/kernel/cpu/resctrl/core.c | 15 +++++++++++++-- fs/resctrl/rdtgroup.c | 6 ++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c index cc3479429044..955a1904ba2a 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -110,12 +110,23 @@ struct rdt_hw_resource rdt_resources_all[RDT_NUM_RESOURCES] = { }, }; +/** + * resctrl_arch_system_num_rmid_idx - Compute number of supported RMIDs + * (minimum across all mon_capable resource) + * + * Return: Number of supported RMIDs at time of call. Note that mount time + * enumeration of resources may reduce the number. + */ u32 resctrl_arch_system_num_rmid_idx(void) { - struct rdt_resource *r = &rdt_resources_all[RDT_RESOURCE_L3].r_resctrl; + u32 num_rmids = U32_MAX; + struct rdt_resource *r; + + for_each_mon_capable_rdt_resource(r) + num_rmids = min(num_rmids, r->mon.num_rmid); /* RMID are independent numbers for x86. num_rmid_idx == num_rmid */ - return r->mon.num_rmid; + return num_rmids == U32_MAX ? 0 : num_rmids; } struct rdt_resource *resctrl_arch_get_resource(enum resctrl_res_level l) diff --git a/fs/resctrl/rdtgroup.c b/fs/resctrl/rdtgroup.c index f18cc5b38315..c94536382316 100644 --- a/fs/resctrl/rdtgroup.c +++ b/fs/resctrl/rdtgroup.c @@ -4296,6 +4296,12 @@ void resctrl_offline_mon_domain(struct rdt_resource *r, struct rdt_domain_hdr *h * During boot this may be called before global allocations have been made by * resctrl_l3_mon_resource_init(). * + * Called during CPU online that may run as soon as CPU online callbacks + * are set up during resctrl initialization. The number of supported RMIDs + * may be reduced if additional mon_capable resources are enumerated + * at mount time. This means the rdt_l3_mon_domain::mbm_states[] and + * rdt_l3_mon_domain::rmid_busy_llc allocations may be larger than needed. + * * Return: %0 for success; -ENOMEM otherwise. */ static int domain_setup_l3_mon_state(struct rdt_resource *r, struct rdt_l3_mon_domain *d) -- 2.51.0