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: 11555203 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CA09C913 for ; Mon, 18 May 2020 11:08:43 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B22C72081A for ; Mon, 18 May 2020 11:08:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B22C72081A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvdimm-bounces@lists.01.org Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 087D111E16CFB; Mon, 18 May 2020 04:05:33 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=vaibhav@linux.ibm.com; receiver= 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 ml01.01.org (Postfix) with ESMTPS id 636DB11E16CFB for ; Mon, 18 May 2020 04:05:30 -0700 (PDT) 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 Message-ID-Hash: DG24DG6XC35T7P6OEOMBQCZR42RF6BZQ X-Message-ID-Hash: DG24DG6XC35T7P6OEOMBQCZR42RF6BZQ X-MailFrom: vaibhav@linux.ibm.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation CC: Vaibhav Jain , "Aneesh Kumar K . V" , Michael Ellerman X-Mailman-Version: 3.1.1 Precedence: list List-Id: "Linux-nvdimm developer list." Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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);