From patchwork Mon Mar 20 04:31:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 71972 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1013222wrt; Sun, 19 Mar 2023 21:35:48 -0700 (PDT) X-Google-Smtp-Source: AK7set91Kf0vBSygqM0nVWvCWRM250QvV1dnRj1CH0VQjggL8sKoomcL9UNeJSw5+G75PDHT4oCI X-Received: by 2002:a05:6a20:8f0c:b0:d9:65a5:44d4 with SMTP id b12-20020a056a208f0c00b000d965a544d4mr3328242pzk.3.1679286948033; Sun, 19 Mar 2023 21:35:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679286948; cv=none; d=google.com; s=arc-20160816; b=e6ZgboL2HCSzxE+ZhZhkRD3Hdgk716USiagwrl76Nx6fGNA5n1E6obAhsUpCeRzKA2 jvorbdq6C46AM7P5/Y4mSlNlyTor7JUcKWmpzB1D7wDc2CddjBnVdMYRzrAocJDBa8iM vncTcYlx6AhyXSKmrYQ7knoA29adI5MxeyBmFmPikB1mKqGrVA26pYFNdt/es5TQ7nZl DfyFU+jtlqXiJIDElDKRX5qDDwOYIEG1IGD/TyN6uOg2JKXJ2pp/eJUbtn7nYt6IrYys Cf3ao5X7LcPtXJ963KvPwjL3DNaqmSeLTiaD6ywyP+U7bIYtX+6gEhLElBsvy7muBFpF x/Hw== 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=mRJwr6IjDTTTO/wOJMKdapGhIMqDYM2J7HfEMzFssk8=; b=DAzO6LpyyLuEy7vrKH9mBPV3ZV6ed+5S6lSRpVYAUhGY03QLzegQFTJCDjE+0rmv8k TgnW+o51YZVm313I5DPwTff5j6uZqBGEG9L03u5j6pEtY4C5EDRH/+9HgO0rmhp4YTG6 gXhJTX+fkKHB/3SyGl+fpDP91ypOV4lAW5WzEyHQeM2OmBKsq5cSUabjqyPNOZDFs8I4 nS23lxRUu38BiZ+Z+1F8jmjBT8bCxgaruGzVe9hS4TX2jaUnuhqliQaNDksMcH3MamOz Fyv/QHGbmYagRhlEoujUcCw+PvS4VQRP4JaoruMcdxpVrgFWFS0ASmGg0t8KMufUyD6Z DDPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AYr2HVGV; 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 e4-20020a636904000000b005091105ca8fsi9434810pgc.14.2023.03.19.21.35.33; Sun, 19 Mar 2023 21:35:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AYr2HVGV; 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 S229940AbjCTEcD (ORCPT + 99 others); Mon, 20 Mar 2023 00:32:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229788AbjCTEcA (ORCPT ); Mon, 20 Mar 2023 00:32:00 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64D52168AC; Sun, 19 Mar 2023 21:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679286718; x=1710822718; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UyEemIYHTGruP7DDwRWCQa9RCIKf6b9i8rDVSRIKsSg=; b=AYr2HVGV4VOkdXpXbKMwMdYSorjVicE4a6cnMD1r5YdRM4veE4LLXpUj HKw83cKlPULM2ybybZ4/dqljLd5upl7qhkFJdnzkLOGwNvVJMIhEL+w/+ vNZ+kV6UWXKqqcBKRXPasgAvkd5c4R8METoXYA1XuusdC69DM3QNIJd91 AjBzMtlAtqjGHw1uEBGbpi9AtK5cQz8xY4b1i4S7B2sDoAbWYdN1mZKUh 1nnYRHUNp6JLQD7v8tWebGRR1VDrttAioDqrzY8I7TDs7tLJ6/O4jr3uK 5/ZsCu7jIjjwv42vdTZTxgjH8NncJmoHwOiy9K24Ben+6rAkPpOGyfgM0 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="337287517" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="337287517" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2023 21:31:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="926823986" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="926823986" Received: from aschofie-mobl2.amr.corp.intel.com (HELO localhost) ([10.209.14.183]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2023 21:31:57 -0700 From: alison.schofield@intel.com To: Dan Williams , Ira Weiny , Vishal Verma , Dave Jiang , Ben Widawsky , Steven Rostedt Cc: Alison Schofield , linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v9 2/6] cxl/trace: Add TRACE support for CXL media-error records Date: Sun, 19 Mar 2023 21:31:47 -0700 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?1760859990804616894?= X-GMAIL-MSGID: =?utf-8?q?1760859990804616894?= 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'. Signed-off-by: Alison Schofield Reviewed-by: Jonathan Cameron --- drivers/cxl/core/mbox.c | 4 +- drivers/cxl/core/trace.h | 84 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 1 deletion(-) diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c index 0da0a30511f2..77fc811bdfed 100644 --- a/drivers/cxl/core/mbox.c +++ b/drivers/cxl/core/mbox.c @@ -1147,7 +1147,9 @@ 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, 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 9b8d3d997834..33a22d26e742 100644 --- a/drivers/cxl/core/trace.h +++ b/drivers/cxl/core/trace.h @@ -7,6 +7,7 @@ #define _CXL_EVENTS_H #include +#include #include #include @@ -600,6 +601,89 @@ TRACE_EVENT(cxl_memory_module, ) ); +#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 *cxlmd, struct cxl_region *region, + const struct cxl_poison_record *record, + u8 flags, __le64 overflow_t), + + TP_ARGS(cxlmd, region, record, flags, overflow_t), + + TP_STRUCT__entry( + __string(memdev, dev_name(&cxlmd->dev)) + __string(host, dev_name(cxlmd->dev.parent)) + __field(u64, serial) + __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(&cxlmd->dev)); + __assign_str(host, dev_name(cxlmd->dev.parent)); + __entry->serial = cxlmd->cxlds->serial; + __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 host=%s serial=%lld region=%s region_uuid=%pU dpa=0x%llx length=0x%x source=%s flags=%s overflow_time=%llu", + __get_str(memdev), + __get_str(host), + __entry->serial, + __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