CXL XOR Interleave Arithmetic
Subsystems (3)
[email protected]
maintainerv3 cover CXL XOR Interleave Arithmetic
From: Alison Schofield <[email protected]>
Changes in v3:
- Fix the 3, 6, 12 way interleave (again).
- Do not look for a CXIMS when not needed for x1 & x3 interleaves
- New cxl_test patch: Add cxl_test module support for this feature
- In a separate ndctl patch, cxl test: cxl_xor_region is added
Changes in v2:
- Use ilog2() of the decoded interleave ways to determine number of xormaps, instead of using encoded ways directly. This fixes 3, 6, and 12 way interleaves. (Dan)
Add support for the new 'XOR' Interleave Arithmetic as defined in the CXL 3.0 Specification:
https://www.computeexpresslink.org/download-the-specification
Alison Schofield (3):
For ACPICA: Add the CXIMS structure definition to the CEDT table cxl/acpi: Support CXL XOR Interleave Math (CXIMS) tools/testing/cxl: Add XOR math support
drivers/cxl/cxl.h | 2 + include/acpi/actbl1.h | 14 ++- drivers/cxl/acpi.c | 132 ++++++++++++++++++++++++++-- tools/testing/cxl/test/cxl.c | 161 ++++++++++++++++++++++++++++++++++- 4 files changed, 299 insertions(+), 10 deletions(-)
base-commit: 1cd8a2537eb07751d405ab7e2223f20338a90506
prerequisite-patch-id: 7475f0a9ed0870e85bb4ba2b3eb25618325614bf
The prereq patch is: tools/testing/cxl: Add an x1 host-bridge with 4 devices
Signature · 1 line
2.31.1
[email protected]
maintainerPATCH v3 1/3 For ACPICA: Add the CXIMS structure definition to the CEDT table
From: Alison Schofield <[email protected]>
A linux-ized ACPI patch is included here for reference. The ACPI pull request has been merged and we expect the upstream version shortly. https://github.com/acpica/acpica/pull/787
The CXL XOR Interleave Math Structure (CXIMS) is added to the CXL Early Discovery Table (CEDT). This new structure is defined in the CXL 3.0 specification Section 9.17.1.4
https://www.computeexpresslink.org/spec-landing
--- include/acpi/actbl1.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
include/acpi/actbl1.h +13 -1
@@ -329,7 +329,8 @@ struct acpi_cedt_header {enum acpi_cedt_type {ACPI_CEDT_TYPE_CHBS =0 ,ACPI_CEDT_TYPE_CFMWS =1 , -ACPI_CEDT_TYPE_RESERVED =2 , +ACPI_CEDT_TYPE_CXIMS =2 , +ACPI_CEDT_TYPE_RESERVED =3 , };/* Values for version field above */
@@ -380,6 +381,7 @@ struct acpi_cedt_cfmws_target_element {/* Values for Interleave Arithmetic field above */ #define ACPI_CEDT_CFMWS_ARITHMETIC_MODULO (0) +#define ACPI_CEDT_CFMWS_ARITHMETIC_XOR (1)/* Values for Restrictions field above */
@@ -389,6 +391,16 @@ struct acpi_cedt_cfmws_target_element {#define ACPI_CEDT_CFMWS_RESTRICT_PMEM (1<<3)#define ACPI_CEDT_CFMWS_RESTRICT_FIXED (1<<4) +/* 2: CXL XOR Interleave Math Structure */ + +struct acpi_cedt_cxims { +struct acpi_cedt_header header; +u16 reserved1; +u8 hbig; +u8 nr_xormaps; +u64 xormap_list[]; +}; +/******************************************************************************* * * CPEP - Corrected Platform Error Polling table (ACPI 4.0)
Signature · 1 line
2.31.1
[email protected]
maintainerPATCH v3 2/3 cxl/acpi: Support CXL XOR Interleave Math (CXIMS)
In reply to [email protected]From: Alison Schofield <[email protected]>
When the CFMWS is using XOR math, parse the corresponding CXIMS structure and store the xormaps in the root decoder structure. Use the xormaps in a new lookup, cxl_hb_xor(), to find a targets entry in the host bridge interleave target list.
Defined in CXL Specfication 3.0 Section: 9.17.1
--- drivers/cxl/cxl.h | 2 + drivers/cxl/acpi.c | 132 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 129 insertions(+), 5 deletions(-)
drivers/cxl/cxl.h +2 -0
@@ -330,12 +330,14 @@ struct cxl_switch_decoder {* @res: host / parent resource for region allocations * @region_id: region id for next region provisioning event * @calc_hb: which host bridge covers the n'th position by granularity +* @platform_data: platform specific configuration data * @cxlsd: base cxl switch decoder */ struct cxl_root_decoder {struct resource *res;atomic_t region_id;struct cxl_dport *(*calc_hb)(struct cxl_root_decoder *cxlrd,int pos); +void *platform_data;struct cxl_switch_decoder cxlsd; };
drivers/cxl/acpi.c +127 -5
157 lines not on this page · raw message
Signature · 1 line
2.31.1
[email protected]
maintainerPATCH v3 3/3 tools/testing/cxl: Add XOR math support
In reply to [email protected]From: Alison Schofield <[email protected]>
Expand the cxl_test topology to include CFMWS's that use XOR math for interleave arithmetic, as defined in the CXL Specification 3.0, and to include an additional host bridge for testing a 4-way host bridge interleave.
With this expanded topology, cxl_test is useful for testing:
x1 - no interleave, target index is always 0
x2 - 2 way interleave uses one xormap
x3 - 3 way interleave uses no xormaps and relies on a modulo calc. x4 - 4 way interleave uses two xormaps
Interleave ways not offered here (x6, 8, 12, 16) follow patterns tested in the set above.
Avoid memory bloat in cxl_test by defining a set of CFMWS entries that use XOR interleave arithmetic and can be allocated using a new module parameter 'interleave_arithmetic'. The default remains as Modulo (0).
modprobe cxl_test interleave_arithmetic=1
--- tools/testing/cxl/test/cxl.c | 161 ++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 4 deletions(-)
tools/testing/cxl/test/cxl.c +157 -4
@@ -11,7 +11,9 @@#include <cxlmem.h> #include "mock.h" -#define NR_CXL_HOST_BRIDGES 2 +static int interleave_arithmetic; + +#define NR_CXL_HOST_BRIDGES 3#define NR_CXL_DIRECT_HOST_BRIDGES 1#define NR_CXL_ROOT_PORTS 2#define NR_CXL_DIRECT_ROOT_PORTS 4
@@ -45,6 +47,9 @@ host_bridge[NR_CXL_HOST_BRIDGES + NR_CXL_DIRECT_HOST_BRIDGES] = { [2 ] = { .handle = &host_bridge[2 ], }, + [3 ] = { + .handle = &host_bridge[3 ], + }, };static bool is_mock_dev (struct device *dev)
@@ -101,6 +106,26 @@ static struct {struct acpi_cedt_cfmws cfmws;u32 target[1 ]; } cfmws5; +struct { +struct acpi_cedt_cfmws cfmws; +u32 target[1 ]; + } cfmws6; +struct { +struct acpi_cedt_cfmws cfmws; +u32 target[2 ]; + } cfmws7; +struct { +struct acpi_cedt_cfmws cfmws; +u32 target[3 ]; + } cfmws8; +struct { +struct acpi_cedt_cfmws cfmws; +u32 target[4 ]; + } cfmws9; +struct { +struct acpi_cedt_cxims cxims; +u64 xormap_list[2 ]; + } cxims0; }__packed mock_cedt = { .cedt = { .header = {
@@ -133,6 +158,14 @@ static struct { .uid = 2, .cxl_version = ACPI_CEDT_CHBS_VERSION_CXL20, }, + .chbs[3] = { + .header = { + .type = ACPI_CEDT_TYPE_CHBS, + .length = sizeof(mock_cedt.chbs[0]), + }, + .uid = 3, + .cxl_version = ACPI_CEDT_CHBS_VERSION_CXL20, + }, .cfmws0 = { .cfmws = { .header = {
@@ -223,15 +256,113 @@ static struct { }, .target = { 2 }, }, + +/* CFMWS #6 through #9 use XOR Math (interleave_arithmetic == 1) */ + .cfmws6 = { + .cfmws = { + .header = { + .type = ACPI_CEDT_TYPE_CFMWS, + .length = sizeof(mock_cedt.cfmws6), + }, + .interleave_arithmetic = 1, +/* No interleaving */ + .interleave_ways = 0, + .granularity = 0, + .restrictions =ACPI_CEDT_CFMWS_RESTRICT_TYPE3 | + ACPI_CEDT_CFMWS_RESTRICT_PMEM, + .qtg_id = 0, + .window_size = SZ_256M * 4UL, + }, + .target = { 0 }, + }, + .cfmws7 = { + .cfmws = { + .header = { + .type = ACPI_CEDT_TYPE_CFMWS, + .length = sizeof(mock_cedt.cfmws7), + }, + .interleave_arithmetic = 1, +/* 2-way interleave */ + .interleave_ways = 1, + .granularity = 0, + .restrictions =ACPI_CEDT_CFMWS_RESTRICT_TYPE3 | + ACPI_CEDT_CFMWS_RESTRICT_PMEM, + .qtg_id = 0, + .window_size = SZ_256M * 8UL, + }, + .target = { 0, 1, }, + }, + .cfmws8 = { + .cfmws = { + .header = { + .type =ACPI_CEDT_TYPE_CFMWS , + .length = sizeof(mock_cedt.cfmws8), + }, + .interleave_arithmetic =1 , +/* 3-way interleave */ + .interleave_ways = 8, + .granularity = 0, + .restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 | +ACPI_CEDT_CFMWS_RESTRICT_PMEM , + .qtg_id = 0, + .window_size = SZ_256M * 12UL, + }, + .target = { 0, 1, 2 }, + }, + .cfmws9 = { + .cfmws = { + .header = { + .type =ACPI_CEDT_TYPE_CFMWS , + .length = sizeof(mock_cedt.cfmws9), + }, + .interleave_arithmetic =1 , +/* 4-way interleave */ + .interleave_ways = 2, + .granularity = 0, + .restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 | +ACPI_CEDT_CFMWS_RESTRICT_PMEM , + .qtg_id = 0, + .window_size = SZ_256M * 16UL, + }, + .target = { 0, 1, 2, 3 }, + }, + .cxims0 = { + .cxims = { + .header = { + .type =ACPI_CEDT_TYPE_CXIMS , + .length = sizeof(mock_cedt.cxims0), + }, + .hbig =0 , + .nr_xormaps = 2, + }, + .xormap_list = { 0x404100, 0x808200 }, + }, + }; -struct acpi_cedt_cfmws *mock_cfmws[6 ] = { +struct acpi_cedt_cfmws *mock_cfmws[10 ] = { [0 ] = &mock_cedt.cfmws0.cfmws, [1 ] = &mock_cedt.cfmws1.cfmws, [2 ] = &mock_cedt.cfmws2.cfmws, [3 ] = &mock_cedt.cfmws3.cfmws, [4 ] = &mock_cedt.cfmws4.cfmws, [5 ] = &mock_cedt.cfmws5.cfmws, +/* Modulo Math above, XOR Math below */ + [6 ] = &mock_cedt.cfmws6.cfmws, + [7 ] = &mock_cedt.cfmws7.cfmws, + [8 ] = &mock_cedt.cfmws8.cfmws, + [9 ] = &mock_cedt.cfmws9.cfmws, +}; + +static int cfmws_start; +static int cfmws_end; +#define CFMWS_MOD_ARRAY_START 0 +#define CFMWS_MOD_ARRAY_END 5 +#define CFMWS_XOR_ARRAY_START 6 +#define CFMWS_XOR_ARRAY_END 9 + +struct acpi_cedt_cxims *mock_cxims[1 ] = { + [0 ] = &mock_cedt.cxims0.cxims, }; struct cxl_mock_res {
@@ -303,7 +434,7 @@ static int populate_cedt(void) chbs->length = size; } -for (i =0 ; i <ARRAY_SIZE (mock_cfmws); i++) { +for (i = cfmws_start; i <= cfmws_end; i++) {struct acpi_cedt_cfmws *window = mock_cfmws[i]; res =alloc_mock_res (window->window_size);
@@ -346,12 +477,19 @@ static int mock_acpi_table_parse_cedt(enum acpi_cedt_type id, }if (id ==ACPI_CEDT_TYPE_CFMWS ) -for (i =0 ; i <ARRAY_SIZE (mock_cfmws); i++) { +for (i = cfmws_start; i <= cfmws_end; i++) { h = (union acpi_subtable_headers *) mock_cfmws[i]; end = (unsigned long ) h + mock_cfmws[i]->header.length;handler_arg (h, arg, end); } +if (id ==ACPI_CEDT_TYPE_CXIMS ) +for (i =0 ; i <ARRAY_SIZE (mock_cxims); i++) { + h = (union acpi_subtable_headers *)mock_cxims[i]; + end = (unsigned long )h + mock_cxims[i]->header.length; +handler_arg (h, arg, end); + } +return 0 ; }
@@ -432,6 +570,9 @@ mock_pci_root[NR_CXL_HOST_BRIDGES + NR_CXL_DIRECT_HOST_BRIDGES] = { [2 ] = { .bus = &mock_pci_bus[2 ], }, + [3 ] = { + .bus = &mock_pci_bus[3 ], + }, };static bool is_mock_bus (struct pci_bus *bus)
@@ -713,6 +854,16 @@ static __init int cxl_test_init(void)if (rc) goto err_gen_pool_add; +if (interleave_arithmetic ==1 ) { + cfmws_start =CFMWS_XOR_ARRAY_START ; + cfmws_end =CFMWS_XOR_ARRAY_END ; +dev_dbg (NULL ,"cxl_test loading xor_math option\n" ); + }else { + cfmws_start =CFMWS_MOD_ARRAY_START ; + cfmws_end =CFMWS_MOD_ARRAY_END ; +dev_dbg (NULL ,"cxl_test loading default (modulo) option\n" ); + } + rc =populate_cedt ();if (rc) goto err_populate;
@@ -926,6 +1077,8 @@ static __exit void cxl_test_exit(void)unregister_cxl_mock_ops (&cxl_mock_ops); } +module_param (interleave_arithmetic, int,0000 ); +MODULE_PARM_DESC (interleave_arithmetic,"Modulo:0, XOR:1" );module_init (cxl_test_init);module_exit (cxl_test_exit);MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.31.1
kernel test robot
build botRe: [PATCH v3 2/3] cxl/acpi: Support CXL XOR Interleave Math (CXIMS)
In reply to [email protected]I love your patch! Perhaps something to improve:
Hi,
I love your patch! Perhaps something to improve:
[auto build test WARNING on 1cd8a2537eb07751d405ab7e2223f20338a90506]
url: https://github.com/intel-lab-lkp/linux/commits/alison-schofield-intel-com/CXL-XOR-Interleave-Arithmetic/20220916-093308 base: 1cd8a2537eb07751d405ab7e2223f20338a90506 config: i386-randconfig-a013 (https://download.01.org/0day-ci/archive/20220916/[email protected]/config) compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/52526703ddd3faa831e99eb2d778d5692aac43ee
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review alison-schofield-intel-com/CXL-XOR-Interleave-Arithmetic/20220916-093308 git checkout 52526703ddd3faa831e99eb2d778d5692aac43ee
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/cxl/
If you fix the issue, kindly add following tag where applicable
All warnings (new ones prefixed by >>):
>> drivers/cxl/acpi.c:56:10: warning: shift count is negative [-Wshift-count-negative]
mask = GENMASK(51, eiw + ig);
^~~~~~~~~~~~~~~~~~~~~
include/linux/bits.h:38:31: note: expanded from macro 'GENMASK'
(GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
^~~~~~~~~~~~~~~
include/linux/bits.h:36:11: note: expanded from macro '__GENMASK'
(~UL(0) >> (BITS_PER_LONG - 1 - (h))))
^ ~~~~~~~~~~~~~~~~~~~~~~~~~1 warning generated.
vim +56 drivers/cxl/acpi.c
16
17 /*
18 * Find a targets entry (n) in the host bridge interleave list.
19 * CXL Specfication 3.0 Table 9-22
20 */
21 static struct cxl_dport *cxl_hb_xor(struct cxl_root_decoder *cxlrd, int pos)
22 {
23 struct cxl_switch_decoder *cxlsd = &cxlrd->cxlsd;
24 struct cxims_data *cximsd = cxlrd->platform_data;
25 struct cxl_decoder *cxld = &cxlsd->cxld;
26 int ig = cxld->interleave_granularity;
27 int iw = cxld->interleave_ways;
28 int i, eiw, n = 0;
29 u64 hpa, mask;
30
31 if (dev_WARN_ONCE(&cxld->dev,
32 cxld->interleave_ways != cxlsd->nr_targets,
33 "misconfigured root decoder\n"))
34 return NULL;
35
36 if (iw == 1)
37 /* Entry is always 0 for no interleave */
38 return cxlrd->cxlsd.target[0];
39
40 hpa = cxlrd->res->start + pos * ig;
41
42 if (iw == 3) {
43 /* Initialize 'i' for the modulo calc */
44 i = 0;
45 goto no_map;
46 }
47
48 /* IW: 2,4,6,8,12,16 begin building 'n' using xormaps */
49 for (i = 0; i < cximsd->nr_maps; i++)
50 n |= (hweight64(hpa & cximsd->xormaps[i]) & 1) << i;
51
52 no_map:
53 /* IW: 3,6,12 add a modulo calculation to 'n' */
54 if (!is_power_of_2(iw)) {
55 eiw = ilog2(iw / 3) + 8;
> 56 mask = GENMASK(51, eiw + ig);
57 n |= (hpa & mask) % 3 << i;
58 }
59
60 return cxlrd->cxlsd.target[n];
61 }
62 Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
Alison Schofield
maintainerRe: [PATCH v3 2/3] cxl/acpi: Support CXL XOR Interleave Math (CXIMS)
In reply to [email protected]Quoted 78 lines · On Thu, Sep 15, 2022 at 06:30:23PM -0700, [email protected] wrote:
From: Alison Schofield <[email protected]>
When the CFMWS is using XOR math, parse the corresponding CXIMS structure and store the xormaps in the root decoder structure. Use the xormaps in a new lookup,
cxl_hb_xor(), to find a targets entry in the host bridge interleave target list.Defined in CXL Specfication 3.0 Section: 9.17.1
Signed-off-by Alison Schofield <[email protected]>--- drivers/cxl/cxl.h | 2 + drivers/cxl/acpi.c | 132 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 129 insertions(+), 5 deletions(-)drivers/cxl/cxl.h +2
-0@@ -330,12 +330,14 @@ struct cxl_switch_decoder {* @res: host / parent resource for region allocations * @region_id: region id for next region provisioning event * @calc_hb: which host bridge covers the n'th position by granularity +* @platform_data: platform specific configuration data * @cxlsd: base cxl switch decoder */ struct cxl_root_decoder {struct resource *res;atomic_t region_id;struct cxl_dport *(*calc_hb)(struct cxl_root_decoder *cxlrd,int pos); +void *platform_data;struct cxl_switch_decoder cxlsd; };drivers/cxl/acpi.c +35
-0@@ -9,6 +9,106 @@#include "cxlpci.h" #include "cxl.h" +struct cxims_data { +int nr_maps; +u64 xormaps[]; +}; + +/* +* Find a targets entry (n) in the host bridge interleave list. +* CXL Specfication 3.0 Table 9-22 +*/ +static struct cxl_dport *cxl_hb_xor (struct cxl_root_decoder *cxlrd,int pos) +{ +struct cxl_switch_decoder *cxlsd = &cxlrd->cxlsd; +struct cxims_data *cximsd = cxlrd->platform_data; +struct cxl_decoder *cxld = &cxlsd->cxld; +int ig = cxld->interleave_granularity; +int iw = cxld->interleave_ways; +int i, eiw, n =0 ; +u64 hpa, mask; + +if (dev_WARN_ONCE (&cxld->dev, + cxld->interleave_ways != cxlsd->nr_targets, +"misconfigured root decoder\n" )) +return NULL ; + +if (iw ==1 ) +/* Entry is always 0 for no interleave */ +return cxlrd->cxlsd.target[0 ]; + + hpa = cxlrd->res->start + pos * ig; + +if (iw ==3 ) { +/* Initialize 'i' for the modulo calc */ + i =0 ; + goto no_map; + }
drivers/cxl/acpi.c line 56
Quoted 10 lines
drivers/cxl/acpi.c +10
-0+ +/* IW: 2,4,6,8,12,16 begin building 'n' using xormaps */ +for (i =0 ; i < cximsd->nr_maps; i++) + n |= (hweight64 (hpa & cximsd->xormaps[i]) &1 ) << i; + +no_map: +/* IW: 3,6,12 add a modulo calculation to 'n' */ +if (!is_power_of_2 (iw)) { + eiw =ilog2 (iw /3 ) +8 ; + mask =GENMASK (51 , eiw + ig);
lkp i386 build warned:
Quoted 1 line
Quoted 1 line
drivers/cxl/acpi.c:56:10: warning: shift count is negative
+[-Wshift-count-negative]
mask = GENMASK(51, eiw + ig);
^~~~~~~~~~~~~~~~~~~~~Will change to GENMASK_ULL.
Quoted 5 lines
drivers/cxl/acpi.c +5
-0+ n |= (hpa & mask) %3 << i; + } + +return cxlrd->cxlsd.target[n]; +}
snip
Quoted 2 lines
+