From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9EBCC3F2D1 for ; Thu, 5 Mar 2020 03:36:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 67E69208CD for ; Thu, 5 Mar 2020 03:36:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67E69208CD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EE3B46B0003; Wed, 4 Mar 2020 22:36:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E942A6B0005; Wed, 4 Mar 2020 22:36:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7F3D6B0007; Wed, 4 Mar 2020 22:36:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0005.hostedemail.com [216.40.44.5]) by kanga.kvack.org (Postfix) with ESMTP id BE4266B0003 for ; Wed, 4 Mar 2020 22:36:28 -0500 (EST) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 48C1F181AC9CB for ; Thu, 5 Mar 2020 03:36:28 +0000 (UTC) X-FDA: 76559896056.16.pan02_3872ece24302c X-HE-Tag: pan02_3872ece24302c X-Filterd-Recvd-Size: 10079 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Thu, 5 Mar 2020 03:36:27 +0000 (UTC) Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0253Tm2O145138 for ; Wed, 4 Mar 2020 22:36:27 -0500 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 2yj6njyy7f-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 04 Mar 2020 22:36:26 -0500 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 5 Mar 2020 03:36:24 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 5 Mar 2020 03:36:16 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 0253aF4b44433444 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 5 Mar 2020 03:36:15 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9883E5204E; Thu, 5 Mar 2020 03:36:15 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id EF6FE5204F; Thu, 5 Mar 2020 03:36:14 +0000 (GMT) Received: from [10.61.2.125] (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id AB3D3A0264; Thu, 5 Mar 2020 14:36:09 +1100 (AEDT) Subject: Re: [PATCH v3 24/27] powerpc/powernv/pmem: Expose SMART data via ndctl To: "Alastair D'Silva" , alastair@d-silva.org Cc: "Aneesh Kumar K . V" , "Oliver O'Halloran" , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Frederic Barrat , Arnd Bergmann , Greg Kroah-Hartman , Dan Williams , Vishal Verma , Dave Jiang , Ira Weiny , Andrew Morton , Mauro Carvalho Chehab , "David S. Miller" , Rob Herring , Anton Blanchard , Krzysztof Kozlowski , Mahesh Salgaonkar , Madhavan Srinivasan , =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , Anju T Sudhakar , Hari Bathini , Thomas Gleixner , Greg Kurz , Nicholas Piggin , Masahiro Yamada , Alexey Kardashevskiy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-nvdimm@lists.01.org, linux-mm@kvack.org References: <20200221032720.33893-1-alastair@au1.ibm.com> <20200221032720.33893-25-alastair@au1.ibm.com> From: Andrew Donnellan Date: Thu, 5 Mar 2020 14:36:13 +1100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200221032720.33893-25-alastair@au1.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 20030503-4275-0000-0000-000003A87B69 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20030503-4276-0000-0000-000038BD89E6 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-03-04_10:2020-03-04,2020-03-04 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxlogscore=999 suspectscore=0 impostorscore=0 priorityscore=1501 bulkscore=0 phishscore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2003050016 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 21/2/20 2:27 pm, Alastair D'Silva wrote: > +static int ndctl_smart(struct ocxlpmem *ocxlpmem, struct nd_cmd_pkg *pkg) > +{ > + u32 length, i; > + struct nd_ocxl_smart *out; > + int rc; > + > + mutex_lock(&ocxlpmem->admin_command.lock); > + > + rc = admin_command_request(ocxlpmem, ADMIN_COMMAND_SMART); > + if (rc) > + goto out; > + > + rc = admin_command_execute(ocxlpmem); > + if (rc) > + goto out; > + > + rc = admin_command_complete_timeout(ocxlpmem, ADMIN_COMMAND_SMART); > + if (rc < 0) { > + dev_err(&ocxlpmem->dev, "SMART timeout\n"); > + goto out; > + } > + > + rc = admin_response(ocxlpmem); > + if (rc < 0) > + goto out; > + if (rc != STATUS_SUCCESS) { > + warn_status(ocxlpmem, "Unexpected status from SMART", rc); > + goto out; > + } > + > + rc = smart_header_parse(ocxlpmem, &length); > + if (rc) > + goto out; > + > + pkg->nd_fw_size = length; > + > + length = min(length, pkg->nd_size_out); // bytes > + out = (struct nd_ocxl_smart *)pkg->nd_payload; > + // Each SMART attribute is 2 * 64 bits > + out->count = length / (2 * sizeof(u64)); // attributes From what I can tell - 8 bytes of nd_ocxl_smart are taken up for the count + reserved bytes, so this is going to potentially overrun the user buffer. > + > + for (i = 0; i < length; i += sizeof(u64)) { It might be neater to make i count up by 1 and then multiply by sizeof(u64) later. > + rc = ocxl_global_mmio_read64(ocxlpmem->ocxl_afu, > + ocxlpmem->admin_command.data_offset + sizeof(u64) + i, + 0x08 rather than + sizeof(u64) for consistency. > + OCXL_LITTLE_ENDIAN, > + &out->attribs[i/sizeof(u64)]); > + if (rc) > + goto out; > + } > + > + rc = admin_response_handled(ocxlpmem); > + if (rc) > + goto out; > + > + rc = 0; > + goto out; > + > +out: > + mutex_unlock(&ocxlpmem->admin_command.lock); > + return rc; > +} > + > +static int ndctl_call(struct ocxlpmem *ocxlpmem, void *buf, unsigned int buf_len) > +{ > + struct nd_cmd_pkg *pkg = buf; > + > + if (buf_len < sizeof(struct nd_cmd_pkg)) { > + dev_err(&ocxlpmem->dev, "Invalid ND_CALL size=%u\n", buf_len); > + return -EINVAL; > + } > + > + if (pkg->nd_family != NVDIMM_FAMILY_OCXL) { > + dev_err(&ocxlpmem->dev, "Invalid ND_CALL family=0x%llx\n", pkg->nd_family); > + return -EINVAL; > + } > + > + switch (pkg->nd_command) { > + case ND_CMD_OCXL_SMART: > + ndctl_smart(ocxlpmem, pkg); Did you intend to dispose of the return code here? > + break; > + > + default: > + dev_err(&ocxlpmem->dev, "Invalid ND_CALL command=0x%llx\n", pkg->nd_command); > + return -EINVAL; > + } > + > + > + return 0; > +} > + > static int ndctl(struct nvdimm_bus_descriptor *nd_desc, > struct nvdimm *nvdimm, > unsigned int cmd, void *buf, unsigned int buf_len, int *cmd_rc) > @@ -88,6 +211,10 @@ static int ndctl(struct nvdimm_bus_descriptor *nd_desc, > struct ocxlpmem *ocxlpmem = container_of(nd_desc, struct ocxlpmem, bus_desc); > > switch (cmd) { > + case ND_CMD_CALL: > + *cmd_rc = ndctl_call(ocxlpmem, buf, buf_len); > + return 0; > + > case ND_CMD_GET_CONFIG_SIZE: > *cmd_rc = ndctl_config_size(buf); > return 0; > @@ -171,6 +298,7 @@ static int register_lpc_mem(struct ocxlpmem *ocxlpmem) > set_bit(ND_CMD_GET_CONFIG_SIZE, &nvdimm_cmd_mask); > set_bit(ND_CMD_GET_CONFIG_DATA, &nvdimm_cmd_mask); > set_bit(ND_CMD_SET_CONFIG_DATA, &nvdimm_cmd_mask); > + set_bit(ND_CMD_CALL, &nvdimm_cmd_mask); > > set_bit(NDD_ALIASING, &nvdimm_flags); > > diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h > index 927690f4888f..0eb7a35d24ae 100644 > --- a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h > +++ b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h > @@ -7,6 +7,7 @@ > #include > #include > #include > +#include > > #define LABEL_AREA_SIZE (1UL << PA_SECTION_SHIFT) > #define DEFAULT_TIMEOUT 100 > @@ -98,6 +99,23 @@ struct ocxlpmem_function0 { > struct ocxl_fn *ocxl_fn; > }; > > +struct nd_ocxl_smart { > + __u8 count; > + __u8 reserved[7]; > + __u64 attribs[0]; > +} __packed; > + > +struct nd_pkg_ocxl { > + struct nd_cmd_pkg gen; > + union { > + struct nd_ocxl_smart smart; > + }; > +}; > + > +enum nd_cmd_ocxl { > + ND_CMD_OCXL_SMART = 1, > +}; > + > struct ocxlpmem { > struct device dev; > struct pci_dev *pdev; > diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h > index de5d90212409..2885052e7f40 100644 > --- a/include/uapi/linux/ndctl.h > +++ b/include/uapi/linux/ndctl.h > @@ -244,6 +244,7 @@ struct nd_cmd_pkg { > #define NVDIMM_FAMILY_HPE2 2 > #define NVDIMM_FAMILY_MSFT 3 > #define NVDIMM_FAMILY_HYPERV 4 > +#define NVDIMM_FAMILY_OCXL 6 > > #define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\ > struct nd_cmd_pkg) > -- Andrew Donnellan OzLabs, ADL Canberra ajd@linux.ibm.com IBM Australia Limited