From patchwork Fri Mar 1 01:31:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 13577823 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F6D32B9D2 for ; Fri, 1 Mar 2024 01:31:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256688; cv=none; b=EfXyi6ZMi/1EWT8lqmaQfejxxV2lFQRzZ/j1ad7vnC32ZTjdtrxn1zFKH1G/NkidUgtXiukRBmhUoa0HylCcGKL0oMQcDBHHyJ84EKK6/0roY7EHkLkkTmHv1O3OwwWvItRY1T12P4TCCCMxIxf3x1W3cqN+nZ1cYwtsimZvmtg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256688; c=relaxed/simple; bh=TVx9IeXgQLRLu1JF0qCJbumBV4fjmWg+KAIK17Za3jw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DZ0t+TUz5bzfCCFKqJtjPt7SlVaqtfeFci4J0GFpR0ibMXCJVELuGh1q2q9/ojBmQMSIBBOWOCOha35HFQJ4zoxE4GrG30w40NrHT0OAIe9deQUELbDdPjWXpgiaLSZmPe4qZHEGBbWYeoq00ba5/voVzTcbdhfEZKh9kKN/q1Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=FEW8WpIN; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="FEW8WpIN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709256686; x=1740792686; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TVx9IeXgQLRLu1JF0qCJbumBV4fjmWg+KAIK17Za3jw=; b=FEW8WpIN+rV3S9IDb8z77UhgGMvFZUMaMQPk6I6OCxmj7qQIjaGPGSxF bGHJarieq9goqlk8En74e7pVATde7XAFGZuOEVkWdozcJMi56uW2K6Ut+ +klodnlYcZydd4zGjO3abpG+N4cPqqJpwZSz7quGknMiRmYEZjvPSZYka ddRkAVGVEE5zgRB8P0rlK5f4wNo8ATM3zMnbN8+1g5QOUbMjIBN9Ip16n fFcaJWd6drsYKgezqQQ4UIDgUx6ZGXdu+Kw9ObsW9ffaAvEEfznKz9P6T bqf9cbyY4/nRsksoeOJMxoss2ZTWninSm3TTV2jDmw8j3OuGk8qs4FeSs Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10999"; a="14343106" X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="14343106" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="7952656" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.212.136.104]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:24 -0800 From: alison.schofield@intel.com To: Vishal Verma Cc: Alison Schofield , nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, Dave Jiang Subject: [ndctl PATCH v9 1/7] libcxl: add interfaces for GET_POISON_LIST mailbox commands Date: Thu, 29 Feb 2024 17:31:16 -0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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.1 8.2.9.9.4.1), the device returns the Poison List as a set of Media Error Records that include the source of the error, the starting device physical address and length. Trigger the retrieval of the poison list by writing to the memory device sysfs attribute: trigger_poison_list. The CXL driver only offers triggering per memdev, so the trigger by region interface offered here is a convenience API that triggers a poison list retrieval for each memdev contributing to a region. int cxl_memdev_trigger_poison_list(struct cxl_memdev *memdev); int cxl_region_trigger_poison_list(struct cxl_region *region); The resulting poison records are logged as kernel trace events named 'cxl_poison'. Signed-off-by: Alison Schofield Reviewed-by: Dave Jiang --- cxl/lib/libcxl.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ cxl/lib/libcxl.sym | 2 ++ cxl/libcxl.h | 2 ++ 3 files changed, 51 insertions(+) diff --git a/cxl/lib/libcxl.c b/cxl/lib/libcxl.c index 725240a17473..1537a33d370e 100644 --- a/cxl/lib/libcxl.c +++ b/cxl/lib/libcxl.c @@ -1710,6 +1710,53 @@ CXL_EXPORT int cxl_memdev_disable_invalidate(struct cxl_memdev *memdev) return 0; } +CXL_EXPORT int cxl_memdev_trigger_poison_list(struct cxl_memdev *memdev) +{ + struct cxl_ctx *ctx = cxl_memdev_get_ctx(memdev); + char *path = memdev->dev_buf; + int len = memdev->buf_len, rc; + + if (snprintf(path, len, "%s/trigger_poison_list", + memdev->dev_path) >= len) { + err(ctx, "%s: buffer too small\n", + cxl_memdev_get_devname(memdev)); + return -ENXIO; + } + rc = sysfs_write_attr(ctx, path, "1\n"); + if (rc < 0) { + fprintf(stderr, + "%s: Failed write sysfs attr trigger_poison_list\n", + cxl_memdev_get_devname(memdev)); + return rc; + } + return 0; +} + +CXL_EXPORT int cxl_region_trigger_poison_list(struct cxl_region *region) +{ + struct cxl_memdev_mapping *mapping; + int rc; + + cxl_mapping_foreach(region, mapping) { + struct cxl_decoder *decoder; + struct cxl_memdev *memdev; + + decoder = cxl_mapping_get_decoder(mapping); + if (!decoder) + continue; + + memdev = cxl_decoder_get_memdev(decoder); + if (!memdev) + continue; + + rc = cxl_memdev_trigger_poison_list(memdev); + if (rc) + return rc; + } + + return 0; +} + CXL_EXPORT int cxl_memdev_enable(struct cxl_memdev *memdev) { struct cxl_ctx *ctx = cxl_memdev_get_ctx(memdev); diff --git a/cxl/lib/libcxl.sym b/cxl/lib/libcxl.sym index 2cbceb3a95da..72a50be7601f 100644 --- a/cxl/lib/libcxl.sym +++ b/cxl/lib/libcxl.sym @@ -276,4 +276,6 @@ global: cxl_cmd_alert_config_set_enable_alert_actions; cxl_cmd_new_set_alert_config; cxl_memdev_wait_sanitize; + cxl_memdev_trigger_poison_list; + cxl_region_trigger_poison_list; } LIBCXL_6; diff --git a/cxl/libcxl.h b/cxl/libcxl.h index 98612ba71b29..352b3a866f63 100644 --- a/cxl/libcxl.h +++ b/cxl/libcxl.h @@ -461,6 +461,8 @@ enum cxl_setpartition_mode { int cxl_cmd_partition_set_mode(struct cxl_cmd *cmd, enum cxl_setpartition_mode mode); +int cxl_memdev_trigger_poison_list(struct cxl_memdev *memdev); +int cxl_region_trigger_poison_list(struct cxl_region *region); int cxl_cmd_alert_config_set_life_used_prog_warn_threshold(struct cxl_cmd *cmd, int threshold); From patchwork Fri Mar 1 01:31:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 13577824 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DAD22C68F for ; Fri, 1 Mar 2024 01:31:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256688; cv=none; b=ZaWEqQLFf2u+9+T9rRHOdAvEPqRRrTmnPRD4U645HwbWPwXYbA/ErCj5rrq52PEGMvzYYdEyiiKGsJgllukQy0aOtn/w1iouMhkn/AZLNs7FpjORyL5E5ecwWzzR2G06RLXuOF8evnf/egMn/hM2TBQu6+9oG8deZNft042N+IU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256688; c=relaxed/simple; bh=hbtZxXnoVzB3QnmV5PLXG8Us1o2ekbGwln4vc2//uhw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MkKkP+WwkFNSB0JyMDmQFIXzDfbR0Is1J2WPMldHuZtZc9DDntJz2aDh4TxuOkobBLgEVEKBN1YpwAFu4xKdomPH3y8DkjdIGtEpF4B7AXK/k8tqw11IFf4nSOTuPNfSuMujnmoZJJlmDP5WrbLB3wvug97Lv15WWH2whkGAWaM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=PD1qk60R; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="PD1qk60R" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709256687; x=1740792687; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hbtZxXnoVzB3QnmV5PLXG8Us1o2ekbGwln4vc2//uhw=; b=PD1qk60R8kce13TV4mjGlSdZv5LPx7+fZ1+LndBHYiTuydq4UF3+yC/B KRNZzC6BFCbX3X+sXOw/RaNW5E7sBeF/elsGMb7MPQcnmcTrH+HG0y/lv uuwHW45kvJwl1sBzwsFzsztIWRbq+jSpBlkjyDRo0JldfxoYJDhuziMGU 2qDTSbhpknDMLmnXAv+1GlRBBLOZah5kUSPAfe9nbTQx+7g5GlXMjT03D ciu43hG1KAKN+tHkMtkDEbmS4t/a3ZeVX/MVt7PJas7jUIWBMQp6bVpKi NwtNl3Lbx8PNLpIrbhBEWEqrYLTPAG41BHiGUs8evj7Vr63RlZGXM8eC6 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10999"; a="14343108" X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="14343108" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="7952663" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.212.136.104]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:25 -0800 From: alison.schofield@intel.com To: Vishal Verma Cc: Alison Schofield , nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, Jonathan Cameron , Dave Jiang Subject: [ndctl PATCH v9 2/7] cxl: add an optional pid check to event parsing Date: Thu, 29 Feb 2024 17:31:17 -0800 Message-Id: <0b1b79d374bbfd90093e2ee47fb130cfbaf36e73.1709253898.git.alison.schofield@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Alison Schofield When parsing CXL events, callers may only be interested in events that originate from the current process. Introduce an optional argument to the event trace context: event_pid. When event_pid is present, simply skip the parsing of events without a matching pid. It is not a failure to see other, non matching events. The initial use case for this is device poison listings where only the media-error records requested by this process are wanted. Signed-off-by: Alison Schofield Reviewed-by: Jonathan Cameron Reviewed-by: Dave Jiang --- cxl/event_trace.c | 5 +++++ cxl/event_trace.h | 1 + 2 files changed, 6 insertions(+) diff --git a/cxl/event_trace.c b/cxl/event_trace.c index 1b5aa09de8b2..93a95f9729fd 100644 --- a/cxl/event_trace.c +++ b/cxl/event_trace.c @@ -214,6 +214,11 @@ static int cxl_event_parse(struct tep_event *event, struct tep_record *record, return 0; } + if (event_ctx->event_pid) { + if (event_ctx->event_pid != tep_data_pid(event->tep, record)) + return 0; + } + if (event_ctx->parse_event) return event_ctx->parse_event(event, record, &event_ctx->jlist_head); diff --git a/cxl/event_trace.h b/cxl/event_trace.h index ec6267202c8b..7f7773b2201f 100644 --- a/cxl/event_trace.h +++ b/cxl/event_trace.h @@ -15,6 +15,7 @@ struct event_ctx { const char *system; struct list_head jlist_head; const char *event_name; /* optional */ + int event_pid; /* optional */ int (*parse_event)(struct tep_event *event, struct tep_record *record, struct list_head *jlist_head); /* optional */ }; From patchwork Fri Mar 1 01:31:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 13577825 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFBBC2B9CE for ; Fri, 1 Mar 2024 01:31:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256689; cv=none; b=slw4eh4+2v1hL2VkQL9ITet9bBo/JU9IbsTa4gcgNSHP4HrMUlx4+MmFd/AdR3t2aqE8tqJIBDVxZdZ3edVcEFovXYMb7HX91KTq/Jc2sWvdMIenJodOnN7YPK4cxsEfRqdpQXx0pAntpyJDnvg24Y+sGw/jhEthxCsB69c9ivM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256689; c=relaxed/simple; bh=vAtrXMzOPQbVk0ENBhOuNC+XRIcLDIDYr/JHq12NW44=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=agUhwnJwxomfSC6bIhyN8Wc/STQd4Esrv/KEkZW0EnzEm0iwdpjSaHGuyr53QwVxuvlcz1OgEIRbj2re3ZYqr2PNvAQ04+oyi6FPF7nnxYIkPpsJNjg2hUtnwM/45a+qiagF3aSwRevA2IfhdyRELnLwiRwgDWMmJXvjwF7awsE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=kHv7ZHy3; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="kHv7ZHy3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709256687; x=1740792687; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vAtrXMzOPQbVk0ENBhOuNC+XRIcLDIDYr/JHq12NW44=; b=kHv7ZHy3N5EljKiYCp2JMPuOgzRCosN8e9tVQBmUv3vJqPsMVt1PJOsA 3OJ821EhzuLyffHkb62oAXDARpe+H90AKIaLZtmwZzZZivzl1/DH9L4O7 evSIQihxFYNFHoRPWYBTKWwPsOagpXmbpCxnI74kadBkFLiQjfj3Y+l9K k+/U8+qD6d6OvtIMPq3ztiuoKKavpHxgIWaqmsBQP8GoWHqn3ogUmq8TC aX3CBdhh6Ec3p/xFo+/kT1S8FKRwQUETdk+CfXP/9WpID44v01K0ogKR6 pcTQptMbrgDM2//aiwubzLX8ht/R9ojDc/1esNQFyhj3+t9eNMVsyYMJE Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10999"; a="14343113" X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="14343113" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="7952667" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.212.136.104]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:26 -0800 From: alison.schofield@intel.com To: Vishal Verma Cc: Alison Schofield , nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, Dave Jiang Subject: [ndctl PATCH v9 3/7] cxl/event_trace: add a private context for private parsers Date: Thu, 29 Feb 2024 17:31:18 -0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Alison Schofield CXL event tracing provides helpers to iterate through a trace buffer and extract events of interest. It offers two parsing options: a default parser that adds every field of an event to a json object, and a private parsing option where the caller can parse each event as it wishes. Although the private parser can do some conditional parsing based on field values, it has no method to receive additional information needed to make parsing decisions in the callback. Add a private_ctx field to the existing 'struct event_context'. Replace the jlist_head parameter, used in the default parser, with the private_ctx. This is in preparation for adding a private parser requiring additional context for cxl_poison events. Signed-off-by: Alison Schofield Reviewed-by: Dave Jiang --- cxl/event_trace.c | 2 +- cxl/event_trace.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cxl/event_trace.c b/cxl/event_trace.c index 93a95f9729fd..bdad0c19dbd4 100644 --- a/cxl/event_trace.c +++ b/cxl/event_trace.c @@ -221,7 +221,7 @@ static int cxl_event_parse(struct tep_event *event, struct tep_record *record, if (event_ctx->parse_event) return event_ctx->parse_event(event, record, - &event_ctx->jlist_head); + event_ctx->private_ctx); return cxl_event_to_json(event, record, &event_ctx->jlist_head); } diff --git a/cxl/event_trace.h b/cxl/event_trace.h index 7f7773b2201f..ec61962abbc6 100644 --- a/cxl/event_trace.h +++ b/cxl/event_trace.h @@ -16,8 +16,9 @@ struct event_ctx { struct list_head jlist_head; const char *event_name; /* optional */ int event_pid; /* optional */ + void *private_ctx; /* required with parse_event() */ int (*parse_event)(struct tep_event *event, struct tep_record *record, - struct list_head *jlist_head); /* optional */ + void *private_ctx);/* optional */ }; int cxl_parse_events(struct tracefs_instance *inst, struct event_ctx *ectx); From patchwork Fri Mar 1 01:31:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 13577826 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3774E2EB0A for ; Fri, 1 Mar 2024 01:31:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256689; cv=none; b=ERaQrD+3fZY3gnaYxLiUAnSYtaFWW1aLMySpknjsgtByURYkldttA8o2ICREX1MAnu8ADacgbgGVZUiLKR8DkqDoPJjynDKpWTlk9wW/hLFkAwHwr9xazYh+G40NDKZSf4jG9VzZd0PuJkREj+UYZP9GaxaCT2uo8yLexdKXU+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256689; c=relaxed/simple; bh=QElUwcVcnupUzTNc63llCO99K2zvT6wzcdjAx4LIt9o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dIHL7hk0hinAw8iULSeAKvbmu8hQDLZoE+reXWTUr0aC2R4WJiWmxI5Y0i+t5RHzMLnJdqs45fWoxdAf9VHDaxvvrHj8rXf8FLVgqOim944Ay7iUfG5CZ44dUiOPKoNEHUvyaGtT8iU2wRRpH1nHOoX+Bvg195DjX/kD+sJV2vY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=APgNJJxF; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="APgNJJxF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709256688; x=1740792688; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QElUwcVcnupUzTNc63llCO99K2zvT6wzcdjAx4LIt9o=; b=APgNJJxFKBTurAaX64NQJKtxXMPyIUZVx7c2wQaMC3wygYc299FKBFc9 nk9x4PsbeNPDNFDpvyewdXOoFcaASRBDsv9JG2ouu4QcGtCdgDq5+TyoO 9O3H4uuhfjgevO9kEHPZYqgk3+2oKkAWpc8PJ20675q7NMxDb1AzKqJ00 EtVC67e39dOKKk9y5zj2C63CThlC2j8MHALkVRfWhfZcGeGsZUUEBg5qX tbODS0XZDQqS8iYsaCyqiRGAYbdMfWKR6IDh7Dt82iPvOjsrdLbMW+aH/ OME+CnFB4emuAbM7baZGcvcICoR9caMBIndNzA0KrLlXeTv2Yvt9F/lzx w==; X-IronPort-AV: E=McAfee;i="6600,9927,10999"; a="14343115" X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="14343115" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="7952670" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.212.136.104]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:27 -0800 From: alison.schofield@intel.com To: Vishal Verma Cc: Alison Schofield , nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org Subject: [ndctl PATCH v9 4/7] cxl/event_trace: add helpers to retrieve tep fields by type Date: Thu, 29 Feb 2024 17:31:19 -0800 Message-Id: <6e07b4ceb01a56aa6791749709c2bf311bb91e1d.1709253898.git.alison.schofield@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Alison Schofield Add helpers to extract the value of an event record field given the field name. This is useful when the user knows the name and format of the field and simply needs to get it. Since this is in preparation for adding a cxl_poison private parser for 'cxl list --media-errors' support, add those specific required types: u8, u32, u64, char* Signed-off-by: Alison Schofield Reviewed-by: Dave Jiang --- cxl/event_trace.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ cxl/event_trace.h | 10 ++++++- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/cxl/event_trace.c b/cxl/event_trace.c index bdad0c19dbd4..6cc9444f3204 100644 --- a/cxl/event_trace.c +++ b/cxl/event_trace.c @@ -15,6 +15,81 @@ #define _GNU_SOURCE #include +static struct tep_format_field *__find_field(struct tep_event *event, + const char *name) +{ + struct tep_format_field **fields; + + fields = tep_event_fields(event); + if (!fields) + return NULL; + + for (int i = 0; fields[i]; i++) { + struct tep_format_field *f = fields[i]; + + if (strcmp(f->name, name) != 0) + continue; + + return f; + } + return NULL; +} + +u64 cxl_get_field_u64(struct tep_event *event, struct tep_record *record, + const char *name) +{ + struct tep_format_field *f; + unsigned char *val; + int len; + + f = __find_field(event, name); + if (!f) + return ULLONG_MAX; + + val = tep_get_field_raw(NULL, event, f->name, record, &len, 0); + if (!val) + return ULLONG_MAX; + + return *(u64 *)val; +} + +char *cxl_get_field_string(struct tep_event *event, struct tep_record *record, + const char *name) +{ + struct tep_format_field *f; + int len; + + f = __find_field(event, name); + if (!f) + return NULL; + + return tep_get_field_raw(NULL, event, f->name, record, &len, 0); +} + +u32 cxl_get_field_u32(struct tep_event *event, struct tep_record *record, + const char *name) +{ + char *val; + + val = cxl_get_field_string(event, record, name); + if (!val) + return UINT_MAX; + + return *(u32 *)val; +} + +u8 cxl_get_field_u8(struct tep_event *event, struct tep_record *record, + const char *name) +{ + char *val; + + val = cxl_get_field_string(event, record, name); + if (!val) + return UCHAR_MAX; + + return *(u8 *)val; +} + static struct json_object *num_to_json(void *num, int elem_size, unsigned long flags) { bool sign = flags & TEP_FIELD_IS_SIGNED; diff --git a/cxl/event_trace.h b/cxl/event_trace.h index ec61962abbc6..bbdea3b896e0 100644 --- a/cxl/event_trace.h +++ b/cxl/event_trace.h @@ -5,6 +5,7 @@ #include #include +#include struct jlist_node { struct json_object *jobj; @@ -25,5 +26,12 @@ int cxl_parse_events(struct tracefs_instance *inst, struct event_ctx *ectx); int cxl_event_tracing_enable(struct tracefs_instance *inst, const char *system, const char *event); int cxl_event_tracing_disable(struct tracefs_instance *inst); - +char *cxl_get_field_string(struct tep_event *event, struct tep_record *record, + const char *name); +u8 cxl_get_field_u8(struct tep_event *event, struct tep_record *record, + const char *name); +u32 cxl_get_field_u32(struct tep_event *event, struct tep_record *record, + const char *name); +u64 cxl_get_field_u64(struct tep_event *event, struct tep_record *record, + const char *name); #endif From patchwork Fri Mar 1 01:31:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 13577827 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBC3D3399B for ; Fri, 1 Mar 2024 01:31:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256690; cv=none; b=PDGgIgzw6qVRnVhTR1xb69j6YVjgiDrDlOQuraklX/H05GubN1S9PHZSS9WH/oic3NwhhDEMrGINMW13mC2A5nI4UEoVXAaE0JTFHuJCBVt8JOMuCjEW7mCen6O6dd3VvDu3WvzdG+v7PHWOpa9mgnTlBHqMkk22hXiEPez9Whw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256690; c=relaxed/simple; bh=AZp5kpJPm0LYNCtbjw/NRIT0PniqQbV0QNLZabDPHag=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=N4cBYbMxCYirX+XdMd2T6d0tPWqaCG2avjxCap017tozQWUbh+Zo6gF1b/CTCHVdmMxqfD8p/70HwnZIo7ovEiArD51CNY30QVYadQae82c5sfHmdZlAnheKvfB/uwAWIcgH5pvaqZOli36jmoIrpOdhjI9lV5kNgq0wraAfp8w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=YqgiRDCR; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="YqgiRDCR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709256689; x=1740792689; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AZp5kpJPm0LYNCtbjw/NRIT0PniqQbV0QNLZabDPHag=; b=YqgiRDCRKhmIVHxgSwXLDfCdyPdel6sFi1vbIdOJBPGioGk5CuDMcL+O g3xDBS/QN6dO5yJZKM4x/gMxTr9rMIiz8wBB6nJJn+clhE2QodfJUJC5d PXQPDjly3aWGNaveFPRuwEjqdYNjg02Jeq/TVhVy9jQ8v8HpFuKk0Q6Vd wbBr4QDkA5VJEiKt+1a6dJUv8n2BV/NgxxFwPyDmUuJEK358UnpuVng3v OMtDwm2xznFJ7o5znZ4MaG7hWXvE7+FEkD98uZR2xEf3BhrnVFgb8MnX5 WASG5R8Ni8sYQiTE/ZFudryZyUbjI8vbEz9qVghfHWgUHn9YQWiNNrjjb Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10999"; a="14343117" X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="14343117" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="7952675" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.212.136.104]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:27 -0800 From: alison.schofield@intel.com To: Vishal Verma Cc: Alison Schofield , nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org Subject: [ndctl PATCH v9 5/7] cxl/list: collect and parse media_error records Date: Thu, 29 Feb 2024 17:31:20 -0800 Message-Id: <9a6be3fd24b22661ec39ea614f75266b594026b3.1709253898.git.alison.schofield@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Alison Schofield Media_error records are logged as events in the kernel tracing subsystem. To prepare the media_error records for cxl list, enable tracing, trigger the poison list read, and parse the generated cxl_poison events into a json representation. Use the event_trace private parsing option to customize the json representation based on cxl-list calling options and event field settings. Signed-off-by: Alison Schofield --- cxl/json.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 271 insertions(+) diff --git a/cxl/json.c b/cxl/json.c index 7678d02020b6..c681176aa483 100644 --- a/cxl/json.c +++ b/cxl/json.c @@ -1,16 +1,20 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (C) 2015-2021 Intel Corporation. All rights reserved. #include +#include #include +#include #include #include #include #include #include +#include #include "filter.h" #include "json.h" #include "../daxctl/json.h" +#include "event_trace.h" #define CXL_FW_VERSION_STR_LEN 16 #define CXL_FW_MAX_SLOTS 4 @@ -571,6 +575,261 @@ err_jobj: return NULL; } +/* CXL Spec 3.1 Table 8-140 Media Error Record */ +#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 + +/* CXL Spec 3.1 Table 8-139 Get Poison List Output Payload */ +#define CXL_POISON_FLAG_MORE BIT(0) +#define CXL_POISON_FLAG_OVERFLOW BIT(1) +#define CXL_POISON_FLAG_SCANNING BIT(2) + +struct poison_ctx { + struct json_object *jpoison; + struct cxl_region *region; + struct cxl_memdev *memdev; + unsigned long flags; +}; + +static struct cxl_memdev *find_memdev(struct cxl_region *region, + const char *memdev_name) +{ + struct cxl_memdev_mapping *mapping; + struct cxl_decoder *decoder; + struct cxl_memdev *memdev; + + cxl_mapping_foreach(region, mapping) + { + decoder = cxl_mapping_get_decoder(mapping); + if (!decoder) + continue; + + memdev = cxl_decoder_get_memdev(decoder); + if (strcmp(memdev_name, cxl_memdev_get_devname(memdev)) == 0) + break; + + memdev = NULL; + } + return memdev; +} + +static const char *find_decoder_name(struct poison_ctx *ctx, + const char *memdev_name, u64 addr) +{ + struct cxl_memdev *memdev = ctx->memdev; + const char *decoder_name = NULL; + struct cxl_endpoint *endpoint; + struct cxl_decoder *decoder; + struct cxl_port *port; + u64 start, end; + + if (!memdev) + memdev = find_memdev(ctx->region, memdev_name); + + if (!memdev) + return NULL; + + endpoint = cxl_memdev_get_endpoint(memdev); + port = cxl_endpoint_get_port(endpoint); + + cxl_decoder_foreach(port, decoder) { + start = cxl_decoder_get_resource(decoder); + end = start + cxl_decoder_get_size(decoder) - 1; + if (start <= addr && addr <= end) { + decoder_name = cxl_decoder_get_devname(decoder); + break; + } + } + return decoder_name; +} + +static int poison_event_to_json(struct tep_event *event, + struct tep_record *record, void *ctx) +{ + struct poison_ctx *p_ctx = (struct poison_ctx *)ctx; + struct json_object *jobj, *jp, *jpoison = p_ctx->jpoison; + unsigned long flags = p_ctx->flags; + char flag_str[32] = { '\0' }; + bool overflow = false; + u8 source, pflags; + const char *name; + u64 addr, ts; + u32 length; + char *str; + + jp = json_object_new_object(); + if (!jp) + return -ENOMEM; + + /* Skip records not in this region when listing by region */ + name = p_ctx->region ? cxl_region_get_devname(p_ctx->region) : NULL; + if (name) + str = cxl_get_field_string(event, record, "region"); + + if ((name) && (strcmp(name, str) != 0)) { + json_object_put(jp); + return 0; + } + + /* Include endpoint decoder name with hpa, when present */ + name = cxl_get_field_string(event, record, "memdev"); + addr = cxl_get_field_u64(event, record, "hpa"); + if (addr != ULLONG_MAX) + name = find_decoder_name(p_ctx, name, addr); + else + name = NULL; + + if (name) { + jobj = json_object_new_string(name); + if (jobj) + json_object_object_add(jp, "decoder", jobj); + + jobj = util_json_object_hex(addr, flags); + if (jobj) + json_object_object_add(jp, "hpa", jobj); + } + + addr = cxl_get_field_u64(event, record, "dpa"); + jobj = util_json_object_hex(addr, flags); + if (jobj) + json_object_object_add(jp, "dpa", jobj); + + length = cxl_get_field_u32(event, record, "dpa_length"); + jobj = util_json_object_size(length, flags); + if (jobj) + json_object_object_add(jp, "length", jobj); + + source = cxl_get_field_u8(event, record, "source"); + switch (source) { + case CXL_POISON_SOURCE_UNKNOWN: + jobj = json_object_new_string("Unknown"); + break; + case CXL_POISON_SOURCE_EXTERNAL: + jobj = json_object_new_string("External"); + break; + case CXL_POISON_SOURCE_INTERNAL: + jobj = json_object_new_string("Internal"); + break; + case CXL_POISON_SOURCE_INJECTED: + jobj = json_object_new_string("Injected"); + break; + case CXL_POISON_SOURCE_VENDOR: + jobj = json_object_new_string("Vendor"); + break; + default: + jobj = json_object_new_string("Reserved"); + } + if (jobj) + json_object_object_add(jp, "source", jobj); + + pflags = cxl_get_field_u8(event, record, "flags"); + if (pflags && pflags < UCHAR_MAX) { + if (pflags & CXL_POISON_FLAG_MORE) + strcat(flag_str, "More,"); + if (pflags & CXL_POISON_FLAG_SCANNING) + strcat(flag_str, "Scanning,"); + if (pflags & CXL_POISON_FLAG_OVERFLOW) { + strcat(flag_str, "Overflow,"); + overflow = true; + } + jobj = json_object_new_string(flag_str); + if (jobj) + json_object_object_add(jp, "flags", jobj); + } + + if (overflow) { + ts = cxl_get_field_u64(event, record, "overflow_ts"); + jobj = util_json_object_hex(ts, flags); + if (jobj) + json_object_object_add(jp, "overflow_t", jobj); + } + json_object_array_add(jpoison, jp); + + return 0; +} + +static struct json_object * +util_cxl_poison_events_to_json(struct tracefs_instance *inst, + struct poison_ctx *p_ctx) +{ + struct event_ctx ectx = { + .event_name = "cxl_poison", + .event_pid = getpid(), + .system = "cxl", + .private_ctx = p_ctx, + .parse_event = poison_event_to_json, + }; + int rc = 0; + + p_ctx->jpoison = json_object_new_array(); + if (!p_ctx->jpoison) + return NULL; + + rc = cxl_parse_events(inst, &ectx); + if (rc < 0) { + fprintf(stderr, "Failed to parse events: %d\n", rc); + goto put_jobj; + } + if (json_object_array_length(p_ctx->jpoison) == 0) + goto put_jobj; + + return p_ctx->jpoison; + +put_jobj: + json_object_put(p_ctx->jpoison); + return NULL; +} + +static struct json_object * +util_cxl_poison_list_to_json(struct cxl_region *region, + struct cxl_memdev *memdev, + unsigned long flags) +{ + struct json_object *jpoison = NULL; + struct poison_ctx p_ctx; + struct tracefs_instance *inst; + int rc; + + inst = tracefs_instance_create("cxl list"); + if (!inst) { + fprintf(stderr, "tracefs_instance_create() failed\n"); + return NULL; + } + + rc = cxl_event_tracing_enable(inst, "cxl", "cxl_poison"); + if (rc < 0) { + fprintf(stderr, "Failed to enable trace: %d\n", rc); + goto err_free; + } + + if (region) + rc = cxl_region_trigger_poison_list(region); + else + rc = cxl_memdev_trigger_poison_list(memdev); + if (rc) + goto err_free; + + rc = cxl_event_tracing_disable(inst); + if (rc < 0) { + fprintf(stderr, "Failed to disable trace: %d\n", rc); + goto err_free; + } + + p_ctx = (struct poison_ctx) { + .region = region, + .memdev = memdev, + .flags = flags, + }; + jpoison = util_cxl_poison_events_to_json(inst, &p_ctx); + +err_free: + tracefs_instance_free(inst); + return jpoison; +} + struct json_object *util_cxl_memdev_to_json(struct cxl_memdev *memdev, unsigned long flags) { @@ -649,6 +908,12 @@ struct json_object *util_cxl_memdev_to_json(struct cxl_memdev *memdev, json_object_object_add(jdev, "firmware", jobj); } + if (flags & UTIL_JSON_MEDIA_ERRORS) { + jobj = util_cxl_poison_list_to_json(NULL, memdev, flags); + if (jobj) + json_object_object_add(jdev, "media_errors", jobj); + } + json_object_set_userdata(jdev, memdev, NULL); return jdev; } @@ -987,6 +1252,12 @@ struct json_object *util_cxl_region_to_json(struct cxl_region *region, json_object_object_add(jregion, "state", jobj); } + if (flags & UTIL_JSON_MEDIA_ERRORS) { + jobj = util_cxl_poison_list_to_json(region, NULL, flags); + if (jobj) + json_object_object_add(jregion, "media_errors", jobj); + } + util_cxl_mappings_append_json(jregion, region, flags); if (flags & UTIL_JSON_DAX) { From patchwork Fri Mar 1 01:31:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 13577828 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D22E2C68F for ; Fri, 1 Mar 2024 01:31:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256691; cv=none; b=E5byMHZN4sJ4QnTSEfZkAsarzTMHljaKrb4+5+M22dO6mZxCmVZmrzddY0Xgn9oHS6HPWIjUkkmrJ63PNyoeHH4rumdIuOI5HJxM2J1n4rEoYM5hWemlvj7DX2tw6opsY0NSPXobN92lvXOBY9jNfNHdXApwpmYQkQwyJzWj0ZQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256691; c=relaxed/simple; bh=YgE+jtO0I1XdPTDQTtSFt5xuc6q3/D5Dokw5iW5LWLQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BPykCocBKBlH8jKuRxBFy5EM1kZsqa8aDoVVdCvMPUZAX3+V0br8yqrtSQIVzRyvuRDl9jDHKpPllWJ86Xo7/nUvLCMr0LSSdoilQo8Q6eqygVzPijmi/TDsrKC2BmoRgOZt6z3HIK/jKW2ugmfBLjgwLmhrvgC1QntlnPj6kOY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=aau2wFM5; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="aau2wFM5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709256689; x=1740792689; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YgE+jtO0I1XdPTDQTtSFt5xuc6q3/D5Dokw5iW5LWLQ=; b=aau2wFM5YKGkoFt6jMpSfaImBAb+WhomztLZccHhZ2yXyWgoS+873qU2 wOcfa4tPwtuGMZM9wcnAPOoaXIapdNFhE9rIgv+SmA49l4/dTwWjGF8Yc SbaYzTU516pG+JYTAaiBG9qSg9CUv6HQ0+7XhI3iSJ/SpyTPUCjnfxDHY /ecGb0cK9J+NTDeaymJFAzvrvIL385MHeEltKI+3HCqalkMiufOou3tTi tsBx2r6HhZ+puyF8UuygVQizEBbca8bnXqOuoC1bKUjRxzEHtjrOAAy3w YJKuzhC92zjbF+bYHSewy7z+o2M/JdEFxrS2uLC5QTOnnxlsTW5nSuN6m A==; X-IronPort-AV: E=McAfee;i="6600,9927,10999"; a="14343119" X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="14343119" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="7952678" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.212.136.104]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:28 -0800 From: alison.schofield@intel.com To: Vishal Verma Cc: Alison Schofield , nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, Dave Jiang Subject: [ndctl PATCH v9 6/7] cxl/list: add --media-errors option to cxl list Date: Thu, 29 Feb 2024 17:31:21 -0800 Message-Id: <92a1bb01b812365f95e18f97365639a978f31ca4.1709253898.git.alison.schofield@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Alison Schofield The --media-errors option to 'cxl list' retrieves poison lists from memory devices supporting the capability and displays the returned media_error records in the cxl list json. This option can apply to memdevs or regions. Include media-errors in the -vvv verbose option. Example usage in the Documentation/cxl/cxl-list.txt update. Signed-off-by: Alison Schofield Reviewed-by: Dave Jiang --- Documentation/cxl/cxl-list.txt | 79 +++++++++++++++++++++++++++++++++- cxl/filter.h | 3 ++ cxl/list.c | 3 ++ 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/Documentation/cxl/cxl-list.txt b/Documentation/cxl/cxl-list.txt index 838de4086678..5c20614ef579 100644 --- a/Documentation/cxl/cxl-list.txt +++ b/Documentation/cxl/cxl-list.txt @@ -415,6 +415,83 @@ OPTIONS --region:: Specify CXL region device name(s), or device id(s), to filter the listing. +-L:: +--media-errors:: + Include media-error information. The poison list is retrieved from the + device(s) and media_error records are added to the listing. Apply this + option to memdevs and regions where devices support the poison list + capability. + + "decoder" and "hpa" are included when the media-error is in a mapped + address. + + "source" will be one of: External, Internal, Injected, Vendor Specific, + or Unknown, as defined in CXL Specification v3.1 Table 8-140. + +---- +# cxl list -m mem1 --media-errors +[ + { + "memdev":"mem1", + "pmem_size":1073741824, + "ram_size":1073741824, + "serial":1, + "numa_node":1, + "host":"cxl_mem.1", + "media_errors":[ + { + "dpa":0, + "length":64, + "source":"Internal" + }, + { + "decoder":"decoder10.0", + "hpa":1035355557888, + "dpa":1073741824, + "length":64, + "source":"External" + }, + { + "decoder":"decoder10.0", + "hpa":1035355566080, + "dpa":1073745920, + "length":64, + "source":"Injected" + } + ] + } +] + +# cxl list -r region5 --media-errors +[ + { + "region":"region5", + "resource":1035355553792, + "size":2147483648, + "type":"pmem", + "interleave_ways":2, + "interleave_granularity":4096, + "decode_state":"commit", + "media_errors":[ + { + "decoder":"decoder10.0", + "hpa":1035355557888, + "dpa":1073741824, + "length":64, + "source":"External" + }, + { + "decoder":"decoder8.1", + "hpa":1035355553792, + "dpa":1073741824, + "length":64, + "source":"Internal" + } + ] + } +] +---- + -v:: --verbose:: Increase verbosity of the output. This can be specified @@ -431,7 +508,7 @@ OPTIONS devices with --idle. - *-vvv* Everything *-vv* provides, plus enable - --health and --partition. + --health, --partition, --media-errors. --debug:: If the cxl tool was built with debug enabled, turn on debug diff --git a/cxl/filter.h b/cxl/filter.h index 3f65990f835a..956a46e0c7a9 100644 --- a/cxl/filter.h +++ b/cxl/filter.h @@ -30,6 +30,7 @@ struct cxl_filter_params { bool fw; bool alert_config; bool dax; + bool media_errors; int verbose; struct log_ctx ctx; }; @@ -88,6 +89,8 @@ static inline unsigned long cxl_filter_to_flags(struct cxl_filter_params *param) flags |= UTIL_JSON_ALERT_CONFIG; if (param->dax) flags |= UTIL_JSON_DAX | UTIL_JSON_DAX_DEVS; + if (param->media_errors) + flags |= UTIL_JSON_MEDIA_ERRORS; return flags; } diff --git a/cxl/list.c b/cxl/list.c index 93ba51ef895c..0b25d78248d5 100644 --- a/cxl/list.c +++ b/cxl/list.c @@ -57,6 +57,8 @@ static const struct option options[] = { "include memory device firmware information"), OPT_BOOLEAN('A', "alert-config", ¶m.alert_config, "include alert configuration information"), + OPT_BOOLEAN('L', "media-errors", ¶m.media_errors, + "include media-error information "), OPT_INCR('v', "verbose", ¶m.verbose, "increase output detail"), #ifdef ENABLE_DEBUG OPT_BOOLEAN(0, "debug", &debug, "debug list walk"), @@ -121,6 +123,7 @@ int cmd_list(int argc, const char **argv, struct cxl_ctx *ctx) param.fw = true; param.alert_config = true; param.dax = true; + param.media_errors = true; /* fallthrough */ case 2: param.idle = true; From patchwork Fri Mar 1 01:31:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 13577829 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 05F94364C4 for ; Fri, 1 Mar 2024 01:31:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256691; cv=none; b=d9xWmrcd921PwBK5vHGhgklQFvaWcXUXNOjxswVqhp2C7i4vD+/uX1a5/pDdGU8Ec70/EdBvBvNLHGUJQu7nz1Ola58DtgClZq5wbBW2swduWmN+AN/aT4/DEq3FA+FOblBLdIeXIWQ2cXlbC9Wio4noGqw2U/xGuUY1LkNPT8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709256691; c=relaxed/simple; bh=oQvBOVgfsNLCjuievYMWAxaXWIEpXlHud/XlzXk6KRQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OrFUYr4JaxQB/VQNSJHc9OFUWQyUszwAyetqKWQTw7qYPumGenvN1BOiJ5Xl5ArNJxlF9jey2ukVPCeoAS69Mab6wrBr0I4Bzjqb/GZVvyaAyepWSi7XTyhhFmzToKa/IjM1fo8wPqMGgtZrQKoxbD/1NHlnjZ26QVTQ98sWhPE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Reuww0oD; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Reuww0oD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709256690; x=1740792690; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oQvBOVgfsNLCjuievYMWAxaXWIEpXlHud/XlzXk6KRQ=; b=Reuww0oDrv6pJkMmTM+jEe0Kid1zrSgYV0JVgNO3G/xsAiFkVMplHF9T 2NW9Do5icTZpwNpjZZAcHE9hO1MzaXgZYc0OivYe5eZMcRXztEjFb/9va aqCWxoxu62wljTBAy984v8UpNDoVZxbbn7ZqqT03lU8XBNmCO96Ey5ZJT QPiDXFuV+pNcnqUrkIZ/RdFngTcx2Oakn2NSQAvuIO50kywlDEtblRZw6 /Qh2miVh4ZG7sGZwzHm6bdk0vAyi2Ee8eu6qV8Ad3uRDRflByrpTn4/xG bk39uApujx+Llj5l79r07GttyrUsVK7d2hnT9NrUs7Gtk6CNY9ISIdM+y w==; X-IronPort-AV: E=McAfee;i="6600,9927,10999"; a="14343121" X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="14343121" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="7952682" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.212.136.104]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 17:31:28 -0800 From: alison.schofield@intel.com To: Vishal Verma Cc: Alison Schofield , nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, Dave Jiang Subject: [ndctl PATCH v9 7/7] cxl/test: add cxl-poison.sh unit test Date: Thu, 29 Feb 2024 17:31:22 -0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Alison Schofield Exercise cxl list, libcxl, and driver pieces of the get poison list pathway. Inject and clear poison using debugfs and use cxl-cli to read the poison list by memdev and by region. Signed-off-by: Alison Schofield Reviewed-by: Dave Jiang --- test/cxl-poison.sh | 137 +++++++++++++++++++++++++++++++++++++++++++++ test/meson.build | 2 + 2 files changed, 139 insertions(+) create mode 100644 test/cxl-poison.sh diff --git a/test/cxl-poison.sh b/test/cxl-poison.sh new file mode 100644 index 000000000000..af2e9dcd1a11 --- /dev/null +++ b/test/cxl-poison.sh @@ -0,0 +1,137 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2023 Intel Corporation. All rights reserved. + +. "$(dirname "$0")"/common + +rc=77 + +set -ex + +trap 'err $LINENO' ERR + +check_prereq "jq" + +modprobe -r cxl_test +modprobe cxl_test + +rc=1 + +# THEORY OF OPERATION: Exercise cxl-cli and cxl driver ability to +# inject, clear, and get the poison list. Do it by memdev and by region. + +find_memdev() +{ + readarray -t capable_mems < <("$CXL" list -b "$CXL_TEST_BUS" -M | + jq -r ".[] | select(.pmem_size != null) | + select(.ram_size != null) | .memdev") + + if [ ${#capable_mems[@]} == 0 ]; then + echo "no memdevs found for test" + err "$LINENO" + fi + + memdev=${capable_mems[0]} +} + +create_x2_region() +{ + # Find an x2 decoder + decoder="$($CXL list -b "$CXL_TEST_BUS" -D -d root | jq -r ".[] | + select(.pmem_capable == true) | + select(.nr_targets == 2) | + .decoder")" + + # Find a memdev for each host-bridge interleave position + port_dev0="$($CXL list -T -d "$decoder" | jq -r ".[] | + .targets | .[] | select(.position == 0) | .target")" + port_dev1="$($CXL list -T -d "$decoder" | jq -r ".[] | + .targets | .[] | select(.position == 1) | .target")" + mem0="$($CXL list -M -p "$port_dev0" | jq -r ".[0].memdev")" + mem1="$($CXL list -M -p "$port_dev1" | jq -r ".[0].memdev")" + + region="$($CXL create-region -d "$decoder" -m "$mem0" "$mem1" | + jq -r ".region")" + if [[ ! $region ]]; then + echo "create-region failed for $decoder" + err "$LINENO" + fi + echo "$region" +} + +# When cxl-cli support for inject and clear arrives, replace +# the writes to /sys/kernel/debug with the new cxl commands. + +inject_poison_sysfs() +{ + memdev="$1" + addr="$2" + + echo "$addr" > /sys/kernel/debug/cxl/"$memdev"/inject_poison +} + +clear_poison_sysfs() +{ + memdev="$1" + addr="$2" + + echo "$addr" > /sys/kernel/debug/cxl/"$memdev"/clear_poison +} + +validate_poison_found() +{ + list_by="$1" + nr_expect="$2" + + poison_list="$($CXL list "$list_by" --media-errors | + jq -r '.[].media_errors')" + if [[ ! $poison_list ]]; then + nr_found=0 + else + nr_found=$(jq "length" <<< "$poison_list") + fi + if [ "$nr_found" -ne "$nr_expect" ]; then + echo "$nr_expect poison records expected, $nr_found found" + err "$LINENO" + fi +} + +test_poison_by_memdev() +{ + find_memdev + inject_poison_sysfs "$memdev" "0x40000000" + inject_poison_sysfs "$memdev" "0x40001000" + inject_poison_sysfs "$memdev" "0x600" + inject_poison_sysfs "$memdev" "0x0" + validate_poison_found "-m $memdev" 4 + + clear_poison_sysfs "$memdev" "0x40000000" + clear_poison_sysfs "$memdev" "0x40001000" + clear_poison_sysfs "$memdev" "0x600" + clear_poison_sysfs "$memdev" "0x0" + validate_poison_found "-m $memdev" 0 +} + +test_poison_by_region() +{ + create_x2_region + inject_poison_sysfs "$mem0" "0x40000000" + inject_poison_sysfs "$mem1" "0x40000000" + validate_poison_found "-r $region" 2 + + clear_poison_sysfs "$mem0" "0x40000000" + clear_poison_sysfs "$mem1" "0x40000000" + validate_poison_found "-r $region" 0 +} + +# Turn tracing on. Note that 'cxl list --poison' does toggle the tracing. +# Turning it on here allows the test user to also view inject and clear +# trace events. +echo 1 > /sys/kernel/tracing/events/cxl/cxl_poison/enable + +test_poison_by_memdev +test_poison_by_region + +check_dmesg "$LINENO" + +modprobe -r cxl-test diff --git a/test/meson.build b/test/meson.build index 65db049821ee..cf99df665978 100644 --- a/test/meson.build +++ b/test/meson.build @@ -159,6 +159,7 @@ cxl_update_firmware = find_program('cxl-update-firmware.sh') cxl_events = find_program('cxl-events.sh') cxl_sanitize = find_program('cxl-sanitize.sh') cxl_destroy_region = find_program('cxl-destroy-region.sh') +cxl_poison = find_program('cxl-poison.sh') tests = [ [ 'libndctl', libndctl, 'ndctl' ], @@ -190,6 +191,7 @@ tests = [ [ 'cxl-events.sh', cxl_events, 'cxl' ], [ 'cxl-sanitize.sh', cxl_sanitize, 'cxl' ], [ 'cxl-destroy-region.sh', cxl_destroy_region, 'cxl' ], + [ 'cxl-poison.sh', cxl_poison, 'cxl' ], ] if get_option('destructive').enabled()