From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 2D97958DA for ; Tue, 27 May 2014 04:32:26 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 26 May 2014 19:32:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.98,916,1392192000"; d="scan'208,217";a="537913698" Received: from fmsmsx106.amr.corp.intel.com ([10.19.9.37]) by fmsmga001.fm.intel.com with ESMTP; 26 May 2014 19:32:36 -0700 Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by FMSMSX106.amr.corp.intel.com (10.19.9.37) with Microsoft SMTP Server (TLS) id 14.3.123.3; Mon, 26 May 2014 19:32:36 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX155.amr.corp.intel.com (10.18.116.71) with Microsoft SMTP Server (TLS) id 14.3.123.3; Mon, 26 May 2014 19:32:36 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.7]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.7]) with mapi id 14.03.0123.003; Tue, 27 May 2014 10:32:34 +0800 From: "Xu, HuilongX" To: "dev@dpdk.org" , "Burakov, Anatoly" Thread-Topic: RE:[dpdk-dev] [PATCH v2 02/16] Distinguish between legitimate failures and non-fatal errors Thread-Index: Ac95U+j1rSJV0lFvSluJbml57FABZw== Date: Tue, 27 May 2014 02:32:33 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-cr-hashedpuzzle: AATH ANzD BEhT BnEq CPtx ENbQ EOOs GIfO GNRT Goho HZgm Hu9B H4Mm JJRY JOKU JlzR; 1; ZABlAHYAQABkAHAAZABrAC4AbwByAGcA; Sosha1_v1; 7; {8F06EDFD-32A5-42F1-8C66-A9E14857929A}; aAB1AGkAbABvAG4AZwB4AC4AeAB1AEAAaQBuAHQAZQBsAC4AYwBvAG0A; Tue, 27 May 2014 02:32:31 GMT; UgBFADoAWwBkAHAAZABrAC0AZABlAHYAXQAgAFsAUABBAFQAQwBIACAAdgAyACAAMAAyAC8AMQA2AF0AIABEAGkAcwB0AGkAbgBnAHUAaQBzAGgAIABiAGUAdAB3AGUAZQBuACAAbABlAGcAaQB0AGkAbQBhAHQAZQAgAGYAYQBpAGwAdQByAGUAcwAJAGEAbgBkACAAbgBvAG4ALQBmAGEAdABhAGwAIABlAHIAcgBvAHIAcwA= x-cr-puzzleid: {8F06EDFD-32A5-42F1-8C66-A9E14857929A} x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH v2 02/16] Distinguish between legitimate failures and non-fatal errors 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: Tue, 27 May 2014 02:32:28 -0000 Currently, EAL does not distinguish between actual failures and expected initialization errors. E.g. sometimes the driver fails to initialize because it was not supposed to be initialized in the first place, such as device not being managed by said driver. This patch makes EAL fail on actual initialization errors while still skipping over expected initialization errors. Signed-off-by: Anatoly Burakov Test-by: HuilongX Xu Compile pass >>Compile OS: FC20 x86_64 >>Kernel version: 3.13.6-200 >>GCC version: 4.8.2 >>Server: Crownpass --- lib/librte_eal/common/eal_common_pci.c | 16 +++++++++------- lib/librte_eal/linuxapp/eal/eal_pci.c | 7 ++++--- lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 4 ++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common= /eal_common_pci.c index 7c23e86..1fb8f2c 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -101,8 +101,8 @@ static struct rte_devargs *pci_devargs_lookup(struct rt= e_pci_device *dev) /* * If vendor/device ID match, call the devinit() function of all - * registered driver for the given device. Return -1 if no driver is - * found for this device. + * registered driver for the given device. Return -1 if initialization + * failed, return 1 if no driver is found for this device. * For drivers with the RTE_PCI_DRV_MULTIPLE flag enabled, register * the same device multiple times until failure to do so. * It is required for non-Intel NIC drivers provided by third-parties such @@ -118,7 +118,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev) rc =3D rte_eal_pci_probe_one_driver(dr, dev)= ; if (rc < 0) /* negative value is an erro= r */ - break; + return -1; if (rc > 0) /* positive value means driv= er not found */ continue; @@ -130,7 +130,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev) ; return 0; } - return -1; + return 1; } /* @@ -144,6 +144,7 @@ rte_eal_pci_probe(void) struct rte_pci_device *dev =3D NULL; struct rte_devargs *devargs; int probe_all =3D 0; + int ret =3D 0; if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI)= =3D=3D 0) probe_all =3D 1; @@ -157,10 +158,11 @@ rte_eal_pci_probe(void) /* probe all or only whitelisted devices */ if (probe_all) - pci_probe_all_drivers(dev); + ret =3D pci_probe_all_drivers= (dev); else if (devargs !=3D NULL && - devargs->type =3D=3D RTE_DEV= TYPE_WHITELISTED_PCI && - pci_probe_all_drivers(dev) <= 0) + devargs->type =3D=3D RTE_DEVT= YPE_WHITELISTED_PCI) + ret =3D pci_probe_all_drivers= (dev); + if (ret < 0) rte_exit(EXIT_FAILURE, "Requ= ested device " PCI_PRI_FMT " cannot be= used\n", dev->addr.domain, dev->addr.bus, dev->addr.d= evid, dev->addr.function); diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxap= p/eal/eal_pci.c index cd5b797..de1b0a0 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -400,6 +400,7 @@ int rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_devi= ce *dev) { struct rte_pci_id *id_table; + int ret =3D 0; for (id_table =3D dr->id_table ; id_table->vendor_id !=3D 0= ; id_table++) { @@ -430,13 +431,13 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *d= r, struct rte_pci_device *d if (dev->devargs !=3D NULL && dev->devargs->type =3D=3D RT= E_DEVTYPE_BLACKLISTED_PCI) { RTE_LOG(DEBUG, EAL, " Devic= e is blacklisted, not initializing\n"); - return 0; + return 1; } if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UI= O) { /* map resources for devices= that use igb_uio */ - if (pci_uio_map_resource(dev= ) < 0) - return -1; + if ((ret =3D pci_uio_map_reso= urce(dev)) !=3D 0) + return ret; } else if (dr->drv_flags & RTE_PCI_DRV_FORCE= _UNBIND && rte_eal_process_type() =3D=3D RTE= _PROC_PRIMARY) { /* unbind current driver */ diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/lin= uxapp/eal/eal_pci_uio.c index f29fee5..2d5e75d 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c @@ -137,7 +137,7 @@ pci_uio_map_secondary(struct rte_pci_device *dev) { } RTE_LOG(ERR, EAL, "Cannot find resource for device\n"); - return -1; + return 1; } static int @@ -284,7 +284,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) { if (uio_num < 0) { RTE_LOG(WARNING, EAL, " "PCI_PRI_FMT" not m= anaged by UIO driver, " "skipping\n", loc->domain, loc->bus, loc->de= vid, loc->function); - return -1; + return 1; } rte_snprintf(devname, sizeof(devname), "/dev/uio%u", uio_num= ); -- 1.7.0.7