From: Santosh Shukla <sshukla@mvista.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v4 09/14] virtio: ethdev: check for vfio interface
Date: Thu, 14 Jan 2016 18:58:32 +0530 [thread overview]
Message-ID: <1452778117-30178-10-git-send-email-sshukla@mvista.com> (raw)
In-Reply-To: <1452778117-30178-1-git-send-email-sshukla@mvista.com>
Introducing api to check interface type is vfio or not, if interface is vfio
then update struct virtio_vfio_dev {}.
Those two apis are:
- virtio_chk_for_vfio
- virtio_hw_init_by_vfio
Signed-off-by: Santosh Shukla <sshukla@mvista.com>
---
v3->v4:
- Removed RTE_PCI_DRV_NEED_MAPPING drv flag (as per Review comment from Stephen
and Suggested by Yuan)
- Introducing vfio interface parsing api which will set/unset is_vfio flag at
runtime.
drivers/net/virtio/virtio_ethdev.c | 112 +++++++++++++++++++++++++++++++++++-
1 file changed, 110 insertions(+), 2 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index d928339..8f2260f 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1202,6 +1202,105 @@ static int virtio_resource_init(struct rte_pci_device *pci_dev)
return virtio_resource_init_by_ioports(pci_dev);
}
+static int virtio_chk_for_vfio(struct rte_pci_device *pci_dev)
+{
+ /*
+ * 1. check whether vfio-noiommu mode is enabled
+ * 2. verify pci device attached to vfio-noiommu driver
+ * root@arm64:/sys/bus/pci/drivers/vfio-pci/0000:00:01.0/iommu_group#
+ * > cat name
+ * > vfio-noiommu
+ */
+
+ /* 1. Chk for vfio: noiommu mode set or not in kernel driver */
+ struct rte_pci_addr *loc;
+ FILE *fp;
+ const char *path = "/sys/module/vfio/parameters/enable_unsafe_noiommu_mode";
+ char filename[PATH_MAX] = {0};
+ char buf[PATH_MAX] = {0};
+
+ fp = fopen(path, "r");
+ if (fp == NULL) {
+ PMD_INIT_LOG(ERR, "can't open %s\n", path);
+ return -1;
+ }
+
+ if (fread(buf, sizeof(char), 1, fp) != 1) {
+ PMD_INIT_LOG(ERR, "can't read from file %s\n", path);
+ fclose(fp);
+ return -1;
+ }
+
+ if (strncmp(buf, "Y", 1) != 0) {
+ PMD_INIT_LOG(ERR, "[%s]: vfio: noiommu mode not set\n", path);
+ fclose(fp);
+ return -1;
+ }
+
+ fclose(fp);
+
+ /* 2. Verify pci device attached to vfio-noiommu driver */
+
+ /* 2.1 chk whether attached driver is vfio-noiommu or not */
+ loc = &pci_dev->addr;
+ snprintf(filename, sizeof(filename),
+ SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/iommu_group/name",
+ loc->domain, loc->bus, loc->devid, loc->function);
+
+ /* check for vfio-noiommu */
+ fp = fopen(filename, "r");
+ if (fp == NULL) {
+ PMD_INIT_LOG(ERR, "can't open %s\n", filename);
+ return -1;
+ }
+
+ if (fread(buf, sizeof(char), sizeof("vfio-noiommu"), fp) !=
+ sizeof("vfio-noiommu")) {
+ PMD_INIT_LOG(ERR, "can't read from file %s\n", filename);
+ fclose(fp);
+ return -1;
+ }
+
+ if (strncmp(buf, "vfio-noiommu", strlen("vfio-noiommu")) != 0) {
+ PMD_INIT_LOG(ERR, "not a vfio-noiommu driver\n");
+ fclose(fp);
+ return -1;
+ }
+
+ fclose(fp);
+
+ /* todo: vfio interrupt handling */
+ return 0;
+}
+
+/* Init virtio by vfio-way */
+static int virtio_hw_init_by_vfio(struct virtio_hw *hw,
+ struct rte_pci_device *pci_dev)
+{
+ struct virtio_vfio_dev *vdev;
+
+ vdev = &hw->dev;
+ if (virtio_chk_for_vfio(pci_dev) < 0) {
+ vdev->is_vfio = false;
+ vdev->pci_dev = NULL;
+ return -1;
+ }
+
+ /* .. So attached interface is vfio */
+ vdev->is_vfio = true;
+ vdev->pci_dev = pci_dev;
+
+ /* For debug use only */
+ const struct rte_intr_handle *intr_handle;
+ RTE_SET_USED(intr_handle); /* to keep compilar happy */
+ intr_handle = &pci_dev->intr_handle;
+ PMD_INIT_LOG(DEBUG, "vdev->pci_dev %p intr_handle %p vfio_dev_fd %d\n",
+ vdev->pci_dev, intr_handle,
+ intr_handle->vfio_dev_fd);
+
+ return 0;
+}
+
#else
static int
virtio_has_msix(const struct rte_pci_addr *loc __rte_unused)
@@ -1215,6 +1314,13 @@ static int virtio_resource_init(struct rte_pci_device *pci_dev __rte_unused)
/* no setup required */
return 0;
}
+
+static int virtio_hw_init_by_vfio(struct virtio_hw *hw __rte_unused,
+ struct rte_pci_device *pci_dev __rte_unused)
+{
+ /* NA */
+ return 0;
+}
#endif
/*
@@ -1287,8 +1393,10 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
pci_dev = eth_dev->pci_dev;
- if (virtio_resource_init(pci_dev) < 0)
- return -1;
+ if (virtio_hw_init_by_vfio(hw, pci_dev) < 0) {
+ if (virtio_resource_init(pci_dev) < 0)
+ return -1;
+ }
hw->use_msix = virtio_has_msix(&pci_dev->addr);
hw->io_base = (uint32_t)(uintptr_t)pci_dev->mem_resource[0].addr;
--
1.7.9.5
next prev parent reply other threads:[~2016-01-14 13:29 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-14 13:28 [dpdk-dev] [PATCH v4 00/14] Add virtio support for arm/arm64 Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 01/14] virtio: Introduce config RTE_VIRTIO_INC_VECTOR Santosh Shukla
2016-01-15 6:51 ` Yuanhan Liu
2016-01-16 6:18 ` Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 02/14] config: i686: set RTE_VIRTIO_INC_VECTOR=n Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 03/14] linuxapp: eal: arm: Always return 0 for rte_eal_iopl_init() Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 04/14] linuxapp/vfio: ignore mapping for ioport region Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 05/14] virtio_pci.h: build fix for sys/io.h for non-x86 arch Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 06/14] eal: pci: vfio: add rd/wr func for pci bar space Santosh Shukla
2016-01-15 5:48 ` Yuanhan Liu
2016-01-16 8:06 ` Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 07/14] virtio: vfio: add api support to rd/wr ioport bar Santosh Shukla
2016-01-15 6:03 ` Yuanhan Liu
2016-01-16 8:53 ` Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 08/14] virtio: pci: extend virtio pci rw api for vfio interface Santosh Shukla
2016-01-15 6:27 ` Yuanhan Liu
2016-01-15 12:43 ` Santosh Shukla
2016-01-15 13:42 ` Santosh Shukla
2016-01-18 6:11 ` Yuanhan Liu
2016-01-18 6:45 ` Santosh Shukla
2016-01-18 7:17 ` Yuanhan Liu
2016-01-18 13:09 ` Santosh Shukla
2016-01-18 6:59 ` Jason Wang
2016-01-18 7:39 ` Santosh Shukla
2016-01-14 13:28 ` Santosh Shukla [this message]
2016-01-15 6:35 ` [dpdk-dev] [PATCH v4 09/14] virtio: ethdev: check " Yuanhan Liu
2016-01-15 12:37 ` Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 10/14] virtio: pci: add dummy func definition for in/outb for non-x86 arch Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 11/14] config: armv7/v8: Enable RTE_LIBRTE_VIRTIO_PMD Santosh Shukla
2016-01-15 6:37 ` Yuanhan Liu
2016-01-15 12:45 ` Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 12/14] eal: pci: export pci_[un]map_device Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 13/14] virtio: enable vfio in pmd driver Santosh Shukla
2016-01-14 13:28 ` [dpdk-dev] [PATCH v4 14/14] vfio: Support for no-IOMMU mode Santosh Shukla
2016-01-29 7:27 ` [dpdk-dev] [PATCH v4 00/14] Add virtio support for arm/arm64 Xie, Huawei
2016-01-29 9:19 ` Santosh Shukla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452778117-30178-10-git-send-email-sshukla@mvista.com \
--to=sshukla@mvista.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).