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 BB1597F39 for ; Fri, 13 Mar 2015 16:47:11 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 13 Mar 2015 08:47:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,395,1422950400"; d="scan'208";a="466882521" Received: from irsmsx101.ger.corp.intel.com ([163.33.3.153]) by FMSMGA003.fm.intel.com with ESMTP; 13 Mar 2015 08:40:13 -0700 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.218]) by IRSMSX101.ger.corp.intel.com ([163.33.3.153]) with mapi id 14.03.0195.001; Fri, 13 Mar 2015 15:47:09 +0000 From: "Iremonger, Bernard" To: Tetsuya Mukawa , "dev@dpdk.org" Thread-Topic: [PATCH v2 15/15] eal: Enable Port Hotplug as default in Linux and BSD Thread-Index: AQHQXK3xS2Ck94QQiECp+lvYDTekkJ0ai5GA Date: Fri, 13 Mar 2015 15:47:08 +0000 Message-ID: <8CEF83825BEC744B83065625E567D7C2049F2A45@IRSMSX108.ger.corp.intel.com> References: <1425438703-18895-1-git-send-email-mukawa@igel.co.jp> <1426155474-1596-1-git-send-email-mukawa@igel.co.jp> <1426155474-1596-16-git-send-email-mukawa@igel.co.jp> In-Reply-To: <1426155474-1596-16-git-send-email-mukawa@igel.co.jp> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.182] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2 15/15] eal: Enable Port Hotplug as default in Linux and BSD 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: Fri, 13 Mar 2015 15:47:12 -0000 > -----Original Message----- > From: Tetsuya Mukawa [mailto:mukawa@igel.co.jp] > Sent: Thursday, March 12, 2015 10:18 AM > To: dev@dpdk.org > Cc: Iremonger, Bernard; Richardson, Bruce; Tetsuya Mukawa > Subject: [PATCH v2 15/15] eal: Enable Port Hotplug as default in Linux an= d BSD >=20 > This patch removes CONFIG_RTE_LIBRTE_EAL_HOTPLUG option, and enables it a= s default in both > Linux and BSD. Hi Tetsuya, This patch should probably be split with the config changes as the first pa= tch of this patch set. The #ifdef RTE_LIBRTE_EAL_HOTPLUG changes should be no longer necessary as = they will have been taken care of in the earlier patches (v2-11, v2-12, v2-= 13). Maybe the /lib/librte_eal/bsdapp/eal/rte_eal_version.map changes could be = moved to one of the earlier bsd patches? Regards, Bernard. > Also, to support port hotplug, rte_eal_pci_scan() and below missing symbo= ls should be exported to > ethdev library. > - rte_eal_parse_devargs_str() > - rte_eal_pci_close_one() > - rte_eal_pci_probe_one() > - rte_eal_pci_scan() > - rte_eal_vdev_init() > - rte_eal_vdev_uninit() >=20 > Signed-off-by: Tetsuya Mukawa > --- > config/common_bsdapp | 6 ------ > config/common_linuxapp | 5 ----- > lib/librte_eal/bsdapp/eal/eal_pci.c | 6 +++--- > lib/librte_eal/bsdapp/eal/rte_eal_version.map | 6 ++++++ > lib/librte_eal/common/eal_common_dev.c | 2 -- > lib/librte_eal/common/eal_common_pci.c | 8 -------- > lib/librte_eal/common/eal_common_pci_uio.c | 2 -- > lib/librte_eal/common/include/rte_pci.h | 2 -- > lib/librte_ether/rte_ethdev.c | 21 --------------------- > 9 files changed, 9 insertions(+), 49 deletions(-) >=20 > diff --git a/config/common_bsdapp b/config/common_bsdapp index 8ff4dc2..8= 8b44e9 100644 > --- a/config/common_bsdapp > +++ b/config/common_bsdapp > @@ -116,12 +116,6 @@ CONFIG_RTE_LIBRTE_EAL_BSDAPP=3Dy > CONFIG_RTE_LIBRTE_EAL_LINUXAPP=3Dn >=20 > # > -# Compile Environment Abstraction Layer to support hotplug -# So far, Ho= tplug functions only support > linux -# -CONFIG_RTE_LIBRTE_EAL_HOTPLUG=3Dn > - > -# > # Compile Environment Abstraction Layer to support Vmware TSC map # > CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=3Dy > diff --git a/config/common_linuxapp b/config/common_linuxapp index 97f1c9= e..f9c9780 100644 > --- a/config/common_linuxapp > +++ b/config/common_linuxapp > @@ -114,11 +114,6 @@ CONFIG_RTE_PCI_MAX_READ_REQUEST_SIZE=3D0 > CONFIG_RTE_LIBRTE_EAL_LINUXAPP=3Dy >=20 > # > -# Compile Environment Abstraction Layer to support hotplug -# - > CONFIG_RTE_LIBRTE_EAL_HOTPLUG=3Dy > - > -# > # Compile Environment Abstraction Layer to support Vmware TSC map # > CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=3Dy > diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/= eal/eal_pci.c > index b6785d4..50c9544 100644 > --- a/lib/librte_eal/bsdapp/eal/eal_pci.c > +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c > @@ -305,8 +305,8 @@ skipdev: > * Scan the content of the PCI bus, and add the devices in the devices > * list. Call pci_scan_one() for each pci entry found. > */ > -static int > -pci_scan(void) > +int > +rte_eal_pci_scan(void) > { > int fd; > unsigned dev_count =3D 0; > @@ -362,7 +362,7 @@ rte_eal_pci_init(void) > if (internal_config.no_pci) > return 0; >=20 > - if (pci_scan() < 0) { > + if (rte_eal_pci_scan() < 0) { > RTE_LOG(ERR, EAL, "%s(): Cannot scan PCI bus\n", __func__); > return -1; > } > diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map > b/lib/librte_eal/bsdapp/eal/rte_eal_version.map > index 67b6a6c..7e850a9 100644 > --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map > +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map > @@ -37,14 +37,20 @@ DPDK_2.0 { > rte_eal_lcore_role; > rte_eal_mp_remote_launch; > rte_eal_mp_wait_lcore; > + rte_eal_parse_devargs_str; > + rte_eal_pci_close_one; > rte_eal_pci_dump; > rte_eal_pci_probe; > + rte_eal_pci_probe_one; > rte_eal_pci_register; > + rte_eal_pci_scan; > rte_eal_pci_unregister; > rte_eal_process_type; > rte_eal_remote_launch; > rte_eal_tailq_lookup; > rte_eal_tailq_register; > + rte_eal_vdev_init; > + rte_eal_vdev_uninit; > rte_eal_wait_lcore; > rte_exit; > rte_get_hpet_cycles; > diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/comm= on/eal_common_dev.c > index 92a5a94..4089d66 100644 > --- a/lib/librte_eal/common/eal_common_dev.c > +++ b/lib/librte_eal/common/eal_common_dev.c > @@ -125,7 +125,6 @@ rte_eal_dev_init(void) > return 0; > } >=20 > -#ifdef RTE_LIBRTE_EAL_HOTPLUG > int > rte_eal_vdev_uninit(const char *name) > { > @@ -151,4 +150,3 @@ rte_eal_vdev_uninit(const char *name) > RTE_LOG(ERR, EAL, "no driver found for %s\n", name); > return -EINVAL; > } > -#endif /* RTE_LIBRTE_EAL_HOTPLUG */ > diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/comm= on/eal_common_pci.c > index 6d98194..126dd01 100644 > --- a/lib/librte_eal/common/eal_common_pci.c > +++ b/lib/librte_eal/common/eal_common_pci.c > @@ -122,7 +122,6 @@ pci_map_resource(void *requested_addr, int fd, off_t = offset, size_t size, > return mapaddr; > } >=20 > -#ifdef RTE_LIBRTE_EAL_HOTPLUG > /* unmap a particular resource */ > void > pci_unmap_resource(void *requested_addr, size_t size) @@ -139,7 +138,6 @= @ > pci_unmap_resource(void *requested_addr, size_t size) > RTE_LOG(DEBUG, EAL, " PCI memory unmapped at %p\n", > requested_addr); > } > -#endif /* RTE_LIBRTE_EAL_HOTPLUG */ >=20 > /* Map pci device */ > static int > @@ -171,7 +169,6 @@ pci_map_device(struct rte_pci_device *dev) > return ret; > } >=20 > -#ifdef RTE_LIBRTE_EAL_HOTPLUG > /* Unmap pci device */ > static void > pci_unmap_device(struct rte_pci_device *dev) @@ -196,7 +193,6 @@ pci_unm= ap_device(struct > rte_pci_device *dev) > break; > } > } > -#endif /* RTE_LIBRTE_EAL_HOTPLUG */ >=20 > /* > * If vendor/device ID match, call the devinit() function of the @@ -275= ,7 +271,6 @@ > rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, > return 1; > } >=20 > -#ifdef RTE_LIBRTE_EAL_HOTPLUG > /* > * If vendor/device ID match, call the devuninit() function of the > * driver. > @@ -334,7 +329,6 @@ rte_eal_pci_close_one_driver(struct rte_pci_driver *d= r, > /* return positive value if driver is not found */ > return 1; > } > -#endif /* RTE_LIBRTE_EAL_HOTPLUG */ >=20 > /* > * If vendor/device ID match, call the devinit() function of all @@ -363= ,7 +357,6 @@ > pci_probe_all_drivers(struct rte_pci_device *dev) > return 1; > } >=20 > -#ifdef RTE_LIBRTE_EAL_HOTPLUG > /* > * If vendor/device ID match, call the devuninit() function of all > * registered driver for the given device. Return -1 if initialization @= @ -454,7 +447,6 @@ err_return: > dev->addr.devid, dev->addr.function); > return -1; > } > -#endif /* RTE_LIBRTE_EAL_HOTPLUG */ >=20 > /* > * Scan the content of the PCI bus, and call the devinit() function for = diff --git > a/lib/librte_eal/common/eal_common_pci_uio.c b/lib/librte_eal/common/eal_= common_pci_uio.c > index b9d7726..fe5dd5f 100644 > --- a/lib/librte_eal/common/eal_common_pci_uio.c > +++ b/lib/librte_eal/common/eal_common_pci_uio.c > @@ -154,7 +154,6 @@ fail: > return -1; > } >=20 > -#ifdef RTE_LIBRTE_EAL_HOTPLUG > static void > pci_uio_unmap(struct mapped_pci_resource *uio_res) { @@ -223,4 +222,3 @= @ > pci_uio_unmap_resource(struct rte_pci_device *dev) > dev->intr_handle.fd =3D -1; > dev->intr_handle.type =3D RTE_INTR_HANDLE_UNKNOWN; } -#endif /* > RTE_LIBRTE_EAL_HOTPLUG */ diff --git a/lib/librte_eal/common/include/rte_= pci.h > b/lib/librte_eal/common/include/rte_pci.h > index d3b883e..b3c6a0f 100644 > --- a/lib/librte_eal/common/include/rte_pci.h > +++ b/lib/librte_eal/common/include/rte_pci.h > @@ -369,7 +369,6 @@ int rte_eal_pci_probe(void); void *pci_map_resource(= void *requested_addr, > int fd, off_t offset, > size_t size, int additional_flags); >=20 > -#ifdef RTE_LIBRTE_EAL_HOTPLUG > /** > * Map pci resouce. > */ > @@ -404,7 +403,6 @@ int rte_eal_pci_probe_one(struct rte_pci_addr *addr); > * - Negative on error. > */ > int rte_eal_pci_close_one(struct rte_pci_addr *addr); -#endif /* RTE_LIB= RTE_EAL_HOTPLUG */ >=20 > /** > * Dump the content of the PCI bus. > diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.= c index e23d7da..818384a > 100644 > --- a/lib/librte_ether/rte_ethdev.c > +++ b/lib/librte_ether/rte_ethdev.c > @@ -425,9 +425,6 @@ rte_eth_dev_count(void) > return (nb_ports); > } >=20 > -/* So far, DPDK hotplug function only supports linux */ -#ifdef RTE_LIBR= TE_EAL_HOTPLUG > - > static enum rte_eth_dev_type > rte_eth_dev_get_device_type(uint8_t port_id) { @@ -708,24 +705,6 @@ > rte_eth_dev_detach(uint8_t port_id, char *name) > } else > return rte_eth_dev_detach_vdev(port_id, name); } -#else /* > RTE_LIBRTE_EAL_HOTPLUG */ -int -rte_eth_dev_attach(const char *devargs __= rte_unused, > - uint8_t *port_id __rte_unused) > -{ > - RTE_LOG(ERR, EAL, "Hotplug support isn't enabled\n"); > - return -1; > -} > - > -/* detach the device, then store the name of the device */ -int -rte_eth= _dev_detach(uint8_t port_id > __rte_unused, > - char *name __rte_unused) > -{ > - RTE_LOG(ERR, EAL, "Hotplug support isn't enabled\n"); > - return -1; > -} > -#endif /* RTE_LIBRTE_EAL_HOTPLUG */ >=20 > static int > rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) > -- > 1.9.1