From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (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 594FB563FD6 for ; Wed, 16 Sep 2026 23:13:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789600438; cv=none; b=JYucoQ1GNJYf2tl1JfHV/HQE5tEcdGyRBJlh6U2QHb0e/0qzn/vTcJ5qbOoPOeXq5aHGwp4d43e/osgUxA0Qv7ZUUyF2n+eG/7uPrhZk1JORGJ4i7TgPk5e/eZSR9p50w2jq1A+nvZeRxufoumom140xHp5YSDZSaMetZVJTLko= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789600438; c=relaxed/simple; bh=hTr11v7wHlQ5Hv/kNGVDfeuTKIxCaC8hCsKMiFNheOQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xh3741Unp9fBcRgNiaXpSft/VUPDeSrsViC9wsimuqEP78tcywTfGRyR0ObaP3yC883UmVQ10EC+4e3JgOPHeM4wi3orYvpg66dC4rsheHRYKFgLXqQPg2f4rq7J7EqJ4Nqzrc4lceC+pD4ZtaBDNf/5XDkDyVLQDK2Jo+mvXco= 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=BJbf598n; arc=none smtp.client-ip=198.175.65.14 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="BJbf598n" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1789600437; x=1821136437; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hTr11v7wHlQ5Hv/kNGVDfeuTKIxCaC8hCsKMiFNheOQ=; b=BJbf598nrJU2qBrNK/NTxw+prXGxoeDju4QS10wZM8miuyYog6YK3l8X 2krVh5HjHv2ZDqF5IPuT1Qk810P3Rboza0zMJ3chU5Kn5GQbOwTKJwiHU MeRhTG/wgGHvYEvmYxQIUTqYEr7rKQqAp4PMaSbEUAiN+ROvaBoD9fTOw +wft8qJdN8HXH/82lJxVbHy+UGmJ0lkn1+tr2fa401MfbETY180frxyvF pAP4FnkCWbQMbzeu6pJ+WtvlCwLNxC2XJe7khnUyLJH21fHqfyNXsVugZ W084fuMvvl7fmwY3+RZElspZuJz09O2Yjd1O2CYi1kgIgM42ZiVXOCzI+ w==; X-CSE-ConnectionGUID: xJyuVlgoQxe+B14G3+11Tg== X-CSE-MsgGUID: 8+uHvKZkQjG8itUp01AJmg== X-IronPort-AV: E=McAfee;i="6800,10657,11905"; a="93861539" X-IronPort-AV: E=Sophos;i="6.27,103,1787036400"; d="scan'208";a="93861539" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2026 16:13:41 -0700 X-CSE-ConnectionGUID: NKId3sCRR6Kn2XU+lB1PBw== X-CSE-MsgGUID: L3XQfS0IQBizwhh6dsrPbw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,103,1787036400"; d="scan'208";a="277231508" Received: from khuang2-desk.gar.corp.intel.com (HELO agluck-desk3.home.arpa) ([10.124.223.219]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2026 16:13:41 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Maciej Wieczor-Retman , Peter Newman , James Morse , Babu Moger , Drew Fustini , Dave Martin , Chen Yu , David E Box , x86@kernel.org Cc: Christoph Hellwig , linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v12 24/25] x86/resctrl: Simplify Kconfig options for resctrl Date: Wed, 16 Sep 2026 16:13:19 -0700 Message-ID: <20260916231320.14502-25-tony.luck@intel.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260916231320.14502-1-tony.luck@intel.com> References: <20260916231320.14502-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: 8bit Linus Torvalds complained[1] about Kconfig complexity making it too hard for "random people to build their own kernels". CONFIG_X86_CPU_RESCTRL_INTEL_AET has been causing problems since it was first added as it required other config options to be set to "built-in". There is no longer a requirement that INTEL_PMT_TELEMETRY or INTEL_TPMI be built-in. Drop CONFIG_X86_CPU_RESCTRL_INTEL_AET and unconditionally include AET (Application Energy Telemetry) as part of X86_CPU_RESCTRL. Link: https://lore.kernel.org/all/CAHk-=whigg3hvOy7c1j1MXFy6o6CHp0g4Tc3Y-MAk+XDssHU0A@mail.gmail.com # [1] Signed-off-by: Tony Luck --- v12: Added [] around "1" in Link tag. In resctrl Makefile add intel_aet.o to ctrlmondata.o line. Rewrite commit using imperative. --- include/linux/intel_vsec.h | 4 ++-- arch/x86/kernel/cpu/resctrl/internal.h | 13 ------------- arch/x86/Kconfig | 13 ------------- arch/x86/kernel/cpu/resctrl/Makefile | 3 +-- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/include/linux/intel_vsec.h b/include/linux/intel_vsec.h index bcbf4937c71c..885f8e3ab057 100644 --- a/include/linux/intel_vsec.h +++ b/include/linux/intel_vsec.h @@ -257,7 +257,7 @@ static inline void intel_pmt_put_feature_group(struct pmt_feature_group *feature_group) {} #endif -#ifdef CONFIG_X86_CPU_RESCTRL_INTEL_AET +#ifdef CONFIG_X86_CPU_RESCTRL void intel_aet_register_enumeration(struct module *module, struct pmt_feature_group *(*get)(enum pmt_feature_id id), void (*put)(struct pmt_feature_group *p)); @@ -269,6 +269,6 @@ static inline void intel_aet_register_enumeration(struct module *module, void (*put)(struct pmt_feature_group *p)) { } static inline void intel_aet_unregister_enumeration(void) { } static inline void intel_aet_invalidate(u8 package_id) { } -#endif /* CONFIG_X86_CPU_RESCTRL_INTEL_AET */ +#endif /* CONFIG_X86_CPU_RESCTRL */ #endif diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h index 5e71dd758624..93d36fa8c638 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -233,24 +233,11 @@ bool rdt_cpu_has(int flag); void rdt_domain_reconfigure_cdp(struct rdt_resource *r); void resctrl_arch_mbm_cntr_assign_set_one(struct rdt_resource *r); -#ifdef CONFIG_X86_CPU_RESCTRL_INTEL_AET bool intel_aet_pre_mount(void); void intel_aet_unmount(void); int intel_aet_read_event(int domid, u32 rmid, void *arch_priv, u64 *val); void intel_aet_mon_domain_setup(int cpu, int id, struct rdt_resource *r, struct list_head *add_pos); bool intel_handle_aet_option(bool force_off, char *tok); -#else -static inline bool intel_aet_pre_mount(void) { return false; } -static inline void intel_aet_unmount(void) { } -static inline int intel_aet_read_event(int domid, u32 rmid, void *arch_priv, u64 *val) -{ - return -EINVAL; -} - -static inline void intel_aet_mon_domain_setup(int cpu, int id, struct rdt_resource *r, - struct list_head *add_pos) { } -static inline bool intel_handle_aet_option(bool force_off, char *tok) { return false; } -#endif #endif /* _ASM_X86_RESCTRL_INTERNAL_H */ diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 06b5d0c4633e..47f92613434e 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -539,19 +539,6 @@ config X86_CPU_RESCTRL Say N if unsure. -config X86_CPU_RESCTRL_INTEL_AET - bool "Intel Application Energy Telemetry" - depends on X86_CPU_RESCTRL && CPU_SUP_INTEL && INTEL_PMT_TELEMETRY=y && INTEL_TPMI=y - help - Enable per-RMID telemetry events in resctrl. - - Intel feature that collects per-RMID execution data - about energy consumption, measure of frequency independent - activity and other performance metrics. Data is aggregated - per package. - - Say N if unsure. - config X86_FRED bool "Flexible Return and Event Delivery" depends on X86_64 diff --git a/arch/x86/kernel/cpu/resctrl/Makefile b/arch/x86/kernel/cpu/resctrl/Makefile index 273ddfa30836..9daf1c0abb80 100644 --- a/arch/x86/kernel/cpu/resctrl/Makefile +++ b/arch/x86/kernel/cpu/resctrl/Makefile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_X86_CPU_RESCTRL) += core.o rdtgroup.o monitor.o -obj-$(CONFIG_X86_CPU_RESCTRL) += ctrlmondata.o -obj-$(CONFIG_X86_CPU_RESCTRL_INTEL_AET) += intel_aet.o +obj-$(CONFIG_X86_CPU_RESCTRL) += ctrlmondata.o intel_aet.o obj-$(CONFIG_RESCTRL_FS_PSEUDO_LOCK) += pseudo_lock.o # To allow define_trace.h's recursive include: -- 2.55.0