From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 4EE194C57 for ; Fri, 20 Apr 2018 15:01:29 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Apr 2018 06:01:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,301,1520924400"; d="scan'208";a="222018447" Received: from irsmsx106.ger.corp.intel.com ([163.33.3.31]) by fmsmga006.fm.intel.com with ESMTP; 20 Apr 2018 06:01:27 -0700 Received: from irsmsx155.ger.corp.intel.com (163.33.192.3) by IRSMSX106.ger.corp.intel.com (163.33.3.31) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 20 Apr 2018 14:01:26 +0100 Received: from irsmsx102.ger.corp.intel.com ([169.254.2.164]) by irsmsx155.ger.corp.intel.com ([169.254.14.143]) with mapi id 14.03.0319.002; Fri, 20 Apr 2018 14:01:25 +0100 From: "Ananyev, Konstantin" To: "Doherty, Declan" , "dev@dpdk.org" CC: Adrien Mazarguil , "Yigit, Ferruh" , Thomas Monjalon , "Shahaf Shuler" , "Doherty, Declan" Thread-Topic: [dpdk-dev] [PATCH v7 3/9] ethdev: add generic create/destroy ethdev APIs Thread-Index: AQHT1YUFK5Pta+Ls+kGaTpUyrThyX6QJoojQ Date: Fri, 20 Apr 2018 13:01:25 +0000 Message-ID: <2601191342CEEE43887BDE71AB977258AE918BF2@IRSMSX102.ger.corp.intel.com> References: <20180328135433.20203-1-declan.doherty@intel.com> <20180416130605.6509-1-declan.doherty@intel.com> <20180416130605.6509-4-declan.doherty@intel.com> In-Reply-To: <20180416130605.6509-4-declan.doherty@intel.com> Accept-Language: en-IE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNDQwMjY1YTctMDQ1ZC00M2NhLTg4NGItMmVhZDdhYjI5Mjg5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6ImFVNXFZR21oWE9uQUI3NEpSWmxVXC8xdkhia2VcL1dVbWJ4bWVkeXFVUXFGYz0ifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-originating-ip: [163.33.239.181] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v7 3/9] ethdev: add generic create/destroy ethdev APIs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Apr 2018 13:01:31 -0000 Hi Declan, > Add new bus generic ethdev create/destroy APIs which are bus independent > and provide hooks for bus specific initialisation. >=20 > Signed-off-by: Declan Doherty > --- > lib/librte_ether/rte_ethdev.c | 95 +++++++++++++++++++++++++++= +++++- > lib/librte_ether/rte_ethdev_driver.h | 57 ++++++++++++++++++++ > lib/librte_ether/rte_ethdev_pci.h | 12 +++++ > lib/librte_ether/rte_ethdev_version.map | 8 +++ > 4 files changed, 171 insertions(+), 1 deletion(-) >=20 > diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.= c > index 3c049ef43..b16d23b9a 100644 > --- a/lib/librte_ether/rte_ethdev.c > +++ b/lib/librte_ether/rte_ethdev.c > @@ -348,7 +348,8 @@ rte_eth_dev_release_port(struct rte_eth_dev *eth_dev) > rte_eth_dev_shared_data_prepare(); >=20 > rte_spinlock_lock(&rte_eth_dev_shared_data->ownership_lock); > - > + eth_dev->device =3D NULL; > + eth_dev->intr_handle =3D NULL; > eth_dev->state =3D RTE_ETH_DEV_UNUSED; >=20 > memset(eth_dev->data, 0, sizeof(struct rte_eth_dev_data)); > @@ -3439,6 +3440,98 @@ rte_eth_dma_zone_reserve(const struct rte_eth_dev = *dev, const char *ring_name, > RTE_MEMZONE_IOVA_CONTIG, align); > } >=20 > +int __rte_experimental > +rte_eth_dev_create(struct rte_device *device, const char *name, > + size_t priv_data_size, > + ethdev_bus_specific_init ethdev_bus_specific_init, > + void *bus_init_params, > + ethdev_init_t ethdev_init, void *init_params) > +{ > + struct rte_eth_dev *ethdev; > + int retval; > + > + if (rte_eal_process_type() =3D=3D RTE_PROC_PRIMARY) { > + ethdev =3D rte_eth_dev_allocate(name); > + if (!ethdev) { > + retval =3D -ENODEV; > + goto probe_failed; > + } > + > + if (priv_data_size) { > + ethdev->data->dev_private =3D rte_zmalloc_socket( > + name, priv_data_size, RTE_CACHE_LINE_SIZE, > + device->numa_node); > + > + if (!ethdev->data->dev_private) { > + RTE_LOG(ERR, EAL, "failed to allocate private data"); > + retval =3D -ENOMEM; > + goto probe_failed; > + } > + } > + } else { > + ethdev =3D rte_eth_dev_attach_secondary(name); > + if (!ethdev) { > + RTE_LOG(ERR, EAL, "secondary process attach failed, " > + "ethdev doesn't exist"); > + retval =3D -ENODEV; > + goto probe_failed; > + } > + } > + > + ethdev->device =3D device; > + > + if (ethdev_bus_specific_init) { > + retval =3D ethdev_bus_specific_init(ethdev, bus_init_params); > + if (retval) { > + RTE_LOG(ERR, EAL, > + "ethdev bus specific initialisation failed"); > + goto probe_failed; > + } > + } > + > + RTE_FUNC_PTR_OR_ERR_RET(*ethdev_init, -EINVAL); You probably have to do it at the start - before allocating ethdev, etc. > + retval =3D ethdev_init(ethdev, init_params); > + if (retval) { > + RTE_LOG(ERR, EAL, "ethdev initialisation failed"); > + goto probe_failed; > + } > + > + return retval; > +probe_failed: > + /* free ports private data if primary process */ > + if (rte_eal_process_type() =3D=3D RTE_PROC_PRIMARY) > + rte_free(ethdev->data->dev_private); > + > + rte_eth_dev_release_port(ethdev); > + > + return retval; > +} > + > +int __rte_experimental > +rte_eth_dev_destroy(struct rte_eth_dev *ethdev, > + ethdev_uninit_t ethdev_uninit) > +{ > + int ret; > + > + ethdev =3D rte_eth_dev_allocated(ethdev->data->name); > + if (!ethdev) > + return -ENODEV; > + > + RTE_FUNC_PTR_OR_ERR_RET(*ethdev_uninit, -EINVAL); > + if (ethdev_uninit) { > + ret =3D ethdev_uninit(ethdev); > + if (ret) > + return ret; > + } > + > + if (rte_eal_process_type() =3D=3D RTE_PROC_PRIMARY) > + rte_free(ethdev->data->dev_private); > + > + ethdev->data->dev_private =3D NULL; > + > + return rte_eth_dev_release_port(ethdev); > +} > + > int > rte_eth_dev_rx_intr_ctl_q(uint16_t port_id, uint16_t queue_id, > int epfd, int op, void *data) > diff --git a/lib/librte_ether/rte_ethdev_driver.h b/lib/librte_ether/rte_= ethdev_driver.h > index a406ef123..e52add0ad 100644 > --- a/lib/librte_ether/rte_ethdev_driver.h > +++ b/lib/librte_ether/rte_ethdev_driver.h > @@ -188,6 +188,63 @@ rte_eth_linkstatus_get(const struct rte_eth_dev *dev= , > #endif > } >=20 > + > +typedef int (*ethdev_init_t)(struct rte_eth_dev *ethdev, void *init_para= ms); > +typedef int (*ethdev_bus_specific_init)(struct rte_eth_dev *ethdev, > + void *bus_specific_init_params); > + > +/** > + * @warning > + * @b EXPERIMENTAL: this API may change without prior notice. > + * > + * PMD helper function for the creation of a new ethdev ports. > + * > + * @param device > + * rte_device handle. > + * @param name > + * port name. > + * @param priv_data_size > + * size of private data required for port. > + * @param bus_specific_init > + * port bus specific initialisation callback function > + * @param bus_init_params > + * port bus specific initialisation parameters > + * @param ethdev_init > + * device specific port initialization callback function > + * @param init_params > + * port initialisation parameters > + * > + * @return > + * Negative errno value on error, 0 on success. > + */ > +int __rte_experimental > +rte_eth_dev_create(struct rte_device *device, const char *name, > + size_t priv_data_size, > + ethdev_bus_specific_init bus_specific_init, void *bus_init_params, > + ethdev_init_t ethdev_init, void *init_params); > + > + > +typedef int (*ethdev_uninit_t)(struct rte_eth_dev *ethdev); > + > +/** > + * @warning > + * @b EXPERIMENTAL: this API may change without prior notice. > + * > + * PMD helper function for cleaing up the resources of a ethdev port on = it's > + * destruction. > + * > + * @param ethdev > + * ethdev handle of port. > + * @param ethdev > + * device specific port un-initialise callback function > + * > + * @return > + * Negative errno value on error, 0 on success. > + */ > +int __rte_experimental > +rte_eth_dev_destroy(struct rte_eth_dev *ethdev, > + ethdev_uninit_t ethdev_uninit); > + > #ifdef __cplusplus > } > #endif > diff --git a/lib/librte_ether/rte_ethdev_pci.h b/lib/librte_ether/rte_eth= dev_pci.h > index 6565ae7d3..603287c28 100644 > --- a/lib/librte_ether/rte_ethdev_pci.h > +++ b/lib/librte_ether/rte_ethdev_pci.h > @@ -70,6 +70,18 @@ rte_eth_copy_pci_info(struct rte_eth_dev *eth_dev, > eth_dev->data->numa_node =3D pci_dev->device.numa_node; > } >=20 > +static inline int > +eth_dev_pci_specific_init(struct rte_eth_dev *eth_dev, void *bus_device)= { > + struct rte_pci_device *pci_dev =3D bus_device; > + > + if (!pci_dev) > + return -ENODEV; > + > + rte_eth_copy_pci_info(eth_dev, pci_dev); > + > + return 0; > +} > + > /** > * @internal > * Allocates a new ethdev slot for an ethernet device and returns the po= inter > diff --git a/lib/librte_ether/rte_ethdev_version.map b/lib/librte_ether/r= te_ethdev_version.map > index 34df6c8b5..bd7232923 100644 > --- a/lib/librte_ether/rte_ethdev_version.map > +++ b/lib/librte_ether/rte_ethdev_version.map > @@ -229,3 +229,11 @@ EXPERIMENTAL { > rte_mtr_stats_update; >=20 > } DPDK_17.11; > + > +EXPERIMENTAL { > + global: > + > + rte_eth_dev_create; > + rte_eth_dev_destroy; > + > +} DPDK_18.05; > -- > 2.14.3