From mboxrd@z Thu Jan 1 00:00:00 1970 From: Santosh Shukla Subject: [PATCH v7 4/4] eal/linux: vfio: add pci ioport support Date: Sun, 7 Feb 2016 19:21:08 +0530 Message-ID: <1454853068-14621-5-git-send-email-sshukla@mvista.com> References: <1454853068-14621-1-git-send-email-sshukla@mvista.com> To: dev@dpdk.org Return-path: Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by dpdk.org (Postfix) with ESMTP id 8EDD19A8D for ; Sun, 7 Feb 2016 14:51:35 +0100 (CET) Received: by mail-pa0-f42.google.com with SMTP id yy13so59685684pab.3 for ; Sun, 07 Feb 2016 05:51:35 -0800 (PST) In-Reply-To: <1454853068-14621-1-git-send-email-sshukla@mvista.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Include vfio map/unmap/rd/wr support for pci ioport. Signed-off-by: Santosh Shukla --- v7: - This is enhancement patch for vfio map/rd/wr, rebased on top of David(s) - "Rework ioport for virtio" patchset. For more information about api, refer patch [1]. [1] http://dpdk.org/dev/patchwork/patch/10426/ lib/librte_eal/linuxapp/eal/eal_pci_vfio.c | 48 ++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c index 4832313..d83ece5 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c @@ -74,6 +74,7 @@ EAL_REGISTER_TAILQ(rte_vfio_tailq) #define VFIO_GROUP_FMT "/dev/vfio/%u" #define VFIO_NOIOMMU_GROUP_FMT "/dev/vfio/noiommu-%u" #define VFIO_GET_REGION_ADDR(x) ((uint64_t) x << 40ULL) +#define VFIO_GET_REGION_IDX(x) (x >> 40) /* per-process VFIO config */ static struct vfio_config vfio_cfg; @@ -999,37 +1000,56 @@ int pci_vfio_ioport_map(struct rte_pci_device *dev, int bar, struct rte_pci_ioport *p) { - RTE_SET_USED(dev); - RTE_SET_USED(bar); - RTE_SET_USED(p); - return -1; + if (bar < VFIO_PCI_BAR0_REGION_INDEX || + bar > VFIO_PCI_BAR5_REGION_INDEX) { + RTE_LOG(ERR, EAL, "invalid bar (%d)!\n", bar); + return -1; + } + + p = rte_zmalloc("VFIO_IOPORT", sizeof(*p), 0); + if (p == NULL) { + RTE_LOG(ERR, EAL, "cannot alloc vfio ioport mem\n"); + return -1; + } + + p->dev = dev; + p->offset = VFIO_GET_REGION_ADDR(bar); + return 0; } void pci_vfio_ioport_read(struct rte_pci_ioport *p, void *data, size_t len, off_t offset) { - RTE_SET_USED(p); - RTE_SET_USED(data); - RTE_SET_USED(len); - RTE_SET_USED(offset); + const struct rte_intr_handle *intr_handle = &p->dev->intr_handle; + if (pread64(intr_handle->vfio_dev_fd, data, + len, p->offset + offset) <= 0) + RTE_LOG(ERR, EAL, + "Can't read from PCI bar (%" PRIu64 ") : offset (%x)\n", + VFIO_GET_REGION_IDX(p->offset), (int)offset); } void pci_vfio_ioport_write(struct rte_pci_ioport *p, const void *data, size_t len, off_t offset) { - RTE_SET_USED(p); - RTE_SET_USED(data); - RTE_SET_USED(len); - RTE_SET_USED(offset); + const struct rte_intr_handle *intr_handle = &p->dev->intr_handle; + if (pwrite64(intr_handle->vfio_dev_fd, data, + len, p->offset + offset) <= 0) + RTE_LOG(ERR, EAL, + "Can't write to PCI bar (%" PRIu64 ") : offset (%x)\n", + VFIO_GET_REGION_IDX(p->offset), (int)offset); } int pci_vfio_ioport_unmap(struct rte_pci_ioport *p) { - RTE_SET_USED(p); - return -1; + if (p == NULL) + return -1; + else { + rte_free(p); + return 0; + } } int -- 1.7.9.5