From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <michael.qiu@intel.com>
Received: from mga03.intel.com (mga03.intel.com [134.134.136.65])
by dpdk.org (Postfix) with ESMTP id 7C95ADE0
for <dev@dpdk.org>; Mon, 8 Dec 2014 11:33:08 +0100 (CET)
Received: from orsmga003.jf.intel.com ([10.7.209.27])
by orsmga103.jf.intel.com with ESMTP; 08 Dec 2014 02:31:05 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.04,691,1406617200"; d="scan'208";a="495357429"
Received: from kmsmsx152.gar.corp.intel.com ([172.21.73.87])
by orsmga003.jf.intel.com with ESMTP; 08 Dec 2014 02:29:12 -0800
Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by
KMSMSX152.gar.corp.intel.com (172.21.73.87) with Microsoft SMTP Server (TLS)
id 14.3.195.1; Mon, 8 Dec 2014 18:28:19 +0800
Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.110]) by
shsmsx102.ccr.corp.intel.com ([169.254.2.216]) with mapi id 14.03.0195.001;
Mon, 8 Dec 2014 18:28:17 +0800
From: "Qiu, Michael" <michael.qiu@intel.com>
To: "Burakov, Anatoly" <anatoly.burakov@intel.com>, "dev@dpdk.org"
<dev@dpdk.org>
Thread-Topic: [PATCH v3] VFIO: Avoid to enable vfio while the module not loaded
Thread-Index: AQHQEsDxYytQfDQLhkKxa1GPquCwVQ==
Date: Mon, 8 Dec 2014 10:28:17 +0000
Message-ID: <533710CFB86FA344BFBF2D6802E60286C9DA58@SHSMSX101.ccr.corp.intel.com>
References: <1417687227-21854-1-git-send-email-michael.qiu@intel.com>
<1418027255-7727-1-git-send-email-michael.qiu@intel.com>
<C6ECDF3AB251BE4894318F4E4512369780C22B2A@IRSMSX109.ger.corp.intel.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach:
X-MS-TNEF-Correlator:
x-originating-ip: [10.239.127.40]
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Subject: Re: [dpdk-dev] [PATCH v3] 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: Mon, 08 Dec 2014 10:33:09 -0000
On 12/8/2014 5:54 PM, Burakov, Anatoly wrote:=0A=
>> When vfio module is not loaded when kernel support vfio feature, the=0A=
>> routine still try to open the container to get file description.=0A=
>>=0A=
>> This action is not safe, and of cause got error messages:=0A=
>>=0A=
>> EAL: Detected 40 lcore(s)=0A=
>> EAL: unsupported IOMMU type!=0A=
>> EAL: VFIO support could not be initialized=0A=
>> EAL: Setting up memory...=0A=
>>=0A=
>> This may make user confuse, this patch make it reasonable and much more=
=0A=
>> soomth to user.=0A=
>>=0A=
>> Signed-off-by: Michael Qiu <michael.qiu@intel.com>=0A=
>> ---=0A=
>> v3 --> v2:=0A=
>> 1. Add error log in rte_eal_check_module()=0A=
>> 2. Some code clean up.=0A=
>>=0A=
>> v2 --> v1:=0A=
>> 1. Move check_module() from rte_common.h to eal_private.h=0A=
>> and rename to rte_eal_check_module().=0A=
>> To make it linuxapp only.=0A=
>> 2. Some code clean up.=0A=
>>=0A=
>> lib/librte_eal/common/eal_private.h | 43=0A=
>> ++++++++++++++++++++++++++++++=0A=
>> lib/librte_eal/linuxapp/eal/eal_pci_vfio.c | 30 ++++++++++++++++++---=
=0A=
>> 2 files changed, 70 insertions(+), 3 deletions(-)=0A=
>>=0A=
>> diff --git a/lib/librte_eal/common/eal_private.h=0A=
>> b/lib/librte_eal/common/eal_private.h=0A=
>> index 232fcec..d1d8126 100644=0A=
>> --- a/lib/librte_eal/common/eal_private.h=0A=
>> +++ b/lib/librte_eal/common/eal_private.h=0A=
>> @@ -35,6 +35,9 @@=0A=
>> #define _EAL_PRIVATE_H_=0A=
>>=0A=
>> #include <stdio.h>=0A=
>> +#include <string.h>=0A=
>> +#include <rte_log.h>=0A=
>> +#include <errno.h>=0A=
>>=0A=
>> /**=0A=
>> * Initialize the memzone subsystem (private to eal).=0A=
>> @@ -203,4 +206,44 @@ int rte_eal_alarm_init(void);=0A=
>> */=0A=
>> int rte_eal_dev_init(void);=0A=
>>=0A=
>> +/**=0A=
>> + * Function is to check if the kernel module(like, vfio,=0A=
>> +vfio_iommu_type1,=0A=
>> + * etc.) loaded.=0A=
>> + *=0A=
>> + * @param module_name=0A=
>> + * The module's name which need to be checked=0A=
>> + *=0A=
>> + * @return=0A=
>> + * -1 means some error happens(NULL pointer or open failure)=0A=
>> + * 0 means the module not loaded=0A=
>> + * 1 means the module loaded=0A=
>> + */=0A=
>> +static inline int=0A=
>> +rte_eal_check_module(const char *module_name) {=0A=
>> + char mod_name[30]; /* Any module names can be longer than 30=0A=
>> bytes? */=0A=
>> + int ret =3D 0;=0A=
>> +=0A=
>> + if (NULL =3D=3D module_name) {=0A=
>> + RTE_LOG(ERR, EAL, "The module name is NULL\n");=0A=
> I don't think this RTE_LOG is necessary - we never RTE_LOG invalid parame=
ters.=0A=
=0A=
OK, I will remove this.=0A=
=0A=
>=0A=
>> + return -1;=0A=
>> + }=0A=
>> + FILE * fd =3D fopen("/proc/modules", "r");=0A=
>> + if (NULL =3D=3D fd) {=0A=
>> + RTE_LOG(ERR, EAL, "Open /proc/modules failed!"=0A=
>> + " error %i (%s)\n", errno, strerror(errno));=0A=
>> + return -1;=0A=
>> + }=0A=
>> + while(!feof(fd)) {=0A=
>> + fscanf(fd, "%s %*[^\n]", mod_name);=0A=
>> + if(!strcmp(mod_name, module_name)) {=0A=
>> + ret =3D 1;=0A=
>> + break;=0A=
>> + }=0A=
>> + }=0A=
>> + fclose(fd);=0A=
>> +=0A=
>> + return ret;=0A=
>> +}=0A=
>> +=0A=
>> #endif /* _EAL_PRIVATE_H_ */=0A=
>> diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c=0A=
>> b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c=0A=
>> index c1246e8..b34b3f5 100644=0A=
>> --- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c=0A=
>> +++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c=0A=
>> @@ -44,6 +44,7 @@=0A=
>> #include <rte_tailq.h>=0A=
>> #include <rte_eal_memconfig.h>=0A=
>> #include <rte_malloc.h>=0A=
>> +#include <eal_private.h>=0A=
>>=0A=
>> #include "eal_filesystem.h"=0A=
>> #include "eal_pci_init.h"=0A=
>> @@ -339,10 +340,15 @@ pci_vfio_get_container_fd(void)=0A=
>> ret =3D ioctl(vfio_container_fd, VFIO_CHECK_EXTENSION,=0A=
>> VFIO_TYPE1_IOMMU);=0A=
>> if (ret !=3D 1) {=0A=
>> if (ret < 0)=0A=
>> - RTE_LOG(ERR, EAL, " could not get IOMMU=0A=
>> type, "=0A=
>> - "error %i (%s)\n", errno,=0A=
>> strerror(errno));=0A=
>> + RTE_LOG(ERR, EAL, " could not get IOMMU=0A=
>> type,"=0A=
>> + " error %i (%s)\n", errno,=0A=
>> + strerror(errno));=0A=
>> else=0A=
>> - RTE_LOG(ERR, EAL, " unsupported IOMMU=0A=
>> type!\n");=0A=
>> + /* Better to show the IOMMU type return=0A=
>> from=0A=
>> + * kernel for easy debug=0A=
>> + */=0A=
>> + RTE_LOG(ERR, EAL, " unsupported IOMMU=0A=
>> type"=0A=
>> + " detected: %d in VFIO\n", ret);=0A=
>> close(vfio_container_fd);=0A=
>> return -1;=0A=
>> }=0A=
>> @@ -783,11 +789,29 @@ pci_vfio_enable(void) {=0A=
>> /* initialize group list */=0A=
>> int i;=0A=
>> + int module_vfio, module_vfio_type1;=0A=
>>=0A=
>> for (i =3D 0; i < VFIO_MAX_GROUPS; i++) {=0A=
>> vfio_cfg.vfio_groups[i].fd =3D -1;=0A=
>> vfio_cfg.vfio_groups[i].group_no =3D -1;=0A=
>> }=0A=
>> +=0A=
>> + module_vfio =3D rte_eal_check_module("vfio");=0A=
>> + module_vfio_type1 =3D rte_eal_check_module("vfio_iommu_type1");=0A=
> We can actually get away with checking just vfio_iommu_type1 (having it l=
oaded implies that vfio is loaded as well).=0A=
=0A=
Yes, you are right. That's the point, I will rework this.=0A=
=0A=
Thanks,=0A=
Michael=0A=
>=0A=
>> +=0A=
>> + /* return error directly */=0A=
>> + if (module_vfio =3D=3D -1 || module_vfio_type1 =3D=3D -1) {=0A=
>> + RTE_LOG(INFO, EAL, "Could not get loaded module=0A=
>> details!\n");=0A=
>> + return -1;=0A=
>> + }=0A=
>> +=0A=
>> + /* return 0 if not all VFIO modules loaded */=0A=
>> + if (module_vfio =3D=3D 0 || module_vfio_type1 =3D=3D 0) {=0A=
>> + RTE_LOG(INFO, EAL, "VFIO modules not all loaded,"=0A=
>> + " skip VFIO support ...\n");=0A=
>> + return 0;=0A=
>> + }=0A=
>> +=0A=
>> vfio_cfg.vfio_container_fd =3D pci_vfio_get_container_fd();=0A=
>>=0A=
>> /* check if we have VFIO driver enabled */=0A=
>> --=0A=
>> 1.9.3=0A=
>=0A=
=0A=