From nobody Sun Feb 8 09:12:22 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 A0D9B25F78C; Tue, 29 Apr 2025 20:24:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745958264; cv=none; b=kGbb169GZlsS4yx52YdXNHPVl0GRYux7Rb9bgS41gWhHWPIMfyElK6CvnpX/OUl2piv+GrDBT3r8Y9jo2X8o1WMIArD8bjWBia453HZ6JnT+o+bclkWg64zTXk17oE0dAQdCPGpFDzBMmcw4ySDU2Be55m8t/VGpNtxO4rV+A9I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745958264; c=relaxed/simple; bh=je4PX87/pOXLlsfa4Mz89lMVrtgvdaQj3AqWmieL8Qo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KCNbewZjynhL3PFturELM/u9NDVBgpgjin/+SKiW+np0qXrMpxoYUlrSoDcYvC2WbIU7KjAEzbB5gQhFtXVKEKeFmKu/JJZOo5/sQUJKwbERhx4qIWrXhOzahKvinu2o+moI/TH8M+jDzEqz2e6xG60gPUnxYYh5ZOz+tnfwSmg= 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=kaWXsEP2; arc=none smtp.client-ip=198.175.65.20 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="kaWXsEP2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1745958262; x=1777494262; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=je4PX87/pOXLlsfa4Mz89lMVrtgvdaQj3AqWmieL8Qo=; b=kaWXsEP2PBUaFEcF9+bH9Zh9lAxSOLeh+MvlpkKHgncZMZybhma5g7nL 0KVlA609kDNdWRs8m+OTVVmY5z5rXypyl9K0S0jQTwJVs31zoinc3WyRz A6Iz+2N9auhT5KsfUBFVge7RI+OrxmpTlNWKml9dUqOrSKRVsOUsJ5iul naotOuxeP1v6bnRCRgSMwhF+yjr5lGugMpEg7UiV5kFQvbOD3tKSJ/Rgl rsnH/63ouoPBZvM1fM4pm6XjKXoQ3jJ0QbzxxFQta9JNSALPii35Om/u6 DAEjZTLLnCDH/FPglvZp5zDWUngEp46lxW3n8kGNCkfmnjzwGKpwp95ZA Q==; X-CSE-ConnectionGUID: sFPWMF7pTmuWCzqHG4AiWw== X-CSE-MsgGUID: 1FGRKaKdQhaJELgqImkqeQ== X-IronPort-AV: E=McAfee;i="6700,10204,11418"; a="47314067" X-IronPort-AV: E=Sophos;i="6.15,250,1739865600"; d="scan'208";a="47314067" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2025 13:24:19 -0700 X-CSE-ConnectionGUID: YY9wJV3mSQGYQTGitr9kgg== X-CSE-MsgGUID: wPtOYY0mQmKt6lRiZKmmiw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,250,1739865600"; d="scan'208";a="139036127" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2025 13:24:18 -0700 From: Tony Luck To: rafael@kernel.org Cc: lenb@kernel.org, Anil Keshavamurthy , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 1/4] ACPICA: Define MRRM ACPI table Date: Tue, 29 Apr 2025 13:24:08 -0700 Message-ID: <20250429202412.380637-2-tony.luck@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250429202412.380637-1-tony.luck@intel.com> References: <20250429202412.380637-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" Patch for reference, this has already been applied to https://github.com/acpica/acpica and will in due course make its way into Linux when the next ACPICA release is ported over. Signed-off-by: Tony Luck --- include/acpi/actbl1.h | 7 +++++++ include/acpi/actbl2.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 387fc821703a..4cb36392e9e9 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -110,6 +110,13 @@ struct acpi_whea_header { u64 mask; /* Bitmask required for this register instruction */ }; =20 +/* Larger subtable header (when Length can exceed 255) */ + +struct acpi_subtbl_hdr_16 { + u16 type; + u16 length; +}; + /* https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/acpitabl/= ns-acpitabl-aspt_table */ #define ASPT_REVISION_ID 0x01 struct acpi_table_aspt { diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index 2e917a8f8bca..e7423db6e24b 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -37,6 +37,7 @@ #define ACPI_SIG_MCHI "MCHI" /* Management Controller Host Inter= face table */ #define ACPI_SIG_MPAM "MPAM" /* Memory System Resource Partition= ing and Monitoring Table */ #define ACPI_SIG_MPST "MPST" /* Memory Power State Table */ +#define ACPI_SIG_MRRM "MRRM" /* Memory Range and Region Map= ping table */ #define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table = */ #define ACPI_SIG_NFIT "NFIT" /* NVDIMM Firmware Interface Table = */ #define ACPI_SIG_NHLT "NHLT" /* Non HD Audio Link Table */ @@ -1736,6 +1737,47 @@ struct acpi_msct_proximity { u64 memory_capacity; /* In bytes */ }; =20 +/*************************************************************************= ****** + * + * MRRM - Memory Range and Region Mapping (MRRM) table + * Conforms to "Intel Resource Director Technology Architecture Specificat= ion" + * Version 1.1, January 2025 + * + *************************************************************************= *****/ + +struct acpi_table_mrrm { + struct acpi_table_header header; /* Common ACPI table header */ + u8 max_mem_region; /* Max Memory Regions supported */ + u8 flags; /* Region assignment type */ + u8 reserved[26]; + u8 memory_range_entry[]; +}; + +/* Flags */ +#define ACPI_MRRM_FLAGS_REGION_ASSIGNMENT_OS (1<<0) + +/*************************************************************************= ****** + * + * Memory Range entry - Memory Range entry in MRRM table + * + *************************************************************************= *****/ + +struct acpi_mrrm_mem_range_entry { + struct acpi_subtbl_hdr_16 header; + u32 reserved0; /* Reserved */ + u64 addr_base; /* Base addr of the mem range */ + u64 addr_len; /* Length of the mem range */ + u16 region_id_flags; /* Valid local or remote Region-ID */ + u8 local_region_id; /* Platform-assigned static local Region-ID */ + u8 remote_region_id; /* Platform-assigned static remote Region-ID */ + u32 reserved1; /* Reserved */ + /* Region-ID Programming Registers[] */ +}; + +/* Values for region_id_flags above */ +#define ACPI_MRRM_VALID_REGION_ID_FLAGS_LOCAL (1<<0) +#define ACPI_MRRM_VALID_REGION_ID_FLAGS_REMOTE (1<<1) + /*************************************************************************= ****** * * MSDM - Microsoft Data Management table --=20 2.48.1 From nobody Sun Feb 8 09:12:22 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 EDA8B2620FA; Tue, 29 Apr 2025 20:24:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745958263; cv=none; b=fi7mK27NO677sOJm1ox+p4w8WPzMB587UTq6ekvKpEoNmm/iqL6SCQmnC58NFYET5FNhBqhKGqTYFyrePATS1M00pZubnZIoEdaNnxZ5IOLnwATVDFUYvB+kSSHg5TPs7Bz3azJcxX9YT9+7bL1zmR4u3Jkv8qHoLY1Y32OVSsI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745958263; c=relaxed/simple; bh=pTiWjc5obwfd6KjattuPQp58CMusIzJRX+fwlUKvvXY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P7Y2zJv4RRxavkOj8ILtEvXXWgxMH+SXi6yF9gsw+dEGSXyOVpod4nqNsZ02wI7Ik/T16SiG/NfL2d+vbxSYkGUmpY2KuwHpDnqDDcbAbpI9se4+QV4oP/AqyKFNW8ZariXp+L6D4FsfMLnBWL/ndoqQPKUfXVFiSc9PMeemDSU= 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=VlaqrMlb; arc=none smtp.client-ip=198.175.65.20 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="VlaqrMlb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1745958262; x=1777494262; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pTiWjc5obwfd6KjattuPQp58CMusIzJRX+fwlUKvvXY=; b=VlaqrMlbppMpE+E4aqcyQg6OHCYRnt0UrYkbGXZkDIfORAXUK14nWhjZ xz1f8tCryPTXZ49jV1rGzTV7OKp0pmzZgIOKCNda6iq90VwIC3jFjni0N 1IEkg5eF8556hfQ+w/B5mmSex3bdlmj2lpOon9FWWkAas51BGLL7sMJ0P TSmoxa7w5zAvObqA22NuC1VOks78qpUHVGnTi+QJ8O2Ql66UqBTe2qgoA fO8aqEu35o2fa+GaLx7kfN3uBApNXh/kHX+BX+FT1QzvpE2LkzeipaFeM Xq4mhc1IjItEyGkF3CnuNsLg/XTwjvHxylwOVbKin7rBCVb3By5Y0HCtX Q==; X-CSE-ConnectionGUID: nIINkZhDRb+f+GplVCn+Og== X-CSE-MsgGUID: XLjCcSiPR32sUNEGOQvIUA== X-IronPort-AV: E=McAfee;i="6700,10204,11418"; a="47314071" X-IronPort-AV: E=Sophos;i="6.15,250,1739865600"; d="scan'208";a="47314071" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2025 13:24:19 -0700 X-CSE-ConnectionGUID: s8oumlQ0Th6IMaswpYdGHA== X-CSE-MsgGUID: 6QlcBOYVQFuDjJrr4R7ELQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,250,1739865600"; d="scan'208";a="139036131" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2025 13:24:18 -0700 From: Tony Luck To: rafael@kernel.org Cc: lenb@kernel.org, Anil Keshavamurthy , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 2/4] ACPI/MRRM: Minimal parse of ACPI MRRM table Date: Tue, 29 Apr 2025 13:24:09 -0700 Message-ID: <20250429202412.380637-3-tony.luck@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250429202412.380637-1-tony.luck@intel.com> References: <20250429202412.380637-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" The resctrl file system code needs to know how many region tags are supported. Parse the ACPI MRRM table and save the max_mem_region value. Provide a function for resctrl to collect that value. Signed-off-by: Tony Luck --- include/linux/acpi.h | 9 +++++++++ drivers/acpi/acpi_mrrm.c | 42 ++++++++++++++++++++++++++++++++++++++++ arch/x86/Kconfig | 1 + drivers/acpi/Kconfig | 3 +++ drivers/acpi/Makefile | 1 + 5 files changed, 56 insertions(+) create mode 100644 drivers/acpi/acpi_mrrm.c diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3f2e93ed9730..c409f4cecb09 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -772,6 +772,10 @@ int acpi_get_local_u64_address(acpi_handle handle, u64= *addr); int acpi_get_local_address(acpi_handle handle, u32 *addr); const char *acpi_get_subsystem_id(acpi_handle handle); =20 +#ifdef CONFIG_ACPI_MRRM +int acpi_mrrm_max_mem_region(void); +#endif + #else /* !CONFIG_ACPI */ =20 #define acpi_disabled 1 @@ -1092,6 +1096,11 @@ static inline acpi_handle acpi_get_processor_handle(= int cpu) return NULL; } =20 +static inline int acpi_mrrm_max_mem_region(void) +{ + return -ENOENT; +} + #endif /* !CONFIG_ACPI */ =20 #ifdef CONFIG_ACPI_HMAT diff --git a/drivers/acpi/acpi_mrrm.c b/drivers/acpi/acpi_mrrm.c new file mode 100644 index 000000000000..ab8022e58da5 --- /dev/null +++ b/drivers/acpi/acpi_mrrm.c @@ -0,0 +1,42 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2025, Intel Corporation. + * + * Memory Range and Region Mapping (MRRM) structure + */ + +#define pr_fmt(fmt) "acpi/mrrm: " fmt + +#include +#include + +static int max_mem_region =3D -ENOENT; + +/* Access for use by resctrl file system */ +int acpi_mrrm_max_mem_region(void) +{ + return max_mem_region; +} + +static __init int acpi_parse_mrrm(struct acpi_table_header *table) +{ + struct acpi_table_mrrm *mrrm; + + mrrm =3D (struct acpi_table_mrrm *)table; + if (!mrrm) + return -ENODEV; + + max_mem_region =3D mrrm->max_mem_region; + + return 0; +} + +static __init int mrrm_init(void) +{ + int ret; + + ret =3D acpi_table_parse(ACPI_SIG_MRRM, acpi_parse_mrrm); + + return ret; +} +device_initcall(mrrm_init); diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4b9f378e05f6..0e43069082df 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -38,6 +38,7 @@ config X86_64 select ARCH_HAS_ELFCORE_COMPAT select ZONE_DMA32 select EXECMEM if DYNAMIC_FTRACE + select ACPI_MRRM if ACPI =20 config FORCE_DYNAMIC_FTRACE def_bool y diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 7f10aa38269d..7bc40c2735ac 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -576,6 +576,9 @@ config ACPI_FFH Enable this feature if you want to set up and install the FFH Address Space handler to handle FFH OpRegion in the firmware. =20 +config ACPI_MRRM + bool + source "drivers/acpi/pmic/Kconfig" =20 config ACPI_VIOT diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 797070fc9a3f..d1b0affb844f 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -66,6 +66,7 @@ acpi-$(CONFIG_ACPI_WATCHDOG) +=3D acpi_watchdog.o acpi-$(CONFIG_ACPI_PRMT) +=3D prmt.o acpi-$(CONFIG_ACPI_PCC) +=3D acpi_pcc.o acpi-$(CONFIG_ACPI_FFH) +=3D acpi_ffh.o +acpi-$(CONFIG_ACPI_MRRM) +=3D acpi_mrrm.o =20 # Address translation acpi-$(CONFIG_ACPI_ADXL) +=3D acpi_adxl.o --=20 2.48.1 From nobody Sun Feb 8 09:12:22 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 96809265CC8; Tue, 29 Apr 2025 20:24:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745958265; cv=none; b=TBXzT4eZAakG2/gkY4mbcjV0nMEw91wEr/Y7tIF06bYC0cnd8MOz8uJex9eiYRqoqVH+18kYKRwtYxzpBujXWhNmSYwHPRFejbGg+lRm8vnQIDnpNysxE9WB4hvI0zrRDkTrg8+oq94gUnBciZ7IHwtGEWxGtMegam7QpbjZw+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745958265; c=relaxed/simple; bh=mvgK1uFtqEsCi8+cfLkgU8dVp3KLbVexxg4gOXXIb4k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HBoz3Mw5OoY06gzYtAtS5FljhIlooYBfN1BWR/EOlSKDA/agVdQFRy60HNxP0CM5RDckwD11uXBd+YW1QHbNL/GCPZMzuaVZHrMcXO3m1mNA1EX0MymnOUvTww0eixlYyqujlRxEZmFSAH+AArW/ue53ylUxNShekLzvNkFRzjQ= 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=F4I4J+zR; arc=none smtp.client-ip=198.175.65.20 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="F4I4J+zR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1745958264; x=1777494264; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mvgK1uFtqEsCi8+cfLkgU8dVp3KLbVexxg4gOXXIb4k=; b=F4I4J+zRdfKJ1X/NcqUhuUGdypKuEayJGzmJvWO/sTBoKCOIdzPdEu70 Xxz6+uvLDpSOJXzycz7iYvEnjrbpTM4ah7vpjXRQNeri4UfmsxYMT3kS4 p+EKCRuSSCbGOngqCPLR4rzNspmkXijreQrJSiRbCdH58twtYwZJVwTuy o2nWKz0RLR5qiiIlqSDqb+D9HtwUUS0JOmsfTTS9rcgWHmeQkqskfnL4b l/YS3pl6vSSZ3GUA6zbmnswTlMhbDrhrUkMddvIaQDtd8mo02TMjCpFn+ ZB0u2YfBxwTrI1m+NNDk03UShT2crocsazRLS5sYcVz1gNN5Id/E18CL8 w==; X-CSE-ConnectionGUID: ANYjGVmbRPiTSLVwEuq/KQ== X-CSE-MsgGUID: cdEbndqnQ+aWwkFryQN8aA== X-IronPort-AV: E=McAfee;i="6700,10204,11418"; a="47314073" X-IronPort-AV: E=Sophos;i="6.15,250,1739865600"; d="scan'208";a="47314073" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2025 13:24:19 -0700 X-CSE-ConnectionGUID: WN1JIc4JSWuwmwDzURyIZw== X-CSE-MsgGUID: xfnvbjugS7arA9kC8tRMFA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,250,1739865600"; d="scan'208";a="139036134" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2025 13:24:18 -0700 From: Tony Luck To: rafael@kernel.org Cc: lenb@kernel.org, Anil Keshavamurthy , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 3/4] ACPI/MRRM: Add /sys files to describe memory ranges Date: Tue, 29 Apr 2025 13:24:10 -0700 Message-ID: <20250429202412.380637-4-tony.luck@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250429202412.380637-1-tony.luck@intel.com> References: <20250429202412.380637-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" Perf and resctrl users need an enumeration of which memory addresses are bound to which "region" tag. Parse the ACPI MRRM table and add /sys entries for each memory range describing base address, length, NUMA node, and which region tags apply for same-socket and cross-socket access. Signed-off-by: Tony Luck --- drivers/acpi/acpi_mrrm.c | 143 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpi_mrrm.c b/drivers/acpi/acpi_mrrm.c index ab8022e58da5..f04645a0407f 100644 --- a/drivers/acpi/acpi_mrrm.c +++ b/drivers/acpi/acpi_mrrm.c @@ -3,12 +3,16 @@ * Copyright (c) 2025, Intel Corporation. * * Memory Range and Region Mapping (MRRM) structure + * + * Parse and report the platform's MRRM table in /sys. */ =20 #define pr_fmt(fmt) "acpi/mrrm: " fmt =20 #include #include +#include +#include =20 static int max_mem_region =3D -ENOENT; =20 @@ -18,25 +22,162 @@ int acpi_mrrm_max_mem_region(void) return max_mem_region; } =20 +struct mrrm_mem_range_entry { + u64 base; + u64 length; + int node; + u8 local_region_id; + u8 remote_region_id; +}; + +static struct mrrm_mem_range_entry *mrrm_mem_range_entry; +static u32 mrrm_mem_entry_num; + +static int get_node_num(struct mrrm_mem_range_entry *e) +{ + unsigned int nid; + + for_each_online_node(nid) { + for (int z =3D 0; z < MAX_NR_ZONES; z++) { + struct zone *zone =3D NODE_DATA(nid)->node_zones + z; + + if (!populated_zone(zone)) + continue; + if (zone_intersects(zone, PHYS_PFN(e->base), PHYS_PFN(e->length))) + return zone_to_nid(zone); + } + } + + return -ENOENT; +} + static __init int acpi_parse_mrrm(struct acpi_table_header *table) { + struct acpi_mrrm_mem_range_entry *mre_entry; struct acpi_table_mrrm *mrrm; + void *mre, *mrrm_end; + int mre_count =3D 0; =20 mrrm =3D (struct acpi_table_mrrm *)table; if (!mrrm) return -ENODEV; =20 + if (mrrm->flags & ACPI_MRRM_FLAGS_REGION_ASSIGNMENT_OS) + return -EOPNOTSUPP; + + mrrm_end =3D (void *)mrrm + mrrm->header.length - 1; + mre =3D (void *)mrrm + sizeof(struct acpi_table_mrrm); + while (mre < mrrm_end) { + mre_entry =3D mre; + mre_count++; + mre +=3D mre_entry->header.length; + } + if (!mre_count) { + pr_info(FW_BUG "No ranges listed in MRRM table\n"); + return -EINVAL; + } + + mrrm_mem_range_entry =3D kmalloc_array(mre_count, sizeof(*mrrm_mem_range_= entry), + GFP_KERNEL | __GFP_ZERO); + if (!mrrm_mem_range_entry) + return -ENOMEM; + + mre =3D (void *)mrrm + sizeof(struct acpi_table_mrrm); + while (mre < mrrm_end) { + struct mrrm_mem_range_entry *e; + + mre_entry =3D mre; + e =3D mrrm_mem_range_entry + mrrm_mem_entry_num; + + e->base =3D mre_entry->addr_base; + e->length =3D mre_entry->addr_len; + e->node =3D get_node_num(e); + + if (mre_entry->region_id_flags & ACPI_MRRM_VALID_REGION_ID_FLAGS_LOCAL) + e->local_region_id =3D mre_entry->local_region_id; + else + e->local_region_id =3D -1; + if (mre_entry->region_id_flags & ACPI_MRRM_VALID_REGION_ID_FLAGS_REMOTE) + e->remote_region_id =3D mre_entry->remote_region_id; + else + e->remote_region_id =3D -1; + + mrrm_mem_entry_num++; + mre +=3D mre_entry->header.length; + } + max_mem_region =3D mrrm->max_mem_region; =20 return 0; } =20 +#define RANGE_ATTR(name, fmt) \ +static ssize_t name##_show(struct kobject *kobj, \ + struct kobj_attribute *attr, char *buf) \ +{ \ + struct mrrm_mem_range_entry *mre; \ + const char *kname =3D kobject_name(kobj); \ + int n, ret; \ + \ + ret =3D kstrtoint(kname + 5, 10, &n); \ + if (ret) \ + return ret; \ + \ + mre =3D mrrm_mem_range_entry + n; \ + \ + return sysfs_emit(buf, fmt, mre->name); \ +} \ +static struct kobj_attribute name##_attr =3D __ATTR_RO(name) + +RANGE_ATTR(base, "0x%llx\n"); +RANGE_ATTR(length, "0x%llx\n"); +RANGE_ATTR(node, "%d\n"); +RANGE_ATTR(local_region_id, "%d\n"); +RANGE_ATTR(remote_region_id, "%d\n"); + +static struct attribute *memory_range_attrs[] =3D { + &base_attr.attr, + &length_attr.attr, + &node_attr.attr, + &local_region_id_attr.attr, + &remote_region_id_attr.attr, + NULL +}; + +ATTRIBUTE_GROUPS(memory_range); + +static __init int add_boot_memory_ranges(void) +{ + struct kobject *pkobj, *kobj; + int ret =3D -EINVAL; + char *name; + + pkobj =3D kobject_create_and_add("memory_ranges", acpi_kobj); + + for (int i =3D 0; i < mrrm_mem_entry_num; i++) { + name =3D kasprintf(GFP_KERNEL, "range%d", i); + if (!name) + break; + + kobj =3D kobject_create_and_add(name, pkobj); + + ret =3D sysfs_create_groups(kobj, memory_range_groups); + if (ret) + return ret; + } + + return ret; +} + static __init int mrrm_init(void) { int ret; =20 ret =3D acpi_table_parse(ACPI_SIG_MRRM, acpi_parse_mrrm); =20 - return ret; + if (ret < 0) + return ret; + + return add_boot_memory_ranges(); } device_initcall(mrrm_init); --=20 2.48.1 From nobody Sun Feb 8 09:12:22 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 08B54266F16; Tue, 29 Apr 2025 20:24:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745958265; cv=none; b=j8ru5f4kENjxCnu0qWtVymD53X+ljj25iobGKhf1ymU8NSkocWP66yNCpBKrnbtH/13z6xTiCisKOmEkcTLYhACzX6dNyviu0TTsUzzNsTUl01pSDG0yjcoaVkMQPVAeMLhsGMDTM2UOzWdJFIA15LxD1CgUNOc/p8f2Ry6qKvQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745958265; c=relaxed/simple; bh=Mzf4z3JjeUDeBLBOc9nbGSbBtSvIhz9Znl+rjIhT6PU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=epNv+wYR3fdzWw9UONGTv3cgZF2YTQYNqU97i4Ni/5HF4RN/yTda4GP74+Kck7z1pJsNn1hQ9PLFTN46e6QO+TkEmaNMG7m++2357uC7h7Fui75x2ERO/ayxhcHjxGuRZTklnJctoQFl8VFsMe5p6fYT501dtpxCnmxHF3paTsQ= 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=IGBXkxLc; arc=none smtp.client-ip=198.175.65.20 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="IGBXkxLc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1745958264; x=1777494264; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Mzf4z3JjeUDeBLBOc9nbGSbBtSvIhz9Znl+rjIhT6PU=; b=IGBXkxLcwB//PnxoizvDfaAkgEz8t0ZfN3cwroqSixtpKYcrdwRaUlwD M5QvJHGZkIQseVrhhc3tHaM4SyApgnsbI+vvWWfzCCShoNjCzm6v3n28J 8Cxhgrn0RLIkjHYTEXsyH/g/D2qs3WKASjry++3qNoUv4H8bcqYdBTIQP Vxe18jG/LcHTzxp3lM7qVO1V+Q1pHcUxJKpXe8fSSJhnnlRZ+YKXLjU9H 7wq4LJDbLcsKj9XRyuVk3RauIjLLtjC94beJnFVb6nN/TMBIAtF5ZnwCr sDv9Eg92vzRmtZ46fxhbNfXjh5C3pteTlY4m5DMS9KpfPJWWgAaH+YhyZ A==; X-CSE-ConnectionGUID: jP4MXr70QfSoefyasgUo6w== X-CSE-MsgGUID: C1sys6H0Rhe9h+n/PEmnqg== X-IronPort-AV: E=McAfee;i="6700,10204,11418"; a="47314075" X-IronPort-AV: E=Sophos;i="6.15,250,1739865600"; d="scan'208";a="47314075" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2025 13:24:20 -0700 X-CSE-ConnectionGUID: 32uMB13fTMuHcSEcrV7dmg== X-CSE-MsgGUID: 3nUPlzM9Roy3ySo/10bv7Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,250,1739865600"; d="scan'208";a="139036137" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2025 13:24:18 -0700 From: Tony Luck To: rafael@kernel.org Cc: lenb@kernel.org, Anil Keshavamurthy , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 4/4] ACPI: Add documentation for exposing MRRM data Date: Tue, 29 Apr 2025 13:24:11 -0700 Message-ID: <20250429202412.380637-5-tony.luck@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250429202412.380637-1-tony.luck@intel.com> References: <20250429202412.380637-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" Initial implementation provides enumeration of the address ranges NUMA node numbers, and BIOS assigned region IDs for each range. Signed-off-by: Tony Luck --- Documentation/ABI/testing/sysfs-firmware-acpi | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-firmware-acpi b/Documentation/= ABI/testing/sysfs-firmware-acpi index 5249ad5a96d9..fffba38f9ce1 100644 --- a/Documentation/ABI/testing/sysfs-firmware-acpi +++ b/Documentation/ABI/testing/sysfs-firmware-acpi @@ -248,3 +248,24 @@ Description: # cat ff_pwr_btn 7 enabled =20 +What: /sys/firmware/acpi/memory_ranges/rangeX +Date: February 2025 +Contact: Tony Luck +Description: + On systems with the ACPI MRRM table reports the + parameters for each range. + + base: Starting system physical address. + + length: Length of this range in bytes. + + node: NUMA node that this range belongs to. Negative numbers + indicate that the node number could not be determined (e.g + for an address range that is reserved for future hot add of + memory). + + local_region_id: ID associated with access by agents + local to this range of addresses. + + remote_region_id: ID associated with access by agents + non-local to this range of addresses. --=20 2.48.1