From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 7D5DD5963 for ; Mon, 8 Feb 2016 15:13:26 +0100 (CET) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP; 08 Feb 2016 06:13:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,416,1449561600"; d="scan'208";a="44340284" Received: from irsmsx110.ger.corp.intel.com ([163.33.3.25]) by fmsmga004.fm.intel.com with ESMTP; 08 Feb 2016 06:13:24 -0800 Received: from irsmsx109.ger.corp.intel.com ([169.254.13.100]) by irsmsx110.ger.corp.intel.com ([169.254.15.31]) with mapi id 14.03.0248.002; Mon, 8 Feb 2016 14:13:23 +0000 From: "Burakov, Anatoly" To: Santosh Shukla , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v8 4/4] eal/linux: vfio: add pci ioport support Thread-Index: AQHRYlhYXm13h0GjNk2Y8YBVv73VQ58iMMkQ Date: Mon, 8 Feb 2016 14:13:23 +0000 Message-ID: References: <0000-cover-letter.patch> <1454925815-14292-1-git-send-email-sshukla@mvista.com> <1454925815-14292-2-git-send-email-sshukla@mvista.com> In-Reply-To: <1454925815-14292-2-git-send-email-sshukla@mvista.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.181] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v8 4/4] eal/linux: vfio: add pci ioport support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2016 14:13:26 -0000 > Include vfio map/rd/wr support for pci ioport. >=20 > Signed-off-by: Santosh Shukla > --- > v7->v8: > - Remove rte_pci_ioport malloc and rte_free()/unmap() func from v7. > - removed umap from git header. >=20 > lib/librte_eal/linuxapp/eal/eal_pci_vfio.c | 36 ++++++++++++++++++----= --- > --- > 1 file changed, 24 insertions(+), 12 deletions(-) >=20 > diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c > b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c > index 4832313..9571ed8 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) >=20 > /* per-process VFIO config */ > static struct vfio_config vfio_cfg; > @@ -999,30 +1000,41 @@ 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->dev =3D dev; > + p->offset =3D VFIO_GET_REGION_ADDR(bar); > + return 0; > } >=20 > 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 =3D &p->dev->intr_handle; > + > + if (pread64(intr_handle->vfio_dev_fd, data, > + len, p->offset + offset) <=3D 0) > + RTE_LOG(ERR, EAL, > + "Can't read from PCI bar (%" PRIu64 ") : offset > (%x)\n", > + VFIO_GET_REGION_IDX(p->offset), (int)offset); > } >=20 > 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 =3D &p->dev->intr_handle; > + > + if (pwrite64(intr_handle->vfio_dev_fd, data, > + len, p->offset + offset) <=3D 0) > + RTE_LOG(ERR, EAL, > + "Can't write to PCI bar (%" PRIu64 ") : offset (%x)\n", > + VFIO_GET_REGION_IDX(p->offset), (int)offset); > } >=20 > int > -- > 1.7.9.5 Acked-by: Anatoly Burakov