From patchwork Wed Jan 18 20:02:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 45461 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2536359wrn; Wed, 18 Jan 2023 12:03:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXvy20v7c0vgZur1KfVxPGSELDMJHFZEOzODk1QndW5Izg8t2uAEjaaiB/nFDoXmCU+NQWyL X-Received: by 2002:a17:906:2c45:b0:843:a9fe:f112 with SMTP id f5-20020a1709062c4500b00843a9fef112mr7792697ejh.16.1674072233274; Wed, 18 Jan 2023 12:03:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674072233; cv=none; d=google.com; s=arc-20160816; b=TrvLZAkpX1uNaED9+Uxr77qd/lJY8Y+RbuWYiW+T8sy1jdlmzxIhz3KqDUrfn87YdN 8DIcxqYrdmbtZPzqXXAVXGzIsfVW6qpu5ymjyk+CBT3eyDvljVeuQFIzfy1yRv+6oogA o6k1Tk6QRcF9w54j+3xLHTpC7D3h+ntFiSgyWbc3lbi7elkUr3pUgZ34kmaz6fpFJMe8 3sDE0N2Tx5FW8va0IH9fX3ceB+vfmd/ZDedVktMpcN0HLH3VjILEzkuiF7t4QxEx2ATa 4gITS7YAJe0eHCu7HPJzlUkUZ0b43RT2j8mdNkhVQyicOd9tfOQnsyaTk7HVeuWYw30T faCA== 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=GoEXGNFJaagoO669RzuTL3yI3CDKcG42ariDMjyLGCo=; b=ws4VHqZghPExbjMz7xXAU9aj099lwo6UJRyRdEZVlt9hDXW9Lpwd9xBZMNpyU4XZwy RVur6EMtKauc4SAwytH4AecfckRAwTvgOitXvq5VtkSKq3T7sPBGMTNnUF4tDsb3OPr7 rT3NDdTf/VQ/xXa93PUY9QbwRWKJKg+QyvxvYvD0X58n/tIBboKRSg8mADiT54aTOexS EJPuEvDxvIxB70DVexbaEkmyGm4fFk3rDhyTh36pypUWnQodpTEr/bvnyFyONT8yJPTi P+89jhnp5ZJNYBN54YsVf2Pp9q3VZvKU2HaxieGrml3YNLRkH3QToa7PtxSY1iqRzmEz 8ZjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cRQ8QVum; 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 nc42-20020a1709071c2a00b008776988fa30si770846ejc.144.2023.01.18.12.03.28; Wed, 18 Jan 2023 12:03:53 -0800 (PST) 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=cRQ8QVum; 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 S229863AbjARUCz (ORCPT + 99 others); Wed, 18 Jan 2023 15:02:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229818AbjARUCd (ORCPT ); Wed, 18 Jan 2023 15:02:33 -0500 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F16F6521F8; Wed, 18 Jan 2023 12:02:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674072151; x=1705608151; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=e2RBSthBY4E3exqvT5N+VtLm2wQXWJbyt9mn0kG6s3Q=; b=cRQ8QVumS0f2tyhQQSmz0krus92w6DVFJsjlfxT1Fukt989yAKX4qznq N5NETS6IcCIqJoikDxv6nz1OXvvntU70T9/5wwnu4ankckv/5udxTYv2J EIqQlK49ugyqYT89ARiWXPRkiuf7gLtUY18aAQ75yABtL+saiFmd43B7f K+ahKViPjYQ7UhXSxgpnLzw/rxB/yfNth9odN5dg4cSEKWWQKQ98bqEKJ sklzvgH/OcomY56vgeG7yd9oIDCEDXIECRWkDLhzqBCNe8kzdv5H7LZxY citT5tTXxRweyiDfHoOQzW9WP8LLlTsSTEt3l+/hi8daRHzCCo/KfvEEH w==; X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="322776774" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="322776774" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 12:02:26 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="661861670" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="661861670" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.209.119.104]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 12:02:25 -0800 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 v5 1/5] cxl/mbox: Add GET_POISON_LIST mailbox command Date: Wed, 18 Jan 2023 12:02:17 -0800 Message-Id: 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?1755391965927611479?= X-GMAIL-MSGID: =?utf-8?q?1755391965927611479?= From: Alison Schofield CXL devices maintain a list of locations that are poisoned or result in poison if the addresses are accessed by the host. Per the spec (CXL 3.0 8.2.9.8.4.1), the device returns this Poison list as a set of Media Error Records that include the source of the error, the starting device physical address and length. The length is the number of adjacent DPAs in the record and is in units of 64 bytes. Retrieve the poison list. Reviewed-by: Jonathan Cameron Signed-off-by: Alison Schofield --- drivers/cxl/core/mbox.c | 74 +++++++++++++++++++++++++++++++++++++++++ drivers/cxl/cxlmem.h | 67 +++++++++++++++++++++++++++++++++++++ drivers/cxl/pci.c | 4 +++ 3 files changed, 145 insertions(+) diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c index b03fba212799..a38be141e108 100644 --- a/drivers/cxl/core/mbox.c +++ b/drivers/cxl/core/mbox.c @@ -4,7 +4,9 @@ #include #include #include +#include #include +#include #include #include "core.h" @@ -770,6 +772,7 @@ int cxl_dev_state_identify(struct cxl_dev_state *cxlds) /* See CXL 2.0 Table 175 Identify Memory Device Output Payload */ struct cxl_mbox_identify id; struct cxl_mbox_cmd mbox_cmd; + u32 val; int rc; mbox_cmd = (struct cxl_mbox_cmd) { @@ -793,6 +796,11 @@ int cxl_dev_state_identify(struct cxl_dev_state *cxlds) cxlds->lsa_size = le32_to_cpu(id.lsa_size); memcpy(cxlds->firmware_version, id.fw_revision, sizeof(id.fw_revision)); + if (test_bit(CXL_MEM_COMMAND_ID_GET_POISON, cxlds->enabled_cmds)) { + val = get_unaligned_le24(id.poison_list_max_mer); + cxlds->poison.max_mer = min_t(u32, val, CXL_POISON_LIST_MAX); + } + return 0; } EXPORT_SYMBOL_NS_GPL(cxl_dev_state_identify, CXL); @@ -857,6 +865,72 @@ int cxl_mem_create_range_info(struct cxl_dev_state *cxlds) } EXPORT_SYMBOL_NS_GPL(cxl_mem_create_range_info, CXL); +int cxl_mem_get_poison(struct cxl_memdev *cxlmd, u64 offset, u64 len, + struct cxl_region *cxlr) +{ + struct cxl_dev_state *cxlds = cxlmd->cxlds; + struct cxl_poison_state *cxlps = &cxlds->poison; + struct cxl_mbox_poison_payload_out *po; + struct cxl_mbox_poison_payload_in pi; + struct cxl_mbox_cmd mbox_cmd; + int nr_records = 0; + int rc; + + rc = mutex_lock_interruptible(&cxlps->getpoison_lock); + if (rc) + return rc; + + po = cxlps->getpoison_po; + pi.offset = cpu_to_le64(offset); + pi.length = cpu_to_le64(len / CXL_POISON_LEN_MULT); + + mbox_cmd = (struct cxl_mbox_cmd) { + .opcode = CXL_MBOX_OP_GET_POISON, + .size_in = sizeof(pi), + .payload_in = &pi, + .size_out = cxlds->payload_size, + .payload_out = po, + .min_out = struct_size(po, record, 0), + }; + + do { + rc = cxl_internal_send_cmd(cxlds, &mbox_cmd); + if (rc) + break; + + /* TODO TRACE the media error records */ + + /* Protect against an uncleared _FLAG_MORE */ + nr_records = nr_records + le16_to_cpu(po->count); + if (nr_records >= cxlps->max_mer) { + dev_dbg(&cxlmd->dev, "Max Error Records reached: %d\n", + nr_records); + break; + } + } while (po->flags & CXL_POISON_FLAG_MORE); + + mutex_unlock(&cxlps->getpoison_lock); + return rc; +} +EXPORT_SYMBOL_NS_GPL(cxl_mem_get_poison, CXL); + +int cxl_poison_state_init(struct cxl_dev_state *cxlds) +{ + struct cxl_poison_state *cxlps = &cxlds->poison; + + if (!test_bit(CXL_MEM_COMMAND_ID_GET_POISON, cxlds->enabled_cmds)) + return 0; + + cxlps->getpoison_po = devm_kzalloc(cxlds->dev, cxlds->payload_size, + GFP_KERNEL); + if (!cxlps->getpoison_po) + return -ENOMEM; + + mutex_init(&cxlps->getpoison_lock); + return 0; +} +EXPORT_SYMBOL_NS_GPL(cxl_poison_state_init, CXL); + struct cxl_dev_state *cxl_dev_state_create(struct device *dev) { struct cxl_dev_state *cxlds; diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index ab138004f644..f53fae20f502 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -193,6 +193,24 @@ struct cxl_endpoint_dvsec_info { struct range dvsec_range[2]; }; +/** + * struct cxl_poison_state - Poison list retrieval + * + * @max_mer: Maximum media error records held in device cache + * @getpoison_po: The poison list payload returned by device + * @getpoison_lock: Protect reads of the poison list + * + * Reads of the poison list are synchronized to ensure that a reader + * does not get an incomplete list because their request overlapped + * (was interrupted or preceded by) another read request of the same + * DPA range. CXL Spec 3.0 Section 8.2.9.8.4.1 + */ +struct cxl_poison_state { + u32 max_mer; + void *getpoison_po; + struct mutex getpoison_lock; /* Protect reads of poison list */ +}; + /** * struct cxl_dev_state - The driver device state * @@ -211,6 +229,7 @@ struct cxl_endpoint_dvsec_info { * (CXL 2.0 8.2.9.5.1.1 Identify Memory Device) * @mbox_mutex: Mutex to synchronize mailbox access. * @firmware_version: Firmware version for the memory device. + * @poison: Poison list retrieval * @enabled_cmds: Hardware commands found enabled in CEL. * @exclusive_cmds: Commands that are kernel-internal only * @dpa_res: Overall DPA resource tree for the device @@ -245,6 +264,7 @@ struct cxl_dev_state { size_t lsa_size; struct mutex mbox_mutex; /* Protects device mailbox and firmware */ char firmware_version[0x10]; + struct cxl_poison_state poison; DECLARE_BITMAP(enabled_cmds, CXL_MEM_COMMAND_ID_MAX); DECLARE_BITMAP(exclusive_cmds, CXL_MEM_COMMAND_ID_MAX); @@ -372,6 +392,50 @@ struct cxl_mbox_set_partition_info { #define CXL_SET_PARTITION_IMMEDIATE_FLAG BIT(0) +/* Get Poison List CXL 3.0 Spec 8.2.9.8.4.1 */ +struct cxl_mbox_poison_payload_in { + __le64 offset; + __le64 length; +} __packed; + +struct cxl_mbox_poison_payload_out { + u8 flags; + u8 rsvd1; + __le64 overflow_t; + __le16 count; + u8 rsvd2[20]; + struct cxl_poison_record { + __le64 address; + __le32 length; + __le32 rsvd; + } __packed record[]; +} __packed; + +/* + * Get Poison List address field encodes the starting + * address of poison, and the source of the poison. + */ +#define CXL_POISON_START_MASK GENMASK_ULL(63, 6) +#define CXL_POISON_SOURCE_MASK GENMASK(2, 0) + +/* Get Poison List record length is in units of 64 bytes */ +#define CXL_POISON_LEN_MULT 64 + +/* Kernel defined maximum for a list of poison errors */ +#define CXL_POISON_LIST_MAX 1024 + +/* Get Poison List: Payload out flags */ +#define CXL_POISON_FLAG_MORE BIT(0) +#define CXL_POISON_FLAG_OVERFLOW BIT(1) +#define CXL_POISON_FLAG_SCANNING BIT(2) + +/* Get Poison List: Poison Source */ +#define CXL_POISON_SOURCE_UNKNOWN 0 +#define CXL_POISON_SOURCE_EXTERNAL 1 +#define CXL_POISON_SOURCE_INTERNAL 2 +#define CXL_POISON_SOURCE_INJECTED 3 +#define CXL_POISON_SOURCE_VENDOR 7 + /** * struct cxl_mem_command - Driver representation of a memory device command * @info: Command information as it exists for the UAPI @@ -441,6 +505,9 @@ int cxl_mem_create_range_info(struct cxl_dev_state *cxlds); struct cxl_dev_state *cxl_dev_state_create(struct device *dev); void set_exclusive_cxl_commands(struct cxl_dev_state *cxlds, unsigned long *cmds); void clear_exclusive_cxl_commands(struct cxl_dev_state *cxlds, unsigned long *cmds); +int cxl_poison_state_init(struct cxl_dev_state *cxlds); +int cxl_mem_get_poison(struct cxl_memdev *cxlmd, u64 offset, u64 len, + struct cxl_region *cxlr); #ifdef CONFIG_CXL_SUSPEND void cxl_mem_active_inc(void); void cxl_mem_active_dec(void); diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index 3a66aadb4df0..d21357f3eca0 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -482,6 +482,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (rc) return rc; + rc = cxl_poison_state_init(cxlds); + if (rc) + return rc; + rc = cxl_dev_state_identify(cxlds); if (rc) return rc; From patchwork Wed Jan 18 20:02:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 45460 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2536264wrn; Wed, 18 Jan 2023 12:03:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXu5yUQNGsYrb7YBrRxNE2DN051WroLB8Tlvb5jSFh4SnxxvdQ9MQ9G52w3FrBGhE3yMjXhX X-Received: by 2002:a17:907:76b0:b0:7c1:7045:1a53 with SMTP id jw16-20020a17090776b000b007c170451a53mr7874118ejc.15.1674072221927; Wed, 18 Jan 2023 12:03:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674072221; cv=none; d=google.com; s=arc-20160816; b=poyXe6ICJYvtYfiytpI4NLQZ/+p+I4Yg4YfATIK5inPSC7GEn5JikNAChUAC8ImMcP k3YvzX2yhSfEBKYFsF1T++Ojx5DlVfpij1ZksH+ZzuCEOTN4ijHLssRk0Lk3x0HhB/Jd tVeBWkyspdjU3DaMXH5ZCL8txTz4P4P7Dl6KIu5EzLkkILPj5j83PQP22MYxjfhQdJWg 7cOnWqfK+SaAV+au6A0wf6039zA+u5PC/is1+igqQVe4iUEJHOC9RBM1St76/5l2N0DC tjgV8ZRWwjUQauBgS0ry8FHTbiQn4im3GL373jTE9jOdonTD3qGH28yMJXx4Zf7uonBa 0sgg== 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=ZdmYxQcklpXg/sgo0IzeVhzLVeRCSjempdtNCv8DnyY=; b=Im7ULjbPdIKYHxBWTJSYCjgAs80LasivHBTIvw+mjT0/oucAeeN4zZuv+MUZ3aqK/+ BY0pfljUPbiJjLX/Ka2p57cQiQTlGELz59accaQglWcN84Rh3LghR47vz9ux2YYk4+pu flG2bfUwkNHz4FAVjJR+xhkWGPs/P3CzsbLjT7XY4jFbCd42lIQIN9sFGSpN8HeJhKwI mg+czsNpRwi9KiyUZ9c4xowj+GeScGKkf4kfE6t/WzoBjTGgboX8G43IEfW3pI+zCxjH LnBEQdta1sCghvYeVJESAsP+Nf4qDmFh1/e1FTEfjtnvBfZWmAGfwL4XCGKD+WXsnetZ MfNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aqwEOJTN; 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 gb21-20020a170907961500b008722ef50e42si7809646ejc.277.2023.01.18.12.03.18; Wed, 18 Jan 2023 12:03:41 -0800 (PST) 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=aqwEOJTN; 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 S229838AbjARUCo (ORCPT + 99 others); Wed, 18 Jan 2023 15:02:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229792AbjARUCd (ORCPT ); Wed, 18 Jan 2023 15:02:33 -0500 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD45056EE0; Wed, 18 Jan 2023 12:02:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674072151; x=1705608151; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HKeKdBveLNMyOzNUEGqYsJRXOdPN9/L54tMdLNvwiBs=; b=aqwEOJTNyK12ZfB0HyYZFJWinWCjsleBgu9lOiajgeE80RGiuGPEYHHr pySV3UvZlODsbX4DH8L4Ds0IKNMQPOXHPr1t+ej9Ckx+1chw+C1/pLJ9K V4AmErlpMiiRKIYwcIgHcBtWQuBldjgMX9ugD4vQALOYTqYG+C0tSb5cC EAKPZO+RspbEhtdj0KwQ/OEN2Sbrb6wbFaQqpIIx4655r5fIsOQlL/41T 98lYfcj7Pu+Gd1akU9vsYkDUBAFZEPxuRi4wQBNQeISj8UbRRFFjJ3wQu aTDtCaw2Qqg+fATiDu6KdlErtQv+Fz6QPMqWDP6lukxmbFxaN+BQ1P13H Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="322776781" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="322776781" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 12:02:27 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="661861680" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="661861680" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.209.119.104]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 12:02:26 -0800 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 v5 2/5] cxl/trace: Add TRACE support for CXL media-error records Date: Wed, 18 Jan 2023 12:02:18 -0800 Message-Id: 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?1755391954105040013?= X-GMAIL-MSGID: =?utf-8?q?1755391954105040013?= From: Alison Schofield CXL devices may support the retrieval of a device poison list. Add a new trace event that the CXL subsystem may use to log the media-error records returned in the poison list. Log each media-error record as a trace event of type 'cxl_poison'. When the poison list is requested by region, include the region name and uuid in the trace event. Reviewed-by: Jonathan Cameron Signed-off-by: Alison Schofield --- drivers/cxl/core/mbox.c | 6 ++- drivers/cxl/core/trace.h | 83 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c index a38be141e108..19b0029bbe71 100644 --- a/drivers/cxl/core/mbox.c +++ b/drivers/cxl/core/mbox.c @@ -10,6 +10,7 @@ #include #include "core.h" +#include "trace.h" static bool cxl_raw_allow_all; @@ -898,7 +899,10 @@ int cxl_mem_get_poison(struct cxl_memdev *cxlmd, u64 offset, u64 len, if (rc) break; - /* TODO TRACE the media error records */ + for (int i = 0; i < le16_to_cpu(po->count); i++) + trace_cxl_poison(cxlmd, to_pci_dev(cxlds->dev), + cxlr, &po->record[i], po->flags, + po->overflow_t); /* Protect against an uncleared _FLAG_MORE */ nr_records = nr_records + le16_to_cpu(po->count); diff --git a/drivers/cxl/core/trace.h b/drivers/cxl/core/trace.h index 20ca2fe2ca8e..c7958311ce5f 100644 --- a/drivers/cxl/core/trace.h +++ b/drivers/cxl/core/trace.h @@ -8,6 +8,9 @@ #include #include +#include + +#include #define CXL_RAS_UC_CACHE_DATA_PARITY BIT(0) #define CXL_RAS_UC_CACHE_ADDR_PARITY BIT(1) @@ -103,6 +106,86 @@ TRACE_EVENT(cxl_aer_correctable_error, ) ); +#define __show_poison_source(source) \ + __print_symbolic(source, \ + { CXL_POISON_SOURCE_UNKNOWN, "Unknown" }, \ + { CXL_POISON_SOURCE_EXTERNAL, "External" }, \ + { CXL_POISON_SOURCE_INTERNAL, "Internal" }, \ + { CXL_POISON_SOURCE_INJECTED, "Injected" }, \ + { CXL_POISON_SOURCE_VENDOR, "Vendor" }) + +#define show_poison_source(source) \ + (((source > CXL_POISON_SOURCE_INJECTED) && \ + (source != CXL_POISON_SOURCE_VENDOR)) ? "Reserved" \ + : __show_poison_source(source)) + +#define show_poison_flags(flags) \ + __print_flags(flags, "|", \ + { CXL_POISON_FLAG_MORE, "More" }, \ + { CXL_POISON_FLAG_OVERFLOW, "Overflow" }, \ + { CXL_POISON_FLAG_SCANNING, "Scanning" }) + +#define __cxl_poison_addr(record) \ + (le64_to_cpu(record->address)) +#define cxl_poison_record_dpa(record) \ + (__cxl_poison_addr(record) & CXL_POISON_START_MASK) +#define cxl_poison_record_source(record) \ + (__cxl_poison_addr(record) & CXL_POISON_SOURCE_MASK) +#define cxl_poison_record_length(record) \ + (le32_to_cpu(record->length) * CXL_POISON_LEN_MULT) +#define cxl_poison_overflow(flags, time) \ + (flags & CXL_POISON_FLAG_OVERFLOW ? le64_to_cpu(time) : 0) + +TRACE_EVENT(cxl_poison, + + TP_PROTO(struct cxl_memdev *memdev, const struct pci_dev *pcidev, + struct cxl_region *region, + const struct cxl_poison_record *record, + u8 flags, __le64 overflow_t), + + TP_ARGS(memdev, pcidev, region, record, flags, overflow_t), + + TP_STRUCT__entry( + __string(memdev, dev_name(&memdev->dev)) + __string(pcidev, dev_name(&pcidev->dev)) + __string(region, region) + __field(u64, overflow_t) + __field(u64, dpa) + __field(u32, length) + __array(char, uuid, 16) + __field(u8, source) + __field(u8, flags) + ), + + TP_fast_assign( + __assign_str(memdev, dev_name(&memdev->dev)); + __assign_str(pcidev, dev_name(&pcidev->dev)); + __entry->overflow_t = cxl_poison_overflow(flags, overflow_t); + __entry->dpa = cxl_poison_record_dpa(record); + __entry->length = cxl_poison_record_length(record); + __entry->source = cxl_poison_record_source(record); + __entry->flags = flags; + if (region) { + __assign_str(region, dev_name(®ion->dev)); + memcpy(__entry->uuid, ®ion->params.uuid, 16); + } else { + __assign_str(region, ""); + memset(__entry->uuid, 0, 16); + } + ), + + TP_printk("memdev=%s pcidev=%s region=%s region_uuid=%pU dpa=0x%llx length=0x%x source=%s flags=%s overflow_time=%llu", + __get_str(memdev), + __get_str(pcidev), + __get_str(region), + __entry->uuid, + __entry->dpa, + __entry->length, + show_poison_source(__entry->source), + show_poison_flags(__entry->flags), + __entry->overflow_t) +); + #endif /* _CXL_EVENTS_H */ #define TRACE_INCLUDE_FILE trace From patchwork Wed Jan 18 20:02:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 45459 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2536257wrn; Wed, 18 Jan 2023 12:03:40 -0800 (PST) X-Google-Smtp-Source: AMrXdXsRK0utAEYdXArHpuThCNGdllhsEU3/EsS4EeNQBPw2AkGN+azkT7guCYshivU4XYi1WJz1 X-Received: by 2002:a17:907:cc03:b0:7c4:f8fb:6a27 with SMTP id uo3-20020a170907cc0300b007c4f8fb6a27mr18969394ejc.0.1674072220442; Wed, 18 Jan 2023 12:03:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674072220; cv=none; d=google.com; s=arc-20160816; b=VhL3ZgKV/a4+P0vqYaA1JzJXMgE7M9lWoZ3WumpwkYDjIX6SuwzuM9EkIacMcVOXvM UlWgaaV0fyFwhQ/UU3WMNtHbzbHpq1NdYz+p0FOiw2EpSyS02yK70McGgK2jWuv1Q4zc RlfuQoz+5vv8LgL7imCApu9rs5Rg4wzz5s1/wPMu7BBCkp8U6YTdbrPvx7RcaeyxIYBM Crh67x9FFQGnZz9PN8bvmFvbO5bEcMh0wyC0VQMYINmMy0QfCZPY8RIZShkvu9OyIcNV DuZkHFj6BKNgRvX7LQVz7VEU/XVjfBDCWj/k6dFEYUuKTE+vikWhQKWQ2v9lHHadROHT WZcg== 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=WCml+nrry4E2LVzNJ/Kk84JvLXWOZk5fTQpeUy1x3hE=; b=gLzNlqnOH2/i378gGGOVx8E9k6LWycWhffMH085SN4kdz8pgW9HwSpFJR8QTBOnqUF 6ZYOx3PRbqD43Hl+7xO08HP7Iw0F5njq/L3ln2t2cMeuZUelzj393XK5AmJU9xlAmo/4 pg+ZUOXdybkA5Hw2iEyMzi488PpeW9NESSCd2QdNkO1SOnydfzxtZFMSFzvEc8cfY/hu 2Gx5QxKF3RkFfWJRrMYrWfzMWCtLbyQ/4EGjC+rPbfrEZXwlA1eRQpoGzWEiIOIqze5T h13mk303WMJ48d2TklXlAIHN/g1ZqqdguUUXiEPxJejoYrSYJ+TI0ot7cQ/knrwi5iL5 ZKtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YNLxLFfo; 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 dt14-20020a170907728e00b008318885e1f1si41588151ejc.176.2023.01.18.12.03.15; Wed, 18 Jan 2023 12:03:40 -0800 (PST) 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=YNLxLFfo; 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 S229843AbjARUCk (ORCPT + 99 others); Wed, 18 Jan 2023 15:02:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229797AbjARUCd (ORCPT ); Wed, 18 Jan 2023 15:02:33 -0500 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADF8B58289; Wed, 18 Jan 2023 12:02:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674072151; x=1705608151; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jpLlAKswEh4UuzLPlTUcyeFewdXnALel5wXlbYz+UJM=; b=YNLxLFfoVqzkFJ39a9c+YXBjR5BsPC7J8cxkZT3Wf/rzdt0fobokle5N n/xnTvDYPILyBCpOd35/Bfh9ZdSOm+NvcAEmZzWdxhAFUPX2Yv/osAhtb LTkf14kN3OBobrHZSHc45JS7RMVvxS+JCWIaVCl34vwppkqaYIEn2Dbzj Y1QNHpAvLuWpf+MR3wJoriJC0g8d+WvpE3j+G1O45Euj8yj2ajZ2BnAJY 6nHdxm+vAprO3rXjyNIMKufOxQZU8DMGC03EaSFaONuA1DAH7Bhr9Uzg5 fT8zcyTzgzYKbrQzMqcGQ9nw1E4l71OtUko0pnwNN9sJYKODsV2YAMUWJ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="322776788" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="322776788" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 12:02:29 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="661861690" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="661861690" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.209.119.104]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 12:02:28 -0800 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 v5 3/5] cxl/memdev: Add trigger_poison_list sysfs attribute Date: Wed, 18 Jan 2023 12:02:19 -0800 Message-Id: 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?1755391952549753556?= X-GMAIL-MSGID: =?utf-8?q?1755391952549753556?= From: Alison Schofield When a boolean 'true' is written to this attribute the memdev driver retrieves the poison list from the device. The list consists of addresses that are poisoned, or would result in poison if accessed, and the source of the poison. This attribute is only visible for devices supporting the capability. The retrieved errors are logged as kernel trace events with the label 'cxl_poison'. Reviewed-by: Jonathan Cameron Signed-off-by: Alison Schofield --- Documentation/ABI/testing/sysfs-bus-cxl | 14 ++++++++ drivers/cxl/core/memdev.c | 45 +++++++++++++++++++++++++ drivers/cxl/cxlmem.h | 2 +- 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index 8494ef27e8d2..df40ed09ea67 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -388,3 +388,17 @@ Description: 1), and checks that the hardware accepts the commit request. Reading this value indicates whether the region is committed or not. + + +What: /sys/bus/cxl/devices/memX/trigger_poison_list +Date: November, 2022 +KernelVersion: v6.2 +Contact: linux-cxl@vger.kernel.org +Description: + (WO) When a boolean 'true' is written to this attribute the + memdev driver retrieves the poison list from the device. The + list consists of addresses that are poisoned, or would result + in poison if accessed, and the source of the poison. This + attribute is only visible for devices supporting the + capability. The retrieved errors are logged as kernel + trace events with the label 'cxl_poison'. diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c index a74a93310d26..e0af7e9c9989 100644 --- a/drivers/cxl/core/memdev.c +++ b/drivers/cxl/core/memdev.c @@ -106,12 +106,49 @@ static ssize_t numa_node_show(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR_RO(numa_node); +static ssize_t trigger_poison_list_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct cxl_memdev *cxlmd = to_cxl_memdev(dev); + struct cxl_dev_state *cxlds = cxlmd->cxlds; + u64 offset, length; + bool tmp; + int rc; + + if (kstrtobool(buf, &tmp)) + return -EINVAL; + + /* CXL 3.0 Spec 8.2.9.8.4.1 Separate pmem and ram poison requests */ + if (resource_size(&cxlds->pmem_res)) { + offset = cxlds->pmem_res.start; + length = resource_size(&cxlds->pmem_res); + rc = cxl_mem_get_poison(cxlmd, offset, length, NULL); + if (rc) + return rc; + } + if (resource_size(&cxlds->ram_res)) { + offset = cxlds->ram_res.start; + length = resource_size(&cxlds->ram_res); + rc = cxl_mem_get_poison(cxlmd, offset, length, NULL); + /* + * Invalid Physical Address is not an error for + * volatile addresses. Device support is optional. + */ + if (rc && rc != -EFAULT) + return rc; + } + return len; +} +static DEVICE_ATTR_WO(trigger_poison_list); + static struct attribute *cxl_memdev_attributes[] = { &dev_attr_serial.attr, &dev_attr_firmware_version.attr, &dev_attr_payload_max.attr, &dev_attr_label_storage_size.attr, &dev_attr_numa_node.attr, + &dev_attr_trigger_poison_list.attr, NULL, }; @@ -130,6 +167,14 @@ static umode_t cxl_memdev_visible(struct kobject *kobj, struct attribute *a, { if (!IS_ENABLED(CONFIG_NUMA) && a == &dev_attr_numa_node.attr) return 0; + + if (a == &dev_attr_trigger_poison_list.attr) { + struct device *dev = kobj_to_dev(kobj); + + if (!test_bit(CXL_MEM_COMMAND_ID_GET_POISON, + to_cxl_memdev(dev)->cxlds->enabled_cmds)) + return 0; + } return a->mode; } diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index f53fae20f502..28ba0cd8f2d3 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -139,7 +139,7 @@ struct cxl_mbox_cmd { C(FWROLLBACK, -ENXIO, "rolled back to the previous active FW"), \ C(FWRESET, -ENXIO, "FW failed to activate, needs cold reset"), \ C(HANDLE, -ENXIO, "one or more Event Record Handles were invalid"), \ - C(PADDR, -ENXIO, "physical address specified is invalid"), \ + C(PADDR, -EFAULT, "physical address specified is invalid"), \ C(POISONLMT, -ENXIO, "poison injection limit has been reached"), \ C(MEDIAFAILURE, -ENXIO, "permanent issue with the media"), \ C(ABORT, -ENXIO, "background cmd was aborted by device"), \ From patchwork Wed Jan 18 20:02:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 45463 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2536739wrn; Wed, 18 Jan 2023 12:04:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXtNHkD6bZSnflpRyr69rh2r79J00mrwnu8GLodg7Epl5JU7GoE72Ph/4KOOLPlLNYI3mVc8 X-Received: by 2002:a05:6402:159:b0:49d:a87f:ba7b with SMTP id s25-20020a056402015900b0049da87fba7bmr8128732edu.39.1674072271380; Wed, 18 Jan 2023 12:04:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674072271; cv=none; d=google.com; s=arc-20160816; b=HvJvHxnQzznRosdzgD5vOfbsoa6Ps2O31DJVrosCYVB4etOHJaQUtLggZvIK0f44RI k1SfOBQyu1wAJrZ9apHuO9ozambnXhLhOIMmVqzg+qnuvKCeCT04n+kAkxn7I3R1KRqN +AraETMktmjjnyDM6aILGX5yJKJmjrdbxjjKAHiuGNsDMQOR9vn+svVepuNKgpM37/B6 zjIiUW+3rNs+gaZ+oHMlcFFuJBacRGHeiU3A/cVc1GHJN44YYinicRgtVm/svqHfVDeV kZ3cldyZD3oq0ICrvAEdDIAPixuXdoP0H9hS4W/+Na6ziNmHBWf+uDf4LrVowYyYfy6o +k6w== 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=hj5cPCSmecKMrdWVThfz89SifymHuklmy10bHaeg49Y=; b=zZH+MAc/hEOXftrX2TsoweLdBjLbhaN8c3ua16NW9mYvCbOlv/0RVKJ8dr19Uc/Bk5 BgArAe/yGYevFWxUXN3L1jU+8RllKLXbt6ZK0aHGSUEOYDVQZ0Gm/3TY7zFGJ6xCyx+f ArN9TVA9zniYkGitqzEop9gaE129yNsCYlK+dyyLzglesIb3ib571Mxg0n9eUSK6kog0 9OoxXluCnbnc3GAMIU9q/rXUiGpplh0puozQecRiHBakyNHutVo+F+RB+iVf6YgLJ98/ /mMGsGXksydbAGDawzgNwunfhS3P3VMzf26HIX6qQaPbtv5dGdLS3o2TFf3J6n6ZJrO6 9Jaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nNqtNO46; 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 dp20-20020a170906c15400b008688996d6c3si15518234ejc.281.2023.01.18.12.04.07; Wed, 18 Jan 2023 12:04:31 -0800 (PST) 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=nNqtNO46; 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 S229933AbjARUD0 (ORCPT + 99 others); Wed, 18 Jan 2023 15:03:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229871AbjARUDL (ORCPT ); Wed, 18 Jan 2023 15:03:11 -0500 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C115F5926F; Wed, 18 Jan 2023 12:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674072171; x=1705608171; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aRw8JrUibr2BZHp3e7ft45UdfvnTap5W0KSsdC4zYxU=; b=nNqtNO46cbHLvEC8gZ1mjEktMDN0DmAF3DLdNMVtdi9sV0rRO2P4v4xl 9/9ow+tZEBItu1OGpc4YaXZA2HPnnh2NAUOBelWW+8CaVdKAa0WoKWwa6 Ul7B+9kYXq5zoLj35R2tpuz9+Wr9vFo1xIcvQVy3+BU1PR5/PX8FKoFQG H6ayyAwpin6htMXPLq+jWII5uW4k5cBA65iMHqjkUy7f8XOaedckT5Xtp yvgBpxttLwfCpkYk2zYY3exzk621fHUPo0TPo9ndtaJDYlCNyM/kzMeJV 7yCxScWeNteqbcdlkffdjr/NK/moFuLA95Kfw+pqzvbsPQsQj/J/v8uRD g==; X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="322776796" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="322776796" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 12:02:30 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="661861697" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="661861697" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.209.119.104]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 12:02:29 -0800 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 v5 4/5] cxl/region: Add trigger_poison_list sysfs attribute Date: Wed, 18 Jan 2023 12:02:20 -0800 Message-Id: <13cdf8de46d0ed02567625f3343f2a4911ab4064.1674070170.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?1755392006306625008?= X-GMAIL-MSGID: =?utf-8?q?1755392006306625008?= From: Alison Schofield When a boolean 'true' is written to this attribute the region driver retrieves the poison list for the capacity each device contributes to this region. The list consists of addresses that are poisoned, or would result in poison if accessed, and the source of the poison. The retrieved errors are logged as kernel trace events with the label 'cxl_poison'. Devices not supporting the poison list capability are ignored. Reviewed-by: Jonathan Cameron Signed-off-by: Alison Schofield --- Documentation/ABI/testing/sysfs-bus-cxl | 14 +++++++++++ drivers/cxl/core/region.c | 33 +++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index df40ed09ea67..b715a4609718 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -402,3 +402,17 @@ Description: attribute is only visible for devices supporting the capability. The retrieved errors are logged as kernel trace events with the label 'cxl_poison'. + + +What: /sys/bus/cxl/devices/regionZ/trigger_poison_list +Date: November, 2022 +KernelVersion: v6.2 +Contact: linux-cxl@vger.kernel.org +Description: + (WO) When a boolean 'true' is written to this attribute the + region driver retrieves the poison list for the capacity + each device contributes to this region. The list consists + of addresses that are poisoned, or would result in poison + if accessed, and the source of the poison. The retrieved + errors are logged as kernel trace events with the label + 'cxl_poison'. diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 02f28da519e3..62ba9aa6bbf8 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -72,6 +72,38 @@ static int is_dup(struct device *match, void *data) return 0; } +static ssize_t trigger_poison_list_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + struct cxl_endpoint_decoder *cxled; + struct cxl_memdev *cxlmd; + u64 offset, length; + int rc, i; + bool tmp; + + if (kstrtobool(buf, &tmp)) + return -EINVAL; + + for (i = 0; i < p->nr_targets; i++) { + cxled = p->targets[i]; + cxlmd = cxled_to_memdev(cxled); + if (!test_bit(CXL_MEM_COMMAND_ID_GET_POISON, + cxlmd->cxlds->enabled_cmds)) + continue; + + offset = cxl_dpa_resource_start(cxled); + length = cxl_dpa_size(cxled); + rc = cxl_mem_get_poison(cxlmd, offset, length, cxlr); + if (rc) + return rc; + } + return len; +} +static DEVICE_ATTR_WO(trigger_poison_list); + static ssize_t uuid_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) { @@ -570,6 +602,7 @@ static struct attribute *cxl_region_attrs[] = { &dev_attr_interleave_granularity.attr, &dev_attr_resource.attr, &dev_attr_size.attr, + &dev_attr_trigger_poison_list.attr, NULL, }; From patchwork Wed Jan 18 20:02:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 45462 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2536645wrn; Wed, 18 Jan 2023 12:04:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXsXtchPFyddX/RBmjXNb3cCzorn2aYS/5W20BloiOcWQ39nFrPLPsPQc/RlHYSNWzvFHMlz X-Received: by 2002:aa7:d713:0:b0:46b:b19b:5e01 with SMTP id t19-20020aa7d713000000b0046bb19b5e01mr8214323edq.38.1674072262350; Wed, 18 Jan 2023 12:04:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674072262; cv=none; d=google.com; s=arc-20160816; b=czxNPtBdiSvG0nA7TQrKYGiEE8Z7+5pFiC+5IVyB9hCx71puASucE3Qu4bQJirytSF FOaOJQyByexrIHaIA/HtOyp+H5/BqYJWqHC6u3Lww6hw/kGVTq33jlshk/oTBYysTeJ+ rLDRmmI/MyrECZmBmxrRVADDGb7zzconlSR8HS8ZCLf9liP9l+GkxT+/h8uOmkv3X4Nu foz52Mearuvi5q4jwfvpflUYveKCcHBZzEcqhoBxrdOnx6RO+AUEMi6vyOHgwdUM63F+ uxbfSnzdqVeK0xjgzDl9yuuXniv9x+UNDfX5f4jmF4g0+5spmzgXqGcpzqXZrK/q3kTs XlWQ== 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=6to2tOtCuvpcSPyuXOXdStUlYVqiFxg/lye7ig/9Q5U=; b=ISzg0jW9NlCrYeupU3ldbL4M42agAi3TfuMe6V83/hKoZ1ApwvL7qKBJSNngucngwO SgHomKTKF1fc71ElJZ87aNRQf42x5mNEmtQihIYvaMbAChMTVRszU0uT/x069MTPx5z7 qm1Fl3ix5CCZEGk+wwDTKFJDU3z8uvxRST/egN/7wKFr6l3TRJnSwIH8D08tzYuS99Y2 rZql3GNUO/St9lRYgEmphbT1BQnvZYx5IK0P4s6FDw10PBc7YF3OZ1Z+k48pJac6Up+a IwIzlEa6B6laTtF3fWkls6NwtXhLR4RnZuS4hCh3dZLb/A8h63pIzsYtWeKhmBldO+WV NX6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AvMvIf9+; 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 q14-20020a056402518e00b0049e07afe709si15166237edd.355.2023.01.18.12.03.58; Wed, 18 Jan 2023 12:04:22 -0800 (PST) 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=AvMvIf9+; 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 S229818AbjARUDS (ORCPT + 99 others); Wed, 18 Jan 2023 15:03:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229882AbjARUDG (ORCPT ); Wed, 18 Jan 2023 15:03:06 -0500 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C033A5899F; Wed, 18 Jan 2023 12:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674072171; x=1705608171; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=K6n6AW/LYnF9WLCAnay5xJmlW79haRIrJ58eRL1qqYo=; b=AvMvIf9+mMkN/o1mngvhjXHgD8LlZV3hAu0o672G/cyn7KsXITbk36mY mpr5ScsMSv8yyLRRvwD8CM0T8Y1micnLY/db3Los7ZEg2NZSKMQNHr0tn afW57MCB37pKZPpHGUzbyjmzbAn1XBusFDeIwXntsZCZWjiI2VDC66tW4 ldJNkpoiy5qFMLiTKmKz6ynHSUzepf8HjextIeNjTgsVrE1lTsUNyO4Aj mYBusfkg8jgg9pVVJWEEQCye/JK53jPEMX7PXkBCHfVQ25emJf+oSQSTu WJ0GR7+fGObBFmf+dB6NA94L37ywlZz9nvJ8ZFLayzXyShbc8AKwtH/sJ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="322776805" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="322776805" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 12:02:31 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10594"; a="661861705" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="661861705" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.209.119.104]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 12:02:30 -0800 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 v5 5/5] tools/testing/cxl: Mock support for Get Poison List Date: Wed, 18 Jan 2023 12:02:21 -0800 Message-Id: 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?1755391996541223615?= X-GMAIL-MSGID: =?utf-8?q?1755391996541223615?= 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. Reviewed-by: Jonathan Cameron Signed-off-by: Alison Schofield --- 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 5e4ecd93f1d2..09dc358bb33b 100644 --- a/tools/testing/cxl/test/mem.c +++ b/tools/testing/cxl/test/mem.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #define LSA_SIZE SZ_128K @@ -38,6 +39,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 */ @@ -141,6 +146,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; @@ -558,6 +565,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; + } mock_plist = { + .po = { + .count = cpu_to_le16(1), + }, + .record = { + .length = cpu_to_le32(1), + .address = cpu_to_le64(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; @@ -606,6 +641,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; } @@ -664,6 +702,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;