From patchwork Mon May 18 11:08:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Jain X-Patchwork-Id: 1292464 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49QbsK4VqXz9sTS for ; Mon, 18 May 2020 21:10:29 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49QbsK3rv5zDqT1 for ; Mon, 18 May 2020 21:10:29 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=vaibhav@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49QbqC4B9SzDqRL for ; Mon, 18 May 2020 21:08:39 +1000 (AEST) Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 04IB3YFZ087371; Mon, 18 May 2020 07:08:33 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 312cp7n9bj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 07:08:33 -0400 Received: from m0098394.ppops.net (m0098394.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 04IB4GA6091230; Mon, 18 May 2020 07:08:32 -0400 Received: from ppma02fra.de.ibm.com (47.49.7a9f.ip4.static.sl-reverse.com [159.122.73.71]) by mx0a-001b2d01.pphosted.com with ESMTP id 312cp7n9ac-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 07:08:32 -0400 Received: from pps.filterd (ppma02fra.de.ibm.com [127.0.0.1]) by ppma02fra.de.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 04IB5hAj012263; Mon, 18 May 2020 11:08:30 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma02fra.de.ibm.com with ESMTP id 3127t5hmb3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 11:08:30 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 04IB8RsU41615586 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 18 May 2020 11:08:27 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3C53BA405B; Mon, 18 May 2020 11:08:27 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7ABBEA4053; Mon, 18 May 2020 11:08:24 +0000 (GMT) Received: from vajain21-in-ibm-com (unknown [9.102.2.238]) by d06av23.portsmouth.uk.ibm.com (Postfix) with SMTP; Mon, 18 May 2020 11:08:24 +0000 (GMT) Received: by vajain21-in-ibm-com (sSMTP sendmail emulation); Mon, 18 May 2020 16:38:23 +0530 From: Vaibhav Jain To: linuxppc-dev@lists.ozlabs.org, linux-nvdimm@lists.01.org Subject: [RFC PATCH 1/4] powerpc/papr_scm: Fetch nvdimm performance stats from PHYP Date: Mon, 18 May 2020 16:38:11 +0530 Message-Id: <20200518110814.145644-2-vaibhav@linux.ibm.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518110814.145644-1-vaibhav@linux.ibm.com> References: <20200518110814.145644-1-vaibhav@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216, 18.0.676 definitions=2020-05-18_04:2020-05-15, 2020-05-18 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 suspectscore=0 adultscore=0 mlxlogscore=999 bulkscore=0 cotscore=-2147483648 priorityscore=1501 malwarescore=0 clxscore=1015 phishscore=0 impostorscore=0 lowpriorityscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2005180096 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Santosh Sivaraj , Oliver O'Halloran , "Aneesh Kumar K . V" , Vaibhav Jain , Dan Williams Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Update papr_scm.c to query dimm performance statistics from PHYP via H_SCM_PERFORMANCE_STATS hcall and export them to userspace as PAPR specific NVDIMM attribute 'perf_stats' in sysfs. The patch also provide a sysfs ABI documentation for the stats being reported and their meanings. During NVDIMM probe time in papr_scm_nvdimm_init() a special variant of H_SCM_PERFORMANCE_STATS hcall is issued to check if collection of performance statistics is supported or not. If yes then a per-nvdimm performance stats buffer is of size as returned by PHYP is allocated and stored along with its length in two newly introduced NVDIMM private struct members 'perf_stats' and 'len_stat_buffer'. Signed-off-by: Vaibhav Jain --- Documentation/ABI/testing/sysfs-bus-papr-scm | 27 ++++ arch/powerpc/platforms/pseries/papr_scm.c | 156 +++++++++++++++++++ 2 files changed, 183 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-papr-scm b/Documentation/ABI/testing/sysfs-bus-papr-scm index 6143d06072f1..ad06b3e9c315 100644 --- a/Documentation/ABI/testing/sysfs-bus-papr-scm +++ b/Documentation/ABI/testing/sysfs-bus-papr-scm @@ -25,3 +25,30 @@ Description: NVDIMM have been scrubbed. * "locked" : Indicating that NVDIMM contents cant be modified until next power cycle. + +What: /sys/bus/nd/devices/nmemX/papr/perf_stats +Date: May, 2020 +KernelVersion: v5.8 +Contact: linuxppc-dev , linux-nvdimm@lists.01.org, +Description: + (RO) Report various performance stats related to papr-scm NVDIMM + device. Each stat is reported on a new line with each line + composed of a stat-identifier followed by it value. Below are + currently known dimm performance stats which are reported: + + * "CtlResCt" : Controller Reset Count + * "CtlResTm" : Controller Reset Elapsed Time + * "PonSecs " : Power-on Seconds + * "MemLife " : Life Remaining + * "CritRscU" : Critical Resource Utilization + * "HostLCnt" : Host Load Count + * "HostSCnt" : Host Store Count + * "HostSDur" : Host Store Duration + * "HostLDur" : Host Load Duration + * "MedRCnt " : Media Read Count + * "MedWCnt " : Media Write Count + * "MedRDur " : Media Read Duration + * "MedWDur " : Media Write Duration + * "CchRHCnt" : Cache Read Hit Count + * "CchWHCnt" : Cache Write Hit Count + * "FastWCnt" : Fast Write Count \ No newline at end of file diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c index c59bf17ad054..fd9a12275315 100644 --- a/arch/powerpc/platforms/pseries/papr_scm.c +++ b/arch/powerpc/platforms/pseries/papr_scm.c @@ -62,6 +62,24 @@ PAPR_SCM_DIMM_HEALTH_FATAL | \ PAPR_SCM_DIMM_HEALTH_UNHEALTHY) +#define PAPR_SCM_PERF_STATS_EYECATCHER __stringify(SCMSTATS) +#define PAPR_SCM_PERF_STATS_VERSION 0x1 + +/* Struct holding a single performance metric */ +struct papr_scm_perf_stat { + u8 statistic_id[8]; + u64 statistic_value; +}; + +/* Struct exchanged between kernel and PHYP for fetching drc perf stats */ +struct papr_scm_perf_stats { + u8 eye_catcher[8]; + u32 stats_version; /* Should be 0x01 */ + u32 num_statistics; /* Number of stats following */ + /* zero or more performance matrics */ + struct papr_scm_perf_stat scm_statistics[]; +} __packed; + /* private struct associated with each region */ struct papr_scm_priv { struct platform_device *pdev; @@ -89,6 +107,12 @@ struct papr_scm_priv { /* Health information for the dimm */ struct nd_papr_pdsm_health health; + + /* length of the stat buffer as expected by phyp */ + size_t len_stat_buffer; + + /* Cached version of all performance state */ + struct papr_scm_perf_stats *perf_stats; }; static int drc_pmem_bind(struct papr_scm_priv *p) @@ -194,6 +218,75 @@ static int drc_pmem_query_n_bind(struct papr_scm_priv *p) return drc_pmem_bind(p); } +/* + * Query the Dimm performance stats from PHYP and copy them (if returned) to + * provided struct papr_scm_perf_stats instance 'stats' of 'size' in bytes. + * The value of R4 is copied to 'out' if the pointer is provided. + */ +static int drc_pmem_query_stats(struct papr_scm_priv *p, + struct papr_scm_perf_stats *buff_stats, + size_t size, unsigned int num_stats, + uint64_t *out) +{ + unsigned long ret[PLPAR_HCALL_BUFSIZE]; + struct papr_scm_perf_stat *stats; + s64 rc, i; + + /* Setup the out buffer */ + if (buff_stats) { + memcpy(buff_stats->eye_catcher, + PAPR_SCM_PERF_STATS_EYECATCHER, 8); + buff_stats->stats_version = + cpu_to_be32(PAPR_SCM_PERF_STATS_VERSION); + buff_stats->num_statistics = + cpu_to_be32(num_stats); + } else { + /* In case of no out buffer ignore the size */ + size = 0; + } + + /* + * Do the HCALL asking PHYP for info and if R4 was requested + * return its value in 'out' variable. + */ + rc = plpar_hcall(H_SCM_PERFORMANCE_STATS, ret, p->drc_index, + __pa(buff_stats), size); + if (out) + *out = ret[0]; + + if (rc == H_PARTIAL) { + dev_err(&p->pdev->dev, + "Unknown performance stats, Err:0x%016lX\n", ret[0]); + return -ENOENT; + } else if (rc != H_SUCCESS) { + dev_err(&p->pdev->dev, + "Failed to query performance stats, Err:%lld\n", rc); + return -ENXIO; + } + + /* Successfully fetched the requested stats from phyp */ + if (size != 0) { + buff_stats->num_statistics = + be32_to_cpu(buff_stats->num_statistics); + + /* Transform the stats buffer values from BE to cpu native */ + for (i = 0, stats = buff_stats->scm_statistics; + i < buff_stats->num_statistics; ++i) { + stats[i].statistic_value = + be64_to_cpu(stats[i].statistic_value); + } + dev_dbg(&p->pdev->dev, + "Performance stats returned %d stats\n", + buff_stats->num_statistics); + } else { + /* Handle case where stat buffer size was requested */ + dev_dbg(&p->pdev->dev, + "Performance stats size %ld\n", ret[0]); + } + + return 0; +} + /* * Issue hcall to retrieve dimm health info and populate papr_scm_priv with the * health information. @@ -563,6 +656,47 @@ static int papr_scm_ndctl(struct nvdimm_bus_descriptor *nd_desc, return *cmd_rc; } +static ssize_t perf_stats_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + int index, rc; + struct seq_buf s; + struct nvdimm *dimm = to_nvdimm(dev); + struct papr_scm_priv *p = nvdimm_provider_data(dimm); + struct papr_scm_perf_stat *stats = p->perf_stats->scm_statistics; + + if (!p->len_stat_buffer) + return -ENOENT; + + seq_buf_init(&s, buf, PAGE_SIZE); + + /* Protect concurrent modifications to papr_scm_priv */ + rc = mutex_lock_interruptible(&p->health_mutex); + if (rc) + return rc; + + /* Ask phyp to return all dimm perf stats */ + rc = drc_pmem_query_stats(p, p->perf_stats, p->len_stat_buffer, 0, + NULL); + if (!rc) { + /* + * Go through the returned output buffer and print stats and + * values. Since statistic_id is essentially a char string of + * 8 bytes, simply use the string format specifier to print it. + */ + for (index = 0; index < p->perf_stats->num_statistics; + ++index) { + seq_buf_printf(&s, "%.8s = 0x%016llX\n", + stats[index].statistic_id, + stats[index].statistic_value); + } + } + + mutex_unlock(&p->health_mutex); + return rc ? rc : seq_buf_used(&s); +} +DEVICE_ATTR_RO(perf_stats); + static ssize_t flags_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -615,6 +749,7 @@ DEVICE_ATTR_RO(flags); /* papr_scm specific dimm attributes */ static struct attribute *papr_scm_nd_attributes[] = { &dev_attr_flags.attr, + &dev_attr_perf_stats.attr, NULL, }; @@ -635,6 +770,7 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p) struct nd_region_desc ndr_desc; unsigned long dimm_flags; int target_nid, online_nid; + u64 stat_size; p->bus_desc.ndctl = papr_scm_ndctl; p->bus_desc.module = THIS_MODULE; @@ -698,6 +834,26 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p) dev_info(dev, "Region registered with target node %d and online node %d", target_nid, online_nid); + /* Try retriving the stat buffer and see if its supported */ + if (!drc_pmem_query_stats(p, NULL, 0, 0, &stat_size)) { + /* Allocate the buffer for phyp where stats are written */ + p->perf_stats = kzalloc(stat_size, GFP_KERNEL); + + /* Failed allocation is non fatal and results in limited data */ + if (!p->perf_stats) + dev_dbg(&p->pdev->dev, + "Unable to allocate %llu bytes for perf-state", + stat_size); + else + p->len_stat_buffer = (size_t)stat_size; + } else { + dev_dbg(&p->pdev->dev, "Unable to retrieve performace stats\n"); + } + + /* Check if perf-stats buffer was allocated */ + if (!p->len_stat_buffer) + dev_info(&p->pdev->dev, "Limited dimm info available\n"); + return 0; err: nvdimm_bus_unregister(p->bus); From patchwork Mon May 18 11:08:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Jain X-Patchwork-Id: 1292466 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49QbyK6qVfz9sTD for ; Mon, 18 May 2020 21:14:49 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49QbyK2R2qzDqSp for ; Mon, 18 May 2020 21:14:49 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=vaibhav@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49QbqG487yzDqQr for ; Mon, 18 May 2020 21:08:42 +1000 (AEST) Received: from pps.filterd (m0187473.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 04IB3Brp070327; Mon, 18 May 2020 07:08:37 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 312btu38r5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 07:08:37 -0400 Received: from m0187473.ppops.net (m0187473.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 04IB3rar071619; Mon, 18 May 2020 07:08:36 -0400 Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 312btu38qf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 07:08:36 -0400 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 04IB5LrM030422; Mon, 18 May 2020 11:08:34 GMT Received: from b06avi18626390.portsmouth.uk.ibm.com (b06avi18626390.portsmouth.uk.ibm.com [9.149.26.192]) by ppma03ams.nl.ibm.com with ESMTP id 3127t5kyj4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 11:08:34 +0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 04IB7J0q47186332 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 18 May 2020 11:07:19 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1946F4204D; Mon, 18 May 2020 11:08:31 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 610394203F; Mon, 18 May 2020 11:08:28 +0000 (GMT) Received: from vajain21-in-ibm-com (unknown [9.102.2.238]) by d06av24.portsmouth.uk.ibm.com (Postfix) with SMTP; Mon, 18 May 2020 11:08:28 +0000 (GMT) Received: by vajain21-in-ibm-com (sSMTP sendmail emulation); Mon, 18 May 2020 16:38:27 +0530 From: Vaibhav Jain To: linuxppc-dev@lists.ozlabs.org, linux-nvdimm@lists.01.org Subject: [RFC PATCH 2/4] powerpc/papr_scm: Add support for PAPR_SCM_PDSM_FETCH_PERF_STATS Date: Mon, 18 May 2020 16:38:12 +0530 Message-Id: <20200518110814.145644-3-vaibhav@linux.ibm.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518110814.145644-1-vaibhav@linux.ibm.com> References: <20200518110814.145644-1-vaibhav@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216, 18.0.676 definitions=2020-05-18_04:2020-05-15, 2020-05-18 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 priorityscore=1501 malwarescore=0 mlxscore=0 mlxlogscore=999 impostorscore=0 spamscore=0 clxscore=1015 cotscore=-2147483648 lowpriorityscore=0 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2005180096 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Santosh Sivaraj , Oliver O'Halloran , "Aneesh Kumar K . V" , Vaibhav Jain , Dan Williams Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add support for pdsm PAPR_SCM_PDSM_FETCH_PERF_STATS that issues HCALL H_SCM_PERFORMANCE_STATS to PHYP to fetch all the NVDIMM performance stats and store them in per nvdimm 'struct papr_scm_priv' as member 'perf_stats'. A further PDSM request (introduced later) is needed to read the contents of this performance stats buffer. A new uapi struct 'nd_psdm_perf_stats_size' is introduced to be used by libndctl to retrieve the size of buffer needed to store all NVDIMM performance stats. The patch updates papr_scm_service_pdsm() to route PAPR_SCM_PDSM_FETCH_PERF_STATS to newly introduced papr_scm_fetch_perf_stats() which then issues the HCALL and copies the needed size to the PDSM payload. Signed-off-by: Vaibhav Jain --- arch/powerpc/include/uapi/asm/papr_scm_pdsm.h | 13 ++++ arch/powerpc/platforms/pseries/papr_scm.c | 70 +++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/arch/powerpc/include/uapi/asm/papr_scm_pdsm.h b/arch/powerpc/include/uapi/asm/papr_scm_pdsm.h index db0cf550dabe..40ec55d06f4c 100644 --- a/arch/powerpc/include/uapi/asm/papr_scm_pdsm.h +++ b/arch/powerpc/include/uapi/asm/papr_scm_pdsm.h @@ -114,6 +114,7 @@ struct nd_pdsm_cmd_pkg { enum papr_scm_pdsm { PAPR_SCM_PDSM_MIN = 0x0, PAPR_SCM_PDSM_HEALTH, + PAPR_SCM_PDSM_FETCH_PERF_STATS, PAPR_SCM_PDSM_MAX, }; @@ -170,4 +171,16 @@ struct nd_papr_pdsm_health_v1 { /* Current version number for the dimm health struct */ #define ND_PAPR_PDSM_HEALTH_VERSION 1 +/* + * Return the maximum buffer size needed to hold all performance state. + * max_stats_size: The buffer size needed to hold all stat entries + */ +struct nd_pdsm_fetch_perf_stats_v1 { + __u32 max_stats_size; + __u8 reserved[4]; +} __packed; + +#define nd_pdsm_fetch_perf_stats nd_pdsm_fetch_perf_stats_v1 +#define ND_PDSM_FETCH_PERF_STATS_VERSION 1 + #endif /* _UAPI_ASM_POWERPC_PAPR_SCM_PDSM_H_ */ diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c index fd9a12275315..f8b37a830aed 100644 --- a/arch/powerpc/platforms/pseries/papr_scm.c +++ b/arch/powerpc/platforms/pseries/papr_scm.c @@ -525,6 +525,73 @@ static int is_cmd_valid(struct nvdimm *nvdimm, unsigned int cmd, void *buf, return 0; } +/* Return the size in bytes for returning all perf stats to libndctl */ +static int papr_scm_fetch_perf_stats(struct papr_scm_priv *p, + struct nd_pdsm_cmd_pkg *pkg) +{ + int rc = 0; + size_t copysize = sizeof(struct nd_pdsm_fetch_perf_stats); + struct nd_pdsm_fetch_perf_stats *sz = + (struct nd_pdsm_fetch_perf_stats *)pdsm_cmd_to_payload(pkg); + + /* + * If the requested payload version is greater than one we know + * about, return the payload version we know about and let + * caller/userspace handle. + */ + if (pkg->payload_version > ND_PDSM_FETCH_PERF_STATS_VERSION) + pkg->payload_version = ND_PDSM_FETCH_PERF_STATS_VERSION; + + if (pkg->hdr.nd_size_out < copysize) { + dev_dbg(&p->pdev->dev, "Truncated payload (%u). Expected (%lu)", + pkg->hdr.nd_size_out, copysize); + rc = -ENOSPC; + goto out; + } + + rc = mutex_lock_interruptible(&p->health_mutex); + if (rc) + goto out; + + if (!p->len_stat_buffer) { + rc = -ENOENT; + goto out_unlock; + } + + /* Setup the buffer and request phyp for all dimm perf stats data */ + rc = drc_pmem_query_stats(p, p->perf_stats, p->len_stat_buffer, 0, + NULL); + if (rc) + goto out_unlock; + + dev_dbg(&p->pdev->dev, "Copying payload size=%lu version=0x%x\n", + copysize, pkg->payload_version); + + /* + * Put the buffer size needed in the payload buffer subtracting the + * perf_stat header size. + */ + if (p->len_stat_buffer > sizeof(struct papr_scm_perf_stats)) + sz->max_stats_size = p->len_stat_buffer - + sizeof(struct papr_scm_perf_stats); + else + sz->max_stats_size = 0; + + pkg->hdr.nd_fw_size = copysize; + +out_unlock: + mutex_unlock(&p->health_mutex); +out: + /* + * Put the error in out package and return success from function + * so that errors if any are propogated back to userspace. + */ + pkg->cmd_status = rc; + dev_dbg(&p->pdev->dev, "completion code = %d\n", rc); + + return 0; +} + /* Fetch the DIMM health info and populate it in provided package. */ static int papr_scm_get_health(struct papr_scm_priv *p, struct nd_pdsm_cmd_pkg *pkg) @@ -594,6 +661,9 @@ static int papr_scm_service_pdsm(struct papr_scm_priv *p, case PAPR_SCM_PDSM_HEALTH: return papr_scm_get_health(p, call_pkg); + case PAPR_SCM_PDSM_FETCH_PERF_STATS: + return papr_scm_fetch_perf_stats(p, call_pkg); + default: dev_dbg(&p->pdev->dev, "Unsupported PDSM request 0x%llx\n", call_pkg->hdr.nd_command); From patchwork Mon May 18 11:08:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Jain X-Patchwork-Id: 1292467 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49Qc0q2Wy5z9sTC for ; Mon, 18 May 2020 21:16:59 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49Qc0q1kSfzDqVC for ; Mon, 18 May 2020 21:16:59 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=vaibhav@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49QbqP1ccczDqTX for ; Mon, 18 May 2020 21:08:48 +1000 (AEST) Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 04IB4YXN179667; Mon, 18 May 2020 07:08:40 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 312aar05we-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 07:08:40 -0400 Received: from m0098413.ppops.net (m0098413.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 04IB5bEQ188186; Mon, 18 May 2020 07:08:40 -0400 Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0b-001b2d01.pphosted.com with ESMTP id 312aar05vp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 07:08:39 -0400 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 04IB5Ps6030496; Mon, 18 May 2020 11:08:38 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma03ams.nl.ibm.com with ESMTP id 3127t5kyjb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 11:08:38 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 04IB8ZgU64094306 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 18 May 2020 11:08:35 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3A122A404D; Mon, 18 May 2020 11:08:35 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 464CCA4053; Mon, 18 May 2020 11:08:32 +0000 (GMT) Received: from vajain21-in-ibm-com (unknown [9.102.2.238]) by d06av23.portsmouth.uk.ibm.com (Postfix) with SMTP; Mon, 18 May 2020 11:08:32 +0000 (GMT) Received: by vajain21-in-ibm-com (sSMTP sendmail emulation); Mon, 18 May 2020 16:38:31 +0530 From: Vaibhav Jain To: linuxppc-dev@lists.ozlabs.org, linux-nvdimm@lists.01.org Subject: [RFC PATCH 3/4] powerpc/papr_scm: Implement support for PAPR_SCM_PDSM_READ_PERF_STATS Date: Mon, 18 May 2020 16:38:13 +0530 Message-Id: <20200518110814.145644-4-vaibhav@linux.ibm.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518110814.145644-1-vaibhav@linux.ibm.com> References: <20200518110814.145644-1-vaibhav@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216, 18.0.676 definitions=2020-05-18_04:2020-05-15, 2020-05-18 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxscore=0 lowpriorityscore=0 mlxlogscore=999 spamscore=0 clxscore=1015 impostorscore=0 adultscore=0 malwarescore=0 priorityscore=1501 bulkscore=0 suspectscore=0 cotscore=-2147483648 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2005180100 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Santosh Sivaraj , Oliver O'Halloran , "Aneesh Kumar K . V" , Vaibhav Jain , Dan Williams Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Implement support for pdsm READ_PERF_STATS to be used by libndctl to fetch all NVDIMM performance statistics. The stats are to be exchanged via newly introduced 'struct nd_pdsm_get_perf_stats' which is allocated and sent by libndctl to papr_scm. The struct contains members 'in_offset' and 'in_length' to provide incremental access to performance statistics data buffer and workaround 'libnvdimm' limit of 256 bytes evelope size. The patch introduces new function 'papr_scm_read_perf_stats()' to service this pdsm and copy the requested chunk of performance stats to the libndctl provided payload buffer for the given offset and length. Signed-off-by: Vaibhav Jain --- arch/powerpc/include/uapi/asm/papr_scm_pdsm.h | 35 +++++++ arch/powerpc/platforms/pseries/papr_scm.c | 91 +++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/arch/powerpc/include/uapi/asm/papr_scm_pdsm.h b/arch/powerpc/include/uapi/asm/papr_scm_pdsm.h index 40ec55d06f4c..2db4ffdff285 100644 --- a/arch/powerpc/include/uapi/asm/papr_scm_pdsm.h +++ b/arch/powerpc/include/uapi/asm/papr_scm_pdsm.h @@ -115,6 +115,7 @@ enum papr_scm_pdsm { PAPR_SCM_PDSM_MIN = 0x0, PAPR_SCM_PDSM_HEALTH, PAPR_SCM_PDSM_FETCH_PERF_STATS, + PAPR_SCM_PDSM_READ_PERF_STATS, PAPR_SCM_PDSM_MAX, }; @@ -183,4 +184,38 @@ struct nd_pdsm_fetch_perf_stats_v1 { #define nd_pdsm_fetch_perf_stats nd_pdsm_fetch_perf_stats_v1 #define ND_PDSM_FETCH_PERF_STATS_VERSION 1 +/* + * Holds a single performance stat. papr_scm owns a buffer that holds an array + * of all the available stats and their values. Access to the buffer is provided + * via PERF_STAT_SIZE and READ_PERF_STATS psdm. + * id : id of the performance stat. Usually acsii encode stat name. + * val : Non normalized value of the id. + */ + +struct nd_pdsm_perf_stat { + __u64 id; + __u64 val; +}; + +/* + * Returns a chunk of performance stats buffer data to libndctl. + * This is needed to overcome the 256 byte envelope size limit enforced by + * libnvdimm. + * in_offset: The starting offset to perf stats data buffer. + * in_length: Length of data to be copied to 'stats_data' + * stats_data: Holds the chunk of requested perf stats data buffer. + * + * Note: To prevent races in reading performance stats, in_offset and in_length + * should multiple of 16-Bytes. If they are not then papr_scm will return an + * -EINVAL error. + */ +struct nd_pdsm_read_perf_stats_v1 { + __u32 in_offset; + __u32 in_length; + struct nd_pdsm_perf_stat stats_data[]; +} __packed; + +#define nd_pdsm_read_perf_stats nd_pdsm_read_perf_stats_v1 +#define ND_PDSM_READ_PERF_STATS_VERSION 1 + #endif /* _UAPI_ASM_POWERPC_PAPR_SCM_PDSM_H_ */ diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c index f8b37a830aed..06744d7fe727 100644 --- a/arch/powerpc/platforms/pseries/papr_scm.c +++ b/arch/powerpc/platforms/pseries/papr_scm.c @@ -525,6 +525,94 @@ static int is_cmd_valid(struct nvdimm *nvdimm, unsigned int cmd, void *buf, return 0; } +/* + * Read the contents of dimm performance statistics buffer at the given + * 'in_offset' and copy 'in_length' number of bytes to the pkg payload. + * Both 'in_offset' and 'in_length' are expected to be in multiples of + * 16-Bytes to prevent a read/write race that may cause malformed values + * top be returned as performance statistics buffer content. + */ +static int papr_scm_read_perf_stats(struct papr_scm_priv *p, + struct nd_pdsm_cmd_pkg *pkg) +{ + int rc; + struct nd_pdsm_read_perf_stats *stats = + (struct nd_pdsm_read_perf_stats *)pdsm_cmd_to_payload(pkg); + const size_t copysize = sizeof(struct nd_pdsm_read_perf_stats); + off_t offset; + + /* + * If the requested payload version is greater than one we know + * about, return the payload version we know about and let + * caller/userspace handle. + */ + if (pkg->payload_version > ND_PDSM_READ_PERF_STATS_VERSION) + pkg->payload_version = ND_PDSM_READ_PERF_STATS_VERSION; + + if (pkg->hdr.nd_size_out < copysize) { + dev_dbg(&p->pdev->dev, "Truncated payload (%u). Expected (%lu)", + pkg->hdr.nd_size_out, copysize); + rc = -ENOSPC; + goto out; + } + + /* Protect concurrent modifications to papr_scm_priv */ + rc = mutex_lock_interruptible(&p->health_mutex); + if (rc) + goto out; + + if (!p->len_stat_buffer) { + dev_dbg(&p->pdev->dev, "Perf stats: req for unsupported device"); + rc = -ENOENT; + goto mutex_unlock_out; + } + + /* calculate offset skipping the perf_stats buffer header */ + offset = stats->in_offset + sizeof(*p->perf_stats); + /* Cap the copy length to extend of stats buffer */ + stats->in_length = min(stats->in_length, + (__u32)(p->len_stat_buffer - offset)); + + /* + * Ensure that offset and length are valid and multiples of 16 bytes. + * PDSM FETCH_PERF_STATS can interleave in between PDSM READ_PERF_STAT. + * Since this is a read/write race hence malformed performance stats + * buffer contents that may be returned. + * A 16-Byte read alignment constraint forces a read granularity of + * same the size of each performance stat and they are guaranteed to + * remain stable during 'health_mutex' lock context. + */ + if (offset >= p->len_stat_buffer || (offset % 16) || + (stats->in_length % 16)) { + dev_dbg(&p->pdev->dev, + "Perf stats: Invalid offset(0x%lx) or length(0x%x)", + offset, stats->in_length); + rc = -EINVAL; + goto mutex_unlock_out; + } + + /* Put the stats buffer data in the payload buffer */ + memcpy(stats->stats_data, + (void *)p->perf_stats + offset, stats->in_length); + + pkg->hdr.nd_fw_size = stats->in_length; + + dev_dbg(&p->pdev->dev, "Copying payload size=%u version=0x%x\n", + stats->in_length, pkg->payload_version); + +mutex_unlock_out: + mutex_unlock(&p->health_mutex); +out: + /* + * Put the error in out package and return success from function + * so that errors if any are propogated back to userspace. + */ + pkg->cmd_status = rc; + dev_dbg(&p->pdev->dev, "completion code = %d\n", rc); + + return 0; +} + /* Return the size in bytes for returning all perf stats to libndctl */ static int papr_scm_fetch_perf_stats(struct papr_scm_priv *p, struct nd_pdsm_cmd_pkg *pkg) @@ -664,6 +752,9 @@ static int papr_scm_service_pdsm(struct papr_scm_priv *p, case PAPR_SCM_PDSM_FETCH_PERF_STATS: return papr_scm_fetch_perf_stats(p, call_pkg); + case PAPR_SCM_PDSM_READ_PERF_STATS: + return papr_scm_read_perf_stats(p, call_pkg); + default: dev_dbg(&p->pdev->dev, "Unsupported PDSM request 0x%llx\n", call_pkg->hdr.nd_command); From patchwork Mon May 18 11:08:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Jain X-Patchwork-Id: 1292468 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49Qc3W0L7lz9sTD for ; Mon, 18 May 2020 21:19:19 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49Qc3Q73jpzDqVF for ; Mon, 18 May 2020 21:19:14 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=vaibhav@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49QbqY0lm0zDqTF for ; Mon, 18 May 2020 21:08:56 +1000 (AEST) Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 04IB4rdQ059632; Mon, 18 May 2020 07:08:44 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 312c21xrhh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 07:08:44 -0400 Received: from m0098417.ppops.net (m0098417.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 04IB59BT061341; Mon, 18 May 2020 07:08:44 -0400 Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 312c21xrgt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 07:08:44 -0400 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 04IB5a9Q003978; Mon, 18 May 2020 11:08:42 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma04fra.de.ibm.com with ESMTP id 3127t5sm46-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 11:08:42 +0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 04IB8dQl60817914 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 18 May 2020 11:08:39 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3AD9711C052; Mon, 18 May 2020 11:08:39 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5ECAF11C050; Mon, 18 May 2020 11:08:36 +0000 (GMT) Received: from vajain21-in-ibm-com (unknown [9.102.2.238]) by d06av25.portsmouth.uk.ibm.com (Postfix) with SMTP; Mon, 18 May 2020 11:08:36 +0000 (GMT) Received: by vajain21-in-ibm-com (sSMTP sendmail emulation); Mon, 18 May 2020 16:38:35 +0530 From: Vaibhav Jain To: linuxppc-dev@lists.ozlabs.org, linux-nvdimm@lists.01.org Subject: [RFC PATCH 4/4] powerpc/papr_scm: Add support for PDSM GET_PERF_STAT Date: Mon, 18 May 2020 16:38:14 +0530 Message-Id: <20200518110814.145644-5-vaibhav@linux.ibm.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518110814.145644-1-vaibhav@linux.ibm.com> References: <20200518110814.145644-1-vaibhav@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216, 18.0.676 definitions=2020-05-18_04:2020-05-15, 2020-05-18 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 impostorscore=0 cotscore=-2147483648 lowpriorityscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 priorityscore=1501 mlxscore=0 spamscore=0 suspectscore=0 phishscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2005180096 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Santosh Sivaraj , Oliver O'Halloran , "Aneesh Kumar K . V" , Vaibhav Jain , Dan Williams Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" This patch adds support for retrieving a singled NVDIMM performance stat from PHYP via PDSM GET_PERF_STAT_VERSION. A new uapi 'struct nd_pdsm_get_perf_stat' is introduced that holds a single performance stat and is populated by newly introduced papr_scm_get_perf_stat() by issuing an H_SCM_PERFORMANCE_STATS to PHYP. Signed-off-by: Vaibhav Jain --- arch/powerpc/include/uapi/asm/papr_scm_pdsm.h | 12 +++ arch/powerpc/platforms/pseries/papr_scm.c | 74 +++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/arch/powerpc/include/uapi/asm/papr_scm_pdsm.h b/arch/powerpc/include/uapi/asm/papr_scm_pdsm.h index 2db4ffdff285..473c4bbddb2f 100644 --- a/arch/powerpc/include/uapi/asm/papr_scm_pdsm.h +++ b/arch/powerpc/include/uapi/asm/papr_scm_pdsm.h @@ -116,6 +116,7 @@ enum papr_scm_pdsm { PAPR_SCM_PDSM_HEALTH, PAPR_SCM_PDSM_FETCH_PERF_STATS, PAPR_SCM_PDSM_READ_PERF_STATS, + PAPR_SCM_PDSM_GET_PERF_STAT, PAPR_SCM_PDSM_MAX, }; @@ -218,4 +219,15 @@ struct nd_pdsm_read_perf_stats_v1 { #define nd_pdsm_read_perf_stats nd_pdsm_read_perf_stats_v1 #define ND_PDSM_READ_PERF_STATS_VERSION 1 +/* + * Fetch the value of single nvdimm performance stat id of which is + * stored in 'stat.id' + */ +struct nd_pdsm_get_perf_stat_v1 { + struct nd_pdsm_perf_stat stat; +} __packed; + +#define nd_pdsm_get_perf_stat nd_pdsm_get_perf_stat_v1 +#define ND_PDSM_GET_PERF_STAT_VERSION 1 + #endif /* _UAPI_ASM_POWERPC_PAPR_SCM_PDSM_H_ */ diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c index 06744d7fe727..284d04f0a094 100644 --- a/arch/powerpc/platforms/pseries/papr_scm.c +++ b/arch/powerpc/platforms/pseries/papr_scm.c @@ -525,6 +525,77 @@ static int is_cmd_valid(struct nvdimm *nvdimm, unsigned int cmd, void *buf, return 0; } +static int papr_scm_get_perf_stat(struct papr_scm_priv *p, + struct nd_pdsm_cmd_pkg *pkg) +{ + int rc; + struct nd_pdsm_get_perf_stat *stat = + (struct nd_pdsm_get_perf_stat *)pdsm_cmd_to_payload(pkg); + const size_t copysize = sizeof(struct nd_pdsm_get_perf_stat); + struct papr_scm_perf_stats *stats_req; + ssize_t stat_size; + + /* + * If the requested payload version is greater than one we know + * about, return the payload version we know about and let + * caller/userspace handle. + */ + if (pkg->payload_version > ND_PDSM_GET_PERF_STAT_VERSION) + pkg->payload_version = ND_PDSM_GET_PERF_STAT_VERSION; + + if (pkg->hdr.nd_size_out < copysize) { + dev_dbg(&p->pdev->dev, "Truncated payload (%u). Expected (%lu)", + pkg->hdr.nd_size_out, copysize); + rc = -ENOSPC; + goto out; + } + + if (!READ_ONCE(p->len_stat_buffer)) { + dev_dbg(&p->pdev->dev, "Perf stat: req for unsupported device"); + rc = -ENOENT; + goto out; + } + + /* Allocate and setup a PERFORMANCE_STATS request buffer */ + stat_size = sizeof(struct papr_scm_perf_stats) + + sizeof(struct papr_scm_perf_stat); + stats_req = kzalloc(stat_size, GFP_KERNEL); + if (!stats_req) { + dev_err(&p->pdev->dev, "Perf stat: Unable to allocate memory\n"); + rc = -ENOMEM; + goto out; + } + + /* Copy the single request statistic_id into the request buffer */ + memcpy(&stats_req->scm_statistics[0].statistic_id, &stat->stat.id, + sizeof(stats_req->scm_statistics[0].statistic_id)); + + /* Fetch the stat from PHYP */ + rc = drc_pmem_query_stats(p, stats_req, stat_size, 1, NULL); + if (rc) + goto out; + + /* Copy the value of stat to the return payload */ + memcpy(&stat->stat.id, &stats_req->scm_statistics[0].statistic_id, + sizeof(stat->stat.id)); + stat->stat.val = stats_req->scm_statistics[0].statistic_value; + + pkg->hdr.nd_fw_size = copysize; + + dev_dbg(&p->pdev->dev, "Copying payload size=%u version=0x%x\n", + pkg->hdr.nd_fw_size, pkg->payload_version); + +out: + /* + * Put the error in out package and return success from function + * so that errors if any are propogated back to userspace. + */ + pkg->cmd_status = rc; + dev_dbg(&p->pdev->dev, "completion code = %d\n", rc); + + return 0; +} + /* * Read the contents of dimm performance statistics buffer at the given * 'in_offset' and copy 'in_length' number of bytes to the pkg payload. @@ -755,6 +826,9 @@ static int papr_scm_service_pdsm(struct papr_scm_priv *p, case PAPR_SCM_PDSM_READ_PERF_STATS: return papr_scm_read_perf_stats(p, call_pkg); + case PAPR_SCM_PDSM_GET_PERF_STAT: + return papr_scm_get_perf_stat(p, call_pkg); + default: dev_dbg(&p->pdev->dev, "Unsupported PDSM request 0x%llx\n", call_pkg->hdr.nd_command);