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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 DB04BC11D30 for ; Fri, 21 Feb 2020 03:28:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8E8FC24670 for ; Fri, 21 Feb 2020 03:28:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8E8FC24670 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=au1.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id CB9EB6B0037; Thu, 20 Feb 2020 22:28:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7AA996B0080; Thu, 20 Feb 2020 22:28:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B9C2E6B0070; Thu, 20 Feb 2020 22:28:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0232.hostedemail.com [216.40.44.232]) by kanga.kvack.org (Postfix) with ESMTP id 6AA3D6B0037 for ; Thu, 20 Feb 2020 22:28:24 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 507A9824805A for ; Fri, 21 Feb 2020 03:28:24 +0000 (UTC) X-FDA: 76512701328.25.frog66_666c53b9f522a X-HE-Tag: frog66_666c53b9f522a X-Filterd-Recvd-Size: 15169 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Fri, 21 Feb 2020 03:28:23 +0000 (UTC) Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01L3KGOJ077684 for ; Thu, 20 Feb 2020 22:28:23 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0b-001b2d01.pphosted.com with ESMTP id 2y9tkcgj3v-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 20 Feb 2020 22:28:22 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 21 Feb 2020 03:28:19 -0000 Received: from b06avi18878370.portsmouth.uk.ibm.com (9.149.26.194) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 21 Feb 2020 03:28:12 -0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 01L3SBXr31981876 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Feb 2020 03:28:11 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 59E2A4C04A; Fri, 21 Feb 2020 03:28:11 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A9B2E4C040; Fri, 21 Feb 2020 03:28:10 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 21 Feb 2020 03:28:10 +0000 (GMT) Received: from adsilva.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id B65B9A03E1; Fri, 21 Feb 2020 14:28:03 +1100 (AEDT) From: "Alastair D'Silva" To: alastair@d-silva.org Cc: "Aneesh Kumar K . V" , "Oliver O'Halloran" , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Frederic Barrat , Andrew Donnellan , 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=20Le=20Goater?= , 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 Subject: [PATCH v3 20/27] powerpc/powernv/pmem: Forward events to userspace Date: Fri, 21 Feb 2020 14:27:13 +1100 X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200221032720.33893-1-alastair@au1.ibm.com> References: <20200221032720.33893-1-alastair@au1.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 20022103-0020-0000-0000-000003AC2213 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20022103-0021-0000-0000-000022042A34 Message-Id: <20200221032720.33893-21-alastair@au1.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-02-20_19:2020-02-19,2020-02-20 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 suspectscore=3 spamscore=0 malwarescore=0 adultscore=0 phishscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 mlxscore=0 mlxlogscore=835 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2002210020 Content-Transfer-Encoding: quoted-printable 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: From: Alastair D'Silva Some of the interrupts that the card generates are better handled by the userspace daemon, in particular: Controller Hardware/Firmware Fatal Controller Dump Available Error Log available This patch allows a userspace application to register an eventfd with the driver via SCM_IOCTL_EVENTFD to receive notifications of these interrupts. Userspace can then identify what events have occurred by calling SCM_IOCTL_EVENT_CHECK and checking against the SCM_IOCTL_EVENT_FOO masks. Signed-off-by: Alastair D'Silva --- arch/powerpc/platforms/powernv/pmem/ocxl.c | 216 ++++++++++++++++++ .../platforms/powernv/pmem/ocxl_internal.h | 5 + include/uapi/nvdimm/ocxl-pmem.h | 16 ++ 3 files changed, 237 insertions(+) diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl.c b/arch/powerpc/pl= atforms/powernv/pmem/ocxl.c index 009d4fd29e7d..e46696d3cc36 100644 --- a/arch/powerpc/platforms/powernv/pmem/ocxl.c +++ b/arch/powerpc/platforms/powernv/pmem/ocxl.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -335,11 +336,22 @@ static void free_ocxlpmem(struct ocxlpmem *ocxlpmem= ) { int rc; =20 + // Disable doorbells + (void)ocxl_global_mmio_set64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_CHIEC, + OCXL_LITTLE_ENDIAN, + GLOBAL_MMIO_CHI_ALL); + if (ocxlpmem->nvdimm_bus) nvdimm_bus_unregister(ocxlpmem->nvdimm_bus); =20 free_minor(ocxlpmem); =20 + if (ocxlpmem->irq_addr[1]) + iounmap(ocxlpmem->irq_addr[1]); + + if (ocxlpmem->irq_addr[0]) + iounmap(ocxlpmem->irq_addr[0]); + if (ocxlpmem->cdev.owner) cdev_del(&ocxlpmem->cdev); =20 @@ -443,6 +455,11 @@ static int file_release(struct inode *inode, struct = file *file) { struct ocxlpmem *ocxlpmem =3D file->private_data; =20 + if (ocxlpmem->ev_ctx) { + eventfd_ctx_put(ocxlpmem->ev_ctx); + ocxlpmem->ev_ctx =3D NULL; + } + ocxlpmem_put(ocxlpmem); return 0; } @@ -938,6 +955,51 @@ static int ioctl_controller_stats(struct ocxlpmem *o= cxlpmem, return rc; } =20 +static int ioctl_eventfd(struct ocxlpmem *ocxlpmem, + struct ioctl_ocxl_pmem_eventfd __user *uarg) +{ + struct ioctl_ocxl_pmem_eventfd args; + + if (copy_from_user(&args, uarg, sizeof(args))) + return -EFAULT; + + if (ocxlpmem->ev_ctx) + return -EINVAL; + + ocxlpmem->ev_ctx =3D eventfd_ctx_fdget(args.eventfd); + if (!ocxlpmem->ev_ctx) + return -EFAULT; + + return 0; +} + +static int ioctl_event_check(struct ocxlpmem *ocxlpmem, u64 __user *uarg= ) +{ + u64 val =3D 0; + int rc; + u64 chi =3D 0; + + rc =3D ocxlpmem_chi(ocxlpmem, &chi); + if (rc < 0) + return rc; + + if (chi & GLOBAL_MMIO_CHI_ELA) + val |=3D IOCTL_OCXL_PMEM_EVENT_ERROR_LOG_AVAILABLE; + + if (chi & GLOBAL_MMIO_CHI_CDA) + val |=3D IOCTL_OCXL_PMEM_EVENT_CONTROLLER_DUMP_AVAILABLE; + + if (chi & GLOBAL_MMIO_CHI_CFFS) + val |=3D IOCTL_OCXL_PMEM_EVENT_FIRMWARE_FATAL; + + if (chi & GLOBAL_MMIO_CHI_CHFS) + val |=3D IOCTL_OCXL_PMEM_EVENT_HARDWARE_FATAL; + + rc =3D copy_to_user((u64 __user *) uarg, &val, sizeof(val)); + + return rc; +} + static long file_ioctl(struct file *file, unsigned int cmd, unsigned lon= g args) { struct ocxlpmem *ocxlpmem =3D file->private_data; @@ -966,6 +1028,15 @@ static long file_ioctl(struct file *file, unsigned = int cmd, unsigned long args) rc =3D ioctl_controller_stats(ocxlpmem, (struct ioctl_ocxl_pmem_controller_stats __user *)args); break; + + case IOCTL_OCXL_PMEM_EVENTFD: + rc =3D ioctl_eventfd(ocxlpmem, + (struct ioctl_ocxl_pmem_eventfd __user *)args); + break; + + case IOCTL_OCXL_PMEM_EVENT_CHECK: + rc =3D ioctl_event_check(ocxlpmem, (u64 __user *)args); + break; } =20 return rc; @@ -1107,6 +1178,146 @@ static void dump_error_log(struct ocxlpmem *ocxlp= mem) kfree(buf); } =20 +static irqreturn_t imn0_handler(void *private) +{ + struct ocxlpmem *ocxlpmem =3D private; + u64 chi =3D 0; + + (void)ocxlpmem_chi(ocxlpmem, &chi); + + if (chi & GLOBAL_MMIO_CHI_ELA) { + dev_warn(&ocxlpmem->dev, "Error log is available\n"); + + if (ocxlpmem->ev_ctx) + eventfd_signal(ocxlpmem->ev_ctx, 1); + } + + if (chi & GLOBAL_MMIO_CHI_CDA) { + dev_warn(&ocxlpmem->dev, "Controller dump is available\n"); + + if (ocxlpmem->ev_ctx) + eventfd_signal(ocxlpmem->ev_ctx, 1); + } + + + return IRQ_HANDLED; +} + +static irqreturn_t imn1_handler(void *private) +{ + struct ocxlpmem *ocxlpmem =3D private; + u64 chi =3D 0; + + (void)ocxlpmem_chi(ocxlpmem, &chi); + + if (chi & (GLOBAL_MMIO_CHI_CFFS | GLOBAL_MMIO_CHI_CHFS)) { + dev_err(&ocxlpmem->dev, + "Controller status is fatal, chi=3D0x%llx, going offline\n", chi); + + if (ocxlpmem->nvdimm_bus) { + nvdimm_bus_unregister(ocxlpmem->nvdimm_bus); + ocxlpmem->nvdimm_bus =3D NULL; + } + + if (ocxlpmem->ev_ctx) + eventfd_signal(ocxlpmem->ev_ctx, 1); + } + + return IRQ_HANDLED; +} + + +/** + * ocxlpmem_setup_irq() - Set up the IRQs for the OpenCAPI Persistent Me= mory device + * @ocxlpmem: the device metadata + * Return: 0 on success, negative on failure + */ +static int ocxlpmem_setup_irq(struct ocxlpmem *ocxlpmem) +{ + int rc; + u64 irq_addr; + + rc =3D ocxl_afu_irq_alloc(ocxlpmem->ocxl_context, &ocxlpmem->irq_id[0])= ; + if (rc) + return rc; + + rc =3D ocxl_irq_set_handler(ocxlpmem->ocxl_context, ocxlpmem->irq_id[0]= , + imn0_handler, NULL, ocxlpmem); + + irq_addr =3D ocxl_afu_irq_get_addr(ocxlpmem->ocxl_context, ocxlpmem->ir= q_id[0]); + if (!irq_addr) + return -EINVAL; + + ocxlpmem->irq_addr[0] =3D ioremap(irq_addr, PAGE_SIZE); + if (!ocxlpmem->irq_addr[0]) + return -EINVAL; + + rc =3D ocxl_global_mmio_write64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_IMA0_OH= P, + OCXL_LITTLE_ENDIAN, + (u64)ocxlpmem->irq_addr[0]); + if (rc) + goto out_irq0; + + rc =3D ocxl_global_mmio_write64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_IMA0_CF= P, + OCXL_LITTLE_ENDIAN, 0); + if (rc) + goto out_irq0; + + rc =3D ocxl_afu_irq_alloc(ocxlpmem->ocxl_context, &ocxlpmem->irq_id[1])= ; + if (rc) + goto out_irq0; + + + rc =3D ocxl_irq_set_handler(ocxlpmem->ocxl_context, ocxlpmem->irq_id[1]= , + imn1_handler, NULL, ocxlpmem); + if (rc) + goto out_irq0; + + irq_addr =3D ocxl_afu_irq_get_addr(ocxlpmem->ocxl_context, ocxlpmem->ir= q_id[1]); + if (!irq_addr) { + rc =3D -EFAULT; + goto out_irq0; + } + + ocxlpmem->irq_addr[1] =3D ioremap(irq_addr, PAGE_SIZE); + if (!ocxlpmem->irq_addr[1]) { + rc =3D -EINVAL; + goto out_irq0; + } + + rc =3D ocxl_global_mmio_write64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_IMA1_OH= P, + OCXL_LITTLE_ENDIAN, + (u64)ocxlpmem->irq_addr[1]); + if (rc) + goto out_irq1; + + rc =3D ocxl_global_mmio_write64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_IMA1_CF= P, + OCXL_LITTLE_ENDIAN, 0); + if (rc) + goto out_irq1; + + // Enable doorbells + rc =3D ocxl_global_mmio_set64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_CHIE, + OCXL_LITTLE_ENDIAN, + GLOBAL_MMIO_CHI_ELA | GLOBAL_MMIO_CHI_CDA | + GLOBAL_MMIO_CHI_CFFS | GLOBAL_MMIO_CHI_CHFS | + GLOBAL_MMIO_CHI_NSCRA); + if (rc) + goto out_irq1; + + return 0; + +out_irq1: + iounmap(ocxlpmem->irq_addr[1]); + ocxlpmem->irq_addr[1] =3D NULL; + +out_irq0: + iounmap(ocxlpmem->irq_addr[0]); + ocxlpmem->irq_addr[0] =3D NULL; + + return rc; +} + /** * probe_function0() - Set up function 0 for an OpenCAPI persistent memo= ry device * This is important as it enables templates higher than 0 across all ot= her functions, @@ -1216,6 +1427,11 @@ static int probe(struct pci_dev *pdev, const struc= t pci_device_id *ent) goto err; } =20 + if (ocxlpmem_setup_irq(ocxlpmem)) { + dev_err(&pdev->dev, "Could not set up OCXL IRQs\n"); + goto err; + } + if (setup_command_metadata(ocxlpmem)) { dev_err(&pdev->dev, "Could not read OCXL command matada\n"); goto err; diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h b/arch/p= owerpc/platforms/powernv/pmem/ocxl_internal.h index b953ee522ed4..927690f4888f 100644 --- a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h +++ b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h @@ -103,6 +103,10 @@ struct ocxlpmem { struct pci_dev *pdev; struct cdev cdev; struct ocxl_fn *ocxl_fn; +#define SCM_IRQ_COUNT 2 + int irq_id[SCM_IRQ_COUNT]; + struct dev_pagemap irq_pgmap[SCM_IRQ_COUNT]; + void *irq_addr[SCM_IRQ_COUNT]; struct nd_interleave_set nd_set; struct nvdimm_bus_descriptor bus_desc; struct nvdimm_bus *nvdimm_bus; @@ -113,6 +117,7 @@ struct ocxlpmem { struct command_metadata ns_command; struct resource pmem_res; struct nd_region *nd_region; + struct eventfd_ctx *ev_ctx; char fw_version[8+1]; u32 timeouts[ADMIN_COMMAND_MAX+1]; =20 diff --git a/include/uapi/nvdimm/ocxl-pmem.h b/include/uapi/nvdimm/ocxl-p= mem.h index add223aa2fdb..988eb0bc413d 100644 --- a/include/uapi/nvdimm/ocxl-pmem.h +++ b/include/uapi/nvdimm/ocxl-pmem.h @@ -66,6 +66,20 @@ struct ioctl_ocxl_pmem_controller_stats { __u64 cache_write_latency; /* nanoseconds */ }; =20 +struct ioctl_ocxl_pmem_eventfd { + __s32 eventfd; + __u32 reserved; +}; + +#ifndef BIT_ULL +#define BIT_ULL(nr) (1ULL << (nr)) +#endif + +#define IOCTL_OCXL_PMEM_EVENT_CONTROLLER_DUMP_AVAILABLE BIT_ULL(0) +#define IOCTL_OCXL_PMEM_EVENT_ERROR_LOG_AVAILABLE BIT_ULL(1) +#define IOCTL_OCXL_PMEM_EVENT_HARDWARE_FATAL BIT_ULL(2) +#define IOCTL_OCXL_PMEM_EVENT_FIRMWARE_FATAL BIT_ULL(3) + /* ioctl numbers */ #define OCXL_PMEM_MAGIC 0x5C /* SCM devices */ @@ -74,5 +88,7 @@ struct ioctl_ocxl_pmem_controller_stats { #define IOCTL_OCXL_PMEM_CONTROLLER_DUMP_DATA _IOWR(OCXL_PMEM_MAGIC, 0x0= 3, struct ioctl_ocxl_pmem_controller_dump_data) #define IOCTL_OCXL_PMEM_CONTROLLER_DUMP_COMPLETE _IO(OCXL_PMEM_MAGIC, 0x= 04) #define IOCTL_OCXL_PMEM_CONTROLLER_STATS _IO(OCXL_PMEM_MAGIC, 0x05) +#define IOCTL_OCXL_PMEM_EVENTFD _IOW(OCXL_PMEM_MAGIC, 0x06, struct io= ctl_ocxl_pmem_eventfd) +#define IOCTL_OCXL_PMEM_EVENT_CHECK _IOR(OCXL_PMEM_MAGIC, 0x07, __u64) =20 #endif /* _UAPI_OCXL_SCM_H */ --=20 2.24.1