From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 7ABC92B94 for ; Wed, 24 Feb 2016 15:08:41 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP; 24 Feb 2016 06:08:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,494,1449561600"; d="scan'208";a="752408754" Received: from irsmsx153.ger.corp.intel.com ([163.33.192.75]) by orsmga003.jf.intel.com with ESMTP; 24 Feb 2016 06:08:23 -0800 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.102]) by IRSMSX153.ger.corp.intel.com ([169.254.9.60]) with mapi id 14.03.0248.002; Wed, 24 Feb 2016 14:08:22 +0000 From: "Iremonger, Bernard" To: Wojciech Zmuda , "dev@dpdk.org" Thread-Topic: [PATCH v3] af_packet: make the device detachable Thread-Index: AQHRZOqBFGOQPMtYPkGeStsTqsh9Z587RzEQ Date: Wed, 24 Feb 2016 14:08:22 +0000 Message-ID: <8CEF83825BEC744B83065625E567D7C219FB4223@IRSMSX108.ger.corp.intel.com> References: <1455208630-21710-1-git-send-email-woz@semihalf.com> In-Reply-To: <1455208630-21710-1-git-send-email-woz@semihalf.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMzVlOGZlZDctZDM1MC00MDYzLWIwMTAtYmQ2NzY5ZmIxY2ZiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IjUzV3lzbHE0QmZwdGI1bjJxMmFTdmF2bU9BanNhUm9LSHduY0lwelR4NVE9In0= x-ctpclassification: CTP_IC 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 v3] af_packet: make the device detachable 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: Wed, 24 Feb 2016 14:08:42 -0000 Hi Wojciech, > Subject: [PATCH v3] af_packet: make the device detachable >=20 > Allow dynamic deallocation of af_packet device through proper API > functions. To achieve this: > * set device flag to RTE_ETH_DEV_DETACHABLE > * implement rte_pmd_af_packet_devuninit() and expose it > through rte_driver.uninit() > * copy device name to ethdev->data to make discoverable with > rte_eth_dev_allocated() > Moreover, make af_packet init function static, as there is no reason to k= eep > it public. >=20 > Signed-off-by: Wojciech Zmuda > --- > v3: > * Rephrased feature note in release notes. > * Rephrased commit log. > * Added API change note in release notes. > * Made init function static. > * Removed af_packet header file, as it is not needed > after init function is not public anymore. >=20 > v2: > * Fixed typo and a comment. > * Added feature to the 2.3 release notes. > * Free memory allocated for rx and tx queues. >=20 > doc/guides/rel_notes/release_2_3.rst | 6 +++ > drivers/net/af_packet/Makefile | 5 -- > drivers/net/af_packet/rte_eth_af_packet.c | 43 ++++++++++++++++= -- > drivers/net/af_packet/rte_eth_af_packet.h | 53 ----------------= ------ > .../net/af_packet/rte_pmd_af_packet_version.map | 3 -- > 5 files changed, 45 insertions(+), 65 deletions(-) delete mode 100644 > drivers/net/af_packet/rte_eth_af_packet.h >=20 > diff --git a/doc/guides/rel_notes/release_2_3.rst > b/doc/guides/rel_notes/release_2_3.rst > index 7945694..da4abc3 100644 > --- a/doc/guides/rel_notes/release_2_3.rst > +++ b/doc/guides/rel_notes/release_2_3.rst The release_2_3.rst file has been renamed to release_16_04.rst so this patc= h no longer applies. > @@ -39,6 +39,9 @@ This section should contain new features added in this > release. Sample format: >=20 > Enabled virtio 1.0 support for virtio pmd driver. >=20 > +* **Added af_packet dynamic removal function.** > + > + Af_packet device can now be detached using API, like other PMD devices= . >=20 > Resolved Issues > --------------- > @@ -91,6 +94,9 @@ This section should contain API changes. Sample format: > * Add a short 1-2 sentence description of the API change. Use fixed widt= h > quotes for ``rte_function_names`` or ``rte_struct_names``. Use the pas= t > tense. >=20 > +* Af_packet device init function is no longer public. Device should be > +attached > + with API. > + >=20 > ABI Changes > ----------- > diff --git a/drivers/net/af_packet/Makefile > b/drivers/net/af_packet/Makefile index ce5d239..cb1a7ae 100644 > --- a/drivers/net/af_packet/Makefile > +++ b/drivers/net/af_packet/Makefile > @@ -50,11 +50,6 @@ CFLAGS +=3D $(WERROR_FLAGS) # > SRCS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) +=3D rte_eth_af_packet.c >=20 > -# > -# Export include files > -# > -SYMLINK-y-include +=3D rte_eth_af_packet.h > - > # this lib depends upon: > DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) +=3D lib/librte_mbuf > DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) +=3D lib/librte_ether diff - > -git a/drivers/net/af_packet/rte_eth_af_packet.c > b/drivers/net/af_packet/rte_eth_af_packet.c > index 767f36b..5544528 100644 > --- a/drivers/net/af_packet/rte_eth_af_packet.c > +++ b/drivers/net/af_packet/rte_eth_af_packet.c > @@ -53,8 +53,6 @@ > #include > #include >=20 > -#include "rte_eth_af_packet.h" > - > #define ETH_AF_PACKET_IFACE_ARG "iface" > #define ETH_AF_PACKET_NUM_Q_ARG "qpairs" > #define ETH_AF_PACKET_BLOCKSIZE_ARG "blocksz" > @@ -65,6 +63,8 @@ > #define DFLT_FRAME_SIZE (1 << 11) > #define DFLT_FRAME_COUNT (1 << 9) >=20 > +#define RTE_PMD_AF_PACKET_MAX_RINGS 16 > + > struct pkt_rx_queue { > int sockfd; >=20 > @@ -667,11 +667,13 @@ rte_pmd_init_internals(const char *name, > data->nb_tx_queues =3D (uint16_t)nb_queues; > data->dev_link =3D pmd_link; > data->mac_addrs =3D &(*internals)->eth_addr; > + strncpy(data->name, > + (*eth_dev)->data->name, strlen((*eth_dev)->data- > >name)); >=20 > (*eth_dev)->data =3D data; > (*eth_dev)->dev_ops =3D &ops; > (*eth_dev)->driver =3D NULL; > - (*eth_dev)->data->dev_flags =3D 0; > + (*eth_dev)->data->dev_flags =3D RTE_ETH_DEV_DETACHABLE; > (*eth_dev)->data->drv_name =3D drivername; > (*eth_dev)->data->kdrv =3D RTE_KDRV_NONE; > (*eth_dev)->data->numa_node =3D numa_node; @@ -798,7 +800,7 > @@ rte_eth_from_packet(const char *name, > return 0; > } >=20 > -int > +static int > rte_pmd_af_packet_devinit(const char *name, const char *params) { > unsigned numa_node; > @@ -836,10 +838,43 @@ exit: > return ret; > } >=20 > +static int > +rte_pmd_af_packet_devuninit(const char *name) { > + struct rte_eth_dev *eth_dev =3D NULL; > + struct pmd_internals *internals; > + unsigned q; > + > + RTE_LOG(INFO, PMD, "Closing AF_PACKET ethdev on numa socket > %u\n", > + rte_socket_id()); > + > + if (name =3D=3D NULL) > + return -1; > + > + /* find the ethdev entry */ > + eth_dev =3D rte_eth_dev_allocated(name); > + if (eth_dev =3D=3D NULL) > + return -1; > + > + internals =3D eth_dev->data->dev_private; > + for (q =3D 0; q < internals->nb_queues; q++) { > + rte_free(internals->rx_queue[q].rd); > + rte_free(internals->tx_queue[q].rd); > + } > + > + rte_free(eth_dev->data->dev_private); > + rte_free(eth_dev->data); > + > + rte_eth_dev_release_port(eth_dev); > + > + return 0; > +} > + > static struct rte_driver pmd_af_packet_drv =3D { > .name =3D "eth_af_packet", > .type =3D PMD_VDEV, > .init =3D rte_pmd_af_packet_devinit, > + .uninit =3D rte_pmd_af_packet_devuninit, > }; >=20 > PMD_REGISTER_DRIVER(pmd_af_packet_drv); > diff --git a/drivers/net/af_packet/rte_eth_af_packet.h > b/drivers/net/af_packet/rte_eth_af_packet.h > deleted file mode 100644 > index 5d1bc7e..0000000 > --- a/drivers/net/af_packet/rte_eth_af_packet.h > +++ /dev/null > @@ -1,53 +0,0 @@ > -/*- > - * BSD LICENSE > - * > - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * * Redistributions in binary form must reproduce the above copyrig= ht > - * notice, this list of conditions and the following disclaimer in > - * the documentation and/or other materials provided with the > - * distribution. > - * * Neither the name of Intel Corporation nor the names of its > - * contributors may be used to endorse or promote products derived > - * from this software without specific prior written permission. > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND > CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT > NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND > FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > COPYRIGHT > - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > INCIDENTAL, > - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT > NOT > - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS > OF USE, > - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED > AND ON ANY > - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR > TORT > - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF > THE USE > - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH > DAMAGE. > - */ > - > -#ifndef _RTE_ETH_AF_PACKET_H_ > -#define _RTE_ETH_AF_PACKET_H_ > - > -#ifdef __cplusplus > -extern "C" { > -#endif > - > -#define RTE_PMD_AF_PACKET_MAX_RINGS 16 > - > -/** > - * For use by the EAL only. Called as part of EAL init to set up any dum= my > NICs > - * configured on command line. > - */ > -int rte_pmd_af_packet_devinit(const char *name, const char *params); > - > -#ifdef __cplusplus > -} > -#endif > - > -#endif > diff --git a/drivers/net/af_packet/rte_pmd_af_packet_version.map > b/drivers/net/af_packet/rte_pmd_af_packet_version.map > index de95169..ef35398 100644 > --- a/drivers/net/af_packet/rte_pmd_af_packet_version.map > +++ b/drivers/net/af_packet/rte_pmd_af_packet_version.map > @@ -1,7 +1,4 @@ > DPDK_2.0 { > - global: > - > - rte_pmd_af_packet_devinit; >=20 > local: *; > }; Does making rte_pmd_af_packet_devinit local result in an ABI breakage? Should the DPDK_2.0 structure be kept and a DPDK_2.3 structure added? A deprecation notice may need to be added to the doc/guides/rel_notes/depre= cation.rst file. > -- > 1.9.1 Regards, Bernard.