XOR Math Fixups: translation & position
[email protected]
maintainerv3 cover XOR Math Fixups: translation & position
From: Alison Schofield <[email protected]>
Changes in v3:
- Patch 2: Perform the 'chunk' check on Modulo decodes only
- Patch 1: Fold cxl_translate() into cxl_dpa_to_hpa() (Jonathan)
Jonathan asked for a rename of cxl_translate to cxl_dpa_to_hpa() but the latter already existed and the work of cxl_translate() was minimal. They are now one.
- Remove the mention of XOR's purpose in Patch 2 commit log (Dan)
- Reword hamming weight wrt XORALLBITS code comment (Jonathan)
- Post a unit test upstream[1] (Dan, Jonathan)
- Remove Reviewed-by Tags on Patch 1 & 2 due to rework
- Add Diego's Tested-by tag to Patch 2,3
Link to v2:
https://lore.kernel.org/[email protected]/
[1] https://lore.kernel.org/[email protected]/
Begin cover letter:
Rather than repeat the individual patch commit message content, let me describe the flow of this set:
Patch 1: Rename an existing fn - cxl_trace_hpa()-> cxl_dpa_to_hpa() A tiny, yet essential cleanup to take first.
Patch 2: cxl: Restore XOR'd position bits during address translation The problem fixed in this patch, bad HPA translations with XOR math, came to my attention recently.
Patch 3 & Patch 4 are paired. Patch 3 presents the new method for verifying a target position in the list and Patch 4 removes the old method. These could be squashed.
FYI - the reason I don't present the code removal first is because I think it is easier to read the diff if I leave in the old root decoder call back setup for calc_hb, insert the new call back along the same path, and then rip out the defunct calc_hb. That's the way I created the patchset and it may be an easier way for reviewers to follow along with the root decoder callback setup.
Alison Schofield (4):
cxl/core: Rename cxl_trace_hpa() to cxl_dpa_to_hpa()
cxl: Restore XOR'd position bits during address translation cxl/region: Verify target positions using the ordered target list
cxl: Remove defunct code calculating host bridge target positions
drivers/cxl/acpi.c | 80 ++++++++++++++++----------------------- drivers/cxl/core/core.h | 8 ++-- drivers/cxl/core/mbox.c | 2 +- drivers/cxl/core/port.c | 21 ++-------- drivers/cxl/core/region.c | 60 ++++++++++++++--------------- drivers/cxl/core/trace.h | 4 +- drivers/cxl/cxl.h | 10 ++--- 7 files changed, 77 insertions(+), 108 deletions(-)
base-commit: f2661062f16b2de5d7b6a5c42a9a5c96326b8454
Signature · 1 line
2.37.3
[email protected]
maintainerPATCH v3 1/4 cxl/core: Rename cxl_trace_hpa() to cxl_dpa_to_hpa()
From: Alison Schofield <[email protected]>
Although cxl_trace_hpa() is used to populate TRACE EVENTs with HPA addresses, the work it performs is a DPA to HPA translation, not a trace. Rename it.
--- drivers/cxl/core/core.h | 8 ++++---- drivers/cxl/core/mbox.c | 2 +- drivers/cxl/core/region.c | 33 +++++++++++++-------------------- drivers/cxl/core/trace.h | 4 ++-- 4 files changed, 20 insertions(+), 27 deletions(-)
drivers/cxl/core/core.h +4 -4
@@ -28,12 +28,12 @@ int cxl_region_init(void);void cxl_region_exit (void );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_trace_hpa (struct cxl_region *cxlr,const struct cxl_memdev *cxlmd, -u64 dpa); +u64 cxl_dpa_to_hpa (struct cxl_region *cxlr,const struct cxl_memdev *cxlmd, +u64 dpa);#else -static inline u64 -cxl_trace_hpa (struct cxl_region *cxlr,const struct cxl_memdev *cxlmd,u64 dpa) +static inline u64 cxl_dpa_to_hpa (struct cxl_region *cxlr, +const struct cxl_memdev *cxlmd,u64 dpa) {return ULLONG_MAX ; }
drivers/cxl/core/mbox.c +1 -1
@@ -878,7 +878,7 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd, dpa =le64_to_cpu (evt->common.phys_addr) &CXL_DPA_MASK ; cxlr =cxl_dpa_to_region (cxlmd, dpa);if (cxlr) - hpa =cxl_trace_hpa (cxlr, cxlmd, dpa); + hpa =cxl_dpa_to_hpa (cxlr, cxlmd, dpa);if (event_type ==CXL_CPER_EVENT_GEN_MEDIA ) trace_cxl_general_media(cxlmd, type, cxlr, hpa,
drivers/cxl/core/region.c +13 -20
@@ -2749,15 +2749,25 @@ static bool cxl_is_hpa_in_range(u64 hpa, struct cxl_region *cxlr, int pos)return false; } -static u64 cxl_dpa_to_hpa (u64 dpa,struct cxl_region *cxlr, -struct cxl_endpoint_decoder *cxled) +u64 cxl_dpa_to_hpa (struct cxl_region *cxlr,const struct cxl_memdev *cxlmd, +u64 dpa) {u64 dpa_offset, hpa_offset, bits_upper, mask_upper, hpa;struct cxl_region_params *p = &cxlr->params; -int pos = cxled->pos; +struct cxl_endpoint_decoder *cxled =NULL ;u16 eig =0 ;u8 eiw =0 ; +int pos; +for (int i =0 ; i < p->nr_targets; i++) { + cxled = p->targets[i]; +if (cxlmd ==cxled_to_memdev (cxled)) +break ; + } +if (!cxled || cxlmd !=cxled_to_memdev (cxled)) +return ULLONG_MAX ; + + pos = cxled->pos;ways_to_eiw (p->interleave_ways, &eiw);granularity_to_eig (p->interleave_granularity, &eig);
@@ -2797,23 +2807,6 @@ static u64 cxl_dpa_to_hpa(u64 dpa, struct cxl_region *cxlr,return hpa; } -u64 cxl_trace_hpa (struct cxl_region *cxlr,const struct cxl_memdev *cxlmd, -u64 dpa) -{ -struct cxl_region_params *p = &cxlr->params; -struct cxl_endpoint_decoder *cxled =NULL ; - -for (int i =0 ; i < p->nr_targets; i++) { - cxled = p->targets[i]; -if (cxlmd ==cxled_to_memdev (cxled)) -break ; - } -if (!cxled || cxlmd !=cxled_to_memdev (cxled)) -return ULLONG_MAX ; - -return cxl_dpa_to_hpa (dpa, cxlr, cxled); -} -static struct lock_class_key cxl_pmem_region_key;static int cxl_pmem_region_alloc (struct cxl_region *cxlr)
drivers/cxl/core/trace.h +2 -2
@@ -704,8 +704,8 @@ TRACE_EVENT(cxl_poison,if (cxlr) {__assign_str (region);memcpy (__entry->uuid, &cxlr->params.uuid,16 ); - __entry->hpa =cxl_trace_hpa (cxlr, cxlmd, - __entry->dpa); + __entry->hpa =cxl_dpa_to_hpa (cxlr, cxlmd, + __entry->dpa); }else {__assign_str (region);memset (__entry->uuid,0 ,16 );
Signature · 1 line
2.37.3
[email protected]
maintainerPATCH v3 2/4 cxl: Restore XOR'd position bits during address translation
In reply to [email protected]From: Alison Schofield <[email protected]>
When a device reports a DPA in events like poison, general_media, and dram, the driver translates that DPA back to an HPA. Presently, the CXL driver translation only considers the Modulo position and will report the wrong HPA for XOR configured root decoders.
Add a helper function that restores the XOR'd bits during DPA->HPA address translation. Plumb a root decoder callback to the new helper when XOR interleave arithmetic is in use. For Modulo arithmetic, just let the callback be NULL - as in no extra work required.
Upon completion of a DPA->HPA translation a couple of checks are performed on the result. One simply confirms that the calculated HPA is within the address range of the region. That test is useful for both Modulo and XOR interleave arithmetic decodes.
A second check confirms that the HPA is within an expected chunk based on the endpoints position in the region and the region granularity. An XOR decode disrupts the Modulo pattern making the chunk check useless.
To align the checks with the proper decode, pull the region range check inline and use the helper to do the chunk check for Modulo decodes only.
A cxl-test unit test of address translations is in upstream review.
--- drivers/cxl/acpi.c | 48 ++++++++++++++++++++++++++++++++++++--- drivers/cxl/core/port.c | 5 +++- drivers/cxl/core/region.c | 22 ++++++++++-------- drivers/cxl/cxl.h | 6 ++++- 4 files changed, 67 insertions(+), 14 deletions(-)
drivers/cxl/acpi.c +45 -3
@@ -74,6 +74,43 @@ static struct cxl_dport *cxl_hb_xor(struct cxl_root_decoder *cxlrd, int pos)return cxlrd->cxlsd.target[n]; } +static u64 cxl_xor_translate (struct cxl_root_decoder *cxlrd,u64 hpa) +{ +struct cxl_cxims_data *cximsd = cxlrd->platform_data; +int hbiw = cxlrd->cxlsd.nr_targets; +u64 val; +int pos; + +/* No xormaps for host bridge interleave ways of 1 or 3 */ +if (hbiw ==1 || hbiw ==3 ) +return hpa; + +/* +* For root decoders using xormaps (hbiw: 2,4,6,8,12,16) restore +* the position bit to its value before the xormap was applied at +* HPA->DPA translation. +* +* pos is the lowest set bit in an XORMAP +* val is the XORALLBITS(HPA & XORMAP) +* +* XORALLBITS: The CXL spec (3.1 Table 9-22) defines XORALLBITS +* as an operation that outputs a single bit by XORing all the +* bits in the input (hpa & xormap). Implement XORALLBITS using +* hweight64(). If the hamming weight is even the XOR of those +* bits results in val==0, if odd the XOR result is val==1. +*/ + +for (int i =0 ; i < cximsd->nr_maps; i++) { +if (!cximsd->xormaps[i]) +continue ; + pos =__ffs (cximsd->xormaps[i]); + val = (hweight64 (hpa & cximsd->xormaps[i]) &1 ); + hpa = (hpa & ~(1ULL << pos)) | (val << pos); + } + +return hpa; +} +struct cxl_cxims_context {struct device *dev;struct cxl_root_decoder *cxlrd;
@@ -362,6 +399,7 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws,struct cxl_cxims_context cxims_ctx;struct device *dev = ctx->dev;cxl_calc_hb_fn cxl_calc_hb; +cxl_translate_fn translate;struct cxl_decoder *cxld;unsigned int ways, i, ig;int rc;
@@ -389,13 +427,17 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws,if (rc)return rc; -if (cfmws->interleave_arithmetic ==ACPI_CEDT_CFMWS_ARITHMETIC_MODULO ) +if (cfmws->interleave_arithmetic ==ACPI_CEDT_CFMWS_ARITHMETIC_MODULO ) { cxl_calc_hb = cxl_hb_modulo; -else + translate =NULL ; + + }else { cxl_calc_hb = cxl_hb_xor; + translate = cxl_xor_translate; + } struct cxl_root_decoder *cxlrd __free(put_cxlrd) = -cxl_root_decoder_alloc (root_port, ways, cxl_calc_hb); +cxl_root_decoder_alloc (root_port, ways, cxl_calc_hb, translate);if (IS_ERR (cxlrd))return PTR_ERR (cxlrd);
drivers/cxl/core/port.c +4 -1
@@ -1808,6 +1808,7 @@ static int cxl_switch_decoder_init(struct cxl_port *port,* @port: owning CXL root of this decoder * @nr_targets: static number of downstream targets * @calc_hb: which host bridge covers the n'th position by granularity +* @translate: decoder specific address translation function * * Return: A new cxl decoder to be registered by cxl_decoder_add(). A * 'CXL root' decoder is one that decodes from a top-level / static platform
@@ -1816,7 +1817,8 @@ static int cxl_switch_decoder_init(struct cxl_port *port,*/ struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port,unsigned int nr_targets, -cxl_calc_hb_fn calc_hb) +cxl_calc_hb_fn calc_hb, +cxl_translate_fn translate) {struct cxl_root_decoder *cxlrd;struct cxl_switch_decoder *cxlsd;
@@ -1839,6 +1841,7 @@ struct cxl_root_decoder *cxl_root_decoder_alloc(struct cxl_port *port, } cxlrd->calc_hb = calc_hb; + cxlrd->translate = translate;mutex_init (&cxlrd->range_lock); cxld = &cxlsd->cxld;
drivers/cxl/core/region.c +13 -9
@@ -2723,20 +2723,13 @@ struct cxl_region *cxl_dpa_to_region(const struct cxl_memdev *cxlmd, u64 dpa)return ctx.cxlr; } -static bool cxl_is_hpa_in_range (u64 hpa,struct cxl_region *cxlr,int pos) +static bool cxl_is_hpa_in_chunk (u64 hpa,struct cxl_region *cxlr,int pos) {struct cxl_region_params *p = &cxlr->params;int gran = p->interleave_granularity;int ways = p->interleave_ways;u64 offset; -/* Is the hpa within this region at all */ -if (hpa < p->res->start || hpa > p->res->end) { -dev_dbg (&cxlr->dev, -"Addr trans fail: hpa 0x%llx not in region\n" , hpa); -return false; - } -/* Is the hpa in an expected chunk for its pos(-ition) */ offset = hpa - p->res->start; offset =do_div (offset, gran * ways);
@@ -2752,6 +2745,7 @@ static bool cxl_is_hpa_in_range(u64 hpa, struct cxl_region *cxlr, int pos)u64 cxl_dpa_to_hpa (struct cxl_region *cxlr,const struct cxl_memdev *cxlmd,u64 dpa) { +struct cxl_root_decoder *cxlrd =to_cxl_root_decoder (cxlr->dev.parent);u64 dpa_offset, hpa_offset, bits_upper, mask_upper, hpa;struct cxl_region_params *p = &cxlr->params;struct cxl_endpoint_decoder *cxled =NULL ;
@@ -2801,7 +2795,17 @@ u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const struct cxl_memdev *cxlmd,/* Apply the hpa_offset to the region base address */ hpa = hpa_offset + p->res->start; -if (!cxl_is_hpa_in_range (hpa, cxlr, cxled->pos)) +/* Root decoder translation overrides typical modulo decode */ +if (cxlrd->translate) + hpa = cxlrd->translate (cxlrd, hpa); + +if (hpa < p->res->start || hpa > p->res->end) { +dev_dbg (&cxlr->dev, +"Addr trans fail: hpa 0x%llx not in region\n" , hpa); +return ULLONG_MAX ; + } + +if (!cxlrd->translate && (!cxl_is_hpa_in_chunk (hpa, cxlr, pos)))return ULLONG_MAX ;return hpa;
drivers/cxl/cxl.h +5 -1
@@ -434,12 +434,14 @@ struct cxl_switch_decoder {struct cxl_root_decoder ;typedef struct cxl_dport *(*cxl_calc_hb_fn )(struct cxl_root_decoder *cxlrd,int pos); +typedef u64 (*cxl_translate_fn )(struct cxl_root_decoder *cxlrd,u64 hpa);/** * struct cxl_root_decoder - Static platform CXL address 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 +* @translate: decoder specific address translation function * @platform_data: platform specific configuration data * @range_lock: sync region autodiscovery by address range * @qos_class: QoS performance class cookie
@@ -449,6 +451,7 @@ struct cxl_root_decoder {struct resource *res;atomic_t region_id;cxl_calc_hb_fn calc_hb; +cxl_translate_fn translate;void *platform_data;struct mutex range_lock;int qos_class;
@@ -773,7 +776,8 @@ bool is_switch_decoder(struct device *dev);bool is_endpoint_decoder (struct device *dev);struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port,unsigned int nr_targets, -cxl_calc_hb_fn calc_hb); +cxl_calc_hb_fn calc_hb, +cxl_translate_fn translate);struct cxl_dport *cxl_hb_modulo (struct cxl_root_decoder *cxlrd,int pos);struct cxl_switch_decoder *cxl_switch_decoder_alloc (struct cxl_port *port,unsigned int nr_targets);
Signature · 1 line
2.37.3
[email protected]
maintainerPATCH v3 3/4 cxl/region: Verify target positions using the ordered target list
In reply to [email protected]From: Alison Schofield <[email protected]>
When a root decoder is configured the interleave target list is read from the BIOS populated CFMWS structure. Per the CXL spec 3.1 Table 9-22 the target list is in interleave order. The CXL driver populates its decoder target list in the same order and stores it in 'struct cxl_switch_decoder' field "@target: active ordered target list in current decoder configuration"
Given the promise of an ordered list, the driver can stop duplicating the work of BIOS and simply check target positions against the ordered list during region configuration.
The simplified check against the ordered list is presented here. A follow-on patch will remove the unused code.
For Modulo arithmetic this is not a fix, only a simplification. For XOR arithmetic this is a fix for HB IW of 3,6,12.
--- drivers/cxl/core/region.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/cxl/core/region.c +4 -1
@@ -1559,10 +1559,13 @@ static int cxl_region_attach_position(struct cxl_region *cxlr, const struct cxl_dport *dport, int pos) {struct cxl_memdev *cxlmd =cxled_to_memdev (cxled); +struct cxl_switch_decoder *cxlsd = &cxlrd->cxlsd; +struct cxl_decoder *cxld = &cxlsd->cxld; +int iw = cxld->interleave_ways;struct cxl_port *iter;int rc; -if (cxlrd->calc_hb (cxlrd, pos) != dport) { +if (dport != cxlrd->cxlsd.target[pos % iw]) {dev_dbg (&cxlr->dev,"%s:%s invalid target position for %s\n" ,dev_name (&cxlmd->dev),dev_name (&cxled->cxld.dev),dev_name (&cxlrd->cxlsd.cxld.dev));
Signature · 1 line
2.37.3
[email protected]
maintainerPATCH v3 4/4 cxl: Remove defunct code calculating host bridge target positions
In reply to [email protected]From: Alison Schofield <[email protected]>
The CXL Spec 3.1 Table 9-22 requires that the BIOS populate the CFMWS target list in interleave target order. This means the calculations the CXL driver added to determine positions when XOR math is in use, along with the entire XOR vs Modulo call back setup is not needed.
A prior patch added a common method to verify positions.
Remove the now unused code related to the cxl_calc_hb_fn.
--- drivers/cxl/acpi.c | 62 ++--------------------------------------- drivers/cxl/core/port.c | 18 ------------ drivers/cxl/cxl.h | 6 ---- 3 files changed, 3 insertions(+), 83 deletions(-)
drivers/cxl/acpi.c +3 -59
@@ -22,57 +22,6 @@ static const guid_t acpi_cxl_qtg_id_guid =GUID_INIT (0xF365F9A6 ,0xA7DE ,0x4071 ,0xA6 ,0x6A ,0xB4 ,0x0C ,0x0B ,0x4F ,0x8E ,0x52 ); -/* -* Find a targets entry (n) in the host bridge interleave list. -* CXL Specification 3.0 Table 9-22 -*/ -static int cxl_xor_calc_n (u64 hpa,struct cxl_cxims_data *cximsd,int iw, -int ig) -{ -int i =0 , n =0 ; -u8 eiw; - -/* IW: 2,4,6,8,12,16 begin building 'n' using xormaps */ -if (iw !=3 ) { -for (i =0 ; i < cximsd->nr_maps; i++) - n |= (hweight64 (hpa & cximsd->xormaps[i]) &1 ) << i; - } -/* IW: 3,6,12 add a modulo calculation to 'n' */ -if (!is_power_of_2 (iw)) { -if (ways_to_eiw (iw, &eiw)) -return -1 ; - hpa &=GENMASK_ULL (51 , eiw + ig); - n |=do_div (hpa,3 ) << i; - } -return n; -} - -static struct cxl_dport *cxl_hb_xor (struct cxl_root_decoder *cxlrd,int pos) -{ -struct cxl_cxims_data *cximsd = cxlrd->platform_data; -struct cxl_switch_decoder *cxlsd = &cxlrd->cxlsd; -struct cxl_decoder *cxld = &cxlsd->cxld; -int ig = cxld->interleave_granularity; -int iw = cxld->interleave_ways; -int n =0 ; -u64 hpa; - -if (dev_WARN_ONCE (&cxld->dev, - cxld->interleave_ways != cxlsd->nr_targets, -"misconfigured root decoder\n" )) -return NULL ; - - hpa = cxlrd->res->start + pos * ig; - -/* Entry (n) is 0 for no interleave (iw == 1) */ -if (iw !=1 ) - n =cxl_xor_calc_n (hpa, cximsd, iw, ig); - -if (n <0 ) -return NULL ; - -return cxlrd->cxlsd.target[n]; -}static u64 cxl_xor_translate (struct cxl_root_decoder *cxlrd,u64 hpa) {
@@ -398,7 +347,6 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws,struct cxl_port *root_port = ctx->root_port;struct cxl_cxims_context cxims_ctx;struct device *dev = ctx->dev; -cxl_calc_hb_fn cxl_calc_hb;cxl_translate_fn translate;struct cxl_decoder *cxld;unsigned int ways, i, ig;
@@ -427,17 +375,13 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws,if (rc)return rc; -if (cfmws->interleave_arithmetic ==ACPI_CEDT_CFMWS_ARITHMETIC_MODULO ) { - cxl_calc_hb = cxl_hb_modulo; +if (cfmws->interleave_arithmetic ==ACPI_CEDT_CFMWS_ARITHMETIC_MODULO ) translate =NULL ; - - }else { - cxl_calc_hb = cxl_hb_xor; +else translate = cxl_xor_translate; - } struct cxl_root_decoder *cxlrd __free(put_cxlrd) = -cxl_root_decoder_alloc (root_port, ways, cxl_calc_hb, translate); +cxl_root_decoder_alloc (root_port, ways, translate);if (IS_ERR (cxlrd))return PTR_ERR (cxlrd);
drivers/cxl/core/port.c +0 -18
@@ -1733,21 +1733,6 @@ static int decoder_populate_targets(struct cxl_switch_decoder *cxlsd,return 0 ; } -struct cxl_dport *cxl_hb_modulo (struct cxl_root_decoder *cxlrd,int pos) -{ -struct cxl_switch_decoder *cxlsd = &cxlrd->cxlsd; -struct cxl_decoder *cxld = &cxlsd->cxld; -int iw; - - iw = cxld->interleave_ways; -if (dev_WARN_ONCE (&cxld->dev, iw != cxlsd->nr_targets, -"misconfigured root decoder\n" )) -return NULL ; - -return cxlrd->cxlsd.target[pos % iw]; -} -EXPORT_SYMBOL_NS_GPL (cxl_hb_modulo,CXL ); -static struct lock_class_key cxl_decoder_key;/**
@@ -1807,7 +1792,6 @@ static int cxl_switch_decoder_init(struct cxl_port *port,* cxl_root_decoder_alloc - Allocate a root level decoder * @port: owning CXL root of this decoder * @nr_targets: static number of downstream targets -* @calc_hb: which host bridge covers the n'th position by granularity * @translate: decoder specific address translation function * * Return: A new cxl decoder to be registered by cxl_decoder_add(). A
@@ -1817,7 +1801,6 @@ static int cxl_switch_decoder_init(struct cxl_port *port,*/ struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port,unsigned int nr_targets, -cxl_calc_hb_fn calc_hb,cxl_translate_fn translate) {struct cxl_root_decoder *cxlrd;
@@ -1840,7 +1823,6 @@ struct cxl_root_decoder *cxl_root_decoder_alloc(struct cxl_port *port,return ERR_PTR (rc); } - cxlrd->calc_hb = calc_hb; cxlrd->translate = translate;mutex_init (&cxlrd->range_lock);
drivers/cxl/cxl.h +0 -6
@@ -432,15 +432,12 @@ struct cxl_switch_decoder { };struct cxl_root_decoder ; -typedef struct cxl_dport *(*cxl_calc_hb_fn )(struct cxl_root_decoder *cxlrd, -int pos);typedef u64 (*cxl_translate_fn )(struct cxl_root_decoder *cxlrd,u64 hpa);/** * struct cxl_root_decoder - Static platform CXL address 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 * @translate: decoder specific address translation function * @platform_data: platform specific configuration data * @range_lock: sync region autodiscovery by address range
@@ -450,7 +447,6 @@ typedef u64 (*cxl_translate_fn)(struct cxl_root_decoder *cxlrd, u64 hpa);struct cxl_root_decoder {struct resource *res;atomic_t region_id; -cxl_calc_hb_fn calc_hb;cxl_translate_fn translate;void *platform_data;struct mutex range_lock;
@@ -776,9 +772,7 @@ bool is_switch_decoder(struct device *dev);bool is_endpoint_decoder (struct device *dev);struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port,unsigned int nr_targets, -cxl_calc_hb_fn calc_hb,cxl_translate_fn translate); -struct cxl_dport *cxl_hb_modulo (struct cxl_root_decoder *cxlrd,int pos);struct cxl_switch_decoder *cxl_switch_decoder_alloc (struct cxl_port *port,unsigned int nr_targets);int cxl_decoder_add (struct cxl_decoder *cxld,int *target_map);
Signature · 1 line
2.37.3
Re: [PATCH v3 1/4] cxl/core: Rename cxl_trace_hpa() to cxl_dpa_to_hpa()
In reply to [email protected]Quoted 8 lines · alison.schofield@ wrote:
From: Alison Schofield <[email protected]>
Although
cxl_trace_hpa()is used to populate TRACE EVENTs with HPA addresses, the work it performs is a DPA to HPA translation, not a trace. Rename it.Suggested-by Dan Williams <[email protected]>Signed-off-by Alison Schofield <[email protected]>
Looks good,
Quoted 17 lines · alison.schofield@ wrote:
From: Alison Schofield <[email protected]>
Changes in v3:
- Patch 2: Perform the 'chunk' check on Modulo decodes only
- Patch 1: Foldcxl_translate()intocxl_dpa_to_hpa()(Jonathan)
Jonathan asked for a rename ofcxl_translatetocxl_dpa_to_hpa()but the latter already existed and the work ofcxl_translate()was minimal. They are now one.
- Remove the mention of XOR's purpose in Patch 2 commit log (Dan)
- Reword hamming weight wrt XORALLBITS code comment (Jonathan)
- Post a unit test upstream[1] (Dan, Jonathan)
- Remove Reviewed-by Tags on Patch 1 & 2 due to rework
- Add Diego's Tested-by tag to Patch 2,3Link to v2:
https://lore.kernel.org/[email protected]/
Quoted 7 lines
[1] https://lore.kernel.org/[email protected]/
Begin cover letter:
Rather than repeat the individual patch commit message content, let me describe the flow of this set:
For a future cover letter, a lead in like this does not capture potential new reviewers compared to a boilerplate flow of:
"Kernel fails at X... this is bad because... here is the flow of the patches to get the kernel back on track..."
Quoted 12 lines
Patch 1: Rename an existing fn - cxl_trace_hpa()->
cxl_dpa_to_hpa()A tiny, yet essential cleanup to take first.Patch 2: cxl: Restore XOR'd position bits during address translation The problem fixed in this patch, bad HPA translations with XOR math, came to my attention recently.
Patch 3 & Patch 4 are paired. Patch 3 presents the new method for verifying a target position in the list and Patch 4 removes the old method. These could be squashed.
Quoted 6 lines
FYI - the reason I don't present the code removal first is because I think it is easier to read the diff if I leave in the old root decoder call back setup for
calc_hb, insert the new call back along the same path, and then rip out the defunctcalc_hb. That's the way I created the patchset and it may be an easier way for reviewers to follow along with the root decoder callback setup.
If I did not say it before, I appreciate notes like this, and agree this makes the patches easier to read.
Re: [PATCH v3 2/4] cxl: Restore XOR'd position bits during address translation
In reply to [email protected]Quoted 38 lines · alison.schofield@ wrote:
From: Alison Schofield <[email protected]>
When a device reports a DPA in events like poison,
general_media, and dram, the driver translates that DPA back to an HPA. Presently, the CXL driver translation only considers the Modulo position and will report the wrong HPA for XOR configured root decoders.Add a helper function that restores the XOR'd bits during
DPA->HPAaddress translation. Plumb a root decoder callback to the new helper when XOR interleave arithmetic is in use. For Modulo arithmetic, just let the callback be NULL - as in no extra work required.Upon completion of a
DPA->HPAtranslation a couple of checks are performed on the result. One simply confirms that the calculated HPA is within the address range of the region. That test is useful for both Modulo and XOR interleave arithmetic decodes.A second check confirms that the HPA is within an expected chunk based on the endpoints position in the region and the region granularity. An XOR decode disrupts the Modulo pattern making the chunk check useless.
To align the checks with the proper decode, pull the region range check inline and use the helper to do the chunk check for Modulo decodes only.
A cxl-test unit test of address translations is in upstream review.
Fixes 28a3ae4ff66c ("cxl/trace: Add an HPA to cxl_poison trace events")Signed-off-by Alison Schofield <[email protected]>--- drivers/cxl/acpi.c | 48 ++++++++++++++++++++++++++++++++++++--- drivers/cxl/core/port.c | 5 +++- drivers/cxl/core/region.c | 22 ++++++++++-------- drivers/cxl/cxl.h | 6 ++++- 4 files changed, 67 insertions(+), 14 deletions(-)
[..]
Quoted 20 lines
drivers/cxl/cxl.h +2
-0@@ -434,12 +434,14 @@ struct cxl_switch_decoder {struct cxl_root_decoder ;typedef struct cxl_dport *(*cxl_calc_hb_fn )(struct cxl_root_decoder *cxlrd,int pos); +typedef u64 (*cxl_translate_fn )(struct cxl_root_decoder *cxlrd,u64 hpa);/** * struct cxl_root_decoder - Static platform CXL address 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 +* @translate: decoder specific address translation function * @platform_data: platform specific configuration data * @range_lock: sync region autodiscovery by address range * @qos_class: QoS performance class cookie
drivers/cxl/cxl.h struct cxl_root_decoder { · line 454
Quoted 4 lines
drivers/cxl/cxl.h +1
-0@@ -449,6 +451,7 @@ struct cxl_root_decoder {struct resource *res;atomic_t region_id;cxl_calc_hb_fn calc_hb; +cxl_translate_fn translate;
So the cxl_translate() => cxl_dpa_to_hpa() rename was good, but now this name sticks out as not right because this routine is not doing dpa to hpa translation. It is doing extended translation after the modulo translation completes. It builds on the assumption that all address decode below host-bridges is only modulo math, but that once the HPA reaches the host-bridge it goes through a second stage translation.
In other parts of the driver this host-bridge level address has been referred to as an SPA. Most times HPAs and SPAs are identical, but with XOR math, or with AMD platforms like this [1], there is CXL HPA to platform SPA translation.
All that said, lets call this method hpa_to_spa() and document it as
@hpa_to_spa: translate CXL host-physical-address to Platform system-physical-address
...then the code reads better:
if (!cxlrd->hpa_to_spa)
...then it is clear that this root decoder is not doing anything outside of standard CXL address translation that all switch and device-endpoint decoders support.
With that rename you can add:
Re: [PATCH v3 2/4] cxl: Restore XOR'd position bits during address translation
In reply to [email protected]Quoted 2 lines · On Tuesday, June 25, 2024 2:55:53 AM GMT+2 [email protected] wrote:
From: Alison Schofield <[email protected]>
Hi Alison,
Below I have two questions...
Quoted 20 lines
When a device reports a DPA in events like poison,
general_media, and dram, the driver translates that DPA back to an HPA. Presently, the CXL driver translation only considers the Modulo position and will report the wrong HPA for XOR configured root decoders.Add a helper function that restores the XOR'd bits during
DPA->HPAaddress translation. Plumb a root decoder callback to the new helper when XOR interleave arithmetic is in use. For Modulo arithmetic, just let the callback be NULL - as in no extra work required.Upon completion of a
DPA->HPAtranslation a couple of checks are performed on the result. One simply confirms that the calculated HPA is within the address range of the region. That test is useful for both Modulo and XOR interleave arithmetic decodes.A second check confirms that the HPA is within an expected chunk based on the endpoints position in the region and the region granularity. An XOR decode disrupts the Modulo pattern making the chunk check useless.
Quoted 5 lines
To align the checks with the proper decode, pull the region range check inline and use the helper to do the chunk check for Modulo decodes only.
A cxl-test unit test of address translations is in upstream review.
Would it be helpful to provide a link to the test?
drivers/cxl/acpi.c static struct cxl_dport *cxl_hb_xor(struct
Quoted 15 lines
Fixes 28a3ae4ff66c ("cxl/trace: Add an HPA to cxl_poison trace events")Signed-off-by Alison Schofield <[email protected]>--- drivers/cxl/acpi.c | 48 ++++++++++++++++++++++++++++++++++++--- drivers/cxl/core/port.c | 5 +++- drivers/cxl/core/region.c | 22 ++++++++++-------- drivers/cxl/cxl.h | 6 ++++- 4 files changed, 67 insertions(+), 14 deletions(-)drivers/cxl/acpi.c +0
-0@@ -74,6 +74,43 @@ static struct cxl_dport *cxl_hb_xor(struct
cxl_root_decoder *cxlrd, int pos)
drivers/cxl/acpi.c static int __cxl_parse_cfmws(struct acpi_cedt_cfmws
Quoted 44 lines
drivers/cxl/acpi.c +37
-0return cxlrd->cxlsd.target[n]; } +static u64 cxl_xor_translate (struct cxl_root_decoder *cxlrd,u64 hpa) +{ +struct cxl_cxims_data *cximsd = cxlrd->platform_data; +int hbiw = cxlrd->cxlsd.nr_targets; +u64 val; +int pos; + +/* No xormaps for host bridge interleave ways of 1 or 3 */ +if (hbiw ==1 || hbiw ==3 ) +return hpa; + +/* +* For root decoders using xormaps (hbiw: 2,4,6,8,12,16) restore +* the position bit to its value before the xormap was applied at +* HPA->DPA translation. +* +* pos is the lowest set bit in an XORMAP +* val is the XORALLBITS(HPA & XORMAP) +* +* XORALLBITS: The CXL spec (3.1 Table 9-22) defines XORALLBITS +* as an operation that outputs a single bit by XORing all the +* bits in the input (hpa & xormap). Implement XORALLBITS using +* hweight64(). If the hamming weight is even the XOR of those +* bits results in val==0, if odd the XOR result is val==1. +*/ + +for (int i =0 ; i < cximsd->nr_maps; i++) { +if (!cximsd->xormaps[i]) +continue ; + pos =__ffs (cximsd->xormaps[i]); + val = (hweight64 (hpa & cximsd->xormaps[i]) &1 ); + hpa = (hpa & ~(1ULL << pos)) | (val << pos); + } + +return hpa; +} +struct cxl_cxims_context {struct device *dev;struct cxl_root_decoder *cxlrd;@@ -362,6 +399,7 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws
*cfmws,
drivers/cxl/acpi.c static int __cxl_parse_cfmws(struct acpi_cedt_cfmws
Quoted 8 lines
drivers/cxl/acpi.c +1
-0struct cxl_cxims_context cxims_ctx;struct device *dev = ctx->dev;cxl_calc_hb_fn cxl_calc_hb; +cxl_translate_fn translate;struct cxl_decoder *cxld;unsigned int ways, i, ig;int rc;@@ -389,13 +427,17 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws
*cfmws,
drivers/cxl/acpi.c static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws,
Quoted 4 lines
drivers/cxl/acpi.c +0
-1if (rc)return rc; - if (cfmws->interleave_arithmetic ==
ACPI_CEDT_CFMWS_ARITHMETIC_MODULO)
drivers/cxl/acpi.c static int __cxl_parse_cfmws(struct acpi_cedt_cfmws · line 430
Quoted 1 line
drivers/cxl/acpi.c +1
-0+ if (cfmws->interleave_arithmetic ==
ACPI_CEDT_CFMWS_ARITHMETIC_MODULO) {
drivers/cxl/acpi.c static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws,
Quoted 12 lines
drivers/cxl/acpi.c +6
-2cxl_calc_hb = cxl_hb_modulo; - else + translate =NULL ; + + }else { cxl_calc_hb = cxl_hb_xor; + translate = cxl_xor_translate; + } struct cxl_root_decoder *cxlrd __free(put_cxlrd) = -cxl_root_decoder_alloc (root_port, ways, cxl_calc_hb); + cxl_root_decoder_alloc(root_port, ways, cxl_calc_hb,
translate);
drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port
Quoted 8 lines
drivers/cxl/acpi.c +0
-0if (IS_ERR (cxlrd))return PTR_ERR (cxlrd);drivers/cxl/core/port.c +0
-0@@ -1808,6 +1808,7 @@ static int cxl_switch_decoder_init(struct cxl_port
*port,
drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port *port,
Quoted 7 lines
drivers/cxl/core/port.c +1
-0* @port: owning CXL root of this decoder * @nr_targets: static number of downstream targets * @calc_hb: which host bridge covers the n'th position by granularity +* @translate: decoder specific address translation function * * Return: A new cxl decoder to be registered by cxl_decoder_add(). A * 'CXL root' decoder is one that decodes from a top-level / static
platform
drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port
Quoted 1 line
drivers/cxl/core/port.c +0
-0@@ -1816,7 +1817,8 @@ static int cxl_switch_decoder_init(struct cxl_port
*port,
drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port *port,
Quoted 3 lines
drivers/cxl/core/port.c +0
-0*/ struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port, unsigned
int nr_targets,
drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port · line 1819
Quoted 1 line
drivers/cxl/core/port.c +0
-1-
cxl_calc_hb_fn calc_hb)
drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port · line 1820
Quoted 1 line
drivers/cxl/core/port.c +1
-0+
cxl_calc_hb_fn calc_hb,
drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port · line 1821
Quoted 1 line
drivers/cxl/core/port.c +1
-0+
cxl_translate_fn translate)
drivers/cxl/core/port.c struct cxl_root_decoder *cxl_root_decoder_alloc(struct
Quoted 4 lines
drivers/cxl/core/port.c +0
-0{struct cxl_root_decoder *cxlrd;struct cxl_switch_decoder *cxlsd;@@ -1839,6 +1841,7 @@ struct cxl_root_decoder *cxl_root_decoder_alloc(struct
cxl_port *port,
drivers/cxl/core/region.c struct cxl_region *cxl_dpa_to_region(const struct
Quoted 12 lines
drivers/cxl/core/port.c +1
-0} cxlrd->calc_hb = calc_hb; + cxlrd->translate = translate;mutex_init (&cxlrd->range_lock); cxld = &cxlsd->cxld;drivers/cxl/core/region.c +0
-0@@ -2723,20 +2723,13 @@ struct cxl_region *cxl_dpa_to_region(const struct
cxl_memdev *cxlmd, u64 dpa)
Quoted 5 lines
drivers/cxl/core/region.c +1
-1return ctx.cxlr; } -static bool cxl_is_hpa_in_range (u64 hpa,struct cxl_region *cxlr,int pos) +static bool cxl_is_hpa_in_chunk (u64 hpa,struct cxl_region *cxlr,int pos)
drivers/cxl/core/region.c struct cxl_region *cxl_dpa_to_region(const struct cxl_memdev *cxlmd, u64 dpa)
Quoted 10 lines
drivers/cxl/core/region.c +0
-4{struct cxl_region_params *p = &cxlr->params;int gran = p->interleave_granularity;int ways = p->interleave_ways;u64 offset; -/* Is the hpa within this region at all */ -if (hpa < p->res->start || hpa > p->res->end) { - dev_dbg(&cxlr->dev, - "Addr trans fail: hpa 0x%llx not in
region\n", hpa);
drivers/cxl/core/region.c static bool cxl_is_hpa_in_range(u64 hpa, struct
Quoted 7 lines
drivers/cxl/core/region.c +0
-3-return false; - } -/* Is the hpa in an expected chunk for its pos(-ition) */ offset = hpa - p->res->start; offset =do_div (offset, gran * ways);@@ -2752,6 +2745,7 @@ static bool cxl_is_hpa_in_range(u64 hpa, struct
cxl_region *cxlr, int pos)
drivers/cxl/core/region.c u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const
Quoted 9 lines
drivers/cxl/core/region.c +1
-0u64 cxl_dpa_to_hpa (struct cxl_region *cxlr,const struct cxl_memdev *cxlmd,u64 dpa) { +struct cxl_root_decoder *cxlrd =to_cxl_root_decoder (cxlr- dev.parent);u64 dpa_offset, hpa_offset, bits_upper, mask_upper, hpa;struct cxl_region_params *p = &cxlr->params;drivers/cxl/core/region.c +0
-0struct cxl_endpoint_decoder *cxled =NULL ;@@ -2801,7 +2795,17 @@ u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const
struct cxl_memdev *cxlmd,
drivers/cxl/core/region.c u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const struct cxl_memdev *cxlmd,
Quoted 11 lines
drivers/cxl/core/region.c +7
-1/* Apply the hpa_offset to the region base address */ hpa = hpa_offset + p->res->start; -if (!cxl_is_hpa_in_range (hpa, cxlr, cxled->pos)) +/* Root decoder translation overrides typical modulo decode */ +if (cxlrd->translate) + hpa = cxlrd->translate (cxlrd, hpa); + +if (hpa < p->res->start || hpa > p->res->end) { + dev_dbg(&cxlr->dev, + "Addr trans fail: hpa 0x%llx not in
region\n", hpa);
drivers/cxl/core/region.c u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const struct cxl_memdev *cxlmd, · line 2809
Quoted 5 lines
drivers/cxl/core/region.c +4
-0+return ULLONG_MAX ; + } + +if (!cxlrd->translate && (!cxl_is_hpa_in_chunk (hpa, cxlr, pos)))return ULLONG_MAX ;
I needed some time to understand this. It was not immediately clear why, for XOR translations, this chunk check is skipped.
Wouldn't it be helpful to add a comment to explain why that check is skipped?
Thanks,
Fabio
Quoted 30 lines
drivers/cxl/core/region.c +0
-0return hpa;drivers/cxl/cxl.h +3
-0@@ -434,12 +434,14 @@ struct cxl_switch_decoder {struct cxl_root_decoder ;typedef struct cxl_dport *(*cxl_calc_hb_fn )(struct cxl_root_decoder *cxlrd,int pos); +typedef u64 (*cxl_translate_fn )(struct cxl_root_decoder *cxlrd,u64 hpa);/** * struct cxl_root_decoder - Static platform CXL address 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 +* @translate: decoder specific address translation function * @platform_data: platform specific configuration data * @range_lock: sync region autodiscovery by address range * @qos_class: QoS performance class cookie @@ -449,6 +451,7 @@ struct cxl_root_decoder {struct resource *res;atomic_t region_id;cxl_calc_hb_fn calc_hb; +cxl_translate_fn translate;void *platform_data;struct mutex range_lock;int qos_class;
drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev); · line 778
Quoted 3 lines
drivers/cxl/cxl.h +0
-0@@ -773,7 +776,8 @@ bool is_switch_decoder(struct device *dev);bool is_endpoint_decoder (struct device *dev);struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port, unsigned
int nr_targets,
drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev); · line 776
Quoted 1 line
drivers/cxl/cxl.h +0
-1-
cxl_calc_hb_fn calc_hb);
drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev); · line 779
Quoted 1 line
drivers/cxl/cxl.h +1
-0+
cxl_calc_hb_fn calc_hb,
drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev); · line 780
Quoted 1 line
drivers/cxl/cxl.h +1
-0+
cxl_translate_fn translate);
drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev);
Quoted 3 lines
drivers/cxl/cxl.h +0
-0struct cxl_dport *cxl_hb_modulo (struct cxl_root_decoder *cxlrd,int pos); struct cxl_switch_decoder *cxl_switch_decoder_alloc(struct cxl_port *port,
unsigned int nr_targets);
Quoted 1 line
Re: [PATCH v3 2/4] cxl: Restore XOR'd position bits during address translation
Quoted 151 lines · On Monday, July 1, 2024 11:28:24 AM GMT+2 Fabio M. De Francesco wrote:
Quoted 2 lines · On Tuesday, June 25, 2024 2:55:53 AM GMT+2 [email protected] wrote:
From: Alison Schofield <[email protected]>
Hi Alison,
Below I have two questions...
Quoted 20 lines
When a device reports a DPA in events like poison,
general_media, and dram, the driver translates that DPA back to an HPA. Presently, the CXL driver translation only considers the Modulo position and will report the wrong HPA for XOR configured root decoders.Add a helper function that restores the XOR'd bits during
DPA->HPAaddress translation. Plumb a root decoder callback to the new helper when XOR interleave arithmetic is in use. For Modulo arithmetic, just let the callback be NULL - as in no extra work required.Upon completion of a
DPA->HPAtranslation a couple of checks are performed on the result. One simply confirms that the calculated HPA is within the address range of the region. That test is useful for both Modulo and XOR interleave arithmetic decodes.A second check confirms that the HPA is within an expected chunk based on the endpoints position in the region and the region granularity. An XOR decode disrupts the Modulo pattern making the chunk check useless.
Quoted 5 lines
To align the checks with the proper decode, pull the region range check inline and use the helper to do the chunk check for Modulo decodes only.
A cxl-test unit test of address translations is in upstream review.
Would it be helpful to provide a link to the test?
drivers/cxl/acpi.c static struct cxl_dport *cxl_hb_xor(struct
Quoted 15 lines
Fixes 28a3ae4ff66c ("cxl/trace: Add an HPA to cxl_poison trace events")Signed-off-by Alison Schofield <[email protected]>--- drivers/cxl/acpi.c | 48 ++++++++++++++++++++++++++++++++++++--- drivers/cxl/core/port.c | 5 +++- drivers/cxl/core/region.c | 22 ++++++++++-------- drivers/cxl/cxl.h | 6 ++++- 4 files changed, 67 insertions(+), 14 deletions(-)drivers/cxl/acpi.c +0
-0@@ -74,6 +74,43 @@ static struct cxl_dport *cxl_hb_xor(struct
cxl_root_decoder*cxlrd, int pos)drivers/cxl/acpi.c static int __cxl_parse_cfmws(struct acpi_cedt_cfmws
Quoted 44 lines
drivers/cxl/acpi.c +37
-0return cxlrd->cxlsd.target[n]; } +static u64 cxl_xor_translate (struct cxl_root_decoder *cxlrd,u64 hpa) +{ +struct cxl_cxims_data *cximsd = cxlrd->platform_data; +int hbiw = cxlrd->cxlsd.nr_targets; +u64 val; +int pos; + +/* No xormaps for host bridge interleave ways of 1 or 3 */ +if (hbiw ==1 || hbiw ==3 ) +return hpa; + +/* +* For root decoders using xormaps (hbiw: 2,4,6,8,12,16) restore +* the position bit to its value before the xormap was applied at +* HPA->DPA translation. +* +* pos is the lowest set bit in an XORMAP +* val is the XORALLBITS(HPA & XORMAP) +* +* XORALLBITS: The CXL spec (3.1 Table 9-22) defines XORALLBITS +* as an operation that outputs a single bit by XORing all the +* bits in the input (hpa & xormap). Implement XORALLBITS using +* hweight64(). If the hamming weight is even the XOR of those +* bits results in val==0, if odd the XOR result is val==1. +*/ + +for (int i =0 ; i < cximsd->nr_maps; i++) { +if (!cximsd->xormaps[i]) +continue ; + pos =__ffs (cximsd->xormaps[i]); + val = (hweight64 (hpa & cximsd->xormaps[i]) &1 ); + hpa = (hpa & ~(1ULL << pos)) | (val << pos); + } + +return hpa; +} +struct cxl_cxims_context {struct device *dev;struct cxl_root_decoder *cxlrd;@@ -362,6 +399,7 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws*cfmws,
drivers/cxl/acpi.c static int __cxl_parse_cfmws(struct acpi_cedt_cfmws
Quoted 8 lines
drivers/cxl/acpi.c +1
-0struct cxl_cxims_context cxims_ctx;struct device *dev = ctx->dev;cxl_calc_hb_fn cxl_calc_hb; +cxl_translate_fn translate;struct cxl_decoder *cxld;unsigned int ways, i, ig;int rc;@@ -389,13 +427,17 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws*cfmws,
drivers/cxl/acpi.c static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws,
Quoted 4 lines
drivers/cxl/acpi.c +0
-1if (rc)return rc; - if (cfmws->interleave_arithmetic ==
ACPI_CEDT_CFMWS_ARITHMETIC_MODULO)drivers/cxl/acpi.c static int __cxl_parse_cfmws(struct acpi_cedt_cfmws · line 430
Quoted 1 line
drivers/cxl/acpi.c +1
-0+ if (cfmws->interleave_arithmetic ==
ACPI_CEDT_CFMWS_ARITHMETIC_MODULO) {drivers/cxl/acpi.c static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws,
Quoted 12 lines
drivers/cxl/acpi.c +6
-2cxl_calc_hb = cxl_hb_modulo; - else + translate =NULL ; + + }else { cxl_calc_hb = cxl_hb_xor; + translate = cxl_xor_translate; + } struct cxl_root_decoder *cxlrd __free(put_cxlrd) = -cxl_root_decoder_alloc (root_port, ways, cxl_calc_hb); + cxl_root_decoder_alloc(root_port, ways, cxl_calc_hb,translate);
drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port
Quoted 8 lines
drivers/cxl/acpi.c +0
-0if (IS_ERR (cxlrd))return PTR_ERR (cxlrd);drivers/cxl/core/port.c +0
-0@@ -1808,6 +1808,7 @@ static int cxl_switch_decoder_init(struct cxl_port*port,
drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port *port,
Quoted 7 lines
drivers/cxl/core/port.c +1
-0* @port: owning CXL root of this decoder * @nr_targets: static number of downstream targets * @calc_hb: which host bridge covers the n'th position by granularity +* @translate: decoder specific address translation function * * Return: A new cxl decoder to be registered by cxl_decoder_add(). A * 'CXL root' decoder is one that decodes from a top-level / static platform
drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port
Quoted 1 line
drivers/cxl/core/port.c +0
-0@@ -1816,7 +1817,8 @@ static int cxl_switch_decoder_init(struct cxl_port*port,
drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port *port,
Quoted 3 lines
drivers/cxl/core/port.c +0
-0*/ struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port, unsignedint
nr_targets,drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port · line 1819
Quoted 1 line
drivers/cxl/core/port.c +0
-1-
cxl_calc_hb_fncalc_hb)
Quoted 8 lines
drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port · line 1820
Quoted 1 line
drivers/cxl/core/port.c +1
-0+
cxl_calc_hb_fncalc_hb,drivers/cxl/core/port.c static int cxl_switch_decoder_init(struct cxl_port · line 1821
Quoted 1 line
drivers/cxl/core/port.c +1
-0+
cxl_translate_fntranslate)drivers/cxl/core/port.c struct cxl_root_decoder
Quoted 4 lines
drivers/cxl/core/port.c +0
-0{struct cxl_root_decoder *cxlrd;struct cxl_switch_decoder *cxlsd;@@ -1839,6 +1841,7 @@ struct cxl_root_decoder
*cxl_root_decoder_alloc(struct
Quoted 7 lines
cxl_port*port,Quoted 6 lines
drivers/cxl/core/port.c +1
-0} cxlrd->calc_hb = calc_hb; + cxlrd->translate = translate;mutex_init (&cxlrd->range_lock);
Quoted 11 lines
drivers/cxl/core/region.c struct cxl_region *cxl_dpa_to_region(const struct
Quoted 6 lines
drivers/cxl/core/port.c +0
-0cxld = &cxlsd->cxld;drivers/cxl/core/region.c +0
-0@@ -2723,20 +2723,13 @@ struct cxl_region *cxl_dpa_to_region(const struct
cxl_memdev*cxlmd, u64 dpa)Quoted 4 lines
drivers/cxl/core/region.c +0
-1return ctx.cxlr; } -static bool cxl_is_hpa_in_range(u64 hpa, struct cxl_region *cxlr, int
pos)
Quoted 1 line
drivers/cxl/core/region.c struct cxl_region *cxl_dpa_to_region(const struct · line 2726
Quoted 1 line
drivers/cxl/core/region.c +1
-0+static bool cxl_is_hpa_in_chunk(u64 hpa, struct cxl_region *cxlr, int
pos)
Quoted 11 lines
drivers/cxl/core/region.c struct cxl_region *cxl_dpa_to_region(const struct cxl_memdev *cxlmd, u64 dpa)
Quoted 10 lines
drivers/cxl/core/region.c +0
-4{struct cxl_region_params *p = &cxlr->params;int gran = p->interleave_granularity;int ways = p->interleave_ways;u64 offset; -/* Is the hpa within this region at all */ -if (hpa < p->res->start || hpa > p->res->end) { - dev_dbg(&cxlr->dev, - "Addr trans fail: hpa 0x%llx not inregion\n", hpa);
Quoted 9 lines
drivers/cxl/core/region.c static bool cxl_is_hpa_in_range(u64 hpa, struct
Quoted 7 lines
drivers/cxl/core/region.c +0
-3-return false; - } -/* Is the hpa in an expected chunk for its pos(-ition) */ offset = hpa - p->res->start; offset =do_div (offset, gran * ways);@@ -2752,6 +2745,7 @@ static bool cxl_is_hpa_in_range(u64 hpa, struct
cxl_region*cxlr, int pos)Quoted 1 line
drivers/cxl/core/region.c +0
-0u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const struct cxl_memdev
*cxlmd,
Quoted 21 lines
drivers/cxl/core/region.c u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const
Quoted 8 lines
drivers/cxl/core/region.c +1
-0u64 dpa) { +struct cxl_root_decoder *cxlrd =to_cxl_root_decoder (cxlr- dev.parent);u64 dpa_offset, hpa_offset, bits_upper, mask_upper, hpa;struct cxl_region_params *p = &cxlr->params;drivers/cxl/core/region.c +0
-0struct cxl_endpoint_decoder *cxled =NULL ;@@ -2801,7 +2795,17 @@ u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, conststruct
cxl_memdev*cxlmd,drivers/cxl/core/region.c u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const struct cxl_memdev *cxlmd,
Quoted 11 lines
drivers/cxl/core/region.c +7
-1/* Apply the hpa_offset to the region base address */ hpa = hpa_offset + p->res->start; -if (!cxl_is_hpa_in_range (hpa, cxlr, cxled->pos)) +/* Root decoder translation overrides typical modulo decode */ +if (cxlrd->translate) + hpa = cxlrd->translate (cxlrd, hpa); + +if (hpa < p->res->start || hpa > p->res->end) { + dev_dbg(&cxlr->dev, + "Addr trans fail: hpa 0x%llx not inregion\n", hpa);
Quoted 8 lines
drivers/cxl/core/region.c u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const struct cxl_memdev *cxlmd, · line 2809
Quoted 5 lines
drivers/cxl/core/region.c +4
-0+return ULLONG_MAX ; + } + +if (!cxlrd->translate && (!cxl_is_hpa_in_chunk (hpa, cxlr, pos)))return ULLONG_MAX ;I needed some time to understand this. It was not immediately clear why, for XOR translations, this chunk check is skipped.
Sorry, I wanted to say for "no translations" (i.e., for !cxlrd->translate) but with copy-paste something went wrong.
Fabio
Quoted 2 lines
Wouldn't it be helpful to add a comment to explain why that check is
skipped?
Quoted 6 lines
Thanks,
Fabio
Quoted 1 line
Quoted 8 lines
drivers/cxl/cxl.h struct cxl_switch_decoder { · line 435
Quoted 8 lines
drivers/cxl/core/region.c +0
-0return hpa;drivers/cxl/cxl.h +0
-0@@ -434,12 +434,14 @@ struct cxl_switch_decoder {struct cxl_root_decoder ; typedef struct cxl_dport *(*cxl_calc_hb_fn)(struct cxl_root_decoder
*cxlrd,
Quoted 25 lines
Quoted 21 lines
drivers/cxl/cxl.h +3
-0int pos); +typedef u64 (*cxl_translate_fn )(struct cxl_root_decoder *cxlrd,u64 hpa);/** * struct cxl_root_decoder - Static platform CXL address 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 +* @translate: decoder specific address translation function * @platform_data: platform specific configuration data * @range_lock: sync region autodiscovery by address range * @qos_class: QoS performance class cookie @@ -449,6 +451,7 @@ struct cxl_root_decoder {struct resource *res;atomic_t region_id;cxl_calc_hb_fn calc_hb; +cxl_translate_fn translate;void *platform_data;struct mutex range_lock;int qos_class;drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev); · line 778
Quoted 3 lines
drivers/cxl/cxl.h +0
-0@@ -773,7 +776,8 @@ bool is_switch_decoder(struct device *dev);bool is_endpoint_decoder (struct device *dev);struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port, unsignedint
nr_targets,
Quoted 8 lines
drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev); · line 776
Quoted 1 line
drivers/cxl/cxl.h +0
-1-
cxl_calc_hb_fncalc_hb);drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev); · line 779
Quoted 1 line
drivers/cxl/cxl.h +1
-0+
cxl_calc_hb_fncalc_hb,drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev); · line 780
Quoted 1 line
drivers/cxl/cxl.h +1
-0+
cxl_translate_fntranslate);Quoted 2 lines
drivers/cxl/cxl.h +0
-0struct cxl_dport *cxl_hb_modulo (struct cxl_root_decoder *cxlrd,int pos); struct cxl_switch_decoder *cxl_switch_decoder_alloc(struct cxl_port
*port,
Quoted 5 lines
Quoted 1 line
unsigned int
nr_targets);Quoted 1 line
Alison Schofield
maintainerRe: [PATCH v3 2/4] cxl: Restore XOR'd position bits during address translation
In reply to Fabio M. De FrancescoQuoted 8 lines · Fabio M. De Francesco
Quoted 2 lines · On Tuesday, June 25, 2024 2:55:53 AM GMT+2 [email protected] wrote:
From: Alison Schofield <[email protected]>
Hi Alison,
Below I have two questions...
Thanks for reviewing -
snip
Quoted 4 lines
Quoted 2 lines
A cxl-test unit test of address translations is in upstream review.
Would it be helpful to provide a link to the test?
Sure. Will add lore link in next rev.
snip
Quoted 2 lines
Quoted 2 lines
+
How about this comment:
/* Predictable chunk guarantee only applies to modulo decodes */
Quoted 7 lines
drivers/cxl/core/region.c u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const struct cxl_memdev *cxlmd, · line 2809
Quoted 2 lines
drivers/cxl/core/region.c +1
-0+if (!cxlrd->translate && (!cxl_is_hpa_in_chunk (hpa, cxlr, pos)))return ULLONG_MAX ;I needed some time to understand this. It was not immediately clear why, for XOR translations, this chunk check is skipped.
Wouldn't it be helpful to add a comment to explain why that check is skipped
Beyond that comment, I'd like readers to use git blame and look at at the commit log:
A second check confirms that the HPA is within an expected chunk
based on the endpoints position in the region and the region granularity. An XOR decode disrupts the Modulo pattern making the chunk check useless.
I'm intentionally avoiding making the CXL driver and it's documentation the source of XOR interleave education.
Quoted 54 lines
Thanks,
Fabio
Quoted 30 lines
drivers/cxl/core/region.c +0
-0return hpa;drivers/cxl/cxl.h +3
-0@@ -434,12 +434,14 @@ struct cxl_switch_decoder {struct cxl_root_decoder ;typedef struct cxl_dport *(*cxl_calc_hb_fn )(struct cxl_root_decoder *cxlrd,int pos); +typedef u64 (*cxl_translate_fn )(struct cxl_root_decoder *cxlrd,u64 hpa);/** * struct cxl_root_decoder - Static platform CXL address 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 +* @translate: decoder specific address translation function * @platform_data: platform specific configuration data * @range_lock: sync region autodiscovery by address range * @qos_class: QoS performance class cookie @@ -449,6 +451,7 @@ struct cxl_root_decoder {struct resource *res;atomic_t region_id;cxl_calc_hb_fn calc_hb; +cxl_translate_fn translate;void *platform_data;struct mutex range_lock;int qos_class;drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev); · line 778
Quoted 3 lines
drivers/cxl/cxl.h +0
-0@@ -773,7 +776,8 @@ bool is_switch_decoder(struct device *dev);bool is_endpoint_decoder (struct device *dev);struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port, unsignedint
nr_targets,drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev); · line 776
Quoted 1 line
drivers/cxl/cxl.h +0
-1-
cxl_calc_hb_fncalc_hb);drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev); · line 779
Quoted 1 line
drivers/cxl/cxl.h +1
-0+
cxl_calc_hb_fncalc_hb,drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev); · line 780
Quoted 1 line
drivers/cxl/cxl.h +1
-0+
cxl_translate_fntranslate);drivers/cxl/cxl.h bool is_switch_decoder(struct device *dev);
Quoted 3 lines
drivers/cxl/cxl.h +0
-0struct cxl_dport *cxl_hb_modulo (struct cxl_root_decoder *cxlrd,int pos); struct cxl_switch_decoder *cxl_switch_decoder_alloc(struct cxl_port *port,unsigned int
nr_targets);Quoted 1 line