From patchwork Mon Mar 20 04:31:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 71973 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1014663wrt; Sun, 19 Mar 2023 21:41:01 -0700 (PDT) X-Google-Smtp-Source: AK7set/yQFDlR1zh2f2nRC1Gr50emK9CjPIovQLzNYKRg6skdx3V9RKb8CRUYE9jOLkikKE6qkGU X-Received: by 2002:a17:902:ee4d:b0:19a:839d:b67a with SMTP id 13-20020a170902ee4d00b0019a839db67amr15763160plo.5.1679287260799; Sun, 19 Mar 2023 21:41:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679287260; cv=none; d=google.com; s=arc-20160816; b=ye7V6fgnWFI+/LHqvY7iutkaPncBXze2qF79+g7T0rEn0hS3lDxYLtxiCpZsjh6pLM 1BUjlpRf/vV4EfPhLp0wvxavEE5qi1QXYsH2mUbkYXP/SI75DY1x+btZo/vMokp+NwFd m4iQj2axVEqdvYZPHDOjRcVgx5MuOzz8oam4P13UrvTAw6mac10MzEFZJPYvhSLIsHox 0JglBNz+GV9FMVgkDyQf8Mrh8NWlFPkNsDPJt7hvcvQwSb1hLUAHq8f9CxrOIf+Bzyvr 3hSEdKFyMHH55HwjDbPJskxiVM91pjY9t+u2+OxBeXFUChYYqc0NsUd6dKMOSJG/ngPM 7kEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NBIAMHX8+SgEj+ZfKw+Xha6FkxFVwGQ9Bu1y1VgXBIE=; b=ge+A0HjHycow2kcHmuo576Ref8dIFD+ngtymQoIyUEdJaAsrG1aRhoLO6fyjLRAXK5 0T9ND9g8tL+ldGMkxchBdSvk2o90ZfdCpJue6zGKtXj7pnc1GxmCMRZZNDjxPGW+ugET UMNEz+C2/P9D528w5ZEft9gksl03qgVmCgcUgD7CrPgXzOqqHrfUEyNj81QhVuVYxqua EA8S/fSaWEJi5mjr9HeysRVDSkH0Fg2APHoEH8HMexDKvIgJC+8SV3VwssX3fFmgX4Cs pk0gSwBoHot90IaBRE6hC4DOUb7BI0P3KKpsVsCjj3jZSM2v7bc4G6YmAjr01udLGaBS eBDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BfQ3eBMa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h5-20020a170902b94500b001a06c56ec5esi9338319pls.347.2023.03.19.21.40.43; Sun, 19 Mar 2023 21:41:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BfQ3eBMa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230141AbjCTEcZ (ORCPT + 99 others); Mon, 20 Mar 2023 00:32:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230008AbjCTEcL (ORCPT ); Mon, 20 Mar 2023 00:32:11 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D7A218A80; Sun, 19 Mar 2023 21:32:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679286723; x=1710822723; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bx5UzUKl047tv8KD71htOdRpfAR/w5OkFPahmHxcAs4=; b=BfQ3eBMaQ6vd4MtRVgB5t9b/g0OZPoZPGOApq2uAEBkBmxM6fW9lIgsP /xX/LG0LIhY1V+vZ+9TqlZUp5ZJOMOXwW6hIwJyr38WpyooVLZ7hxghTw Vb9KM/iHVHhfoWX9VZ6Q2bb9nXogFpq5kUp32Xrm4aRiRgKA1jOr0VHsi KM+f5eyFQqfs/lLw/VvjG6+nXb9XT1Abe7NhMliS0mNDwBGa+d8NRVsp2 IxjHw9Am2E7lx2Oe7NPJfBdA11LC6fzVo5owb8dBAnmsot2FgpNQgAHyS ML96GZTqIIlSZKZdFRF4b1mAXqEOVubgQnnm1/AF/r30iuJlnCDbSHNlK Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="337287542" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="337287542" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2023 21:32:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="926824001" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="926824001" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.209.14.183]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2023 21:32:02 -0700 From: alison.schofield@intel.com To: Dan Williams , Ira Weiny , Vishal Verma , Dave Jiang , Ben Widawsky , Steven Rostedt Cc: Alison Schofield , linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v9 6/6] tools/testing/cxl: Mock support for Get Poison List Date: Sun, 19 Mar 2023 21:31:51 -0700 Message-Id: <68c2e17b0ea19d611a191bc72ab8ef67e4e5da49.1679284567.git.alison.schofield@intel.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760860318915158722?= X-GMAIL-MSGID: =?utf-8?q?1760860318915158722?= From: Alison Schofield Make mock memdevs support the Get Poison List mailbox command. Return a fake poison error record when the get poison list command is issued. This supports testing the kernel tracing and cxl list capabilities for media errors. Signed-off-by: Alison Schofield Reviewed-by: Jonathan Cameron Reviewed-by: Ira Weiny --- tools/testing/cxl/test/mem.c | 42 ++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c index 9263b04d35f7..2fa9c18d4c2c 100644 --- a/tools/testing/cxl/test/mem.c +++ b/tools/testing/cxl/test/mem.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include "trace.h" @@ -40,6 +41,10 @@ static struct cxl_cel_entry mock_cel[] = { .opcode = cpu_to_le16(CXL_MBOX_OP_GET_HEALTH_INFO), .effect = cpu_to_le16(0), }, + { + .opcode = cpu_to_le16(CXL_MBOX_OP_GET_POISON), + .effect = cpu_to_le16(0), + }, }; /* See CXL 2.0 Table 181 Get Health Info Output Payload */ @@ -471,6 +476,8 @@ static int mock_id(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd) cpu_to_le64(DEV_SIZE / CXL_CAPACITY_MULTIPLIER), }; + put_unaligned_le24(CXL_POISON_LIST_MAX, id.poison_list_max_mer); + if (cmd->size_out < sizeof(id)) return -EINVAL; @@ -888,6 +895,34 @@ static int mock_health_info(struct cxl_dev_state *cxlds, return 0; } +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; + + /* 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), + }, + }; + + 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; +} + static int cxl_mock_mbox_send(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd) { struct device *dev = cxlds->dev; @@ -942,6 +977,9 @@ static int cxl_mock_mbox_send(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd * case CXL_MBOX_OP_PASSPHRASE_SECURE_ERASE: rc = mock_passphrase_secure_erase(cxlds, cmd); break; + case CXL_MBOX_OP_GET_POISON: + rc = mock_get_poison(cxlds, cmd); + break; default: break; } @@ -1010,6 +1048,10 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) if (rc) return rc; + rc = cxl_poison_state_init(cxlds); + if (rc) + return rc; + rc = cxl_dev_state_identify(cxlds); if (rc) return rc;