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 08/12] tools/testing/cxl: Mock the Inject Poison mailbox command
Date: Fri, 31 Mar 2023 12:13:58 -0700 [thread overview]
Message-ID: <705756c5-c0e3-6758-e54b-5d8716de7132@intel.com> (raw)
In-Reply-To: <fc4ee78a1574ba5a0a7a7c2918af2c0d57012fd5.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>
>
> Mock the injection of poison by storing the device:address entries in
> mock_poison_list[]. Enforce a limit of 8 poison injections per memdev
> device and 128 total entries for the cxl_test mock driver.
>
> Introducing the mock_poison[] list here, makes it available for use in
> the mock of Clear Poison, and the mock of Get Poison List.
>
> 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 | 77 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 77 insertions(+)
>
> diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c
> index 2fa9c18d4c2c..4fca886e2a7c 100644
> --- a/tools/testing/cxl/test/mem.c
> +++ b/tools/testing/cxl/test/mem.c
> @@ -16,6 +16,9 @@
> #define DEV_SIZE SZ_2G
> #define EFFECT(x) (1U << x)
>
> +#define MOCK_INJECT_DEV_MAX 8
> +#define MOCK_INJECT_TEST_MAX 128
> +
> static struct cxl_cel_entry mock_cel[] = {
> {
> .opcode = cpu_to_le16(CXL_MBOX_OP_GET_SUPPORTED_LOGS),
> @@ -45,6 +48,10 @@ static struct cxl_cel_entry mock_cel[] = {
> .opcode = cpu_to_le16(CXL_MBOX_OP_GET_POISON),
> .effect = cpu_to_le16(0),
> },
> + {
> + .opcode = cpu_to_le16(CXL_MBOX_OP_INJECT_POISON),
> + .effect = cpu_to_le16(0),
> + },
> };
>
> /* See CXL 2.0 Table 181 Get Health Info Output Payload */
> @@ -474,6 +481,7 @@ static int mock_id(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> cpu_to_le64(SZ_256M / CXL_CAPACITY_MULTIPLIER),
> .total_capacity =
> cpu_to_le64(DEV_SIZE / CXL_CAPACITY_MULTIPLIER),
> + .inject_poison_limit = cpu_to_le16(MOCK_INJECT_DEV_MAX),
> };
>
> put_unaligned_le24(CXL_POISON_LIST_MAX, id.poison_list_max_mer);
> @@ -895,6 +903,11 @@ static int mock_health_info(struct cxl_dev_state *cxlds,
> return 0;
> }
>
> +static struct mock_poison {
> + struct cxl_dev_state *cxlds;
> + u64 dpa;
> +} mock_poison_list[MOCK_INJECT_TEST_MAX];
> +
> static int mock_get_poison(struct cxl_dev_state *cxlds,
> struct cxl_mbox_cmd *cmd)
> {
> @@ -923,6 +936,67 @@ static int mock_get_poison(struct cxl_dev_state *cxlds,
> return 0;
> }
>
> +static bool mock_poison_dev_max_injected(struct cxl_dev_state *cxlds)
> +{
> + int count = 0;
> +
> + for (int i = 0; i < MOCK_INJECT_TEST_MAX; i++) {
> + if (mock_poison_list[i].cxlds == cxlds)
> + count++;
> + }
> + return (count >= MOCK_INJECT_DEV_MAX);
> +}
> +
> +static bool mock_poison_add(struct cxl_dev_state *cxlds, u64 dpa)
> +{
> + if (mock_poison_dev_max_injected(cxlds)) {
> + dev_dbg(cxlds->dev,
> + "Device poison injection limit has been reached: %d\n",
> + MOCK_INJECT_DEV_MAX);
> + return false;
> + }
> +
> + for (int i = 0; i < MOCK_INJECT_TEST_MAX; i++) {
> + if (!mock_poison_list[i].cxlds) {
> + mock_poison_list[i].cxlds = cxlds;
> + mock_poison_list[i].dpa = dpa;
> + return true;
> + }
> + }
> + dev_dbg(cxlds->dev,
> + "Mock test poison injection limit has been reached: %d\n",
> + MOCK_INJECT_TEST_MAX);
> +
> + return false;
> +}
> +
> +static bool mock_poison_found(struct cxl_dev_state *cxlds, u64 dpa)
> +{
> + for (int i = 0; i < MOCK_INJECT_TEST_MAX; i++) {
> + if (mock_poison_list[i].cxlds == cxlds &&
> + mock_poison_list[i].dpa == dpa)
> + return true;
> + }
> + return false;
> +}
> +
> +static int mock_inject_poison(struct cxl_dev_state *cxlds,
> + struct cxl_mbox_cmd *cmd)
> +{
> + struct cxl_mbox_inject_poison *pi = cmd->payload_in;
> + u64 dpa = le64_to_cpu(pi->address);
> +
> + if (mock_poison_found(cxlds, dpa)) {
> + /* Not an error to inject poison if already poisoned */
> + dev_dbg(cxlds->dev, "DPA: 0x%llx already poisoned\n", dpa);
> + return 0;
> + }
> + if (!mock_poison_add(cxlds, dpa))
> + return -ENXIO;
> +
> + return 0;
> +}
> +
> static int cxl_mock_mbox_send(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
> {
> struct device *dev = cxlds->dev;
> @@ -980,6 +1054,9 @@ static int cxl_mock_mbox_send(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *
> case CXL_MBOX_OP_GET_POISON:
> rc = mock_get_poison(cxlds, cmd);
> break;
> + case CXL_MBOX_OP_INJECT_POISON:
> + rc = mock_inject_poison(cxlds, cmd);
> + break;
> default:
> break;
> }
next prev parent reply other threads:[~2023-03-31 19:15 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 [this message]
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
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=705756c5-c0e3-6758-e54b-5d8716de7132@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).