From patchwork Sun Nov 8 21:15:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Jain X-Patchwork-Id: 11889873 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 93CA816C0 for ; Sun, 8 Nov 2020 21:16:15 +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 58941206E3 for ; Sun, 8 Nov 2020 21:16:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="laYinAt4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 58941206E3 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 9B55D16538BB6; Sun, 8 Nov 2020 13:16:14 -0800 (PST) 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 121EF16538BA7 for ; Sun, 8 Nov 2020 13:16:11 -0800 (PST) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A8L1eCt086646; Sun, 8 Nov 2020 16:16:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=gIkrjQ6tArcB431xvOWmyzSECk+X6fCJ1oyR7svE9Wk=; b=laYinAt4HYbSq1xyMaGX+iEsdP6Tybfsdme7fDf7WCQ1lq4H7DwEwwlfo3jy4ynXMQbB 9cYPTWAA5Wk7ZFIq6xGG3cyA6BySSpg3KI9uaBZD7iVRdqSU0ArjD9d91E7hoVxtO0qg DqJEgtRVuTVBykJ5mM1jnC41Is+OHn4yXFlta69++3OwtCgsbR/2fP4pNZNGWkM9nZkC 1hjv1PKFBg02CqGtb2E5icXtHG8IoNar1yX9C7wnJwIgAxgaWkMp4t4BAqasItxactS1 VJRnhO61xXuwzK6pH6DHd/WIu2NSjjSPQ35veDUx1+nfEZbmxqEIpAmCSnTYIAhodvQp tQ== 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 34nqs3anh3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 08 Nov 2020 16:16:02 -0500 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 0A8LCKHa026033; Sun, 8 Nov 2020 21:16:00 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma03ams.nl.ibm.com with ESMTP id 34nk78hb6u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 08 Nov 2020 21:16:00 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 0A8LFvEP2032336 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 8 Nov 2020 21:15:57 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 981E45204F; Sun, 8 Nov 2020 21:15:57 +0000 (GMT) Received: from vajain21.in.ibm.com (unknown [9.199.47.5]) by d06av21.portsmouth.uk.ibm.com (Postfix) with SMTP id C8FB152051; Sun, 8 Nov 2020 21:15:53 +0000 (GMT) Received: by vajain21.in.ibm.com (sSMTP sendmail emulation); Mon, 09 Nov 2020 02:45:52 +0530 From: Vaibhav Jain To: linuxppc-dev@lists.ozlabs.org, linux-nvdimm@lists.01.org Subject: [RFC][PATCH 1/2] libnvdimm: Introduce ND_CMD_GET_STAT to retrieve nvdimm statistics Date: Mon, 9 Nov 2020 02:45:48 +0530 Message-Id: <20201108211549.122018-1-vaibhav@linux.ibm.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-11-08_10:2020-11-05,2020-11-08 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 phishscore=0 clxscore=1011 suspectscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 adultscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011080148 Message-ID-Hash: NAM7S4CMNQ4BE3OQWKWEMOCGOZM2X4ZM X-Message-ID-Hash: NAM7S4CMNQ4BE3OQWKWEMOCGOZM2X4ZM 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: Implement support for exposing generic nvdimm statistics via newly introduced dimm-command ND_CMD_GET_STAT that can be handled by nvdimm command handler function and provide values for these statistics back to libnvdimm. Following generic nvdimm statistics are defined as an enumeration in 'uapi/ndctl.h': * "media_reads" : Number of media reads that have occurred since reboot. * "media_writes" : Number of media writes that have occurred since reboot. * "read_requests" : Number of read requests that have occurred since reboot. * "write_requests" : Number of write requests that have occurred since reboot. * "total_media_reads" : Total number of media reads that have occurred. * "total_media_writes" : Total number of media writes that have occurred. * "total_read_requests" : Total number of read requests that have occurred. * "total_write_requests" : Total number of write requests that have occurred. Apart from ND_CMD_GET_STAT ioctl these nvdimm statistics are also exposed via sysfs '/stats' directory for easy user-space access like below: /sys/class/nd/ndctl0/device/nmem0/stats # tail -n +1 * ==> media_reads <== 252197707602 ==> media_writes <== 20684685172 ==> read_requests <== 658810924962 ==> write_requests <== 404464081574 In case a specific nvdimm-statistic is not supported than nvdimm command handler function can simply return an error (e.g -ENOENT) for request to read that nvdimm-statistic. The value for a specific nvdimm-stat is exchanged via newly introduced 'struct nd_cmd_get_dimm_stat' that hold a single statistics and a union of possible values types. Presently only '__s64' type of generic attributes are supported. These attributes are defined in 'ndvimm/dimm_devs.c' via a helper macro 'NVDIMM_STAT_ATTR'. Signed-off-by: Vaibhav Jain --- drivers/nvdimm/bus.c | 6 ++ drivers/nvdimm/dimm_devs.c | 109 +++++++++++++++++++++++++++++++++++++ drivers/nvdimm/nd.h | 5 ++ include/uapi/linux/ndctl.h | 27 +++++++++ 4 files changed, 147 insertions(+) diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c index 2304c6183822..d53564477437 100644 --- a/drivers/nvdimm/bus.c +++ b/drivers/nvdimm/bus.c @@ -794,6 +794,12 @@ static const struct nd_cmd_desc __nd_cmd_dimm_descs[] = { .out_num = 1, .out_sizes = { UINT_MAX, }, }, + [ND_CMD_GET_STAT] = { + .in_num = 1, + .in_sizes = { sizeof(struct nd_cmd_get_dimm_stat), }, + .out_num = 1, + .out_sizes = { sizeof(struct nd_cmd_get_dimm_stat), }, + }, }; const struct nd_cmd_desc *nd_cmd_dimm_desc(int cmd) diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c index b59032e0859b..68aaa294def7 100644 --- a/drivers/nvdimm/dimm_devs.c +++ b/drivers/nvdimm/dimm_devs.c @@ -555,6 +555,114 @@ static umode_t nvdimm_firmware_visible(struct kobject *kobj, struct attribute *a return a->mode; } +/* Request a dimm stat from the bus driver */ +static int __request_dimm_stat(struct nvdimm_bus *nvdimm_bus, + struct nvdimm *dimm, u64 stat_id, + s64 *stat_val) +{ + struct nvdimm_bus_descriptor *nd_desc = nvdimm_bus->nd_desc; + struct nd_cmd_get_dimm_stat stat = { .stat_id = stat_id }; + int rc, cmd_rc; + + if (!test_bit(ND_CMD_GET_STAT, &dimm->cmd_mask)) { + pr_debug("CMD_GET_STAT not set for bus driver 0x%lx\n", + nd_desc->cmd_mask); + return -ENOENT; + } + + /* Is stat requested is known & bus driver supports fetching stats */ + if (stat_id <= ND_DIMM_STAT_INVALID || stat_id > ND_DIMM_STAT_MAX) { + WARN(1, "Unknown stat-id(%llu) requested", stat_id); + return -ENOENT; + } + + /* Ask bus driver for its stat value */ + rc = nd_desc->ndctl(nd_desc, dimm, ND_CMD_GET_STAT, + &stat, sizeof(stat), &cmd_rc); + if (rc || cmd_rc) { + pr_debug("Unable to request stat %lld. Error (%d,%d)\n", + stat_id, rc, cmd_rc); + return rc ? rc : cmd_rc; + } + + /* Indicate error in case returned struct doesn't have the stat_id set */ + if (stat.stat_id != stat_id) { + pr_debug("Invalid statid %llu returned\n", stat.stat_id); + return -ENOENT; + } + + *stat_val = stat.int_val; + return 0; +} + +static ssize_t nvdimm_stat_attr_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct nvdimm_stat_attr *nattr = container_of(attr, typeof(*nattr), attr); + struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev); + struct nvdimm *nvdimm = to_nvdimm(dev); + s64 stat_val; + int rc; + + rc = __request_dimm_stat(nvdimm_bus, nvdimm, nattr->stat_id, &stat_val); + + if (rc) + return rc; + + return snprintf(buf, PAGE_SIZE, "%lld", stat_val); +} + +static umode_t nvdimm_stats_visible(struct kobject *kobj, struct attribute *a, int n) +{ + struct nvdimm_stat_attr *nattr = container_of(a, typeof(*nattr), attr.attr); + struct device *dev = container_of(kobj, typeof(*dev), kobj); + struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev); + struct nvdimm *nvdimm = to_nvdimm(dev); + u64 stat_val; + int rc; + + /* request dimm stat from bus driver and is success mark attribute as visible */ + rc = __request_dimm_stat(nvdimm_bus, nvdimm, nattr->stat_id, &stat_val); + if (rc) + pr_info("Unable to query stat %llu . Error(%d)\n", nattr->stat_id, rc); + + return rc ? 0 : a->mode; +} + +#define NVDIMM_STAT_ATTR(_name, _stat_id) \ + struct nvdimm_stat_attr nvdimm_stat_attr_##_name = { \ + .attr = __ATTR(_name, 0400, nvdimm_stat_attr_show, NULL), \ + .stat_id = _stat_id, \ + } + +static NVDIMM_STAT_ATTR(media_reads, ND_DIMM_STAT_MEDIA_READS); +static NVDIMM_STAT_ATTR(media_writes, ND_DIMM_STAT_MEDIA_WRITES); +static NVDIMM_STAT_ATTR(read_requests, ND_DIMM_STAT_READ_REQUESTS); +static NVDIMM_STAT_ATTR(write_requests, ND_DIMM_STAT_WRITE_REQUESTS); +static NVDIMM_STAT_ATTR(total_media_reads, ND_DIMM_STAT_TOTAL_MEDIA_READS); +static NVDIMM_STAT_ATTR(total_media_writes, ND_DIMM_STAT_TOTAL_MEDIA_WRITES); +static NVDIMM_STAT_ATTR(total_read_requests, ND_DIMM_STAT_TOTAL_READ_REQUESTS); +static NVDIMM_STAT_ATTR(total_write_requests, ND_DIMM_STAT_TOTAL_WRITE_REQUESTS); + +static struct attribute *nvdimm_stats_attributes[] = { + &nvdimm_stat_attr_media_reads.attr.attr, + &nvdimm_stat_attr_media_writes.attr.attr, + &nvdimm_stat_attr_read_requests.attr.attr, + &nvdimm_stat_attr_write_requests.attr.attr, + &nvdimm_stat_attr_total_media_reads.attr.attr, + &nvdimm_stat_attr_total_media_writes.attr.attr, + &nvdimm_stat_attr_total_read_requests.attr.attr, + &nvdimm_stat_attr_total_write_requests.attr.attr, + NULL, +}; + +static const struct attribute_group nvdimm_stats_group = { + .name = "stats", + .attrs = nvdimm_stats_attributes, + .is_visible = nvdimm_stats_visible, +}; + static const struct attribute_group nvdimm_firmware_attribute_group = { .name = "firmware", .attrs = nvdimm_firmware_attributes, @@ -565,6 +673,7 @@ static const struct attribute_group *nvdimm_attribute_groups[] = { &nd_device_attribute_group, &nvdimm_attribute_group, &nvdimm_firmware_attribute_group, + &nvdimm_stats_group, NULL, }; diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h index 696b55556d4d..ea9e846ae245 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h @@ -223,6 +223,11 @@ enum nd_async_mode { ND_ASYNC, }; +struct nvdimm_stat_attr { + struct device_attribute attr; + u64 stat_id; +}; + int nd_integrity_init(struct gendisk *disk, unsigned long meta_size); void wait_nvdimm_bus_probe_idle(struct device *dev); void nd_device_register(struct device *dev); diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h index 8cf1e4884fd5..81b76986b423 100644 --- a/include/uapi/linux/ndctl.h +++ b/include/uapi/linux/ndctl.h @@ -97,6 +97,31 @@ struct nd_cmd_clear_error { __u64 cleared; } __packed; +/* Various generic dimm stats that can be reported */ +enum { + ND_DIMM_STAT_INVALID = 0, + ND_DIMM_STAT_MEDIA_READS = 1, /* Media reads after power cycle */ + ND_DIMM_STAT_MEDIA_WRITES = 2, /* Media writes after power cycle */ + ND_DIMM_STAT_READ_REQUESTS = 3, /* Read requests after power cycle */ + ND_DIMM_STAT_WRITE_REQUESTS = 4, /* Write requests after power cycle */ + ND_DIMM_STAT_TOTAL_MEDIA_READS = 5, /* Total Media Reads */ + ND_DIMM_STAT_TOTAL_MEDIA_WRITES = 6, /* Total Media Writes */ + ND_DIMM_STAT_TOTAL_READ_REQUESTS = 7, /* Total Read Requests */ + ND_DIMM_STAT_TOTAL_WRITE_REQUESTS = 8, /* Total Write Requests */ + ND_DIMM_STAT_MAX = 8, +}; + +struct nd_cmd_get_dimm_stat { + /* See enum above for valid values */ + __u64 stat_id; + + /* Holds a single dimm stat value */ + union { + __s64 int_val; + char str_val[120]; + }; +} __packed; + enum { ND_CMD_IMPLEMENTED = 0, @@ -117,6 +142,7 @@ enum { ND_CMD_VENDOR_EFFECT_LOG = 8, ND_CMD_VENDOR = 9, ND_CMD_CALL = 10, + ND_CMD_GET_STAT = 11, }; enum { @@ -151,6 +177,7 @@ static inline const char *nvdimm_cmd_name(unsigned cmd) case ND_CMD_VENDOR_EFFECT_LOG: return "effect_log"; case ND_CMD_VENDOR: return "vendor"; case ND_CMD_CALL: return "cmd_call"; + case ND_CMD_GET_STAT: return "get_stat"; default: return "unknown"; } } From patchwork Sun Nov 8 21:15:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Jain X-Patchwork-Id: 11889875 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 53AA5697 for ; Sun, 8 Nov 2020 21:16:20 +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 18260206DB for ; Sun, 8 Nov 2020 21:16:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="Bi2wIPkH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 18260206DB 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 C803516546D40; Sun, 8 Nov 2020 13:16:19 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=vaibhav@linux.ibm.com; receiver= 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 ml01.01.org (Postfix) with ESMTPS id D9BB116538BA7 for ; Sun, 8 Nov 2020 13:16:17 -0800 (PST) Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A8L0rYs193284; Sun, 8 Nov 2020 16:16:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=UlAnYRC0cfkGeC1nfGcvQkPFukBPSB5d89mrhnAjoJs=; b=Bi2wIPkHR8cLcGQ0caDyhjec9RkGdvQsvDjHVy6fMbXQtbvPbGxWdHH+CnMr0gCAXu6D e3XJXqjKP+rBmDSPyFXMysXypQ0WAnK4KrU11WYh2IBjr35JiJ8X6hYtokBghH5zCf0L or1yRSKj9QekdhTYsplQW3u+Os4edDsOGxOQHr1nqvf/sCH4qoL5PctBYcF4aiL47oBk DWjLcJnjnC8YIpBdRNsKR+EM2OwP/zl1cKBqvgmHobfxYZAeyqZ0DlJUdCr+WTphCFNg h26urroGwCVL3RgM+mZl3n5fE+0RMHBPre5+vgOmorzhdB0bsyFd1F4mCzibAttnmFdV 6Q== Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0b-001b2d01.pphosted.com with ESMTP id 34p9jux2jq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 08 Nov 2020 16:16:07 -0500 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 0A8LD3CC005584; Sun, 8 Nov 2020 21:16:05 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma05fra.de.ibm.com with ESMTP id 34nk788p1d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 08 Nov 2020 21:16:05 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 0A8LG27765732966 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 8 Nov 2020 21:16:02 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B3650A405C; Sun, 8 Nov 2020 21:16:02 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 11544A4062; Sun, 8 Nov 2020 21:15:59 +0000 (GMT) Received: from vajain21.in.ibm.com (unknown [9.199.47.5]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with SMTP; Sun, 8 Nov 2020 21:15:58 +0000 (GMT) Received: by vajain21.in.ibm.com (sSMTP sendmail emulation); Mon, 09 Nov 2020 02:45:57 +0530 From: Vaibhav Jain To: linuxppc-dev@lists.ozlabs.org, linux-nvdimm@lists.01.org Subject: [RFC][PATCH 2/2] powerpc/papr_scm: Implement support for reporting generic nvdimm stats Date: Mon, 9 Nov 2020 02:45:49 +0530 Message-Id: <20201108211549.122018-2-vaibhav@linux.ibm.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201108211549.122018-1-vaibhav@linux.ibm.com> References: <20201108211549.122018-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.312,18.0.737 definitions=2020-11-08_10:2020-11-05,2020-11-08 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxlogscore=999 malwarescore=0 phishscore=0 impostorscore=0 adultscore=0 bulkscore=0 lowpriorityscore=0 mlxscore=0 priorityscore=1501 suspectscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011080148 Message-ID-Hash: D5H34I3ITWCCZZRCUN542BEOSCJPRYGI X-Message-ID-Hash: D5H34I3ITWCCZZRCUN542BEOSCJPRYGI 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 reporting papr-scm supported generic nvdimm stats by implementing support for handling ND_CMD_GET_STAT in 'papr_scm_ndctl(). The mapping between libnvdimm generic nvdimm-stats and papr-scm specific performance-stats is embedded inside 'dimm_stats_map[]'. This array is queried by newly introduced 'papr_scm_get_stat()' that verifies if the requested nvdimm-stat is supported and if yes does an hcall via 'drc_pmem_query_stat()' to request the performance-stat and return it back to libnvdimm. Signed-off-by: Vaibhav Jain --- arch/powerpc/platforms/pseries/papr_scm.c | 66 ++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c index 835163f54244..51eeab3376fd 100644 --- a/arch/powerpc/platforms/pseries/papr_scm.c +++ b/arch/powerpc/platforms/pseries/papr_scm.c @@ -25,7 +25,8 @@ ((1ul << ND_CMD_GET_CONFIG_SIZE) | \ (1ul << ND_CMD_GET_CONFIG_DATA) | \ (1ul << ND_CMD_SET_CONFIG_DATA) | \ - (1ul << ND_CMD_CALL)) + (1ul << ND_CMD_CALL) | \ + (1ul << ND_CMD_GET_STAT)) /* DIMM health bitmap bitmap indicators */ /* SCM device is unable to persist memory contents */ @@ -120,6 +121,16 @@ struct papr_scm_priv { static LIST_HEAD(papr_nd_regions); static DEFINE_MUTEX(papr_ndr_lock); +/* Map generic nvdimm stats to papr-scm stats */ +static const char * const dimm_stat_map[] = { + [ND_DIMM_STAT_INVALID] = NULL, + [ND_DIMM_STAT_MEDIA_READS] = "MedRCnt ", + [ND_DIMM_STAT_MEDIA_WRITES] = "MedWCnt ", + [ND_DIMM_STAT_READ_REQUESTS] = "HostLCnt", + [ND_DIMM_STAT_WRITE_REQUESTS] = "HostSCnt", + [ND_DIMM_STAT_MAX] = NULL, +}; + static int drc_pmem_bind(struct papr_scm_priv *p) { unsigned long ret[PLPAR_HCALL_BUFSIZE]; @@ -728,6 +739,54 @@ static int papr_scm_service_pdsm(struct papr_scm_priv *p, return pdsm_pkg->cmd_status; } +/* + * For a given pdsm request call an appropriate service function. + * Returns errors if any while handling the pdsm command package. + */ +static int papr_scm_get_stat(struct papr_scm_priv *p, + struct nd_cmd_get_dimm_stat *dimm_stat) + +{ + int rc; + ssize_t size; + struct papr_scm_perf_stat *stat; + struct papr_scm_perf_stats *stats; + + /* Check if the requested stat-id is supported */ + if (dimm_stat->stat_id >= ARRAY_SIZE(dimm_stat_map) || + !dimm_stat_map[dimm_stat->stat_id]) { + dev_dbg(&p->pdev->dev, "Invalid stat-id %lld\n", dimm_stat->stat_id); + return -ENOSPC; + } + + /* Allocate request buffer enough to hold single performance stat */ + size = sizeof(struct papr_scm_perf_stats) + + sizeof(struct papr_scm_perf_stat); + + stats = kzalloc(size, GFP_KERNEL); + if (!stats) + return -ENOMEM; + + stat = &stats->scm_statistic[0]; + memcpy(&stat->stat_id, dimm_stat_map[dimm_stat->stat_id], + sizeof(stat->stat_id)); + stat->stat_val = 0; + + /* Fetch the statistic from PHYP and copy it to provided payload */ + rc = drc_pmem_query_stats(p, stats, 1); + if (rc < 0) { + dev_dbg(&p->pdev->dev, "Err(%d) fetching stat '%.8s'\n", + rc, stat->stat_id); + kfree(stats); + return rc; + } + + dimm_stat->int_val = be64_to_cpu(stat->stat_val); + + kfree(stats); + return 0; +} + static int papr_scm_ndctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, unsigned int cmd, void *buf, unsigned int buf_len, int *cmd_rc) @@ -772,6 +831,11 @@ static int papr_scm_ndctl(struct nvdimm_bus_descriptor *nd_desc, *cmd_rc = papr_scm_service_pdsm(p, call_pkg); break; + case ND_CMD_GET_STAT: + *cmd_rc = papr_scm_get_stat(p, + (struct nd_cmd_get_dimm_stat *)buf); + break; + default: dev_dbg(&p->pdev->dev, "Unknown command = %d\n", cmd); return -EINVAL;