Skip to content

Commit ee2d72b

Browse files
committed
cxl/region: Read existing extents on region creation
Dynamic capacity device extents may be left in an accepted state on a device due to an unexpected host crash. In this case it is expected that the creation of a new region on top of a DC partition can read those extents and surface them for continued use. Once all endpoint decoders are part of a region and the region is being realized, a read of the 'devices extent list' can reveal these previously accepted extents. CXL r3.1 specifies the mailbox call Get Dynamic Capacity Extent List for this purpose. The call returns all the extents for all dynamic capacity partitions. If the fabric manager is adding extents to any DCD partition, the extent list for the recovered region may change. In this case the query must retry. Upon retry the query could encounter extents which were accepted on a previous list query. Adding such extents is ignored without error because they are entirely within a previous accepted extent. Instead warn on this case to allow for differentiating bad devices from this normal condition. Latch any errors to be bubbled up to ensure notification to the user even if individual errors are rate limited or otherwise ignored. The scan for existing extents races with the dax_cxl driver. This is synchronized through the region device lock. Extents which are found after the driver has loaded will surface through the normal notification path while extents seen prior to the driver are read during driver load. Based on an original patch by Navneet Singh. Reviewed-by: Jonathan Cameron <[email protected]> Reviewed-by: Fan Ni <[email protected]> Signed-off-by: Ira Weiny <[email protected]> --- Changes: [0day: fix extent count in GetExtent input payload] [iweiny: minor clean ups] [iweiny: Adjust for partition arch]
1 parent add0d16 commit ee2d72b

File tree

4 files changed

+156
-0
lines changed

4 files changed

+156
-0
lines changed

drivers/cxl/core/core.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ cxled_to_mds(struct cxl_endpoint_decoder *cxled)
2222
return container_of(cxlds, struct cxl_memdev_state, cxlds);
2323
}
2424

25+
int cxl_process_extent_list(struct cxl_endpoint_decoder *cxled);
2526
int cxl_region_invalidate_memregion(struct cxl_region *cxlr);
2627

2728
#ifdef CONFIG_CXL_REGION

drivers/cxl/core/mbox.c

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,6 +1737,115 @@ int cxl_dev_dc_identify(struct cxl_mailbox *mbox,
17371737
}
17381738
EXPORT_SYMBOL_NS_GPL(cxl_dev_dc_identify, "CXL");
17391739

1740+
/* Return -EAGAIN if the extent list changes while reading */
1741+
static int __cxl_process_extent_list(struct cxl_endpoint_decoder *cxled)
1742+
{
1743+
u32 current_index, total_read, total_expected, initial_gen_num;
1744+
struct cxl_memdev_state *mds = cxled_to_mds(cxled);
1745+
struct cxl_mailbox *cxl_mbox = &mds->cxlds.cxl_mbox;
1746+
struct device *dev = mds->cxlds.dev;
1747+
struct cxl_mbox_cmd mbox_cmd;
1748+
u32 max_extent_count;
1749+
int latched_rc = 0;
1750+
bool first = true;
1751+
1752+
struct cxl_mbox_get_extent_out *extents __free(kvfree) =
1753+
kvmalloc(cxl_mbox->payload_size, GFP_KERNEL);
1754+
if (!extents)
1755+
return -ENOMEM;
1756+
1757+
total_read = 0;
1758+
current_index = 0;
1759+
total_expected = 0;
1760+
max_extent_count = (cxl_mbox->payload_size - sizeof(*extents)) /
1761+
sizeof(struct cxl_extent);
1762+
do {
1763+
u32 nr_returned, current_total, current_gen_num;
1764+
struct cxl_mbox_get_extent_in get_extent;
1765+
int rc;
1766+
1767+
get_extent = (struct cxl_mbox_get_extent_in) {
1768+
.extent_cnt = cpu_to_le32(max(max_extent_count,
1769+
total_expected - current_index)),
1770+
.start_extent_index = cpu_to_le32(current_index),
1771+
};
1772+
1773+
mbox_cmd = (struct cxl_mbox_cmd) {
1774+
.opcode = CXL_MBOX_OP_GET_DC_EXTENT_LIST,
1775+
.payload_in = &get_extent,
1776+
.size_in = sizeof(get_extent),
1777+
.size_out = cxl_mbox->payload_size,
1778+
.payload_out = extents,
1779+
.min_out = 1,
1780+
};
1781+
1782+
rc = cxl_internal_send_cmd(cxl_mbox, &mbox_cmd);
1783+
if (rc < 0)
1784+
return rc;
1785+
1786+
/* Save initial data */
1787+
if (first) {
1788+
total_expected = le32_to_cpu(extents->total_extent_count);
1789+
initial_gen_num = le32_to_cpu(extents->generation_num);
1790+
first = false;
1791+
}
1792+
1793+
nr_returned = le32_to_cpu(extents->returned_extent_count);
1794+
total_read += nr_returned;
1795+
current_total = le32_to_cpu(extents->total_extent_count);
1796+
current_gen_num = le32_to_cpu(extents->generation_num);
1797+
1798+
dev_dbg(dev, "Got extent list %d-%d of %d generation Num:%d\n",
1799+
current_index, total_read - 1, current_total, current_gen_num);
1800+
1801+
if (current_gen_num != initial_gen_num || total_expected != current_total) {
1802+
dev_warn(dev, "Extent list change detected; gen %u != %u : cnt %u != %u\n",
1803+
current_gen_num, initial_gen_num,
1804+
total_expected, current_total);
1805+
return -EAGAIN;
1806+
}
1807+
1808+
for (int i = 0; i < nr_returned ; i++) {
1809+
struct cxl_extent *extent = &extents->extent[i];
1810+
1811+
dev_dbg(dev, "Processing extent %d/%d\n",
1812+
current_index + i, total_expected);
1813+
1814+
rc = validate_add_extent(mds, extent);
1815+
if (rc)
1816+
latched_rc = rc;
1817+
}
1818+
1819+
current_index += nr_returned;
1820+
} while (total_expected > total_read);
1821+
1822+
return latched_rc;
1823+
}
1824+
1825+
#define CXL_READ_EXTENT_LIST_RETRY 10
1826+
1827+
/**
1828+
* cxl_process_extent_list() - Read existing extents
1829+
* @cxled: Endpoint decoder which is part of a region
1830+
*
1831+
* Issue the Get Dynamic Capacity Extent List command to the device
1832+
* and add existing extents if found.
1833+
*
1834+
* A retry of 10 is somewhat arbitrary, however, extent changes should be
1835+
* relatively rare while bringing up a region. So 10 should be plenty.
1836+
*/
1837+
int cxl_process_extent_list(struct cxl_endpoint_decoder *cxled)
1838+
{
1839+
int retry = CXL_READ_EXTENT_LIST_RETRY;
1840+
int rc;
1841+
1842+
do {
1843+
rc = __cxl_process_extent_list(cxled);
1844+
} while (rc == -EAGAIN && retry--);
1845+
1846+
return rc;
1847+
}
1848+
17401849
static void add_part(struct cxl_dpa_info *info, u64 start, u64 size, enum cxl_partition_mode mode)
17411850
{
17421851
int i = info->nr_partitions;

drivers/cxl/core/region.c

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3196,6 +3196,26 @@ static int devm_cxl_add_pmem_region(struct cxl_region *cxlr)
31963196
return rc;
31973197
}
31983198

3199+
static int cxlr_add_existing_extents(struct cxl_region *cxlr)
3200+
{
3201+
struct cxl_region_params *p = &cxlr->params;
3202+
int i, latched_rc = 0;
3203+
3204+
for (i = 0; i < p->nr_targets; i++) {
3205+
struct device *dev = &p->targets[i]->cxld.dev;
3206+
int rc;
3207+
3208+
rc = cxl_process_extent_list(p->targets[i]);
3209+
if (rc) {
3210+
dev_err(dev, "Existing extent processing failed %d\n",
3211+
rc);
3212+
latched_rc = rc;
3213+
}
3214+
}
3215+
3216+
return latched_rc;
3217+
}
3218+
31993219
static void cxlr_dax_unregister(void *_cxlr_dax)
32003220
{
32013221
struct cxl_dax_region *cxlr_dax = _cxlr_dax;
@@ -3231,6 +3251,11 @@ static int devm_cxl_add_dax_region(struct cxl_region *cxlr)
32313251
dev_dbg(&cxlr->dev, "%s: register %s\n", dev_name(dev->parent),
32323252
dev_name(dev));
32333253

3254+
if (cxlr->mode == CXL_PARTMODE_DYNAMIC_RAM_A)
3255+
if (cxlr_add_existing_extents(cxlr))
3256+
dev_err(&cxlr->dev, "Existing extent processing failed %d\n",
3257+
rc);
3258+
32343259
return devm_add_action_or_reset(&cxlr->dev, cxlr_dax_unregister,
32353260
cxlr_dax);
32363261
err:

drivers/cxl/cxlmem.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,27 @@ struct cxl_mbox_dc_response {
600600
} __packed extent_list[];
601601
} __packed;
602602

603+
/*
604+
* Get Dynamic Capacity Extent List; Input Payload
605+
* CXL rev 3.1 section 8.2.9.9.9.2; Table 8-166
606+
*/
607+
struct cxl_mbox_get_extent_in {
608+
__le32 extent_cnt;
609+
__le32 start_extent_index;
610+
} __packed;
611+
612+
/*
613+
* Get Dynamic Capacity Extent List; Output Payload
614+
* CXL rev 3.1 section 8.2.9.9.9.2; Table 8-167
615+
*/
616+
struct cxl_mbox_get_extent_out {
617+
__le32 returned_extent_count;
618+
__le32 total_extent_count;
619+
__le32 generation_num;
620+
u8 rsvd[4];
621+
struct cxl_extent extent[];
622+
} __packed;
623+
603624
struct cxl_mbox_get_supported_logs {
604625
__le16 entries;
605626
u8 rsvd[6];

0 commit comments

Comments
 (0)