From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by dpdk.org (Postfix) with ESMTP id 0321ABE7C for ; Wed, 27 Jan 2016 18:42:41 +0100 (CET) Received: by mail-pa0-f54.google.com with SMTP id ho8so7998873pac.2 for ; Wed, 27 Jan 2016 09:42:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mvista-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=V4hmz9VPcpgXoR1STr8obSqut39P2RNc8wlMyJw4YWQ=; b=bpEmd/47eo+RulEUpFs95o/RVcxNy3bpGpffCRp4mUtFuOWFfhus1pn4W6BUd/DA8K 7wG9pQJGX2IMeF7DHAYFF0nDyFl/VD6t1XxXgmszZzLHPm09lUnF25SQFoi2RpRmUG7O FAoCcTLFO88pKjD1YHHLA1k55iJnGXeJqOCK2efL/efLB0a9QpZi8nIeXf+nEVD1A9Hd SaUZ4cjiZ78VYWrmkXTZ7Y1IP5HJGLvImzfXKg631ICCS8t6c8sCBGfuZrGZM9LEeKOo LH1ORpmJEDZ8OMN9srUzGxl2i63mS27va4nErj4zxzotMJXNAPzwL32AiDTqP4HWXJsM ISmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=V4hmz9VPcpgXoR1STr8obSqut39P2RNc8wlMyJw4YWQ=; b=fT16RL13wILfygLOxgckgSDpfdo7w1vRVwAiMAAyKEaegD4TSAMw72mNKFL7MV9CMj g0w9FbeQCAO8PmfsQIiMB0jow9BJhLmXhychyyBtKqVqpsUlFxYSWhjCKW59woeKrfmC e0+dfblB9g6AbIuPuNvIRvEk4ECkFxizxaFfw0W5MfwfkNkAj8GlRLkGx2SHsbOOcNTU bRjcF428645xz2ECWlJ/P9FI9bVs29rL34qukDmu1aIBYZCAEBKkEHgdUysM6ohtK4dd yYbchAx8XpjBCCWMXMNYpOPYVQmV5eidakO0LGm6QbCrAXLYjN2LvEdoyoVf8mNDLyQM h3GA== X-Gm-Message-State: AG10YOQXoFeRjCjUdp51uO9GYX7iBG5RKshzeGQDeg/wzzde0Z+VYwzq8fxAHhzFXv56dtEz+vqpQG5qVQb7mkhL MIME-Version: 1.0 X-Received: by 10.66.177.193 with SMTP id cs1mr44151166pac.132.1453916560396; Wed, 27 Jan 2016 09:42:40 -0800 (PST) Received: by 10.66.196.81 with HTTP; Wed, 27 Jan 2016 09:42:40 -0800 (PST) In-Reply-To: <1453371964-3354-2-git-send-email-sshukla@mvista.com> References: <1453371964-3354-1-git-send-email-sshukla@mvista.com> <1453371964-3354-2-git-send-email-sshukla@mvista.com> Date: Wed, 27 Jan 2016 23:12:40 +0530 Message-ID: From: Santosh Shukla To: dev@dpdk.org Content-Type: text/plain; charset=UTF-8 Subject: Re: [dpdk-dev] [PATCH v6 05/11] eal: pci: vfio: add rd/wr func for pci bar space 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: Wed, 27 Jan 2016 17:42:41 -0000 On Thu, Jan 21, 2016 at 3:56 PM, Santosh Shukla wrote: > Introducing below api for pci bar space rd/wr. Currently used for > pci iobar rd/wr. > > Api's are: > - rte_eal_pci_read_bar > - rte_eal_pci_write_bar > > virtio when used for vfio-mode then virtio driver will use these api > to do rd/wr operation on ioport pci bar. > > Signed-off-by: Santosh Shukla > --- > v5-->v6: > - included dummy implementation for rte_eal_pci_read/write_bar() api in bsdapp. > - Added api entry in rte_eal_version.map > Ping for v6? > lib/librte_eal/bsdapp/eal/eal_pci.c | 19 ++++++++++++ > lib/librte_eal/bsdapp/eal/rte_eal_version.map | 3 ++ > lib/librte_eal/common/include/rte_pci.h | 38 +++++++++++++++++++++++ > lib/librte_eal/linuxapp/eal/eal_pci.c | 34 ++++++++++++++++++++ > lib/librte_eal/linuxapp/eal/eal_pci_init.h | 6 ++++ > lib/librte_eal/linuxapp/eal/eal_pci_vfio.c | 28 +++++++++++++++++ > lib/librte_eal/linuxapp/eal/rte_eal_version.map | 3 ++ > 7 files changed, 131 insertions(+) > > diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c > index 95c32c1..2e535ea 100644 > --- a/lib/librte_eal/bsdapp/eal/eal_pci.c > +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c > @@ -479,6 +479,25 @@ int rte_eal_pci_write_config(const struct rte_pci_device *dev, > return -1; > } > > +int rte_eal_pci_read_bar(const struct rte_pci_device *device __rte_unused, > + void *buf __rte_unused, size_t len __rte_unused, > + off_t offset __rte_unused, > + int bar_idx __rte_unused) > + > +{ > + /* NA */ > + return 1; > +} > + > +int rte_eal_pci_write_bar(const struct rte_pci_device *device __rte_unused, > + const void *buf __rte_unused, size_t len __rte_unused, > + off_t offset __rte_unused, > + int bar_idx __rte_unused) > +{ > + /* NA */ > + return 1; > +} > + > /* Init the PCI EAL subsystem */ > int > rte_eal_pci_init(void) > diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map > index 1b28170..7c7dcf0 100644 > --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map > +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map > @@ -141,4 +141,7 @@ DPDK_2.3 { > > rte_eal_pci_map_device; > rte_eal_pci_unmap_device; > + rte_eal_pci_read_bar; > + rte_eal_pci_write_bar; > + > } DPDK_2.2; > diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h > index 2224109..0c667ff 100644 > --- a/lib/librte_eal/common/include/rte_pci.h > +++ b/lib/librte_eal/common/include/rte_pci.h > @@ -471,6 +471,44 @@ int rte_eal_pci_read_config(const struct rte_pci_device *device, > void *buf, size_t len, off_t offset); > > /** > + * Read PCI bar space. > + * > + * @param device > + * A pointer to a rte_pci_device structure describing the device > + * to use > + * @param buf > + * A data buffer where the bytes should be read into > + * @param len > + * The length of the data buffer. > + * @param offset > + * The offset into PCI bar space > + * @param bar_idx > + * The pci bar index (valid range is 0..5) > + */ > +int rte_eal_pci_read_bar(const struct rte_pci_device *device, > + void *buf, size_t len, off_t offset, int bar_idx); > + > +/** > + * Write PCI bar space. > + * > + * @param device > + * A pointer to a rte_pci_device structure describing the device > + * to use > + * @param buf > + * A data buffer containing the bytes should be written > + * @param len > + * The length of the data buffer. > + * @param offset > + * The offset into PCI config space > + * @param bar_idx > + * The pci bar index (valid range is 0..5) > +*/ > +int rte_eal_pci_write_bar(const struct rte_pci_device *device, > + const void *buf, size_t len, off_t offset, > + int bar_idx); > + > + > +/** > * Write PCI config space. > * > * @param device > diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c > index db947da..eb503f0 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_pci.c > +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c > @@ -621,6 +621,40 @@ int rte_eal_pci_write_config(const struct rte_pci_device *device, > } > } > > +int rte_eal_pci_read_bar(const struct rte_pci_device *device, > + void *buf, size_t len, off_t offset, > + int bar_idx) > + > +{ > + const struct rte_intr_handle *intr_handle = &device->intr_handle; > + > + switch (device->kdrv) { > + case RTE_KDRV_VFIO: > + return pci_vfio_read_bar(intr_handle, buf, len, > + offset, bar_idx); > + default: > + RTE_LOG(ERR, EAL, "write bar not supported by driver\n"); > + return -1; > + } > +} > + > +int rte_eal_pci_write_bar(const struct rte_pci_device *device, > + const void *buf, size_t len, off_t offset, > + int bar_idx) > +{ > + > + const struct rte_intr_handle *intr_handle = &device->intr_handle; > + > + switch (device->kdrv) { > + case RTE_KDRV_VFIO: > + return pci_vfio_write_bar(intr_handle, buf, len, > + offset, bar_idx); > + default: > + RTE_LOG(ERR, EAL, "write bar not supported by driver\n"); > + return -1; > + } > +} > + > /* Init the PCI EAL subsystem */ > int > rte_eal_pci_init(void) > diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_init.h b/lib/librte_eal/linuxapp/eal/eal_pci_init.h > index a17c708..3bc592b 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_pci_init.h > +++ b/lib/librte_eal/linuxapp/eal/eal_pci_init.h > @@ -68,6 +68,12 @@ int pci_vfio_read_config(const struct rte_intr_handle *intr_handle, > int pci_vfio_write_config(const struct rte_intr_handle *intr_handle, > const void *buf, size_t len, off_t offs); > > +int pci_vfio_read_bar(const struct rte_intr_handle *intr_handle, > + void *buf, size_t len, off_t offs, int bar_idx); > + > +int pci_vfio_write_bar(const struct rte_intr_handle *intr_handle, > + const void *buf, size_t len, off_t offs, int bar_idx); > + > /* map VFIO resource prototype */ > int pci_vfio_map_resource(struct rte_pci_device *dev); > int pci_vfio_get_group_fd(int iommu_group_fd); > diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c > index abde779..df407ef 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c > +++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c > @@ -93,6 +93,34 @@ pci_vfio_write_config(const struct rte_intr_handle *intr_handle, > VFIO_GET_REGION_ADDR(VFIO_PCI_CONFIG_REGION_INDEX) + offs); > } > > +int > +pci_vfio_read_bar(const struct rte_intr_handle *intr_handle, > + void *buf, size_t len, off_t offs, int bar_idx) > +{ > + if (bar_idx < VFIO_PCI_BAR0_REGION_INDEX > + || bar_idx > VFIO_PCI_BAR5_REGION_INDEX) { > + RTE_LOG(ERR, EAL, "invalid bar_idx!\n"); > + return -1; > + } > + > + return pread64(intr_handle->vfio_dev_fd, buf, len, > + VFIO_GET_REGION_ADDR(bar_idx) + offs); > +} > + > +int > +pci_vfio_write_bar(const struct rte_intr_handle *intr_handle, > + const void *buf, size_t len, off_t offs, int bar_idx) > +{ > + if (bar_idx < VFIO_PCI_BAR0_REGION_INDEX > + || bar_idx > VFIO_PCI_BAR5_REGION_INDEX) { > + RTE_LOG(ERR, EAL, "invalid bar_idx!\n"); > + return -1; > + } > + > + return pwrite64(intr_handle->vfio_dev_fd, buf, len, > + VFIO_GET_REGION_ADDR(bar_idx) + offs); > +} > + > /* get PCI BAR number where MSI-X interrupts are */ > static int > pci_vfio_get_msix_bar(int fd, int *msix_bar, uint32_t *msix_table_offset, > diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map > index b9937c4..371b6c1 100644 > --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map > +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map > @@ -144,4 +144,7 @@ DPDK_2.3 { > > rte_eal_pci_map_device; > rte_eal_pci_unmap_device; > + rte_eal_pci_read_bar; > + rte_eal_pci_write_bar; > + > } DPDK_2.2; > -- > 1.7.9.5 >