From: Dave Jiang <dave.jiang@intel.com>
To: alison.schofield@intel.com,
Dan Williams <dan.j.williams@intel.com>,
Ira Weiny <ira.weiny@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Ben Widawsky <bwidawsk@kernel.org>
Cc: linux-cxl@vger.kernel.org,
Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: Re: [PATCH v5 10/12] tools/testing/cxl: Use injected poison for get poison list
Date: Fri, 31 Mar 2023 12:16:13 -0700 [thread overview]
Message-ID: <12774750-1b79-a488-c03c-ea63b9b0ea86@intel.com> (raw)
In-Reply-To: <ff7b560914fbb6e1a28705ad249cd40145832e3b.1679892337.git.alison.schofield@intel.com>
On 3/26/23 10:03 PM, alison.schofield@intel.com wrote:
> From: Alison Schofield <alison.schofield@intel.com>
>
> 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: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> ---
> tools/testing/cxl/test/mem.c | 59 ++++++++++++++++++++++++------------
> 1 file changed, 40 insertions(+), 19 deletions(-)
>
> diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c
> index 720147c7cb2b..9658d95236b7 100644
> --- a/tools/testing/cxl/test/mem.c
> +++ b/tools/testing/cxl/test/mem.c
> @@ -912,31 +912,52 @@ static struct mock_poison {
> u64 dpa;
> } mock_poison_list[MOCK_INJECT_TEST_MAX];
>
> +static struct cxl_mbox_poison_payload_out
> +*cxl_get_injected_po(struct cxl_dev_state *cxlds, u64 offset, u64 length)
> +{
> + struct cxl_mbox_poison_payload_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_payload_in *pi = cmd->payload_in;
> + struct cxl_mbox_poison_payload_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_payload_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),
> - },
> - };
> + po = cxl_get_injected_po(cxlds, offset, length);
> + 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);
>
> - if (cmd->size_out < sizeof(mock_plist))
> - return -EINVAL;
> -
> - memcpy(cmd->payload_out, &mock_plist, sizeof(mock_plist));
> - cmd->size_out = sizeof(mock_plist);
> return 0;
> }
>
next prev parent reply other threads:[~2023-03-31 19:16 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-27 5:03 [PATCH v5 0/12] cxl: CXL Inject & Clear Poison alison.schofield
2023-03-27 5:03 ` [PATCH v5 01/12] cxl/memdev: Add support for the Inject Poison mailbox command alison.schofield
2023-03-30 18:47 ` Jonathan Cameron
2023-03-31 18:11 ` Dave Jiang
2023-03-31 18:52 ` Alison Schofield
2023-03-27 5:03 ` [PATCH v5 02/12] cxl/memdev: Add support for the Clear " alison.schofield
2023-03-30 18:50 ` Jonathan Cameron
2023-03-30 20:12 ` Alison Schofield
2023-04-03 14:08 ` Jonathan Cameron
2023-03-31 18:40 ` Dave Jiang
2023-03-31 19:55 ` Alison Schofield
2023-03-31 21:18 ` Dave Jiang
2023-03-27 5:03 ` [PATCH v5 03/12] cxl/memdev: Warn of poison inject or clear to a mapped region alison.schofield
2023-03-30 18:55 ` Jonathan Cameron
2023-04-11 17:43 ` Alison Schofield
2023-04-13 17:07 ` Jonathan Cameron
2023-03-27 5:03 ` [PATCH v5 04/12] cxl/memdev: Trace inject and clear poison as cxl_poison events alison.schofield
2023-03-30 19:03 ` Jonathan Cameron
2023-03-31 18:53 ` Dave Jiang
2023-03-27 5:03 ` [PATCH v5 05/12] cxl/mem: Add debugfs attributes for poison inject and clear alison.schofield
2023-03-30 18:58 ` Jonathan Cameron
2023-03-27 5:03 ` [PATCH v5 06/12] cxl/memdev: Make inject and clear poison cmds kernel exclusive alison.schofield
2023-03-31 19:10 ` Dave Jiang
2023-03-27 5:03 ` [PATCH v5 07/12] cxl/mbox: Block inject and clear poison opcodes in raw mode alison.schofield
2023-03-31 19:10 ` Dave Jiang
2023-03-27 5:03 ` [PATCH v5 08/12] tools/testing/cxl: Mock the Inject Poison mailbox command alison.schofield
2023-03-31 19:13 ` Dave Jiang
2023-03-27 5:03 ` [PATCH v5 09/12] tools/testing/cxl: Mock the Clear " alison.schofield
2023-03-31 19:15 ` Dave Jiang
2023-03-27 5:03 ` [PATCH v5 10/12] tools/testing/cxl: Use injected poison for get poison list alison.schofield
2023-03-31 19:16 ` Dave Jiang [this message]
2023-03-27 5:03 ` [PATCH v5 11/12] tools/testing/cxl: Add a sysfs attr to test poison inject limits alison.schofield
2023-03-31 19:18 ` Dave Jiang
2023-03-27 5:03 ` [PATCH v5 12/12] tools/testing/cxl: Require CONFIG_DEBUG_FS alison.schofield
2023-03-31 19:20 ` Dave Jiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=12774750-1b79-a488-c03c-ea63b9b0ea86@intel.com \
--to=dave.jiang@intel.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=alison.schofield@intel.com \
--cc=bwidawsk@kernel.org \
--cc=dan.j.williams@intel.com \
--cc=ira.weiny@intel.com \
--cc=linux-cxl@vger.kernel.org \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).