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, USER_AGENT_GIT 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 3099EC33C8C for ; Tue, 7 Jan 2020 12:21:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0424C2070E for ; Tue, 7 Jan 2020 12:21:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728189AbgAGMVe (ORCPT ); Tue, 7 Jan 2020 07:21:34 -0500 Received: from mga09.intel.com ([134.134.136.24]:13883 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728172AbgAGMV3 (ORCPT ); Tue, 7 Jan 2020 07:21:29 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2020 04:21:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,406,1571727600"; d="scan'208";a="422476119" Received: from iov2.bj.intel.com ([10.238.145.72]) by fmsmga006.fm.intel.com with ESMTP; 07 Jan 2020 04:21:27 -0800 From: Liu Yi L To: alex.williamson@redhat.com, kwankhede@nvidia.com Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kevin.tian@intel.com, joro@8bytes.org, peterx@redhat.com, baolu.lu@linux.intel.com, Liu Yi L Subject: [PATCH v4 12/12] samples: refine vfio-mdev-pci driver Date: Tue, 7 Jan 2020 20:01:49 +0800 Message-Id: <1578398509-26453-13-git-send-email-yi.l.liu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1578398509-26453-1-git-send-email-yi.l.liu@intel.com> References: <1578398509-26453-1-git-send-email-yi.l.liu@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Williamson This patch refines the implementation of original vfio-mdev-pci driver. And the vfio-mdev-pci-type_name will be named per the following rule: vmdev->attr.name = kasprintf(GFP_KERNEL, "%04x:%04x:%04x:%04x:%06x:%02x", pdev->vendor, pdev->device, pdev->subsystem_vendor, pdev->subsystem_device, pdev->class, pdev->revision); Before usage, check the /sys/bus/pci/devices/$bdf/mdev_supported_types/ to ensure the final mdev_supported_types. Cc: Kevin Tian Cc: Lu Baolu Signed-off-by: Alex Williamson Signed-off-by: Liu Yi L --- samples/vfio-mdev-pci/vfio_mdev_pci.c | 123 ++++++++++++++++++++-------------- 1 file changed, 73 insertions(+), 50 deletions(-) diff --git a/samples/vfio-mdev-pci/vfio_mdev_pci.c b/samples/vfio-mdev-pci/vfio_mdev_pci.c index b180356..0377b5b 100644 --- a/samples/vfio-mdev-pci/vfio_mdev_pci.c +++ b/samples/vfio-mdev-pci/vfio_mdev_pci.c @@ -64,18 +64,22 @@ MODULE_PARM_DESC(disable_idle_d3, static struct pci_driver vfio_mdev_pci_driver; -static ssize_t -name_show(struct kobject *kobj, struct device *dev, char *buf) -{ - return sprintf(buf, "%s-type1\n", dev_name(dev)); -} - -MDEV_TYPE_ATTR_RO(name); +struct vfio_mdev_pci_device { + struct vfio_pci_device vdev; + struct mdev_parent_ops ops; + struct attribute_group *groups[2]; + struct attribute_group attr; + atomic_t avail; +}; static ssize_t available_instances_show(struct kobject *kobj, struct device *dev, char *buf) { - return sprintf(buf, "%d\n", 1); + struct vfio_mdev_pci_device *vmdev; + + vmdev = pci_get_drvdata(to_pci_dev(dev)); + + return sprintf(buf, "%d\n", atomic_read(&vmdev->avail)); } MDEV_TYPE_ATTR_RO(available_instances); @@ -89,64 +93,61 @@ static ssize_t device_api_show(struct kobject *kobj, struct device *dev, MDEV_TYPE_ATTR_RO(device_api); static struct attribute *vfio_mdev_pci_types_attrs[] = { - &mdev_type_attr_name.attr, &mdev_type_attr_device_api.attr, &mdev_type_attr_available_instances.attr, NULL, }; -static struct attribute_group vfio_mdev_pci_type_group1 = { - .name = "type1", - .attrs = vfio_mdev_pci_types_attrs, -}; - -struct attribute_group *vfio_mdev_pci_type_groups[] = { - &vfio_mdev_pci_type_group1, - NULL, -}; - struct vfio_mdev_pci { struct vfio_pci_device *vdev; struct mdev_device *mdev; - unsigned long handle; }; static int vfio_mdev_pci_create(struct kobject *kobj, struct mdev_device *mdev) { struct device *pdev; - struct vfio_pci_device *vdev; + struct vfio_mdev_pci_device *vmdev; struct vfio_mdev_pci *pmdev; int ret; pdev = mdev_parent_dev(mdev); - vdev = dev_get_drvdata(pdev); + vmdev = dev_get_drvdata(pdev); + + if (atomic_dec_if_positive(&vmdev->avail) < 0) + return -ENOSPC; + pmdev = kzalloc(sizeof(struct vfio_mdev_pci), GFP_KERNEL); - if (pmdev == NULL) { - ret = -EBUSY; - goto out; + if (!pmdev) { + atomic_inc(&vmdev->avail); + return -ENOMEM; } pmdev->mdev = mdev; - pmdev->vdev = vdev; + pmdev->vdev = &vmdev->vdev; mdev_set_drvdata(mdev, pmdev); ret = mdev_set_iommu_device(mdev_dev(mdev), pdev); if (ret) { pr_info("%s, failed to config iommu isolation for mdev: %s on pf: %s\n", __func__, dev_name(mdev_dev(mdev)), dev_name(pdev)); - goto out; + kfree(pmdev); + atomic_inc(&vmdev->avail); + return ret; } pr_info("%s, creation succeeded for mdev: %s\n", __func__, dev_name(mdev_dev(mdev))); -out: - return ret; + return 0; } static int vfio_mdev_pci_remove(struct mdev_device *mdev) { struct vfio_mdev_pci *pmdev = mdev_get_drvdata(mdev); + struct vfio_mdev_pci_device *vmdev; + + vmdev = container_of(pmdev->vdev, struct vfio_mdev_pci_device, vdev); kfree(pmdev); + atomic_inc(&vmdev->avail); pr_info("%s, succeeded for mdev: %s\n", __func__, dev_name(mdev_dev(mdev))); @@ -240,24 +241,12 @@ static ssize_t vfio_mdev_pci_write(struct mdev_device *mdev, return vfio_pci_write(pmdev->vdev, (char __user *)buf, count, ppos); } -static const struct mdev_parent_ops vfio_mdev_pci_ops = { - .supported_type_groups = vfio_mdev_pci_type_groups, - .create = vfio_mdev_pci_create, - .remove = vfio_mdev_pci_remove, - - .open = vfio_mdev_pci_open, - .release = vfio_mdev_pci_release, - - .read = vfio_mdev_pci_read, - .write = vfio_mdev_pci_write, - .mmap = vfio_mdev_pci_mmap, - .ioctl = vfio_mdev_pci_ioctl, -}; - static int vfio_mdev_pci_driver_probe(struct pci_dev *pdev, const struct pci_device_id *id) { + struct vfio_mdev_pci_device *vmdev; struct vfio_pci_device *vdev; + const struct mdev_parent_ops *ops; int ret; if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL) @@ -276,10 +265,38 @@ static int vfio_mdev_pci_driver_probe(struct pci_dev *pdev, return -EBUSY; } - vdev = kzalloc(sizeof(*vdev), GFP_KERNEL); - if (!vdev) + vmdev = kzalloc(sizeof(*vmdev), GFP_KERNEL); + if (!vmdev) return -ENOMEM; + vmdev->attr.name = kasprintf(GFP_KERNEL, + "%04x:%04x:%04x:%04x:%06x:%02x", + pdev->vendor, pdev->device, + pdev->subsystem_vendor, + pdev->subsystem_device, pdev->class, + pdev->revision); + if (!vmdev->attr.name) { + kfree(vmdev); + return -ENOMEM; + } + + atomic_set(&vmdev->avail, 1); + + vmdev->attr.attrs = vfio_mdev_pci_types_attrs; + vmdev->groups[0] = &vmdev->attr; + + vmdev->ops.supported_type_groups = vmdev->groups; + vmdev->ops.create = vfio_mdev_pci_create; + vmdev->ops.remove = vfio_mdev_pci_remove; + vmdev->ops.open = vfio_mdev_pci_open; + vmdev->ops.release = vfio_mdev_pci_release; + vmdev->ops.read = vfio_mdev_pci_read; + vmdev->ops.write = vfio_mdev_pci_write; + vmdev->ops.mmap = vfio_mdev_pci_mmap; + vmdev->ops.ioctl = vfio_mdev_pci_ioctl; + ops = &vmdev->ops; + + vdev = &vmdev->vdev; vdev->pdev = pdev; vdev->irq_type = VFIO_PCI_NUM_IRQS; mutex_init(&vdev->igate); @@ -292,7 +309,7 @@ static int vfio_mdev_pci_driver_probe(struct pci_dev *pdev, #endif vdev->disable_idle_d3 = disable_idle_d3; - pci_set_drvdata(pdev, vdev); + pci_set_drvdata(pdev, vmdev); ret = vfio_pci_reflck_attach(vdev); if (ret) { @@ -323,7 +340,7 @@ static int vfio_mdev_pci_driver_probe(struct pci_dev *pdev, vfio_pci_set_power_state(vdev, PCI_D3hot); } - ret = mdev_register_device(&pdev->dev, &vfio_mdev_pci_ops); + ret = mdev_register_device(&pdev->dev, ops); if (ret) pr_err("Cannot register mdev for device %s\n", dev_name(&pdev->dev)); @@ -335,12 +352,17 @@ static int vfio_mdev_pci_driver_probe(struct pci_dev *pdev, static void vfio_mdev_pci_driver_remove(struct pci_dev *pdev) { + struct vfio_mdev_pci_device *vmdev; struct vfio_pci_device *vdev; - vdev = pci_get_drvdata(pdev); - if (!vdev) + mdev_unregister_device(&pdev->dev); + + vmdev = pci_get_drvdata(pdev); + if (!vmdev) return; + vdev = &vmdev->vdev; + vfio_pci_reflck_put(vdev->reflck); kfree(vdev->region); @@ -358,7 +380,8 @@ static void vfio_mdev_pci_driver_remove(struct pci_dev *pdev) VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM); } - kfree(vdev); + kfree(vmdev->attr.name); + kfree(vmdev); } static struct pci_driver vfio_mdev_pci_driver = { -- 2.7.4