Skip to content

Commit 863fdcc

Browse files
committed
tools/testing/cxl: Fix cxl_hdm_decode_init() calling convention
This failing signature: [ 8.392669] cxl_bus_probe: cxl_port endpoint2: probe: 970997760 [ 8.392670] cxl_port: probe of endpoint2 failed with error 970997760 [ 8.392719] create_endpoint: cxl_mem mem0: add: endpoint2 [ 8.392721] cxl_mem mem0: endpoint2 failed probe [ 8.392725] cxl_bus_probe: cxl_mem mem0: probe: -6 ...shows cxl_hdm_decode_init() resulting in a return code ("970997760") that looks like stack corruption. The problem goes away if cxl_hdm_decode_init() is not mocked via __wrap_cxl_hdm_decode_init(). The corruption results from the mismatch that the calling convention for cxl_hdm_decode_init() is: int cxl_hdm_decode_init(struct cxl_dev_state *cxlds, struct cxl_hdm *cxlhdm) ...and __wrap_cxl_hdm_decode_init() is: bool __wrap_cxl_hdm_decode_init(struct cxl_dev_state *cxlds, struct cxl_hdm *cxlhdm) ...i.e. an int is expected but __wrap_hdm_decode_init() returns bool. Fix the convention and cleanup the organization to match __wrap_cxl_await_media_ready() as the difference was a red herring that distracted from finding the bug. Fixes: 92804ed ("cxl/pci: Drop @info argument to cxl_hdm_decode_init()") Reviewed-by: Jonathan Cameron <[email protected]> Reviewed-by: Adam Manzanares <[email protected]> Link: https://lore.kernel.org/r/165603870776.551046.8709990108936497723.stgit@dwillia2-xfh Signed-off-by: Dan Williams <[email protected]>
1 parent e35f571 commit 863fdcc

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

tools/testing/cxl/test/mock.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,15 @@ int __wrap_cxl_await_media_ready(struct cxl_dev_state *cxlds)
208208
}
209209
EXPORT_SYMBOL_NS_GPL(__wrap_cxl_await_media_ready, CXL);
210210

211-
bool __wrap_cxl_hdm_decode_init(struct cxl_dev_state *cxlds,
212-
struct cxl_hdm *cxlhdm)
211+
int __wrap_cxl_hdm_decode_init(struct cxl_dev_state *cxlds,
212+
struct cxl_hdm *cxlhdm)
213213
{
214214
int rc = 0, index;
215215
struct cxl_mock_ops *ops = get_cxl_mock_ops(&index);
216216

217-
if (!ops || !ops->is_mock_dev(cxlds->dev))
217+
if (ops && ops->is_mock_dev(cxlds->dev))
218+
rc = 0;
219+
else
218220
rc = cxl_hdm_decode_init(cxlds, cxlhdm);
219221
put_cxl_mock_ops(index);
220222

0 commit comments

Comments
 (0)