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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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 AF739C4CEC4 for ; Thu, 19 Sep 2019 22:57:54 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (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 7CDD3206C2 for ; Thu, 19 Sep 2019 22:57:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7CDD3206C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 29284D30; Thu, 19 Sep 2019 22:57:54 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id D5279CC9 for ; Thu, 19 Sep 2019 22:57:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 3817B108 for ; Thu, 19 Sep 2019 22:57:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 96E313DE04; Thu, 19 Sep 2019 22:57:51 +0000 (UTC) Received: from x1.home (ovpn-118-102.phx2.redhat.com [10.3.118.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84E775D6B2; Thu, 19 Sep 2019 22:57:50 +0000 (UTC) Date: Thu, 19 Sep 2019 16:57:50 -0600 From: Alex Williamson To: Matthew Rosato Subject: Re: [PATCH v4 4/4] vfio: pci: Using a device region to retrieve zPCI information Message-ID: <20190919165750.73675997@x1.home> In-Reply-To: <1567815231-17940-5-git-send-email-mjrosato@linux.ibm.com> References: <1567815231-17940-1-git-send-email-mjrosato@linux.ibm.com> <1567815231-17940-5-git-send-email-mjrosato@linux.ibm.com> Organization: Red Hat MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 19 Sep 2019 22:57:51 +0000 (UTC) Cc: gor@linux.ibm.com, linux-s390@vger.kernel.org, walling@linux.ibm.com, kvm@vger.kernel.org, sebott@linux.ibm.com, pmorel@linux.ibm.com, cohuck@redhat.com, heiko.carstens@de.ibm.com, linux-kernel@vger.kernel.org, pasic@linux.ibm.com, borntraeger@de.ibm.com, iommu@lists.linux-foundation.org, robin.murphy@arm.com, gerald.schaefer@de.ibm.com X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org On Fri, 6 Sep 2019 20:13:51 -0400 Matthew Rosato wrote: > From: Pierre Morel > > We define a new configuration entry for VFIO/PCI, VFIO_PCI_ZDEV > > When the VFIO_PCI_ZDEV feature is configured we initialize > a new device region, VFIO_REGION_SUBTYPE_ZDEV_CLP, to hold > the information from the ZPCI device the use > > Signed-off-by: Pierre Morel > Signed-off-by: Matthew Rosato > --- > drivers/vfio/pci/Kconfig | 7 +++ > drivers/vfio/pci/Makefile | 1 + > drivers/vfio/pci/vfio_pci.c | 9 ++++ > drivers/vfio/pci/vfio_pci_private.h | 10 +++++ > drivers/vfio/pci/vfio_pci_zdev.c | 85 +++++++++++++++++++++++++++++++++++++ > 5 files changed, 112 insertions(+) > create mode 100644 drivers/vfio/pci/vfio_pci_zdev.c > > diff --git a/drivers/vfio/pci/Kconfig b/drivers/vfio/pci/Kconfig > index ac3c1dd..d4562a8 100644 > --- a/drivers/vfio/pci/Kconfig > +++ b/drivers/vfio/pci/Kconfig > @@ -45,3 +45,10 @@ config VFIO_PCI_NVLINK2 > depends on VFIO_PCI && PPC_POWERNV > help > VFIO PCI support for P9 Witherspoon machine with NVIDIA V100 GPUs > + > +config VFIO_PCI_ZDEV > + bool "VFIO PCI Generic for ZPCI devices" > + depends on VFIO_PCI && S390 > + default y > + help > + VFIO PCI support for S390 Z-PCI devices > diff --git a/drivers/vfio/pci/Makefile b/drivers/vfio/pci/Makefile > index f027f8a..781e080 100644 > --- a/drivers/vfio/pci/Makefile > +++ b/drivers/vfio/pci/Makefile > @@ -3,5 +3,6 @@ > vfio-pci-y := vfio_pci.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o > vfio-pci-$(CONFIG_VFIO_PCI_IGD) += vfio_pci_igd.o > vfio-pci-$(CONFIG_VFIO_PCI_NVLINK2) += vfio_pci_nvlink2.o > +vfio-pci-$(CONFIG_VFIO_PCI_ZDEV) += vfio_pci_zdev.o > > obj-$(CONFIG_VFIO_PCI) += vfio-pci.o > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > index 703948c..b40544a 100644 > --- a/drivers/vfio/pci/vfio_pci.c > +++ b/drivers/vfio/pci/vfio_pci.c > @@ -356,6 +356,15 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev) > } > } > > + if (IS_ENABLED(CONFIG_VFIO_PCI_ZDEV)) { > + ret = vfio_pci_zdev_init(vdev); > + if (ret) { > + dev_warn(&vdev->pdev->dev, > + "Failed to setup ZDEV regions\n"); > + goto disable_exit; > + } > + } > + > vfio_pci_probe_mmaps(vdev); > > return 0; > diff --git a/drivers/vfio/pci/vfio_pci_private.h b/drivers/vfio/pci/vfio_pci_private.h > index ee6ee91..08e02f5 100644 > --- a/drivers/vfio/pci/vfio_pci_private.h > +++ b/drivers/vfio/pci/vfio_pci_private.h > @@ -186,4 +186,14 @@ static inline int vfio_pci_ibm_npu2_init(struct vfio_pci_device *vdev) > return -ENODEV; > } > #endif > + > +#ifdef CONFIG_VFIO_PCI_ZDEV > +extern int vfio_pci_zdev_init(struct vfio_pci_device *vdev); > +#else > +static inline int vfio_pci_zdev_init(struct vfio_pci_device *vdev) > +{ > + return -ENODEV; > +} > +#endif > + > #endif /* VFIO_PCI_PRIVATE_H */ > diff --git a/drivers/vfio/pci/vfio_pci_zdev.c b/drivers/vfio/pci/vfio_pci_zdev.c > new file mode 100644 > index 0000000..22e2b60 > --- /dev/null > +++ b/drivers/vfio/pci/vfio_pci_zdev.c > @@ -0,0 +1,85 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * VFIO ZPCI devices support > + * > + * Copyright (C) IBM Corp. 2019. All rights reserved. > + * Author: Pierre Morel > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + */ > +#include > +#include > +#include > +#include > +#include > + > +#include "vfio_pci_private.h" > + > +static size_t vfio_pci_zdev_rw(struct vfio_pci_device *vdev, > + char __user *buf, size_t count, loff_t *ppos, > + bool iswrite) > +{ > + struct vfio_region_zpci_info *region; > + struct zpci_dev *zdev; > + unsigned int index = VFIO_PCI_OFFSET_TO_INDEX(*ppos); > + loff_t pos = *ppos & VFIO_PCI_OFFSET_MASK; > + > + if (!vdev->pdev->bus) > + return -ENODEV; > + > + zdev = vdev->pdev->bus->sysdata; > + if (!zdev) > + return -ENODEV; > + > + if (pos >= sizeof(*region) || iswrite) > + return -EINVAL; > + > + region = vdev->region[index - VFIO_PCI_NUM_REGIONS].data; > + region->dasm = zdev->dma_mask; > + region->start_dma = zdev->start_dma; > + region->end_dma = zdev->end_dma; > + region->msi_addr = zdev->msi_addr; > + region->flags = VFIO_PCI_ZDEV_FLAGS_REFRESH; Even more curious what this means, why do we need a flag that's always set? Maybe NOREFRESH if it were ever to exist. > + region->gid = zdev->pfgid; > + region->mui = zdev->fmb_update; > + region->noi = zdev->max_msi; > + memcpy(region->util_str, zdev->util_str, CLP_UTIL_STR_LEN); Just checking, I assume this is dynamic based on it being recreated every time, otherwise you'd have created it in the init function and just do the below on read, right? The fields that I can guess what they might be don't seem like they'd change. Comments would be good. Thanks, Alex > + > + count = min(count, (size_t)(sizeof(*region) - pos)); > + if (copy_to_user(buf, region, count)) > + return -EFAULT; > + > + return count; > +} > + > +static void vfio_pci_zdev_release(struct vfio_pci_device *vdev, > + struct vfio_pci_region *region) > +{ > + kfree(region->data); > +} > + > +static const struct vfio_pci_regops vfio_pci_zdev_regops = { > + .rw = vfio_pci_zdev_rw, > + .release = vfio_pci_zdev_release, > +}; > + > +int vfio_pci_zdev_init(struct vfio_pci_device *vdev) > +{ > + struct vfio_region_zpci_info *region; > + int ret; > + > + region = kmalloc(sizeof(*region) + CLP_UTIL_STR_LEN, GFP_KERNEL); > + if (!region) > + return -ENOMEM; > + > + ret = vfio_pci_register_dev_region(vdev, > + PCI_VENDOR_ID_IBM | VFIO_REGION_TYPE_PCI_VENDOR_TYPE, > + VFIO_REGION_SUBTYPE_ZDEV_CLP, > + &vfio_pci_zdev_regops, sizeof(*region) + CLP_UTIL_STR_LEN, > + VFIO_REGION_INFO_FLAG_READ, region); > + > + return ret; > +} _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu