From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <anatoly.burakov@intel.com>
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
by dpdk.org (Postfix) with ESMTP id 74FFA282
for <dev@dpdk.org>; Wed, 10 Dec 2014 12:48:45 +0100 (CET)
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
by fmsmga101.fm.intel.com with ESMTP; 10 Dec 2014 03:48:44 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.07,552,1413270000"; d="scan'208";a="635503055"
Received: from irsmsx110.ger.corp.intel.com ([163.33.3.25])
by fmsmga001.fm.intel.com with ESMTP; 10 Dec 2014 03:48:43 -0800
Received: from irsmsx109.ger.corp.intel.com ([169.254.13.244]) by
IRSMSX110.ger.corp.intel.com ([169.254.15.55]) with mapi id 14.03.0195.001;
Wed, 10 Dec 2014 11:48:42 +0000
From: "Burakov, Anatoly" <anatoly.burakov@intel.com>
To: "Qiu, Michael" <michael.qiu@intel.com>, "dev@dpdk.org" <dev@dpdk.org>
Thread-Topic: [PATCH v6] VFIO: Avoid to enable vfio while the module not loaded
Thread-Index: AQHQFG78yZzDmFNlgEmnV3x7yWaB5ZyItYSQ
Date: Wed, 10 Dec 2014 11:48:42 +0000
Message-ID: <C6ECDF3AB251BE4894318F4E4512369780C24883@IRSMSX109.ger.corp.intel.com>
References: <1418035455-9434-1-git-send-email-michael.qiu@intel.com>
<1418211977-8218-1-git-send-email-michael.qiu@intel.com>
In-Reply-To: <1418211977-8218-1-git-send-email-michael.qiu@intel.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach:
X-MS-TNEF-Correlator:
x-originating-ip: [163.33.239.180]
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Subject: Re: [dpdk-dev] [PATCH v6] VFIO: Avoid to enable vfio while the
module not loaded
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Dec 2014 11:48:46 -0000
> When vfio module is not loaded when kernel support vfio feature, the
> routine still try to open the container to get file description.
>=20
> This action is not safe, and of cause got error messages:
>=20
> EAL: Detected 40 lcore(s)
> EAL: unsupported IOMMU type!
> EAL: VFIO support could not be initialized
> EAL: Setting up memory...
>=20
> This may make user confuse, this patch make it reasonable and much more
> soomth to user.
>=20
> Signed-off-by: Michael Qiu <michael.qiu@intel.com>
> ---
> v6 --> v5
> 1. Change rte_eal_check_module() to normal
> function instead of inline
> 2. limit fscanf to get 29 charactors not include '\0'
>=20
> lib/librte_eal/common/eal_private.h | 14 ++++++++++++++
> lib/librte_eal/linuxapp/eal/eal.c | 27 ++++++++++++++++++++++++=
+++
> lib/librte_eal/linuxapp/eal/eal_pci_vfio.c | 26
> +++++++++++++++++++++++---
> 3 files changed, 64 insertions(+), 3 deletions(-)
>=20
> diff --git a/lib/librte_eal/common/eal_private.h
> b/lib/librte_eal/common/eal_private.h
> index 232fcec..2c751c6 100644
> --- a/lib/librte_eal/common/eal_private.h
> +++ b/lib/librte_eal/common/eal_private.h
> @@ -203,4 +203,18 @@ int rte_eal_alarm_init(void);
> */
> int rte_eal_dev_init(void);
>=20
> +/**
> + * Function is to check if the kernel module(like, vfio,
> +vfio_iommu_type1,
> + * etc.) loaded.
> + *
> + * @param module_name
> + * The module's name which need to be checked
> + *
> + * @return
> + * -1 means some error happens(NULL pointer or open failure)
> + * 0 means the module not loaded
> + * 1 means the module loaded
> + */
> +int rte_eal_check_module(const char *module_name);
> +
> #endif /* _EAL_PRIVATE_H_ */
> diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/=
eal/eal.c
> index 89f3b5e..9c1a1cc 100644
> --- a/lib/librte_eal/linuxapp/eal/eal.c
> +++ b/lib/librte_eal/linuxapp/eal/eal.c
> @@ -859,3 +859,30 @@ int rte_eal_has_hugepages(void) {
> return ! internal_config.no_hugetlbfs; }
> +
> +int
> +rte_eal_check_module(const char *module_name) {
> + char mod_name[30]; /* Any module names can be longer than 30
> bytes? */
> + int ret =3D 0;
> +
> + if (NULL =3D=3D module_name)
> + return -1;
> +
> + FILE * fd =3D fopen("/proc/modules", "r");
> + if (NULL =3D=3D fd) {
> + RTE_LOG(ERR, EAL, "Open /proc/modules failed!"
> + " error %i (%s)\n", errno, strerror(errno));
> + return -1;
> + }
> + while(!feof(fd)) {
> + fscanf(fd, "%29s %*[^\n]", mod_name);
> + if(!strcmp(mod_name, module_name)) {
> + ret =3D 1;
> + break;
> + }
> + }
> + fclose(fd);
> +
> + return ret;
> +}
> diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
> b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
> index c1246e8..16fe10f 100644
> --- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
> @@ -44,6 +44,7 @@
> #include <rte_tailq.h>
> #include <rte_eal_memconfig.h>
> #include <rte_malloc.h>
> +#include <eal_private.h>
>=20
> #include "eal_filesystem.h"
> #include "eal_pci_init.h"
> @@ -339,10 +340,12 @@ pci_vfio_get_container_fd(void)
> ret =3D ioctl(vfio_container_fd, VFIO_CHECK_EXTENSION,
> VFIO_TYPE1_IOMMU);
> if (ret !=3D 1) {
> if (ret < 0)
> - RTE_LOG(ERR, EAL, " could not get IOMMU
> type, "
> - "error %i (%s)\n", errno,
> strerror(errno));
> + RTE_LOG(ERR, EAL, " could not get IOMMU
> type,"
> + " error %i (%s)\n", errno,
> + strerror(errno));
> else
> - RTE_LOG(ERR, EAL, " unsupported IOMMU
> type!\n");
> + RTE_LOG(ERR, EAL, " unsupported IOMMU
> type"
> + " detected in VFIO\n");
> close(vfio_container_fd);
> return -1;
> }
> @@ -783,11 +786,28 @@ pci_vfio_enable(void) {
> /* initialize group list */
> int i;
> + int module_vfio_type1;
>=20
> for (i =3D 0; i < VFIO_MAX_GROUPS; i++) {
> vfio_cfg.vfio_groups[i].fd =3D -1;
> vfio_cfg.vfio_groups[i].group_no =3D -1;
> }
> +
> + module_vfio_type1 =3D rte_eal_check_module("vfio_iommu_type1");
> +
> + /* return error directly */
> + if (module_vfio_type1 =3D=3D -1) {
> + RTE_LOG(INFO, EAL, "Could not get loaded module
> details!\n");
> + return -1;
> + }
> +
> + /* return 0 if VFIO modules not loaded */
> + if (module_vfio_type1 =3D=3D 0) {
> + RTE_LOG(INFO, EAL, "VFIO modules not all loaded,"
> + " skip VFIO support ...\n");
> + return 0;
> + }
> +
> vfio_cfg.vfio_container_fd =3D pci_vfio_get_container_fd();
>=20
> /* check if we have VFIO driver enabled */
> --
> 1.9.3
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>