tools/testing/cxl: Use injected poison for get poison list

Prior to poison inject support, the mock of 'Get Poison List'
returned a poison list containing a single mocked error record.

Following the addition of poison inject and clear support to the
mock driver, use the mock_poison_list[], rather than faking an
error record. Mock_poison_list[] list tracks the actual poison
inject and clear requests issued by userspace.

Signed-off-by: Alison Schofield <alison.schofield@intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/0f4242c81821f4982b02cb1009c22783ef66b2f1.1681874357.git.alison.schofield@intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c
index 3c3909d..8b053de 100644 (file)
--- a/tools/testing/cxl/test/mem.c
+++ b/tools/testing/cxl/test/mem.c
@@ -912,31 +912,55 @@ static struct mock_poison {
        u64 dpa;
 } mock_poison_list[MOCK_INJECT_TEST_MAX];
 
+static struct cxl_mbox_poison_out *
+cxl_get_injected_po(struct cxl_dev_state *cxlds, u64 offset, u64 length)
+{
+       struct cxl_mbox_poison_out *po;
+       int nr_records = 0;
+       u64 dpa;
+
+       po = kzalloc(struct_size(po, record, MOCK_INJECT_DEV_MAX), GFP_KERNEL);
+       if (!po)
+               return NULL;
+
+       for (int i = 0; i < MOCK_INJECT_TEST_MAX; i++) {
+               if (mock_poison_list[i].cxlds != cxlds)
+                       continue;
+               if (mock_poison_list[i].dpa < offset ||
+                   mock_poison_list[i].dpa > offset + length - 1)
+                       continue;
+
+               dpa = mock_poison_list[i].dpa + CXL_POISON_SOURCE_INJECTED;
+               po->record[nr_records].address = cpu_to_le64(dpa);
+               po->record[nr_records].length = cpu_to_le32(1);
+               nr_records++;
+               if (nr_records == MOCK_INJECT_DEV_MAX)
+                       break;
+       }
+
+       /* Always return count, even when zero */
+       po->count = cpu_to_le16(nr_records);
+
+       return po;
+}
+
 static int mock_get_poison(struct cxl_dev_state *cxlds,
                           struct cxl_mbox_cmd *cmd)
 {
        struct cxl_mbox_poison_in *pi = cmd->payload_in;
+       struct cxl_mbox_poison_out *po;
+       u64 offset = le64_to_cpu(pi->offset);
+       u64 length = le64_to_cpu(pi->length);
+       int nr_records;
 
-       /* Mock one poison record at pi.offset for 64 bytes */
-       struct {
-               struct cxl_mbox_poison_out po;
-               struct cxl_poison_record record;
-       } __packed mock_plist = {
-               .po = {
-                       .count = cpu_to_le16(1),
-               },
-               .record = {
-                       .length = cpu_to_le32(1),
-                       .address = cpu_to_le64(le64_to_cpu(pi->offset) +
-                                              CXL_POISON_SOURCE_INJECTED),
-               },
-       };
-
-       if (cmd->size_out < sizeof(mock_plist))
-               return -EINVAL;
+       po = cxl_get_injected_po(cxlds, offset, length);
+       if (!po)
+               return -ENOMEM;
+       nr_records = le16_to_cpu(po->count);
+       memcpy(cmd->payload_out, po, struct_size(po, record, nr_records));
+       cmd->size_out = struct_size(po, record, nr_records);
+       kfree(po);
 
-       memcpy(cmd->payload_out, &mock_plist, sizeof(mock_plist));
-       cmd->size_out = sizeof(mock_plist);
        return 0;
 }