From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gaetan Rivet Subject: [PATCH v3 1/2] bus/pci: fix vfio mode Date: Mon, 30 Oct 2017 17:36:52 +0100 Message-ID: <8492fe4cf1a8d6f15d389c9148e4942f1d060a40.1509381300.git.gaetan.rivet@6wind.com> References: <3195804eda227dde6bb6d80122b2af25e071e1c1.1509367736.git.gaetan.rivet@6wind.com> Cc: Jerin Jacob , Gaetan Rivet To: dev@dpdk.org Return-path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id C338E1B2B0 for ; Mon, 30 Oct 2017 17:37:12 +0100 (CET) Received: by mail-wr0-f195.google.com with SMTP id g90so13254048wrd.6 for ; Mon, 30 Oct 2017 09:37:12 -0700 (PDT) In-Reply-To: <3195804eda227dde6bb6d80122b2af25e071e1c1.1509367736.git.gaetan.rivet@6wind.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Jerin Jacob Revert back to using VFIO_PRESENT as a marker to enable compilation of VFIO-related segments. Fixes: 279b581c897d ("vfio: expose functions") Signed-off-by: Jerin Jacob Signed-off-by: Gaetan Rivet --- In addition to simply re-defining VFIO_PRESENT, the previous #ifdef removed in favor of RTE_EAL_VFIO must be switched back as well. Not doing so would break compilation on kernels prior to 3.6. Additionally, the following patch adds a warning for users. This fix is left as-is, instead of a more involved solution like Ferruh's. The reasoning behind it is that it should be made abundantly clear that the VFIO_PRESENT symbol is defined in eal_vfio.h and eal_vfio.h only, that it is a private EAL symbol that is currently bleeding out of the EAL. It should be visible when those private symbols will be removed from libs external to the EAL. v3: - Fix build by include eal_vfio.h in pci_init.h and pci.c as well. drivers/bus/pci/linux/pci.c | 1 + drivers/bus/pci/linux/pci_init.h | 4 +++- drivers/bus/pci/linux/pci_vfio.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index cdf8106..d0ce020 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -46,6 +46,7 @@ #include "eal_private.h" #include "eal_filesystem.h" +#include "eal_vfio.h" #include "private.h" #include "pci_init.h" diff --git a/drivers/bus/pci/linux/pci_init.h b/drivers/bus/pci/linux/pci_init.h index 99d7a2e..3290cee 100644 --- a/drivers/bus/pci/linux/pci_init.h +++ b/drivers/bus/pci/linux/pci_init.h @@ -38,6 +38,8 @@ #include +#include "eal_vfio.h" + /** IO resource type: */ #define IORESOURCE_IO 0x00000100 #define IORESOURCE_MEM 0x00000200 @@ -74,7 +76,7 @@ void pci_uio_ioport_write(struct rte_pci_ioport *p, const void *data, size_t len, off_t offset); int pci_uio_ioport_unmap(struct rte_pci_ioport *p); -#ifdef RTE_EAL_VFIO +#ifdef VFIO_PRESENT #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) #define RTE_PCI_MSIX_TABLE_BIR 0x7 diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index 360eed3..38d3792 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -48,6 +48,7 @@ #include #include "eal_filesystem.h" +#include "eal_vfio.h" #include "pci_init.h" #include "private.h" @@ -62,7 +63,7 @@ * This file is only compiled if CONFIG_RTE_EAL_VFIO is set to "y". */ -#ifdef RTE_EAL_VFIO +#ifdef VFIO_PRESENT #define PAGE_SIZE (sysconf(_SC_PAGESIZE)) #define PAGE_MASK (~(PAGE_SIZE - 1)) -- 2.1.4