acpi/hmat / cxl: Add exclusive caching enumeration and RAS support
Subsystems (5)
Dave Jiang
maintainercover acpi/hmat / cxl: Add exclusive caching enumeration and RAS support
v1:
- Drop RFC prefix
- Drop MMIO hole discovery. Will implement if there's real world implementation.
- Drop MCE_PRI_CXL. Use MCE_PRI_UC. (Boris)
- Minor refactors and grammar fixes. (Jonathan)
- Rename 'mode' to 'address_mode'. (Jonathan)
RFCv2:
- Dropped 1/6 (ACPICA definition merged)
- Change UNKNOWN to RESERVED for cache definition. (Jonathan)
- Fix spelling errors (Jonathan)
- Rename region_res_match_range() to region_res_match_cxl_range(). (Jonathan)
- Add warning when cache is not 1:1 with backing region. (Jonathan)
- Code and comments cleanup. (Jonathan)
- Make MCE code access in CXL arch independent. (Jonathan)
- Fixup 0-day reports.
Certain systems provide an exclusive caching memory configurations where a 1:1 layout of DRAM and far memory (FM) such as CXL memory is utilized. In this configuration, the memory region is provided as a single memory region to the OS. For example such as below:
128GB DRAM 128GB CXL memory
|------------------------------------|------------------------------------|
The kernel sees the region as a 256G system memory region. Data can reside in either DRAM or FM with no replication. Hot data is swapped into DRAM by the hardware behind the scenes.
This kernel series introduces code to enumerate the side cache by the kernel when configured in a exclusive-cache configuration. It also adds RAS support to deal with the aliased memory addresses.
A new ECN [1] to ACPI HMAT table was introduced and was approved to describe the "extended-linear" addressing for direct-mapped memory-side caches. A reserved field in the Memory Side Cache Information Structure of HMAT is redefined as "Address Mode" where a value of 1 is defined as Extended-linear mode. This value is valid if the cache is direct mapped. "It indicates that the associated address range (SRAT.MemoryAffinityStructure.Length) is comprised of the backing store capacity extended by the cache capacity." By augmenting the HMAT and SRAT parsing code, this new information can be stored by the HMAT handling code.
Current CXL region enumeration code is not enlightened with the side cache configuration and therefore only presents the region size as the size of the CXL region. Add support to allow CXL region enumeration code to query the HMAT handling code and retrieve the information regarding the side cache and adjust the region size accordingly. This should allow the CXL CLI to display the full region size rather than just the CXL only region size.
There are 3 sources where the kernel may be notified that error is detected for memory.
1. CXL DRAM event. This is a CXL event that is generated when an error is detected by the CXL device patrol or demand scrubber. The trace_event is augmented to display the aliased System Phyiscal Address (SPA) in addition to the alerted address. However, reporting of memory failure is TBD until the discussion [2] of failure reporting is settled upstream.
2. UCNA event from DRAM patrol or demand scrubber. This should eventually go through the MCE callback chain.
3. MCE from kernel consume poison.
It is possible that all 3 sources may report at the same time and all report at the error.
For 2 and 3, a MCE notifier callback is registered by the CXL on a per device basis. The callback will determine if the reported address is in one of the special regions and offline the aliased address if that is the case.
[1]: https://lore.kernel.org/linux-cxl/[email protected]/
[2]: https://lore.kernel.org/linux-cxl/[email protected]/
---
Dave Jiang (4):
acpi: numa: Add support to enumerate and store extended linear address mode acpi/hmat / cxl: Add extended linear cache support for CXL
cxl: Add extended linear cache address alias emission for cxl events
cxl: Add mce notifier to emit aliased address for extended linear cache
Documentation/ABI/stable/sysfs-devices-node | 6 +++ arch/x86/mm/pat/set_memory.c | 1 + drivers/acpi/numa/hmat.c | 44 ++++++++++++++++++++ drivers/base/node.c | 2 + drivers/cxl/core/Makefile | 2 + drivers/cxl/core/acpi.c | 11 +++++ drivers/cxl/core/core.h | 8 ++++ drivers/cxl/core/mbox.c | 30 ++++++++++++-- drivers/cxl/core/mce.c | 52 +++++++++++++++++++++++ drivers/cxl/core/mce.h | 14 +++++++ drivers/cxl/core/region.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++-- drivers/cxl/core/trace.h | 24 +++++++---- drivers/cxl/cxl.h | 8 ++++ drivers/cxl/cxlmem.h | 2 + include/linux/acpi.h | 19 +++++++++ include/linux/node.h | 7 ++++ tools/testing/cxl/Kbuild | 1 + 17 files changed, 323 insertions(+), 15 deletions(-)
Dave Jiang
maintainerPATCH 1/4 acpi: numa: Add support to enumerate and store extended linear address mode
Store the address mode as part of the cache attriutes. Export the mode attribute to sysfs as all other cache attributes.
---
RFC:
- Rename mode to address_mode (Jonathan)
--- Documentation/ABI/stable/sysfs-devices-node | 6 ++++++ drivers/acpi/numa/hmat.c | 5 +++++ drivers/base/node.c | 2 ++ include/linux/node.h | 7 +++++++ 4 files changed, 20 insertions(+)
Documentation/ABI/stable/sysfs-devices-node +6 -0
@@ -177,6 +177,12 @@ Description: The cache write policy: 0 for write-back, 1 for write-through, other or unknown. +What: /sys/devices/system/node/nodeX/memory_side_cache/indexY/address_mode +Date: December 2024 +Contact: Dave Jiang <[email protected]> +Description: + The address mode: 0 for reserved, 1 for extended-linear. + What: /sys/devices/system/node/nodeX/x86/sgx_total_bytes Date: November 2021 Contact: Jarkko Sakkinen <[email protected]>
drivers/acpi/numa/hmat.c +5 -0
@@ -506,6 +506,11 @@ static __init int hmat_parse_cache(union acpi_subtable_headers *header,switch ((attrs &ACPI_HMAT_CACHE_ASSOCIATIVITY ) >>8 ) {case ACPI_HMAT_CA_DIRECT_MAPPED : tcache->cache_attrs.indexing =NODE_CACHE_DIRECT_MAP ; +/* Extended Linear mode is only valid if cache is direct mapped */ +if (cache->address_mode ==ACPI_HMAT_CACHE_MODE_EXTENDED_LINEAR ) { + tcache->cache_attrs.address_mode = +NODE_CACHE_ADDR_MODE_EXTENDED_LINEAR ; + }break ;case ACPI_HMAT_CA_COMPLEX_CACHE_INDEXING : tcache->cache_attrs.indexing =NODE_CACHE_INDEXED ;
drivers/base/node.c +2 -0
@@ -244,12 +244,14 @@ CACHE_ATTR(size, "%llu") CACHE_ATTR(line_size, "%u") CACHE_ATTR(indexing, "%u") CACHE_ATTR(write_policy, "%u") +CACHE_ATTR(address_mode, "%#x")static struct attribute *cache_attrs[] = { &dev_attr_indexing.attr, &dev_attr_size.attr, &dev_attr_line_size.attr, &dev_attr_write_policy.attr, + &dev_attr_address_mode.attr,NULL , };ATTRIBUTE_GROUPS (cache);
include/linux/node.h +7 -0
@@ -57,6 +57,11 @@ enum cache_write_policy { NODE_CACHE_WRITE_OTHER, }; +enum cache_mode { +NODE_CACHE_ADDR_MODE_RESERVED , +NODE_CACHE_ADDR_MODE_EXTENDED_LINEAR , +}; +/** * struct node_cache_attrs - system memory caching attributes *
@@ -65,6 +70,7 @@ enum cache_write_policy {* @size: Total size of cache in bytes * @line_size: Number of bytes fetched on a cache miss * @level: The cache hierarchy level +* @address_mode: The address mode */ struct node_cache_attrs {enum cache_indexing indexing;
@@ -72,6 +78,7 @@ struct node_cache_attrs {u64 size;u16 line_size;u8 level; +u16 address_mode; };#ifdef CONFIG_HMEM_REPORTING
Signature · 1 line
2.47.0
Dave Jiang
maintainerPATCH 2/4 acpi/hmat / cxl: Add extended linear cache support for CXL
In reply to Dave JiangThe current cxl region size only indicates the size of the CXL memory region without accounting for the extended linear cache size. Retrieve the cache size from HMAT and append that to the cxl region size for the cxl region range that matches the SRAT range that has extended linear cache enabled.
The SRAT defines the whole memory range that includes the extended linear cache and the CXL memory region. The new HMAT ECN/ECR to the Memory Side Cache Information Structure defines the size of the extended linear cache size and matches to the SRAT Memory Affinity Structure by the memory proxmity domain. Add a helper to match the cxl range to the SRAT memory range in order to retrieve the cache size.
There are several places that checks the cxl region range against the decoder range. Use new helper to check between the two ranges and address the new cache size.
---
RFC:
- Minor refactors (Jonathan)
- Fix grammar (Jonathan)
--- drivers/acpi/numa/hmat.c | 39 ++++++++++++++++++++++ drivers/cxl/core/Makefile | 1 + drivers/cxl/core/acpi.c | 11 ++++++ drivers/cxl/core/core.h | 3 ++ drivers/cxl/core/region.c | 70 ++++++++++++++++++++++++++++++++++++--- drivers/cxl/cxl.h | 2 ++ include/linux/acpi.h | 19 +++++++++++ tools/testing/cxl/Kbuild | 1 + 8 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 drivers/cxl/core/acpi.c
drivers/acpi/numa/hmat.c +39 -0
@@ -108,6 +108,45 @@ static struct memory_target *find_mem_target(unsigned int mem_pxm)return NULL ; } +/** +* hmat_get_extended_linear_cache_size - Retrieve the extended linear cache size +* @backing_res: resource from the backing media +* @nid: node id for the memory region +* @cache_size: (Output) size of extended linear cache. +* +* Return: 0 on success. Errno on failure. +* +*/ +int hmat_get_extended_linear_cache_size (struct resource *backing_res,int nid, +resource_size_t *cache_size) +{ +unsigned int pxm =node_to_pxm (nid); +struct memory_target *target; +struct target_cache *tcache; +struct resource *res; + + target =find_mem_target (pxm); +if (!target) +return -ENOENT ; + +list_for_each_entry (tcache, &target->caches, node) { +if (tcache->cache_attrs.address_mode == +NODE_CACHE_ADDR_MODE_EXTENDED_LINEAR ) +continue ; + + res = &target->memregions; +if (!resource_contains (res, backing_res)) +continue ; + + *cache_size = tcache->cache_attrs.size; +return 0 ; + } + + *cache_size =0 ; +return 0 ; +} +EXPORT_SYMBOL_NS_GPL (hmat_get_extended_linear_cache_size,CXL ); +static struct memory_target *acpi_find_genport_target (u32 uid) {struct memory_target *target;
drivers/cxl/core/Makefile +1 -0
@@ -14,5 +14,6 @@ cxl_core-y += pci.o cxl_core-y += hdm.o cxl_core-y += pmu.o cxl_core-y += cdat.o +cxl_core-y += acpi.o cxl_core-$(CONFIG_TRACING) += trace.o cxl_core-$(CONFIG_CXL_REGION) += region.o
drivers/cxl/core/acpi.c new file +11 -0
@@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright(c) 2024 Intel Corporation. All rights reserved. */ +#include <linux/acpi.h> +#include "cxl.h" +#include "core.h" + +int cxl_acpi_get_extended_linear_cache_size (struct resource *backing_res, +int nid,resource_size_t *size) +{ +return hmat_get_extended_linear_cache_size (backing_res, nid, size); +}
drivers/cxl/core/core.h +3 -0
@@ -115,4 +115,7 @@ bool cxl_need_node_perf_attrs_update(int nid);int cxl_port_get_switch_dport_bandwidth (struct cxl_port *port,struct access_coordinate *c); +int cxl_acpi_get_extended_linear_cache_size (struct resource *backing_res, +int nid,resource_size_t *size); +#endif /* __CXL_CORE_H__ */
drivers/cxl/core/region.c +66 -4
106 lines not on this page · raw message
drivers/cxl/cxl.h +2 -0
@@ -492,6 +492,7 @@ enum cxl_config_state {* @res: allocated iomem capacity for this region * @targets: active ordered targets in current decoder configuration * @nr_targets: number of targets +* @cache_size: extended linear cache size, if exists * * State transitions are protected by the cxl_region_rwsem */
@@ -503,6 +504,7 @@ struct cxl_region_params {struct resource *res;struct cxl_endpoint_decoder *targets[CXL_DECODER_MAX_INTERLEAVE ];int nr_targets; +resource_size_t cache_size; };/*
include/linux/acpi.h +19 -0
@@ -436,12 +436,20 @@ int thermal_acpi_critical_trip_temp(struct acpi_device *adev, int *ret_temp);#ifdef CONFIG_ACPI_HMAT int acpi_get_genport_coordinates (u32 uid,struct access_coordinate *coord); +int hmat_get_extended_linear_cache_size (struct resource *backing_res,int nid, +resource_size_t *size);#else static inline int acpi_get_genport_coordinates (u32 uid,struct access_coordinate *coord) {return -EOPNOTSUPP ; } + +static inline int hmat_get_extended_linear_cache_size (struct resource *backing_res, +int nid,resource_size_t *size) +{ +return -EOPNOTSUPP ; +}#endif #ifdef CONFIG_ACPI_NUMA
@@ -1090,6 +1098,17 @@ static inline acpi_handle acpi_get_processor_handle(int cpu)#endif /* !CONFIG_ACPI */ +#ifdef CONFIG_ACPI_HMAT +int hmat_get_extended_linear_cache_size (struct resource *backing_res,int nid, +resource_size_t *size); +#else +static inline int hmat_get_extended_linear_cache_size (struct resource *backing_res, +int nid,resource_size_t *size) +{ +return -EOPNOTSUPP ; +} +#endif +extern void arch_post_acpi_subsys_init (void );#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
tools/testing/cxl/Kbuild +1 -0
@@ -61,6 +61,7 @@ cxl_core-y += $(CXL_CORE_SRC)/pci.o cxl_core-y += $(CXL_CORE_SRC)/hdm.o cxl_core-y += $(CXL_CORE_SRC)/pmu.o cxl_core-y += $(CXL_CORE_SRC)/cdat.o +cxl_core-y += $(CXL_CORE_SRC)/acpi.o cxl_core-$(CONFIG_TRACING) += $(CXL_CORE_SRC)/trace.o cxl_core-$(CONFIG_CXL_REGION) += $(CXL_CORE_SRC)/region.o cxl_core-y += config_check.o
Signature · 1 line
2.47.0
kernel test robot
build botRe: [PATCH 2/4] acpi/hmat / cxl: Add extended linear cache support for CXL
kernel test robot noticed the following build errors:
Hi Dave,
kernel test robot noticed the following build errors:
[auto build test ERROR on rafael-pm/linux-next]
[also build test ERROR on rafael-pm/bleeding-edge cxl/next driver-core/driver-core-testing driver-core/driver-core-next driver-core/driver-core-linus tip/x86/mm linus/master cxl/pending v6.13-rc1 next-20241204] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Dave-Jiang/acpi-numa-Add-support-to-enumerate-and-store-extended-linear-address-mode/20241205-064921 base: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next patch link: https://lore.kernel.org/r/20241204224827.2097263-3-dave.jiang%40intel.com patch subject: [PATCH 2/4] acpi/hmat / cxl: Add extended linear cache support for CXL config: i386-buildonly-randconfig-004 (https://download.01.org/0day-ci/archive/20241205/[email protected]/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241205/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from kernel/sysctl.c:54:
>> include/linux/acpi.h:1105:19: error: redefinition of 'hmat_get_extended_linear_cache_size'
1105 | static inline int hmat_get_extended_linear_cache_size(struct resource *backing_res,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/acpi.h:448:19: note: previous definition of 'hmat_get_extended_linear_cache_size' with type 'int(struct resource *, int, resource_size_t *)' {aka 'int(struct resource *, int, unsigned int *)'}
448 | static inline int hmat_get_extended_linear_cache_size(struct resource *backing_res,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/hmat_get_extended_linear_cache_size +1105 include/linux/acpi.h
1100
1101 #ifdef CONFIG_ACPI_HMAT
1102 int hmat_get_extended_linear_cache_size(struct resource *backing_res, int nid,
1103 resource_size_t *size);
1104 #else
> 1105 static inline int hmat_get_extended_linear_cache_size(struct resource *backing_res,
1106 int nid, resource_size_t *size)
1107 {
1108 return -EOPNOTSUPP;
1109 }
1110 #endif
1111
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Li Ming
reviewerRe: [PATCH 2/4] acpi/hmat / cxl: Add extended linear cache support for CXL
In reply to Dave JiangQuoted 57 lines · Dave Jiang
The current cxl region size only indicates the size of the CXL memory region without accounting for the extended linear cache size. Retrieve the cache size from HMAT and append that to the cxl region size for the cxl region range that matches the SRAT range that has extended linear cache enabled.
The SRAT defines the whole memory range that includes the extended linear cache and the CXL memory region. The new HMAT ECN/ECR to the Memory Side Cache Information Structure defines the size of the extended linear cache size and matches to the SRAT Memory Affinity Structure by the memory proxmity domain. Add a helper to match the cxl range to the SRAT memory range in order to retrieve the cache size.
There are several places that checks the cxl region range against the decoder range. Use new helper to check between the two ranges and address the new cache size.
Signed-off-by Dave Jiang <[email protected]>---
RFC:
- Minor refactors (Jonathan)
- Fix grammar (Jonathan)--- drivers/acpi/numa/hmat.c | 39 ++++++++++++++++++++++ drivers/cxl/core/Makefile | 1 + drivers/cxl/core/acpi.c | 11 ++++++ drivers/cxl/core/core.h | 3 ++ drivers/cxl/core/region.c | 70 ++++++++++++++++++++++++++++++++++++--- drivers/cxl/cxl.h | 2 ++ include/linux/acpi.h | 19 +++++++++++ tools/testing/cxl/Kbuild | 1 + 8 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 drivers/cxl/core/acpi.cdrivers/acpi/numa/hmat.c +15
-0@@ -108,6 +108,45 @@ static struct memory_target *find_mem_target(unsigned int mem_pxm)return NULL ; } +/** +* hmat_get_extended_linear_cache_size - Retrieve the extended linear cache size +* @backing_res: resource from the backing media +* @nid: node id for the memory region +* @cache_size: (Output) size of extended linear cache. +* +* Return: 0 on success. Errno on failure. +* +*/ +int hmat_get_extended_linear_cache_size (struct resource *backing_res,int nid, +resource_size_t *cache_size) +{ +unsigned int pxm =node_to_pxm (nid); +struct memory_target *target; +struct target_cache *tcache;
drivers/acpi/numa/hmat.c static struct memory_target *find_mem_target(unsigned int mem_pxm) · line 135
Quoted 10 lines
drivers/acpi/numa/hmat.c +10
-0+struct resource *res; + + target =find_mem_target (pxm); +if (!target) +return -ENOENT ; + +list_for_each_entry (tcache, &target->caches, node) { +if (tcache->cache_attrs.address_mode == +NODE_CACHE_ADDR_MODE_EXTENDED_LINEAR ) +continue ;
Should continue only when "tcache->cache_attrs.address_mode" is NOT "NODE_CACHE_ADDR_MODE_EXTENDED_LINEAR"?
[snip]
Quoted 45 lines
drivers/acpi/numa/hmat.c +38
-0+static int cxl_extended_linear_cache_resize (struct cxl_region *cxlr, +struct resource *res) +{ +struct cxl_region_params *p = &cxlr->params; +int nid =phys_to_target_node (res->start); +resource_size_t size, cache_size; +int rc; + + size =resource_size (res); +if (!size) +return -EINVAL ; + + rc =cxl_acpi_get_extended_linear_cache_size (res, nid, &cache_size); +if (rc) +return rc; + +if (!cache_size) +return 0 ; + +if (size != cache_size) { +dev_warn (&cxlr->dev,"Extended Linear Cache is not 1:1, unsupported!" ); +return -EOPNOTSUPP ; + } + +/* +* Move the start of the range to where the cache range starts. The +* implementation assumes that the cache range is in front of the +* CXL range. This is not dictated by the HMAT spec but is how the +* current known implementation is configured. +*/ + res->start -= cache_size; + p->cache_size = cache_size; + +return 0 ; +} +/* Establish an empty region covering the given HPA range */ static struct cxl_region *construct_region (struct cxl_root_decoder *cxlrd,struct cxl_endpoint_decoder *cxled)@@ -3256,6 +3306,18 @@ static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd, *res =DEFINE_RES_MEM_NAMED (hpa->start,range_len (hpa),dev_name (&cxlr->dev)); + + rc =cxl_extended_linear_cache_resize (cxlr, res);
drivers/acpi/numa/hmat.c static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd, · line 3320
Quoted 10 lines
drivers/acpi/numa/hmat.c +10
-0+if (rc) { +/* +* Failing to support extended linear cache region resize does not +* prevent the region from functioning. Only cause cxl list showing +* incorrect region size. +*/ +dev_warn (cxlmd->dev.parent, +"Failed to support extended linear cache.\n" ); + } +
cxl_extended_linear_cache_resize() will adjust res->start if there is an available cache_size.
Is it possible that below insert_resource() failed because "res->start" is less than "cxlrd->res->start"?
My understanding is that the address range of cxlrd->res comes from CFMWS, I don't find any description in patchset about the address range defined in CFMWS including extended linear cache size. So I guess that a CFMWS will not expose a address range with extended linear cache size?
I'm studying this patchset, please correct me if I'm wrong. Thank you.
drivers/acpi/numa/hmat.c static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd, · line 3323
Quoted 3 lines
drivers/acpi/numa/hmat.c +0
-0rc =insert_resource (cxlrd->res, res);if (rc) {/*
[snip]
Ming
Dave Jiang
maintainerRe: [PATCH 2/4] acpi/hmat / cxl: Add extended linear cache support for CXL
Quoted 71 lines · Li Ming
Quoted 57 lines · Dave Jiang
The current cxl region size only indicates the size of the CXL memory region without accounting for the extended linear cache size. Retrieve the cache size from HMAT and append that to the cxl region size for the cxl region range that matches the SRAT range that has extended linear cache enabled.
The SRAT defines the whole memory range that includes the extended linear cache and the CXL memory region. The new HMAT ECN/ECR to the Memory Side Cache Information Structure defines the size of the extended linear cache size and matches to the SRAT Memory Affinity Structure by the memory proxmity domain. Add a helper to match the cxl range to the SRAT memory range in order to retrieve the cache size.
There are several places that checks the cxl region range against the decoder range. Use new helper to check between the two ranges and address the new cache size.
Signed-off-by Dave Jiang <[email protected]>---
RFC:
- Minor refactors (Jonathan)
- Fix grammar (Jonathan)--- drivers/acpi/numa/hmat.c | 39 ++++++++++++++++++++++ drivers/cxl/core/Makefile | 1 + drivers/cxl/core/acpi.c | 11 ++++++ drivers/cxl/core/core.h | 3 ++ drivers/cxl/core/region.c | 70 ++++++++++++++++++++++++++++++++++++--- drivers/cxl/cxl.h | 2 ++ include/linux/acpi.h | 19 +++++++++++ tools/testing/cxl/Kbuild | 1 + 8 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 drivers/cxl/core/acpi.cdrivers/acpi/numa/hmat.c +15
-0@@ -108,6 +108,45 @@ static struct memory_target *find_mem_target(unsigned int mem_pxm)return NULL ; } +/** +* hmat_get_extended_linear_cache_size - Retrieve the extended linear cache size +* @backing_res: resource from the backing media +* @nid: node id for the memory region +* @cache_size: (Output) size of extended linear cache. +* +* Return: 0 on success. Errno on failure. +* +*/ +int hmat_get_extended_linear_cache_size (struct resource *backing_res,int nid, +resource_size_t *cache_size) +{ +unsigned int pxm =node_to_pxm (nid); +struct memory_target *target; +struct target_cache *tcache;drivers/acpi/numa/hmat.c static struct memory_target *find_mem_target(unsigned int mem_pxm) · line 135
Quoted 10 lines
drivers/acpi/numa/hmat.c +10
-0+struct resource *res; + + target =find_mem_target (pxm); +if (!target) +return -ENOENT ; + +list_for_each_entry (tcache, &target->caches, node) { +if (tcache->cache_attrs.address_mode == +NODE_CACHE_ADDR_MODE_EXTENDED_LINEAR ) +continue ;Should continue only when "
tcache->cache_attrs.address_mode" is NOT "NODE_CACHE_ADDR_MODE_EXTENDED_LINEAR"?
Quoted 1 line
[snip]
yes thanks. editing mistake. :(
Quoted 59 lines
Quoted 46 lines
drivers/acpi/numa/hmat.c +38
-0+static int cxl_extended_linear_cache_resize (struct cxl_region *cxlr, +struct resource *res) +{ +struct cxl_region_params *p = &cxlr->params; +int nid =phys_to_target_node (res->start); +resource_size_t size, cache_size; +int rc; + + size =resource_size (res); +if (!size) +return -EINVAL ; + + rc =cxl_acpi_get_extended_linear_cache_size (res, nid, &cache_size); +if (rc) +return rc; + +if (!cache_size) +return 0 ; + +if (size != cache_size) { +dev_warn (&cxlr->dev,"Extended Linear Cache is not 1:1, unsupported!" ); +return -EOPNOTSUPP ; + } + +/* +* Move the start of the range to where the cache range starts. The +* implementation assumes that the cache range is in front of the +* CXL range. This is not dictated by the HMAT spec but is how the +* current known implementation is configured. +*/ + res->start -= cache_size; + p->cache_size = cache_size; + +return 0 ; +} +/* Establish an empty region covering the given HPA range */ static struct cxl_region *construct_region (struct cxl_root_decoder *cxlrd,struct cxl_endpoint_decoder *cxled)@@ -3256,6 +3306,18 @@ static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd, *res =DEFINE_RES_MEM_NAMED (hpa->start,range_len (hpa),dev_name (&cxlr->dev)); + + rc =cxl_extended_linear_cache_resize (cxlr, res);drivers/acpi/numa/hmat.c static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd, · line 3320
Quoted 10 lines
drivers/acpi/numa/hmat.c +10
-0+if (rc) { +/* +* Failing to support extended linear cache region resize does not +* prevent the region from functioning. Only cause cxl list showing +* incorrect region size. +*/ +dev_warn (cxlmd->dev.parent, +"Failed to support extended linear cache.\n" ); + } +
cxl_extended_linear_cache_resize()will adjustres->startif there is an availablecache_size.
Quoted 3 lines
Is it possible that below
insert_resource()failed because "res->start" is less than "cxlrd->res->start"?My understanding is that the address range of
cxlrd->rescomes from CFMWS, I don't find any description in patchset about the address range defined in CFMWS including extended linear cache size. So I guess that a CFMWS will not expose a address range with extended linear cache size?
The CFMWS window is expected to include the extended cache range. res->start should not to be less than cxlrd->res->start after adjustment. It's been the case in testing. I'll add a comment to address that.
Quoted 10 lines
I'm studying this patchset, please correct me if I'm wrong. Thank you.
drivers/acpi/numa/hmat.c static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd, · line 3323
Quoted 3 lines
drivers/acpi/numa/hmat.c +0
-0rc =insert_resource (cxlrd->res, res);if (rc) {/* [snip]
Ming
Re: [PATCH 2/4] acpi/hmat / cxl: Add extended linear cache support for CXL
In reply to Dave JiangQuoted 13 lines · On Wed, 4 Dec 2024 15:46:47 -0700 Dave Jiang <[email protected]> wrote:
The current cxl region size only indicates the size of the CXL memory region without accounting for the extended linear cache size. Retrieve the cache size from HMAT and append that to the cxl region size for the cxl region range that matches the SRAT range that has extended linear cache enabled.
The SRAT defines the whole memory range that includes the extended linear cache and the CXL memory region. The new HMAT ECN/ECR to the Memory Side Cache Information Structure defines the size of the extended linear cache size and matches to the SRAT Memory Affinity Structure by the memory proxmity domain. Add a helper to match the cxl range to the SRAT memory range in order to retrieve the cache size.
Quoted 5 lines
There are several places that checks the cxl region range against the decoder range. Use new helper to check between the two ranges and address the new cache size.
Signed-off-by Dave Jiang <[email protected]>
Hi Dave,
A few minor comments inline given you are going around again for the issue Li Ming spotted.
Jonathan
Quoted 52 lines
---
RFC:
- Minor refactors (Jonathan)
- Fix grammar (Jonathan)--- drivers/acpi/numa/hmat.c | 39 ++++++++++++++++++++++ drivers/cxl/core/Makefile | 1 + drivers/cxl/core/acpi.c | 11 ++++++ drivers/cxl/core/core.h | 3 ++ drivers/cxl/core/region.c | 70 ++++++++++++++++++++++++++++++++++++--- drivers/cxl/cxl.h | 2 ++ include/linux/acpi.h | 19 +++++++++++ tools/testing/cxl/Kbuild | 1 + 8 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 drivers/cxl/core/acpi.cdrivers/acpi/numa/hmat.c +28
-0@@ -108,6 +108,45 @@ static struct memory_target *find_mem_target(unsigned int mem_pxm)return NULL ; } +/** +* hmat_get_extended_linear_cache_size - Retrieve the extended linear cache size +* @backing_res: resource from the backing media +* @nid: node id for the memory region +* @cache_size: (Output) size of extended linear cache. +* +* Return: 0 on success. Errno on failure. +* +*/ +int hmat_get_extended_linear_cache_size (struct resource *backing_res,int nid, +resource_size_t *cache_size) +{ +unsigned int pxm =node_to_pxm (nid); +struct memory_target *target; +struct target_cache *tcache; +struct resource *res; + + target =find_mem_target (pxm); +if (!target) +return -ENOENT ; + +list_for_each_entry (tcache, &target->caches, node) { +if (tcache->cache_attrs.address_mode == +NODE_CACHE_ADDR_MODE_EXTENDED_LINEAR ) +continue ; + + res = &target->memregions; +if (!resource_contains (res, backing_res))
drivers/acpi/numa/hmat.c static struct memory_target *find_mem_target(unsigned int mem_pxm) · line 148
Quoted 10 lines
drivers/acpi/numa/hmat.c +10
-0+continue ; + + *cache_size = tcache->cache_attrs.size; +return 0 ; + } + + *cache_size =0 ; +return 0 ; +} +EXPORT_SYMBOL_NS_GPL (hmat_get_extended_linear_cache_size,CXL );
Needs quotes around "CXL" now I think.
Quoted 24 lines
drivers/acpi/numa/hmat.c +1
-0+static struct memory_target *acpi_find_genport_target (u32 uid) {struct memory_target *target;drivers/cxl/core/Makefile +1
-0@@ -14,5 +14,6 @@ cxl_core-y += pci.o cxl_core-y += hdm.o cxl_core-y += pmu.o cxl_core-y += cdat.o +cxl_core-y += acpi.o cxl_core-$(CONFIG_TRACING) += trace.o cxl_core-$(CONFIG_CXL_REGION) += region.odrivers/cxl/core/region.c +0
-0@@ -824,6 +824,21 @@ static int match_free_decoder(struct device *dev, void *data)return 1 ; }
drivers/cxl/core/region.c static int match_free_decoder(struct device *dev, void *data) · line 836
Quoted 10 lines
drivers/cxl/core/region.c +10
-0+static bool region_res_match_cxl_range (struct cxl_region_params *p, +struct range *range) +{ +if (!p->res) +return false; + +/* +* The CXL range is assumed to be fronted by the DRAM range in +* current known implementation. This assumption will be made +* until a variant implementation exists.
Start with:
If an extended linear cache region then the CXL range is...
Otherwise the comment sounds more general that it is.
Quoted 33 lines
drivers/cxl/core/region.c +8
-3+*/ +return p->res->start + p->cache_size == range->start && + p->res->end == range->end; +} +static int match_auto_decoder (struct device *dev,void *data) {struct cxl_region_params *p = data;@@ -836,7 +851,7 @@ static int match_auto_decoder(struct device *dev, void *data) cxld =to_cxl_decoder (dev); r = &cxld->hpa_range; -if (p->res && p->res->start == r->start && p->res->end == r->end) +if (region_res_match_cxl_range (p, r))return 1 ;return 0 ;@@ -1413,8 +1428,7 @@ static int cxl_port_setup_targets(struct cxl_port *port,if (test_bit (CXL_REGION_F_AUTO , &cxlr->flags)) {if (cxld->interleave_ways != iw || cxld->interleave_granularity != ig || - cxld->hpa_range.start != p->res->start || - cxld->hpa_range.end != p->res->end || + !region_res_match_cxl_range (p, &cxld->hpa_range) || ((cxld->flags &CXL_DECODER_F_ENABLE ) ==0 )) {dev_err (&cxlr->dev,"%s:%s %s expected iw: %d ig: %d %pr\n" , +/* Establish an empty region covering the given HPA range */ static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd, struct cxl_endpoint_decoder *cxled)
drivers/cxl/core/region.c static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd, · line 3314
Quoted 9 lines
drivers/cxl/core/region.c +6
-0@@ -3256,6 +3306,18 @@ static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd, *res =DEFINE_RES_MEM_NAMED (hpa->start,range_len (hpa),dev_name (&cxlr->dev)); + + rc =cxl_extended_linear_cache_resize (cxlr, res); +if (rc) { +/* +* Failing to support extended linear cache region resize does not +* prevent the region from functioning. Only cause cxl list showing
Only causes cxl list to show incorrect region size
Quoted 14 lines
drivers/cxl/core/region.c +6
-0+* incorrect region size. +*/ +dev_warn (cxlmd->dev.parent, +"Failed to support extended linear cache.\n" ); + } + rc =insert_resource (cxlrd->res, res);if (rc) {/* drivers/cxl/cxl.h +0
-0
drivers/cxl/cxl.h enum cxl_config_state { · line 495
Quoted 4 lines
drivers/cxl/cxl.h +1
-0@@ -492,6 +492,7 @@ enum cxl_config_state {* @res: allocated iomem capacity for this region * @targets: active ordered targets in current decoder configuration * @nr_targets: number of targets +* @cache_size: extended linear cache size, if exists
otherwise zero. (as you don't check for existence - or remove "if exists" and just have "extended linear cache size"
Quoted 11 lines
drivers/cxl/cxl.h +1
-0* * State transitions are protected by the cxl_region_rwsem */ @@ -503,6 +504,7 @@ struct cxl_region_params {struct resource *res;struct cxl_endpoint_decoder *targets[CXL_DECODER_MAX_INTERLEAVE ];int nr_targets; +resource_size_t cache_size; };/*
Dave Jiang
maintainerRe: [PATCH 2/4] acpi/hmat / cxl: Add extended linear cache support for CXL
Quoted 84 lines · Jonathan Cameron
Quoted 13 lines · On Wed, 4 Dec 2024 15:46:47 -0700 Dave Jiang <[email protected]> wrote:
The current cxl region size only indicates the size of the CXL memory region without accounting for the extended linear cache size. Retrieve the cache size from HMAT and append that to the cxl region size for the cxl region range that matches the SRAT range that has extended linear cache enabled.
The SRAT defines the whole memory range that includes the extended linear cache and the CXL memory region. The new HMAT ECN/ECR to the Memory Side Cache Information Structure defines the size of the extended linear cache size and matches to the SRAT Memory Affinity Structure by the memory proxmity domain. Add a helper to match the cxl range to the SRAT memory range in order to retrieve the cache size.
Quoted 5 lines
There are several places that checks the cxl region range against the decoder range. Use new helper to check between the two ranges and address the new cache size.
Signed-off-by Dave Jiang <[email protected]>Hi Dave,
A few minor comments inline given you are going around again for the issue Li Ming spotted.
Jonathan
Quoted 56 lines
---
RFC:
- Minor refactors (Jonathan)
- Fix grammar (Jonathan)--- drivers/acpi/numa/hmat.c | 39 ++++++++++++++++++++++ drivers/cxl/core/Makefile | 1 + drivers/cxl/core/acpi.c | 11 ++++++ drivers/cxl/core/core.h | 3 ++ drivers/cxl/core/region.c | 70 ++++++++++++++++++++++++++++++++++++--- drivers/cxl/cxl.h | 2 ++ include/linux/acpi.h | 19 +++++++++++ tools/testing/cxl/Kbuild | 1 + 8 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 drivers/cxl/core/acpi.cdrivers/acpi/numa/hmat.c +32
-0@@ -108,6 +108,45 @@ static struct memory_target *find_mem_target(unsigned int mem_pxm)return NULL ; } +/** +* hmat_get_extended_linear_cache_size - Retrieve the extended linear cache size +* @backing_res: resource from the backing media +* @nid: node id for the memory region +* @cache_size: (Output) size of extended linear cache. +* +* Return: 0 on success. Errno on failure. +* +*/ +int hmat_get_extended_linear_cache_size (struct resource *backing_res,int nid, +resource_size_t *cache_size) +{ +unsigned int pxm =node_to_pxm (nid); +struct memory_target *target; +struct target_cache *tcache; +struct resource *res; + + target =find_mem_target (pxm); +if (!target) +return -ENOENT ; + +list_for_each_entry (tcache, &target->caches, node) { +if (tcache->cache_attrs.address_mode == +NODE_CACHE_ADDR_MODE_EXTENDED_LINEAR ) +continue ; + + res = &target->memregions; +if (!resource_contains (res, backing_res)) +continue ; + + *cache_size = tcache->cache_attrs.size; +return 0 ;
Quoted 8 lines
drivers/acpi/numa/hmat.c static struct memory_target *find_mem_target(unsigned int mem_pxm) · line 148
Quoted 6 lines
drivers/acpi/numa/hmat.c +6
-0+ } + + *cache_size =0 ; +return 0 ; +} +EXPORT_SYMBOL_NS_GPL (hmat_get_extended_linear_cache_size,CXL );Needs quotes around "CXL" now I think.
Yep. That was a fun surprise coming back from the holidays.
Quoted 38 lines
Quoted 25 lines
drivers/acpi/numa/hmat.c +1
-0+static struct memory_target *acpi_find_genport_target (u32 uid) {struct memory_target *target;drivers/cxl/core/Makefile +1
-0@@ -14,5 +14,6 @@ cxl_core-y += pci.o cxl_core-y += hdm.o cxl_core-y += pmu.o cxl_core-y += cdat.o +cxl_core-y += acpi.o cxl_core-$(CONFIG_TRACING) += trace.o cxl_core-$(CONFIG_CXL_REGION) += region.odrivers/cxl/core/region.c +0
-0@@ -824,6 +824,21 @@ static int match_free_decoder(struct device *dev, void *data)return 1 ; }drivers/cxl/core/region.c static int match_free_decoder(struct device *dev, void *data) · line 836
Quoted 10 lines
drivers/cxl/core/region.c +10
-0+static bool region_res_match_cxl_range (struct cxl_region_params *p, +struct range *range) +{ +if (!p->res) +return false; + +/* +* The CXL range is assumed to be fronted by the DRAM range in +* current known implementation. This assumption will be made +* until a variant implementation exists. Start with:
If an extended linear cache region then the CXL range is...
Quoted 1 line
Otherwise the comment sounds more general that it is.
ok
Quoted 35 lines
Quoted 35 lines
drivers/cxl/core/region.c +8
-3+*/ +return p->res->start + p->cache_size == range->start && + p->res->end == range->end; +} +static int match_auto_decoder (struct device *dev,void *data) {struct cxl_region_params *p = data;@@ -836,7 +851,7 @@ static int match_auto_decoder(struct device *dev, void *data) cxld =to_cxl_decoder (dev); r = &cxld->hpa_range; -if (p->res && p->res->start == r->start && p->res->end == r->end) +if (region_res_match_cxl_range (p, r))return 1 ;return 0 ;@@ -1413,8 +1428,7 @@ static int cxl_port_setup_targets(struct cxl_port *port,if (test_bit (CXL_REGION_F_AUTO , &cxlr->flags)) {if (cxld->interleave_ways != iw || cxld->interleave_granularity != ig || - cxld->hpa_range.start != p->res->start || - cxld->hpa_range.end != p->res->end || + !region_res_match_cxl_range (p, &cxld->hpa_range) || ((cxld->flags &CXL_DECODER_F_ENABLE ) ==0 )) {dev_err (&cxlr->dev,"%s:%s %s expected iw: %d ig: %d %pr\n" , +/* Establish an empty region covering the given HPA range */ static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd, struct cxl_endpoint_decoder *cxled)@@ -3256,6 +3306,18 @@ static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd,
Quoted 10 lines
drivers/cxl/core/region.c static struct cxl_region *construct_region(struct cxl_root_decoder *cxlrd, · line 3314
Quoted 8 lines
drivers/cxl/core/region.c +6
-0*res =DEFINE_RES_MEM_NAMED (hpa->start,range_len (hpa),dev_name (&cxlr->dev)); + + rc =cxl_extended_linear_cache_resize (cxlr, res); +if (rc) { +/* +* Failing to support extended linear cache region resize does not +* prevent the region from functioning. Only cause cxl list showing Only causes cxl list to show incorrect region size
thank you
Quoted 14 lines
Quoted 14 lines
drivers/cxl/core/region.c +6
-0+* incorrect region size. +*/ +dev_warn (cxlmd->dev.parent, +"Failed to support extended linear cache.\n" ); + } + rc =insert_resource (cxlrd->res, res);if (rc) {/* drivers/cxl/cxl.h +0
-0
Quoted 9 lines
drivers/cxl/cxl.h enum cxl_config_state { · line 495
Quoted 5 lines
drivers/cxl/cxl.h +1
-0@@ -492,6 +492,7 @@ enum cxl_config_state {* @res: allocated iomem capacity for this region * @targets: active ordered targets in current decoder configuration * @nr_targets: number of targets +* @cache_size: extended linear cache size, if exists otherwise zero. (as you don't check for existence - or remove "if exists" and just have "extended linear cache size"
ok
Quoted 12 lines
Quoted 11 lines
drivers/cxl/cxl.h +1
-0* * State transitions are protected by the cxl_region_rwsem */ @@ -503,6 +504,7 @@ struct cxl_region_params {struct resource *res;struct cxl_endpoint_decoder *targets[CXL_DECODER_MAX_INTERLEAVE ];int nr_targets; +resource_size_t cache_size; };/*
Dave Jiang
maintainerPATCH 3/4 cxl: Add extended linear cache address alias emission for cxl events
In reply to Dave JiangAdd the aliased address of extended linear cache when emitting event trace for DRAM and general media of CXL events.
---
RFC:
- Drop mmio hole discovery code
--- drivers/cxl/core/core.h | 5 +++++ drivers/cxl/core/mbox.c | 27 ++++++++++++++++++++++++--- drivers/cxl/core/region.c | 12 ++++++++++++ drivers/cxl/core/trace.h | 24 ++++++++++++++++-------- 4 files changed, 57 insertions(+), 11 deletions(-)
drivers/cxl/core/core.h +5 -0
@@ -30,8 +30,13 @@ int cxl_get_poison_by_endpoint(struct cxl_port *port);struct cxl_region *cxl_dpa_to_region (const struct cxl_memdev *cxlmd,u64 dpa);u64 cxl_dpa_to_hpa (struct cxl_region *cxlr,const struct cxl_memdev *cxlmd,u64 dpa); +int cxl_region_nid (struct cxl_region *cxlr);#else +static inline int cxl_region_nid (struct cxl_region *cxlr) +{ +return NUMA_NO_NODE ; +}static inline u64 cxl_dpa_to_hpa (struct cxl_region *cxlr,const struct cxl_memdev *cxlmd,u64 dpa) {
drivers/cxl/core/mbox.c +24 -3
@@ -856,6 +856,24 @@ int cxl_enumerate_cmds(struct cxl_memdev_state *mds) }EXPORT_SYMBOL_NS_GPL (cxl_enumerate_cmds,CXL ); +static u64 cxlr_hpa_cache_alias (struct cxl_region *cxlr,u64 hpa) +{ +struct cxl_region_params *p = &cxlr->params; +int nid; + +if (!p->cache_size) +return ~0ULL ; + + nid =cxl_region_nid (cxlr); +if (nid ==NUMA_NO_NODE ) + nid =0 ; + +if (hpa >= p->res->start + p->cache_size) +return hpa - p->cache_size; + +return hpa + p->cache_size; +} + void cxl_event_trace_record(const struct cxl_memdev *cxlmd, enum cxl_event_log_type type, enum cxl_event_type event_type,
@@ -871,7 +889,7 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd, }if (trace_cxl_general_media_enabled () ||trace_cxl_dram_enabled ()) { -u64 dpa, hpa =ULLONG_MAX ; +u64 dpa, hpa =ULLONG_MAX , hpa_alias;struct cxl_region *cxlr;/*
@@ -887,11 +905,14 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd,if (cxlr) hpa =cxl_dpa_to_hpa (cxlr, cxlmd, dpa); + hpa_alias =cxlr_hpa_cache_alias (cxlr, hpa); +if (event_type ==CXL_CPER_EVENT_GEN_MEDIA )trace_cxl_general_media (cxlmd, type, cxlr, hpa, - &evt->gen_media); + hpa_alias, &evt->gen_media);else if (event_type ==CXL_CPER_EVENT_DRAM ) -trace_cxl_dram (cxlmd, type, cxlr, hpa, &evt->dram); +trace_cxl_dram (cxlmd, type, cxlr, hpa, hpa_alias, + &evt->dram); } }EXPORT_SYMBOL_NS_GPL (cxl_event_trace_record,CXL );
drivers/cxl/core/region.c +12 -0
@@ -2406,6 +2406,18 @@ static bool cxl_region_update_coordinates(struct cxl_region *cxlr, int nid)return true; } +int cxl_region_nid (struct cxl_region *cxlr) +{ +struct cxl_region_params *p = &cxlr->params; +struct resource *res; + +guard (rwsem_read)(&cxl_region_rwsem); + res = p->res; +if (!res) +return NUMA_NO_NODE ; +return phys_to_target_node (res->start); +} +static int cxl_region_perf_attrs_callback (struct notifier_block *nb,unsigned long action,void *arg) {
drivers/cxl/core/trace.h +16 -8
@@ -316,9 +316,10 @@ TRACE_EVENT(cxl_generic_event, TRACE_EVENT(cxl_general_media, TP_PROTO(const struct cxl_memdev *cxlmd, enum cxl_event_log_type log, - struct cxl_region *cxlr, u64 hpa, struct cxl_event_gen_media *rec), + struct cxl_region *cxlr, u64 hpa, u64 hpa_alias, + struct cxl_event_gen_media *rec), - TP_ARGS(cxlmd, log, cxlr, hpa, rec), + TP_ARGS(cxlmd, log, cxlr, hpa, hpa_alias, rec), TP_STRUCT__entry( CXL_EVT_TP_entry
@@ -332,6 +333,7 @@ TRACE_EVENT(cxl_general_media,__array (u8, comp_id,CXL_EVENT_GEN_MED_COMP_ID_SIZE ) /* Following are out of order to pack trace record */ __field(u64, hpa) + __field(u64, hpa_alias) __field_struct(uuid_t, region_uuid) __field(u16, validity_flags)__field (u8, rank)
@@ -358,6 +360,7 @@ TRACE_EVENT(cxl_general_media, CXL_EVENT_GEN_MED_COMP_ID_SIZE); __entry->validity_flags =get_unaligned_le16 (&rec->media_hdr.validity_flags); __entry->hpa = hpa; + __entry->hpa_alias = hpa_alias;if (cxlr) {__assign_str (region_name);uuid_copy (&__entry->region_uuid, &cxlr->params.uuid);
@@ -370,7 +373,7 @@ TRACE_EVENT(cxl_general_media, CXL_EVT_TP_printk("dpa=%llx dpa_flags='%s' " \ "descriptor='%s' type='%s' transaction_type='%s' channel=%u rank=%u " \ "device=%x comp_id=%s validity_flags='%s' " \ - "hpa=%llx region=%s region_uuid=%pUb", + "hpa=%llx hpa_alias=%llx region=%s region_uuid=%pUb", __entry->dpa, show_dpa_flags(__entry->dpa_flags), show_event_desc_flags(__entry->descriptor), show_gmer_mem_event_type(__entry->type),
@@ -378,7 +381,8 @@ TRACE_EVENT(cxl_general_media, __entry->channel, __entry->rank, __entry->device,__print_hex (__entry->comp_id,CXL_EVENT_GEN_MED_COMP_ID_SIZE ),show_valid_flags (__entry->validity_flags), - __entry->hpa,__get_str (region_name), &__entry->region_uuid + __entry->hpa, __entry->hpa_alias,__get_str (region_name), + &__entry->region_uuid ) );
@@ -424,9 +428,10 @@ TRACE_EVENT(cxl_general_media, TRACE_EVENT(cxl_dram, TP_PROTO(const struct cxl_memdev *cxlmd, enum cxl_event_log_type log, - struct cxl_region *cxlr, u64 hpa, struct cxl_event_dram *rec), + struct cxl_region *cxlr, u64 hpa, u64 hpa_alias, + struct cxl_event_dram *rec), - TP_ARGS(cxlmd, log, cxlr, hpa, rec), + TP_ARGS(cxlmd, log, cxlr, hpa, hpa_alias, rec), TP_STRUCT__entry( CXL_EVT_TP_entry
@@ -442,6 +447,7 @@ TRACE_EVENT(cxl_dram, __field(u32, row) __array(u8, cor_mask, CXL_EVENT_DER_CORRECTION_MASK_SIZE) __field(u64, hpa) + __field(u64, hpa_alias) __field_struct(uuid_t, region_uuid) __field(u8, rank) /* Out of order to pack trace record */__field (u8, bank_group)/* Out of order to pack trace record */
@@ -472,6 +478,7 @@ TRACE_EVENT(cxl_dram,memcpy (__entry->cor_mask, &rec->correction_mask,CXL_EVENT_DER_CORRECTION_MASK_SIZE ); __entry->hpa = hpa; + __entry->hpa_alias = hpa_alias;if (cxlr) {__assign_str (region_name);uuid_copy (&__entry->region_uuid, &cxlr->params.uuid);
@@ -485,7 +492,7 @@ TRACE_EVENT(cxl_dram,"transaction_type='%s' channel=%u rank=%u nibble_mask=%x " \"bank_group=%u bank=%u row=%u column=%u cor_mask=%s " \"validity_flags='%s' " \ -"hpa=%llx region=%s region_uuid=%pUb" , +"hpa=%llx hpa_alias=%llx region=%s region_uuid=%pUb" , __entry->dpa,show_dpa_flags (__entry->dpa_flags),show_event_desc_flags (__entry->descriptor), show_dram_mem_event_type(__entry->type),
@@ -495,7 +502,8 @@ TRACE_EVENT(cxl_dram, __entry->row, __entry->column,__print_hex (__entry->cor_mask,CXL_EVENT_DER_CORRECTION_MASK_SIZE ),show_dram_valid_flags (__entry->validity_flags), - __entry->hpa,__get_str (region_name), &__entry->region_uuid + __entry->hpa_alias, __entry->hpa,__get_str (region_name), + &__entry->region_uuid ) );
Signature · 1 line
2.47.0
Re: [PATCH 3/4] cxl: Add extended linear cache address alias emission for cxl events
Quoted 4 lines · On Wed, 4 Dec 2024 15:46:48 -0700 Dave Jiang <[email protected]> wrote:
Add the aliased address of extended linear cache when emitting event trace for DRAM and general media of CXL events.
Signed-off-by Dave Jiang <[email protected]>
I wonder if you want to future proof the hpa_alias for potential case of there being more than 1? hpa_alias0 or similar so that we can add more as needed?
Otherwise, looks like there is either a null point dereference or overly paranoid existing code. I haven't checked which but changes needed either way.
Jonathan
drivers/cxl/core/mbox.c int cxl_enumerate_cmds(struct cxl_memdev_state *mds) · line 861
Quoted 11 lines
drivers/cxl/core/mbox.c +3
-0@@ -856,6 +856,24 @@ int cxl_enumerate_cmds(struct cxl_memdev_state *mds) }EXPORT_SYMBOL_NS_GPL (cxl_enumerate_cmds,CXL ); +static u64 cxlr_hpa_cache_alias (struct cxl_region *cxlr,u64 hpa) +{ +struct cxl_region_params *p = &cxlr->params;
Bad idea to unconditionally dereference I think. See below.
Quoted 28 lines
drivers/cxl/core/mbox.c +16
-1+int nid; + +if (!p->cache_size) +return ~0ULL ; + + nid =cxl_region_nid (cxlr); +if (nid ==NUMA_NO_NODE ) + nid =0 ; + +if (hpa >= p->res->start + p->cache_size) +return hpa - p->cache_size; + +return hpa + p->cache_size; +} + void cxl_event_trace_record(const struct cxl_memdev *cxlmd, enum cxl_event_log_type type, enum cxl_event_type event_type,@@ -871,7 +889,7 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd, }if (trace_cxl_general_media_enabled () ||trace_cxl_dram_enabled ()) { -u64 dpa, hpa =ULLONG_MAX ; +u64 dpa, hpa =ULLONG_MAX , hpa_alias;struct cxl_region *cxlr;/*
drivers/cxl/core/mbox.c void cxl_event_trace_record(const struct cxl_memdev *cxlmd, · line 908
Quoted 4 lines
drivers/cxl/core/mbox.c +1
-0@@ -887,11 +905,14 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd,if (cxlr) hpa =cxl_dpa_to_hpa (cxlr, cxlmd, dpa); + hpa_alias =cxlr_hpa_cache_alias (cxlr, hpa);
If there is no region, and hence no hpa does it make sense to call this? Particularly as first thing done in this is to dereference cxlr.
Quoted 12 lines
drivers/cxl/core/mbox.c +4
-2+if (event_type ==CXL_CPER_EVENT_GEN_MEDIA )trace_cxl_general_media (cxlmd, type, cxlr, hpa, - &evt->gen_media); + hpa_alias, &evt->gen_media);else if (event_type ==CXL_CPER_EVENT_DRAM ) -trace_cxl_dram (cxlmd, type, cxlr, hpa, &evt->dram); +trace_cxl_dram (cxlmd, type, cxlr, hpa, hpa_alias, + &evt->dram); } }EXPORT_SYMBOL_NS_GPL (cxl_event_trace_record,CXL );
Dave Jiang
maintainerRe: [PATCH 3/4] cxl: Add extended linear cache address alias emission for cxl events
Quoted 10 lines · Jonathan Cameron
Quoted 4 lines · On Wed, 4 Dec 2024 15:46:48 -0700 Dave Jiang <[email protected]> wrote:
Add the aliased address of extended linear cache when emitting event trace for DRAM and general media of CXL events.
Signed-off-by Dave Jiang <[email protected]>I wonder if you want to future proof the
hpa_aliasfor potential case of there being more than 1?hpa_alias0or similar so that we can add more as needed?
Do you mean when emitting via the trace? Yeah I can change it to hpa_alias0 in the output string.
Quoted 5 lines
Otherwise, looks like there is either a null point dereference or overly paranoid existing code. I haven't checked which but changes needed either way.
I'll move it under the if (cxlr) and also add a check for cxlr in the helper function.
DJ
Quoted 67 lines
Jonathan
drivers/cxl/core/mbox.c int cxl_enumerate_cmds(struct cxl_memdev_state *mds) · line 861
Quoted 11 lines
drivers/cxl/core/mbox.c +3
-0@@ -856,6 +856,24 @@ int cxl_enumerate_cmds(struct cxl_memdev_state *mds) }EXPORT_SYMBOL_NS_GPL (cxl_enumerate_cmds,CXL ); +static u64 cxlr_hpa_cache_alias (struct cxl_region *cxlr,u64 hpa) +{ +struct cxl_region_params *p = &cxlr->params;Bad idea to unconditionally dereference I think. See below.
Quoted 28 lines
drivers/cxl/core/mbox.c +16
-1+int nid; + +if (!p->cache_size) +return ~0ULL ; + + nid =cxl_region_nid (cxlr); +if (nid ==NUMA_NO_NODE ) + nid =0 ; + +if (hpa >= p->res->start + p->cache_size) +return hpa - p->cache_size; + +return hpa + p->cache_size; +} + void cxl_event_trace_record(const struct cxl_memdev *cxlmd, enum cxl_event_log_type type, enum cxl_event_type event_type,@@ -871,7 +889,7 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd, }if (trace_cxl_general_media_enabled () ||trace_cxl_dram_enabled ()) { -u64 dpa, hpa =ULLONG_MAX ; +u64 dpa, hpa =ULLONG_MAX , hpa_alias;struct cxl_region *cxlr;/* drivers/cxl/core/mbox.c void cxl_event_trace_record(const struct cxl_memdev *cxlmd, · line 908
Quoted 4 lines
drivers/cxl/core/mbox.c +1
-0@@ -887,11 +905,14 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd,if (cxlr) hpa =cxl_dpa_to_hpa (cxlr, cxlmd, dpa); + hpa_alias =cxlr_hpa_cache_alias (cxlr, hpa);If there is no region, and hence no hpa does it make sense to call this? Particularly as first thing done in this is to dereference cxlr.
Quoted 12 lines
drivers/cxl/core/mbox.c +4
-2+if (event_type ==CXL_CPER_EVENT_GEN_MEDIA )trace_cxl_general_media (cxlmd, type, cxlr, hpa, - &evt->gen_media); + hpa_alias, &evt->gen_media);else if (event_type ==CXL_CPER_EVENT_DRAM ) -trace_cxl_dram (cxlmd, type, cxlr, hpa, &evt->dram); +trace_cxl_dram (cxlmd, type, cxlr, hpa, hpa_alias, + &evt->dram); } }EXPORT_SYMBOL_NS_GPL (cxl_event_trace_record,CXL );
Re: [PATCH 3/4] cxl: Add extended linear cache address alias emission for cxl events
Quoted 7 lines · On Tue, 7 Jan 2025 12:41:46 -0700 Dave Jiang <[email protected]> wrote:
Quoted 6 lines · Jonathan Cameron
Quoted 3 lines · On Wed, 4 Dec 2024 15:46:48 -0700 Dave Jiang <[email protected]> wrote:
Add the aliased address of extended linear cache when emitting event trace for DRAM and general media of CXL events.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Dave Jiang <[email protected]>I wonder if you want to future proof the
hpa_aliasfor potential case of there being more than 1?hpa_alias0or similar so that we can add more as needed?Do you mean when emitting via the trace? Yeah I can change it to
hpa_alias0in the output string.
err. Can't entirely remember what I meant but that seems sensible ;)
Quoted 81 lines
Quoted 6 lines
Otherwise, looks like there is either a null point dereference or overly paranoid existing code. I haven't checked which but changes needed either way.
I'll move it under the if (cxlr) and also add a check for cxlr in the helper function.
DJ
Quoted 67 lines
Jonathan
drivers/cxl/core/mbox.c int cxl_enumerate_cmds(struct cxl_memdev_state *mds) · line 861
Quoted 11 lines
drivers/cxl/core/mbox.c +3
-0@@ -856,6 +856,24 @@ int cxl_enumerate_cmds(struct cxl_memdev_state *mds) }EXPORT_SYMBOL_NS_GPL (cxl_enumerate_cmds,CXL ); +static u64 cxlr_hpa_cache_alias (struct cxl_region *cxlr,u64 hpa) +{ +struct cxl_region_params *p = &cxlr->params;Bad idea to unconditionally dereference I think. See below.
Quoted 28 lines
drivers/cxl/core/mbox.c +16
-1+int nid; + +if (!p->cache_size) +return ~0ULL ; + + nid =cxl_region_nid (cxlr); +if (nid ==NUMA_NO_NODE ) + nid =0 ; + +if (hpa >= p->res->start + p->cache_size) +return hpa - p->cache_size; + +return hpa + p->cache_size; +} + void cxl_event_trace_record(const struct cxl_memdev *cxlmd, enum cxl_event_log_type type, enum cxl_event_type event_type,@@ -871,7 +889,7 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd, }if (trace_cxl_general_media_enabled () ||trace_cxl_dram_enabled ()) { -u64 dpa, hpa =ULLONG_MAX ; +u64 dpa, hpa =ULLONG_MAX , hpa_alias;struct cxl_region *cxlr;/* drivers/cxl/core/mbox.c void cxl_event_trace_record(const struct cxl_memdev *cxlmd, · line 908
Quoted 4 lines
drivers/cxl/core/mbox.c +1
-0@@ -887,11 +905,14 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd,if (cxlr) hpa =cxl_dpa_to_hpa (cxlr, cxlmd, dpa); + hpa_alias =cxlr_hpa_cache_alias (cxlr, hpa);If there is no region, and hence no hpa does it make sense to call this? Particularly as first thing done in this is to dereference cxlr.
Quoted 12 lines
drivers/cxl/core/mbox.c +4
-2+if (event_type ==CXL_CPER_EVENT_GEN_MEDIA )trace_cxl_general_media (cxlmd, type, cxlr, hpa, - &evt->gen_media); + hpa_alias, &evt->gen_media);else if (event_type ==CXL_CPER_EVENT_DRAM ) -trace_cxl_dram (cxlmd, type, cxlr, hpa, &evt->dram); +trace_cxl_dram (cxlmd, type, cxlr, hpa, hpa_alias, + &evt->dram); } }EXPORT_SYMBOL_NS_GPL (cxl_event_trace_record,CXL );
Dave Jiang
maintainerPATCH 4/4 cxl: Add mce notifier to emit aliased address for extended linear cache
In reply to Dave JiangBelow is a setup with extended linear cache configuration with an example layout of memory region shown below presented as a single memory region consists of 256G memory where there's 128G of DRAM and 128G of CXL memory. The kernel sees a region of total 256G of system memory.
128G DRAM 128G CXL memory
|-----------------------------------|-------------------------------------|
Data resides in either DRAM or far memory (FM) with no replication. Hot data is swapped into DRAM by the hardware behind the scenes. When error is detected in one location, it is possible that error also resides in the aliased location. Therefore when a memory location that is flagged by MCE is part of the special region, the aliased memory location needs to be offlined as well.
Add an mce notify callback to identify if the MCE address location is part of an extended linear cache region and handle accordingly.
Added symbol export to set_mce_nospec() in x86 code in order to call set_mce_nospec() from the CXL MCE notify callback.
---
RFC:
- Drop MCE_PRI_CXL and use MCE_PRI_UC (Boris)
--- arch/x86/mm/pat/set_memory.c | 1 + drivers/cxl/core/Makefile | 1 + drivers/cxl/core/mbox.c | 3 +++ drivers/cxl/core/mce.c | 52 ++++++++++++++++++++++++++++++++++++ drivers/cxl/core/mce.h | 14 ++++++++++ drivers/cxl/core/region.c | 25 +++++++++++++++++ drivers/cxl/cxl.h | 6 +++++ drivers/cxl/cxlmem.h | 2 ++ 8 files changed, 104 insertions(+) create mode 100644 drivers/cxl/core/mce.c create mode 100644 drivers/cxl/core/mce.h
arch/x86/mm/pat/set_memory.c +1 -0
@@ -2083,6 +2083,7 @@ int set_mce_nospec(unsigned long pfn)pr_warn ("Could not invalidate pfn=0x%lx from 1:1 map\n" , pfn);return rc; } +EXPORT_SYMBOL_GPL (set_mce_nospec);/* Restore full speculative operation to the pfn. */ int clear_mce_nospec (unsigned long pfn)
drivers/cxl/core/Makefile +1 -0
@@ -17,3 +17,4 @@ cxl_core-y += cdat.o cxl_core-y += acpi.o cxl_core-$(CONFIG_TRACING) += trace.o cxl_core-$(CONFIG_CXL_REGION) += region.o +cxl_core-$(CONFIG_X86_MCE) += mce.o
drivers/cxl/core/mbox.c +3 -0
@@ -11,6 +11,7 @@#include "core.h" #include "trace.h" +#include "mce.h" static bool cxl_raw_allow_all;
@@ -1474,6 +1475,8 @@ struct cxl_memdev_state *cxl_memdev_state_create(struct device *dev) mds->ram_perf.qos_class =CXL_QOS_CLASS_INVALID ; mds->pmem_perf.qos_class =CXL_QOS_CLASS_INVALID ; +cxl_register_mce_notifier (&mds->mce_notifier); +return mds; }EXPORT_SYMBOL_NS_GPL (cxl_memdev_state_create,CXL );
drivers/cxl/core/mce.c new file +52 -0
52 lines not on this page · raw message
drivers/cxl/core/mce.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright(c) 2024 Intel Corporation. All rights reserved. */ +#ifndef _CXL_CORE_MCE_H_ +#define _CXL_CORE_MCE_H_ + +#include <linux/notifier.h> + +#ifdef CONFIG_X86_MCE +void cxl_register_mce_notifier (struct notifier_block *mce_notifer); +#else +static inline void cxl_register_mce_notifier (struct notifier_block *mce_notifier) {} +#endif + +#endif
drivers/cxl/core/region.c +25 -0
@@ -3435,6 +3435,31 @@ int cxl_add_to_region(struct cxl_port *root, struct cxl_endpoint_decoder *cxled) }EXPORT_SYMBOL_NS_GPL (cxl_add_to_region,CXL ); +u64 cxl_port_get_spa_cache_alias (struct cxl_port *endpoint,u64 spa) +{ +struct cxl_region_ref *iter; +unsigned long index; + +guard (rwsem_write)(&cxl_region_rwsem); + +xa_for_each (&endpoint->regions, index, iter) { +struct cxl_region_params *p = &iter->region->params; + +if (p->res->start <= spa && spa <= p->res->end) { +if (!p->cache_size) +return 0 ; + +if (spa > p->res->start + p->cache_size) +return spa - p->cache_size; + +return spa + p->cache_size; + } + } + +return 0 ; +} +EXPORT_SYMBOL_NS_GPL (cxl_port_get_spa_cache_alias,CXL ); +static int is_system_ram (struct resource *res,void *arg) {struct cxl_region *cxlr = arg;
drivers/cxl/cxl.h +6 -0
@@ -876,6 +876,7 @@ struct cxl_pmem_region *to_cxl_pmem_region(struct device *dev);int cxl_add_to_region (struct cxl_port *root,struct cxl_endpoint_decoder *cxled);struct cxl_dax_region *to_cxl_dax_region (struct device *dev); +u64 cxl_port_get_spa_cache_alias (struct cxl_port *endpoint,u64 spa);#else static inline bool is_cxl_pmem_region (struct device *dev) {
@@ -894,6 +895,11 @@ static inline struct cxl_dax_region *to_cxl_dax_region(struct device *dev) {return NULL ; } +static inline u64 cxl_port_get_spa_cache_alias (struct cxl_port *endpoint, +u64 spa) +{ +return 0 ; +}#endif void cxl_endpoint_parse_cdat (struct cxl_port *port);
drivers/cxl/cxlmem.h +2 -0
@@ -477,6 +477,7 @@ static inline struct cxl_dev_state *mbox_to_cxlds(struct cxl_mailbox *cxl_mbox)* @poison: poison driver state info * @security: security driver state info * @fw: firmware upload / activation state +* @mce_notifier: MCE notifier * * See CXL 3.0 8.2.9.8.2 Capacity Configuration and Label Storage for * details on capacity parameters.
@@ -503,6 +504,7 @@ struct cxl_memdev_state {struct cxl_poison_state poison;struct cxl_security_state security;struct cxl_fw_state fw; +struct notifier_block mce_notifier; }; static inline struct cxl_memdev_state *
Signature · 1 line
2.47.0
Re: [PATCH 4/4] cxl: Add mce notifier to emit aliased address for extended linear cache
Quoted 15 lines · On Wed, 4 Dec 2024 15:46:49 -0700 Dave Jiang <[email protected]> wrote:
Below is a setup with extended linear cache configuration with an example layout of memory region shown below presented as a single memory region consists of 256G memory where there's 128G of DRAM and 128G of CXL memory. The kernel sees a region of total 256G of system memory.
128G DRAM 128G CXL memory
|-----------------------------------|-------------------------------------|Data resides in either DRAM or far memory (FM) with no replication. Hot data is swapped into DRAM by the hardware behind the scenes. When error is detected in one location, it is possible that error also resides in the aliased location. Therefore when a memory location that is flagged by MCE is part of the special region, the aliased memory location needs to be offlined as well.
Quoted 8 lines
Add an mce notify callback to identify if the MCE address location is part of an extended linear cache region and handle accordingly.
Added symbol export to
set_mce_nospec()in x86 code in order to callset_mce_nospec()from the CXL MCE notify callback.
A couple of minor editorial comments.
Quoted 12 lines
drivers/cxl/core/mce.c new file +6
-0@@ -0,0 +1,52 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright(c) 2024 Intel Corporation. All rights reserved. */ +#include <linux/notifier.h> +#include <linux/set_memory.h> +#include <asm/mce.h> +#include <cxlmem.h>
drivers/cxl/core/mce.c line 16
Quoted 10 lines
drivers/cxl/core/mce.c new file +10
-0+#include "mce.h" + +static int cxl_handle_mce (struct notifier_block *nb,unsigned long val, +void *data) +{ + struct cxl_memdev_state *mds = container_of(nb, struct cxl_memdev_state, + mce_notifier); +struct cxl_memdev *cxlmd = mds->cxlds.cxlmd; +struct cxl_port *endpoint = cxlmd->endpoint; +struct mce *mce = (struct mce *)data;
Explicit cast not needed or useful. C lets us not bother when casting from void *
Quoted 53 lines
drivers/cxl/core/mce.c new file +29
-0+u64 spa, spa_alias; +unsigned long pfn; + +if (!mce || !mce_usable_address (mce)) +return NOTIFY_DONE ; + + spa = mce->addr &MCI_ADDR_PHYSADDR ; + + pfn = spa >>PAGE_SHIFT ; +if (!pfn_valid (pfn)) +return NOTIFY_DONE ; + + spa_alias =cxl_port_get_spa_cache_alias (endpoint, spa); +if (!spa_alias) +return NOTIFY_DONE ; + + pfn = spa_alias >>PAGE_SHIFT ; + +/* +* Take down the aliased memory page. The original memory page flagged +* by the MCE will be taken cared of by the standard MCE handler. +*/ +dev_emerg (mds->cxlds.dev,"Offlining aliased SPA address: %#llx\n" , + spa_alias); +if (!memory_failure (pfn,0 )) +set_mce_nospec (pfn); + +return NOTIFY_OK ; +}drivers/cxl/core/region.c +14
-0@@ -3435,6 +3435,31 @@ int cxl_add_to_region(struct cxl_port *root, struct cxl_endpoint_decoder *cxled) }EXPORT_SYMBOL_NS_GPL (cxl_add_to_region,CXL ); +u64 cxl_port_get_spa_cache_alias (struct cxl_port *endpoint,u64 spa) +{ +struct cxl_region_ref *iter; +unsigned long index; + +guard (rwsem_write)(&cxl_region_rwsem); + +xa_for_each (&endpoint->regions, index, iter) { +struct cxl_region_params *p = &iter->region->params; + +if (p->res->start <= spa && spa <= p->res->end) { +if (!p->cache_size) +return 0 ; +
drivers/cxl/core/region.c int cxl_add_to_region(struct cxl_port *root, struct cxl_endpoint_decoder *cxled) · line 3461
Quoted 10 lines
drivers/cxl/core/region.c +10
-0+if (spa > p->res->start + p->cache_size) +return spa - p->cache_size; + +return spa + p->cache_size; + } + } + +return 0 ; +} +EXPORT_SYMBOL_NS_GPL (cxl_port_get_spa_cache_alias,CXL );
Quotes needed (the patch that changed that has been annoying this cycle!)