| Message ID | 20220128002707.391076-8-ben.widawsky@intel.com |
|---|---|
| State | New, archived |
| Headers | show |
| Series | CXL Region driver | expand |
On Thu, Jan 27, 2022 at 4:27 PM Ben Widawsky <ben.widawsky@intel.com> wrote: > > Cross host bridge verification primarily determines if the requested > interleave ordering can be achieved by the root decoder, which isn't as > programmable as other decoders. I don't understand that comment. Are you talking about the CFMWS static decoders that can not be programmed at all, or the 1st level decoders beneath that. > The algorithm implemented here is based on the CXL Type 3 Memory Device > Software Guide, chapter 2.13.14 Just spell out the support here and don't require the reader to read that other doc to understand if it follows it exactly, or takes some liberties. I.e. the assumptions and tradeoffs built into the design choices in the patch need to be spelled out here. > > Signed-off-by: Ben Widawsky <ben.widawsky@intel.com> > --- > Changes since v2: > - Fail earlier on lack of host bridges. This should only be capable as > of now with cxl_test memdevs. > --- > .clang-format | 2 + > drivers/cxl/cxl.h | 13 +++++++ > drivers/cxl/region.c | 89 +++++++++++++++++++++++++++++++++++++++++++- > 3 files changed, 103 insertions(+), 1 deletion(-) > > diff --git a/.clang-format b/.clang-format > index fa959436bcfd..1221d53be90b 100644 > --- a/.clang-format > +++ b/.clang-format > @@ -169,6 +169,8 @@ ForEachMacros: > - 'for_each_cpu_and' > - 'for_each_cpu_not' > - 'for_each_cpu_wrap' > + - 'for_each_cxl_decoder_target' > + - 'for_each_cxl_endpoint' > - 'for_each_dapm_widgets' > - 'for_each_dev_addr' > - 'for_each_dev_scope' > diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h > index b300673072f5..a291999431c7 100644 > --- a/drivers/cxl/cxl.h > +++ b/drivers/cxl/cxl.h > @@ -81,6 +81,19 @@ static inline int cxl_to_interleave_ways(u8 eniw) > } > } > > +static inline u8 cxl_to_eniw(u8 ways) > +{ > + if (is_power_of_2(ways)) > + return ilog2(ways); > + > + return ways / 3 + 8; > +} > + > +static inline u8 cxl_to_ig(u16 g) > +{ > + return ilog2(g) - 8; > +} These need better names to not be confused with the reverse helpers. How about interleave_ways_to_cxl_iw() and interleave_granularity_to_cxl_ig()? > + > static inline bool cxl_is_interleave_ways_valid(int iw) > { > switch (iw) { > diff --git a/drivers/cxl/region.c b/drivers/cxl/region.c > index 5588873dd250..562c8720da56 100644 > --- a/drivers/cxl/region.c > +++ b/drivers/cxl/region.c > @@ -29,6 +29,17 @@ > > #define region_ways(region) ((region)->config.interleave_ways) > #define region_granularity(region) ((region)->config.interleave_granularity) > +#define region_eniw(region) (cxl_to_eniw(region_ways(region))) > +#define region_ig(region) (cxl_to_ig(region_granularity(region))) This feels like too much indirection... > + > +#define for_each_cxl_endpoint(ep, region, idx) \ > + for (idx = 0, ep = (region)->config.targets[idx]; \ > + idx < region_ways(region); ep = (region)->config.targets[++idx]) Is the macro really buying anything in terms of readability? for (i = 0; i < region->interleave_ways; i++) ...looks ok to me. > + > +#define for_each_cxl_decoder_target(dport, decoder, idx) \ > + for (idx = 0, dport = (decoder)->target[idx]; \ > + idx < (decoder)->nr_targets - 1; \ > + dport = (decoder)->target[++idx]) Doesn't this need locking to protect against target array updates? Another detail that might be less obfuscated with an open coded loop. I would only expect a new for_each() macro when the iterator is a function call, not a simple array de-reference with an incremented index. > > static struct cxl_decoder *rootd_from_region(struct cxl_region *cxlr) > { > @@ -195,6 +206,30 @@ static bool qtg_match(const struct cxl_decoder *rootd, > return true; > } > > +static int get_unique_hostbridges(const struct cxl_region *cxlr, > + struct cxl_port **hbs) > +{ > + struct cxl_memdev *ep; > + int i, hb_count = 0; > + > + for_each_cxl_endpoint(ep, cxlr, i) { > + struct cxl_port *hb = get_hostbridge(ep); > + bool found = false; > + int j; > + > + BUG_ON(!hb); Doesn't seem like a reason to crash the kernel. > + > + for (j = 0; j < hb_count; j++) { > + if (hbs[j] == hb) > + found = true; > + } > + if (!found) > + hbs[hb_count++] = hb; > + } > + > + return hb_count; > +} > + > /** > * region_xhb_config_valid() - determine cross host bridge validity > * @cxlr: The region being programmed > @@ -208,7 +243,59 @@ static bool qtg_match(const struct cxl_decoder *rootd, > static bool region_xhb_config_valid(const struct cxl_region *cxlr, > const struct cxl_decoder *rootd) > { > - /* TODO: */ > + const int rootd_eniw = cxl_to_eniw(rootd->interleave_ways); > + const int rootd_ig = cxl_to_ig(rootd->interleave_granularity); > + const int cxlr_ig = region_ig(cxlr); > + const int cxlr_iw = region_ways(cxlr); > + struct cxl_port *hbs[CXL_DECODER_MAX_INTERLEAVE]; I'm worried about the stack usage of this. 0day has not complained yet, but is it necessary to collect everything into an array versus having a helper that does the lookup based on an index? It's not like cxl_region_probe() is a fast path. > + struct cxl_dport *target; > + int i; > + > + i = get_unique_hostbridges(cxlr, hbs); > + if (dev_WARN_ONCE(&cxlr->dev, i == 0, "Cannot find a valid host bridge\n")) Doesn't seem like a reason to crash the kernel. At least the topology basics like this can be validated at target assignment time. > + return false; > + > + /* Are all devices in this region on the same CXL host bridge */ > + if (i == 1) > + return true; Doesn't this also need to check that the decoder is not interleaved across host bridges? > + > + /* CFMWS.HBIG >= Device.Label.IG */ > + if (rootd_ig < cxlr_ig) { > + dev_dbg(&cxlr->dev, > + "%s HBIG must be greater than region IG (%d < %d)\n", > + dev_name(&rootd->dev), rootd_ig, cxlr_ig); > + return false; > + } > + > + /* > + * ((2^(CFMWS.HBIG - Device.RLabel.IG) * (2^CFMWS.ENIW)) > Device.RLabel.NLabel) > + * > + * XXX: 2^CFMWS.ENIW is trying to decode the NIW. Instead, use the look > + * up function which supports non power of 2 interleave configurations. > + */ > + if (((1 << (rootd_ig - cxlr_ig)) * (1 << rootd_eniw)) > cxlr_iw) { Now here is where some helper macros could make things more readable. This looks like an acronym soup despite me being familiar with the CXL spec. > + dev_dbg(&cxlr->dev, > + "granularity ratio requires a larger number of devices (%d) than currently configured (%d)\n", > + ((1 << (rootd_ig - cxlr_ig)) * (1 << rootd_eniw)), > + cxlr_iw); > + return false; > + } > + > + /* > + * CFMWS.InterleaveTargetList[n] must contain all devices, x where: > + * (Device[x],RegionLabel.Position >> (CFMWS.HBIG - > + * Device[x].RegionLabel.InterleaveGranularity)) & > + * ((2^CFMWS.ENIW) - 1) = n > + */ > + for_each_cxl_decoder_target(target, rootd, i) { > + if (((i >> (rootd_ig - cxlr_ig))) & > + (((1 << rootd_eniw) - 1) != target->port_id)) { > + dev_dbg(&cxlr->dev, > + "One or more devices are not connected to the correct hostbridge.\n"); > + return false; > + } > + } > + > return true; > } > > -- > 2.35.0 >
diff --git a/.clang-format b/.clang-format index fa959436bcfd..1221d53be90b 100644 --- a/.clang-format +++ b/.clang-format @@ -169,6 +169,8 @@ ForEachMacros: - 'for_each_cpu_and' - 'for_each_cpu_not' - 'for_each_cpu_wrap' + - 'for_each_cxl_decoder_target' + - 'for_each_cxl_endpoint' - 'for_each_dapm_widgets' - 'for_each_dev_addr' - 'for_each_dev_scope' diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index b300673072f5..a291999431c7 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -81,6 +81,19 @@ static inline int cxl_to_interleave_ways(u8 eniw) } } +static inline u8 cxl_to_eniw(u8 ways) +{ + if (is_power_of_2(ways)) + return ilog2(ways); + + return ways / 3 + 8; +} + +static inline u8 cxl_to_ig(u16 g) +{ + return ilog2(g) - 8; +} + static inline bool cxl_is_interleave_ways_valid(int iw) { switch (iw) { diff --git a/drivers/cxl/region.c b/drivers/cxl/region.c index 5588873dd250..562c8720da56 100644 --- a/drivers/cxl/region.c +++ b/drivers/cxl/region.c @@ -29,6 +29,17 @@ #define region_ways(region) ((region)->config.interleave_ways) #define region_granularity(region) ((region)->config.interleave_granularity) +#define region_eniw(region) (cxl_to_eniw(region_ways(region))) +#define region_ig(region) (cxl_to_ig(region_granularity(region))) + +#define for_each_cxl_endpoint(ep, region, idx) \ + for (idx = 0, ep = (region)->config.targets[idx]; \ + idx < region_ways(region); ep = (region)->config.targets[++idx]) + +#define for_each_cxl_decoder_target(dport, decoder, idx) \ + for (idx = 0, dport = (decoder)->target[idx]; \ + idx < (decoder)->nr_targets - 1; \ + dport = (decoder)->target[++idx]) static struct cxl_decoder *rootd_from_region(struct cxl_region *cxlr) { @@ -195,6 +206,30 @@ static bool qtg_match(const struct cxl_decoder *rootd, return true; } +static int get_unique_hostbridges(const struct cxl_region *cxlr, + struct cxl_port **hbs) +{ + struct cxl_memdev *ep; + int i, hb_count = 0; + + for_each_cxl_endpoint(ep, cxlr, i) { + struct cxl_port *hb = get_hostbridge(ep); + bool found = false; + int j; + + BUG_ON(!hb); + + for (j = 0; j < hb_count; j++) { + if (hbs[j] == hb) + found = true; + } + if (!found) + hbs[hb_count++] = hb; + } + + return hb_count; +} + /** * region_xhb_config_valid() - determine cross host bridge validity * @cxlr: The region being programmed @@ -208,7 +243,59 @@ static bool qtg_match(const struct cxl_decoder *rootd, static bool region_xhb_config_valid(const struct cxl_region *cxlr, const struct cxl_decoder *rootd) { - /* TODO: */ + const int rootd_eniw = cxl_to_eniw(rootd->interleave_ways); + const int rootd_ig = cxl_to_ig(rootd->interleave_granularity); + const int cxlr_ig = region_ig(cxlr); + const int cxlr_iw = region_ways(cxlr); + struct cxl_port *hbs[CXL_DECODER_MAX_INTERLEAVE]; + struct cxl_dport *target; + int i; + + i = get_unique_hostbridges(cxlr, hbs); + if (dev_WARN_ONCE(&cxlr->dev, i == 0, "Cannot find a valid host bridge\n")) + return false; + + /* Are all devices in this region on the same CXL host bridge */ + if (i == 1) + return true; + + /* CFMWS.HBIG >= Device.Label.IG */ + if (rootd_ig < cxlr_ig) { + dev_dbg(&cxlr->dev, + "%s HBIG must be greater than region IG (%d < %d)\n", + dev_name(&rootd->dev), rootd_ig, cxlr_ig); + return false; + } + + /* + * ((2^(CFMWS.HBIG - Device.RLabel.IG) * (2^CFMWS.ENIW)) > Device.RLabel.NLabel) + * + * XXX: 2^CFMWS.ENIW is trying to decode the NIW. Instead, use the look + * up function which supports non power of 2 interleave configurations. + */ + if (((1 << (rootd_ig - cxlr_ig)) * (1 << rootd_eniw)) > cxlr_iw) { + dev_dbg(&cxlr->dev, + "granularity ratio requires a larger number of devices (%d) than currently configured (%d)\n", + ((1 << (rootd_ig - cxlr_ig)) * (1 << rootd_eniw)), + cxlr_iw); + return false; + } + + /* + * CFMWS.InterleaveTargetList[n] must contain all devices, x where: + * (Device[x],RegionLabel.Position >> (CFMWS.HBIG - + * Device[x].RegionLabel.InterleaveGranularity)) & + * ((2^CFMWS.ENIW) - 1) = n + */ + for_each_cxl_decoder_target(target, rootd, i) { + if (((i >> (rootd_ig - cxlr_ig))) & + (((1 << rootd_eniw) - 1) != target->port_id)) { + dev_dbg(&cxlr->dev, + "One or more devices are not connected to the correct hostbridge.\n"); + return false; + } + } + return true; }
Cross host bridge verification primarily determines if the requested interleave ordering can be achieved by the root decoder, which isn't as programmable as other decoders. The algorithm implemented here is based on the CXL Type 3 Memory Device Software Guide, chapter 2.13.14 Signed-off-by: Ben Widawsky <ben.widawsky@intel.com> --- Changes since v2: - Fail earlier on lack of host bridges. This should only be capable as of now with cxl_test memdevs. --- .clang-format | 2 + drivers/cxl/cxl.h | 13 +++++++ drivers/cxl/region.c | 89 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 103 insertions(+), 1 deletion(-)