Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (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 46C181FAC4E for ; Wed, 4 Jun 2025 21:22:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749072138; cv=none; b=bUa/vOpYb+ZSp0DLcbjGazyq1ICL6Nz/9fUrmMGGNgdMUKC1CGtEzKnCnuhPozjDibocZ8jehHBF/XxseDq3t8zPtz10+0s2+QdQrLOLX+uVE7RSgt7M+LmtyszhG968Sy6p9HOSsu8eHr0MEWiivF2N9xRCHQ8Ef8U4BZJoCZ0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749072138; c=relaxed/simple; bh=mrfi1QYiWikbPQQ1lTr4igmz0kTS4BErTnR8Ei3X7Js=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OiM1z5KSnRVqrAJW1VhOFyZ1EX2dDXVh8rufClvSzUBIybnI4bbQdtY1SSy72pRxYcP31DitdxktOkS1yOPeQPBWnzqBmFYXXMBi/4FKotvoN4atLF16rQab3tHZJfvaJpVRPF6imkjeuYhjjH6i9iEYMpHenwCZAdwj0wM3XgM= 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=V9Bh3h5w; arc=none smtp.client-ip=192.198.163.7 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="V9Bh3h5w" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1749072137; x=1780608137; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mrfi1QYiWikbPQQ1lTr4igmz0kTS4BErTnR8Ei3X7Js=; b=V9Bh3h5wGdI6nj65++a3ZvZZNX68kqCFPgsquPFasgC5v+uPg24rBpug DFVw2NguT1huecl14DMozAKFoVBnuMNIE9EZSgkHUMIHCKsutl4/zdCFc JDut6oVdlmy6G6nQwkJdEOgMI0EOzR8avxzvoOpfNdTNvKg7RSlS1/JTt q6pr9DozvhSvz1m7lDItntDic3HoMnyPTUwy2v8MXekuMDEm3vpE+mPjZ BEok0An4fb4aDcbqzSWF0Ih2Sw+o+qnuDYZeRN/7l9ymOBVWrsBG0sCpr CmWEuvAH+GwjkVLUERAJRDmgppsFPz8jPR+lMsHrI2KyI1SlOqgG6gf4H A==; X-CSE-ConnectionGUID: Gvhy6PWDS/2M3tH0VrzKqg== X-CSE-MsgGUID: KmJ9PMOxQza0fL3fZPyoHw== X-IronPort-AV: E=McAfee;i="6800,10657,11454"; a="76572763" X-IronPort-AV: E=Sophos;i="6.16,210,1744095600"; d="scan'208";a="76572763" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2025 14:22:15 -0700 X-CSE-ConnectionGUID: VGnvCGlYRAa2HGL5rgkX+A== X-CSE-MsgGUID: MymtO8YsTuyjVTtDC0am4g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,210,1744095600"; d="scan'208";a="150094196" Received: from agluck-desk3.sc.intel.com ([172.25.103.51]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2025 14:22:15 -0700 From: Tony Luck To: Babu Moger , Reinette Chatre Cc: Fenghua Yu , Maciej Wieczor-Retman , Peter Newman , James Morse , Drew Fustini , Dave Martin , Anil Keshavamurthy , Chen Yu , x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v5 3/4 UPDATED] x86/resctrl: Remove 'rdt_mon_features' global variable Date: Wed, 4 Jun 2025 14:22:07 -0700 Message-ID: <20250604212208.49080-4-tony.luck@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250604212208.49080-1-tony.luck@intel.com> References: <20250604212208.49080-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 rdt_mon_features is used as a bitmask of enabled monitor events. A monitor event's status is now maintained in mon_evt::enabled with all monitor events' mon_evt structures found in the filesystem's mon_event_all[] array. Remove the remaining uses of rdt_mon_features. Signed-off-by: Tony Luck --- arch/x86/include/asm/resctrl.h | 1 - arch/x86/kernel/cpu/resctrl/core.c | 9 +++++---- arch/x86/kernel/cpu/resctrl/monitor.c | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/resctrl.h b/arch/x86/include/asm/resctrl.h index b1dd5d6b87db..575f8408a9e7 100644 --- a/arch/x86/include/asm/resctrl.h +++ b/arch/x86/include/asm/resctrl.h @@ -44,7 +44,6 @@ DECLARE_PER_CPU(struct resctrl_pqr_state, pqr_state); extern bool rdt_alloc_capable; extern bool rdt_mon_capable; -extern unsigned int rdt_mon_features; DECLARE_STATIC_KEY_FALSE(rdt_enable_key); DECLARE_STATIC_KEY_FALSE(rdt_alloc_enable_key); diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c index f02095625043..8ff76b9bd09b 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -861,21 +861,22 @@ static __init bool get_rdt_alloc_resources(void) static __init bool get_rdt_mon_resources(void) { struct rdt_resource *r = &rdt_resources_all[RDT_RESOURCE_L3].r_resctrl; + bool ret = false; if (rdt_cpu_has(X86_FEATURE_CQM_OCCUP_LLC)) { resctrl_enable_mon_event(QOS_L3_OCCUP_EVENT_ID); - rdt_mon_features |= (1 << QOS_L3_OCCUP_EVENT_ID); + ret = true; } if (rdt_cpu_has(X86_FEATURE_CQM_MBM_TOTAL)) { resctrl_enable_mon_event(QOS_L3_MBM_TOTAL_EVENT_ID); - rdt_mon_features |= (1 << QOS_L3_MBM_TOTAL_EVENT_ID); + ret = true; } if (rdt_cpu_has(X86_FEATURE_CQM_MBM_LOCAL)) { resctrl_enable_mon_event(QOS_L3_MBM_LOCAL_EVENT_ID); - rdt_mon_features |= (1 << QOS_L3_MBM_LOCAL_EVENT_ID); + ret = true; } - if (!rdt_mon_features) + if (!ret) return false; return !rdt_get_mon_l3_config(r); diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c index 61d38517e2bf..07f8ab097cbe 100644 --- a/arch/x86/kernel/cpu/resctrl/monitor.c +++ b/arch/x86/kernel/cpu/resctrl/monitor.c @@ -31,11 +31,6 @@ */ bool rdt_mon_capable; -/* - * Global to indicate which monitoring events are enabled. - */ -unsigned int rdt_mon_features; - #define CF(cf) ((unsigned long)(1048576 * (cf) + 0.5)) static int snc_nodes_per_l3_cache = 1; -- 2.49.0