From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0040.outbound.protection.outlook.com [104.47.32.40]) by dpdk.org (Postfix) with ESMTP id 662C7282 for ; Wed, 14 Dec 2016 20:25:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=onevmw.onmicrosoft.com; s=selector1-vmware-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=HjAyeJwTnr+z/YqHW2Ooe5U64Yqv2+N3OIhzDM/AcaM=; b=B+1gQrYsibQkFU7i/9/j/OmCvNAohpNlySJdamaeuBpitfijUL6hbgVZIGKFq8nrhFtrmt5F+z2Q6x3Uh2DUU/6hdBr2JiiGCNaF7WtGP3JGYoumAtilMGuXuAhBQe24wBCu0v9So0ZUMTciZJ9oJu7qR9GNXQGL6/ritRtiUA0= Received: from BY2PR05MB2359.namprd05.prod.outlook.com (10.166.113.11) by BY2PR05MB2357.namprd05.prod.outlook.com (10.166.113.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.5; Wed, 14 Dec 2016 19:25:11 +0000 Received: from BY2PR05MB2359.namprd05.prod.outlook.com ([10.166.113.11]) by BY2PR05MB2359.namprd05.prod.outlook.com ([10.166.113.11]) with mapi id 15.01.0789.009; Wed, 14 Dec 2016 19:25:11 +0000 From: Yong Wang To: Ferruh Yigit , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v4] net/kni: add KNI PMD Thread-Index: AQHSSzVTxslxUr1Mx0irHfhqQAZ8/qEEy9mwgALj2gCAACBukA== Date: Wed, 14 Dec 2016 19:25:11 +0000 Message-ID: References: <20161010131946.13303-1-ferruh.yigit@intel.com> <20161130181228.25380-1-ferruh.yigit@intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=yongwang@vmware.com; x-originating-ip: [208.91.1.34] x-ms-office365-filtering-correlation-id: 96b48a59-f65d-46ad-42f1-08d42456ec69 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BY2PR05MB2357; x-microsoft-exchange-diagnostics: 1; BY2PR05MB2357; 7:M3IlKjlfKkZ6O+S38BvJyXFdr2N0uXwYsSk+U/RunjyG9s8Bb+HXoKkKWsdwhFdWCB2DGYEOFuy0f9ZMq+v5y2Fs7itIFDaZMgGpfP7zniS6BewD1BxPlt2QOjOVw5BStscZmLkCSVOR0CqBnM9F2A+HBu7DroawDXSzZ1OrtU+LZ+iSIxLYtkJH4AlKZ45SmSXbK4P0S8oZAiv9agSRpY6r0cBfItCaPHlyMnQrmhUQYf6zIjYEUGncMR1QGte09g/iGtbLPcvWgVbTOyFMj3g8H/Ki8a1R8aDcZA7SKffvxiARRrOOZiHUJWpuCa01UjC3+KwAJtKLOSLl9aeyPx9Ovz4YDdl1Fcr7bz4IVrro5y3Twm/sSWkXIe6v81I7+32yMW866Qx/ZlesmSZvGLNsaIIWlHy4F9PksUPa2c6vN/1cx8pcRPSaTYGKvOpAQaxfAG/GHWCtNdbv+eiSYA==; 20:UikHRDXF4D0I6wZBGcaJ7IARJNr9xr4gxCaE+yuaZuwBmcmXjOeQUWyqcG8AZgCkJ+joQbhrmvt1USclLLHpgvfX0+LMCxswD2lOcXJ/VtZ53Vdovj50glY+HxHf8RpfuVWUIYdg2T12JsVzePoWQGzZEEpNB8TAOkVZPKl2hC4= x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(61668805478150)(278428928389397)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041248)(20161123555025)(20161123558021)(20161123560025)(20161123564025)(20161123562025)(6072148); SRVR:BY2PR05MB2357; BCL:0; PCL:0; RULEID:; SRVR:BY2PR05MB2357; x-forefront-prvs: 01565FED4C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(7916002)(39450400003)(377454003)(189002)(24454002)(199003)(13464003)(3280700002)(2900100001)(122556002)(107886002)(6506006)(76576001)(33656002)(68736007)(77096006)(9686002)(38730400001)(3660700001)(92566002)(8676002)(8936002)(81156014)(97736004)(5660300001)(81166006)(101416001)(189998001)(50986999)(99286002)(54356999)(7696004)(76176999)(5001770100001)(6436002)(6116002)(105586002)(106116001)(93886004)(3846002)(2950100002)(106356001)(74316002)(575784001)(66066001)(305945005)(229853002)(7736002)(102836003)(86362001)(2906002)(2501003)(25786008)(579004)(559001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR05MB2357; H:BY2PR05MB2359.namprd05.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Dec 2016 19:25:11.4688 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR05MB2357 Subject: Re: [dpdk-dev] [PATCH v4] net/kni: add KNI PMD 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: Wed, 14 Dec 2016 19:25:15 -0000 > -----Original Message----- > From: Ferruh Yigit [mailto:ferruh.yigit@intel.com] > Sent: Wednesday, December 14, 2016 8:00 AM > To: Yong Wang ; dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH v4] net/kni: add KNI PMD >=20 > On 12/12/2016 9:59 PM, Yong Wang wrote: > >> -----Original Message----- > >> From: Ferruh Yigit [mailto:ferruh.yigit@intel.com] > >> Sent: Wednesday, November 30, 2016 10:12 AM > >> To: dev@dpdk.org > >> Cc: Ferruh Yigit ; Yong Wang > >> > >> Subject: [PATCH v4] net/kni: add KNI PMD > >> > >> Add KNI PMD which wraps librte_kni for ease of use. > >> > >> KNI PMD can be used as any regular PMD to send / receive packets to th= e > >> Linux networking stack. > >> > >> Signed-off-by: Ferruh Yigit > >> --- > >> > >> v4: > >> * allow only single queue > >> * use driver.name as name > >> > >> v3: > >> * rebase on top of latest master > >> > >> v2: > >> * updated driver name eth_kni -> net_kni > >> --- > >> config/common_base | 1 + > >> config/common_linuxapp | 1 + > >> drivers/net/Makefile | 1 + > >> drivers/net/kni/Makefile | 63 +++++ > >> drivers/net/kni/rte_eth_kni.c | 462 > >> ++++++++++++++++++++++++++++++++ > >> drivers/net/kni/rte_pmd_kni_version.map | 4 + > >> mk/rte.app.mk | 10 +- > >> 7 files changed, 537 insertions(+), 5 deletions(-) > >> create mode 100644 drivers/net/kni/Makefile > >> create mode 100644 drivers/net/kni/rte_eth_kni.c > >> create mode 100644 drivers/net/kni/rte_pmd_kni_version.map > >> > >> diff --git a/config/common_base b/config/common_base > >> index 4bff83a..3385879 100644 > >> --- a/config/common_base > >> +++ b/config/common_base > >> @@ -543,6 +543,7 @@ CONFIG_RTE_PIPELINE_STATS_COLLECT=3Dn > >> # Compile librte_kni > >> # > >> CONFIG_RTE_LIBRTE_KNI=3Dn > >> +CONFIG_RTE_LIBRTE_PMD_KNI=3Dn > >> CONFIG_RTE_KNI_KMOD=3Dn > >> CONFIG_RTE_KNI_PREEMPT_DEFAULT=3Dy > >> CONFIG_RTE_KNI_VHOST=3Dn > >> diff --git a/config/common_linuxapp b/config/common_linuxapp > >> index 2483dfa..2ecd510 100644 > >> --- a/config/common_linuxapp > >> +++ b/config/common_linuxapp > >> @@ -39,6 +39,7 @@ CONFIG_RTE_EAL_IGB_UIO=3Dy > >> CONFIG_RTE_EAL_VFIO=3Dy > >> CONFIG_RTE_KNI_KMOD=3Dy > >> CONFIG_RTE_LIBRTE_KNI=3Dy > >> +CONFIG_RTE_LIBRTE_PMD_KNI=3Dy > >> CONFIG_RTE_LIBRTE_VHOST=3Dy > >> CONFIG_RTE_LIBRTE_PMD_VHOST=3Dy > >> CONFIG_RTE_LIBRTE_PMD_AF_PACKET=3Dy > >> diff --git a/drivers/net/Makefile b/drivers/net/Makefile > >> index bc93230..c4771cd 100644 > >> --- a/drivers/net/Makefile > >> +++ b/drivers/net/Makefile > >> @@ -41,6 +41,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) +=3D enic > >> DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) +=3D fm10k > >> DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) +=3D i40e > >> DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) +=3D ixgbe > >> +DIRS-$(CONFIG_RTE_LIBRTE_PMD_KNI) +=3D kni > >> DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D mlx4 > >> DIRS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D mlx5 > >> DIRS-$(CONFIG_RTE_LIBRTE_MPIPE_PMD) +=3D mpipe > >> diff --git a/drivers/net/kni/Makefile b/drivers/net/kni/Makefile > >> new file mode 100644 > >> index 0000000..0b7cf91 > >> --- /dev/null > >> +++ b/drivers/net/kni/Makefile > >> @@ -0,0 +1,63 @@ > >> +# BSD LICENSE > >> +# > >> +# Copyright(c) 2016 Intel Corporation. All rights reserved. > >> +# > >> +# Redistribution and use in source and binary forms, with or withou= t > >> +# modification, are permitted provided that the following condition= s > >> +# are met: > >> +# > >> +# * Redistributions of source code must retain the above copyrigh= t > >> +# notice, this list of conditions and the following disclaimer. > >> +# * Redistributions in binary form must reproduce the above copyr= ight > >> +# 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 deriv= ed > >> +# 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. > >> + > >> +include $(RTE_SDK)/mk/rte.vars.mk > >> + > >> +# > >> +# library name > >> +# > >> +LIB =3D librte_pmd_kni.a > >> + > >> +CFLAGS +=3D -O3 > >> +CFLAGS +=3D $(WERROR_FLAGS) > >> +LDLIBS +=3D -lpthread > >> + > >> +EXPORT_MAP :=3D rte_pmd_kni_version.map > >> + > >> +LIBABIVER :=3D 1 > >> + > >> +# > >> +# all source are stored in SRCS-y > >> +# > >> +SRCS-$(CONFIG_RTE_LIBRTE_PMD_KNI) +=3D rte_eth_kni.c > >> + > >> +# > >> +# Export include files > >> +# > >> +SYMLINK-y-include +=3D > >> + > >> +# this lib depends upon: > >> +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_KNI) +=3D lib/librte_eal > >> +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_KNI) +=3D lib/librte_ether > >> +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_KNI) +=3D lib/librte_kni > >> +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_KNI) +=3D lib/librte_mbuf > >> +DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_KNI) +=3D lib/librte_mempool > >> + > >> +include $(RTE_SDK)/mk/rte.lib.mk > >> diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_k= ni.c > >> new file mode 100644 > >> index 0000000..6c4df96 > >> --- /dev/null > >> +++ b/drivers/net/kni/rte_eth_kni.c > >> @@ -0,0 +1,462 @@ > >> +/*- > >> + * BSD LICENSE > >> + * > >> + * Copyright(c) 2016 Intel Corporation. All rights reserved. > >> + * All rights reserved. > >> + * > >> + * Redistribution and use in source and binary forms, with or witho= ut > >> + * modification, are permitted provided that the following conditio= ns > >> + * are met: > >> + * > >> + * * Redistributions of source code must retain the above copyrig= ht > >> + * notice, this list of conditions and the following disclaimer= . > >> + * * Redistributions in binary form must reproduce the above copy= right > >> + * 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 deri= ved > >> + * 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. > >> + */ > >> + > >> +#include > >> +#include > >> +#include > >> + > >> +#include > >> +#include > >> +#include > >> +#include > >> + > >> +/* Only single queue supported */ > >> +#define KNI_MAX_QUEUE_PER_PORT 1 > >> + > >> +#define MAX_PACKET_SZ 2048 > >> +#define MAX_KNI_PORTS 8 > >> + > >> +struct pmd_queue_stats { > >> + uint64_t pkts; > >> + uint64_t bytes; > >> + uint64_t err_pkts; > >> +}; > >> + > >> +struct pmd_queue { > >> + struct pmd_internals *internals; > >> + struct rte_mempool *mb_pool; > >> + > >> + struct pmd_queue_stats rx; > >> + struct pmd_queue_stats tx; > >> +}; > >> + > >> +struct pmd_internals { > >> + struct rte_kni *kni; > >> + int is_kni_started; > >> + > >> + pthread_t thread; > >> + int stop_thread; > >> + > >> + struct pmd_queue rx_queues[KNI_MAX_QUEUE_PER_PORT]; > >> + struct pmd_queue tx_queues[KNI_MAX_QUEUE_PER_PORT]; > >> +}; > >> + > >> +static struct ether_addr eth_addr; > >> +static struct rte_eth_link pmd_link =3D { > >> + .link_speed =3D ETH_SPEED_NUM_10G, > >> + .link_duplex =3D ETH_LINK_FULL_DUPLEX, > >> + .link_status =3D 0 > >> +}; > >> +static int is_kni_initialized; > >> + > >> +static uint16_t > >> +eth_kni_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) > >> +{ > >> + struct pmd_queue *kni_q =3D q; > >> + struct rte_kni *kni =3D kni_q->internals->kni; > >> + uint16_t nb_pkts; > >> + > >> + nb_pkts =3D rte_kni_rx_burst(kni, bufs, nb_bufs); > >> + > >> + kni_q->rx.pkts +=3D nb_pkts; > >> + kni_q->rx.err_pkts +=3D nb_bufs - nb_pkts; > >> + > >> + return nb_pkts; > >> +} > >> + > >> +static uint16_t > >> +eth_kni_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) > >> +{ > >> + struct pmd_queue *kni_q =3D q; > >> + struct rte_kni *kni =3D kni_q->internals->kni; > >> + uint16_t nb_pkts; > >> + > >> + nb_pkts =3D rte_kni_tx_burst(kni, bufs, nb_bufs); > >> + > >> + kni_q->tx.pkts +=3D nb_pkts; > >> + kni_q->tx.err_pkts +=3D nb_bufs - nb_pkts; > >> + > >> + return nb_pkts; > >> +} > >> + > >> +static void * > >> +kni_handle_request(void *param) > >> +{ > >> + struct pmd_internals *internals =3D param; > >> +#define MS 1000 > >> + > >> + while (!internals->stop_thread) { > >> + rte_kni_handle_request(internals->kni); > >> + usleep(500 * MS); > >> + } > >> + > >> + return param; > >> +} > >> + > > > > Do we really need a thread to handle request by default? I know there a= re > apps that handle request their own way and having a separate thread could > add synchronization problems. Can we at least add an option to disable t= his? >=20 > I didn't think about there can be a use case that requires own request > handling. >=20 > But, kni requests should be handled to make kni interface run properly, > and to handle interface "kni" handler (internals->kni) required, which > this PMD doesn't expose. >=20 > So, just disabling this thread won't work on its own. I understand that and what I am asking is a way to at least disable this wi= thout having to make code changes for applications that have their own way = of handling KNI request and the callback mentioned below sounds good to me.= I am fine with adding this capability with this commit or in a separate c= ommit after you have this commit checked in. =20 > A solution can be found, like callback registraion, or get_handler API, > but if an application has custom request handling, perhaps it may prefer > to use kni library directly instead of this wrapper, since wrapper > already doesn't expose all kni features. I think one of the motivation of having KNI pmd is that it's abstracted the= same way as other physical or virtual devices. I think it makes sense to = achieve feature parity with the KNI library as much as possible. What's c= urrently supported in KNI library but missing in KNI PMD and any specific r= eason they are not supported? > > > >> +static int > >> +eth_kni_start(struct rte_eth_dev *dev) > >> +{ > >> + struct pmd_internals *internals =3D dev->data->dev_private; > >> + uint16_t port_id =3D dev->data->port_id; > >> + struct rte_mempool *mb_pool; > >> + struct rte_kni_conf conf; > >> + const char *name =3D dev->data->name + 4; /* remove net_ */ > >> + > >> + snprintf(conf.name, RTE_KNI_NAMESIZE, "%s", name); > >> + conf.force_bind =3D 0; > >> + conf.group_id =3D port_id; > >> + conf.mbuf_size =3D MAX_PACKET_SZ; > >> + mb_pool =3D internals->rx_queues[0].mb_pool; > >> + > >> + internals->kni =3D rte_kni_alloc(mb_pool, &conf, NULL); > >> + if (internals->kni =3D=3D NULL) { > >> + RTE_LOG(ERR, PMD, > >> + "Fail to create kni for port: %d\n", port_id); > >> + return -1; > >> + } > >> + > >> + return 0; > >> +} > >> + > >> +static int > >> +eth_kni_dev_start(struct rte_eth_dev *dev) > >> +{ > >> + struct pmd_internals *internals =3D dev->data->dev_private; > >> + int ret; > >> + > >> + if (internals->is_kni_started =3D=3D 0) { > >> + ret =3D eth_kni_start(dev); > >> + if (ret) > >> + return -1; > >> + internals->is_kni_started =3D 1; > >> + } > >> + > > > > In case is_kni_started is 1 already, shouldn't we return directly inst= ead of > proceeding? >=20 > "is_kni_started" is just to protect "eth_kni_start()", as you can see it > doesn't have a counterpart in eth_kni_dev_stop(). This flag is to be > sure "eth_kni_start()" called only once during PMD life cycle. >=20 > The check you mentioned already done, start() / stop() functions already > balanced by APIs calling these functions. What about KNI request handing thread then? Is it safe to have multiple th= reads calling into rte_kni_handle_request()? My understanding is that this = is not safe as kni_fifo is not multi-thread safe. It's also a bit wasteful= to create multiple threads here. > > > >> + ret =3D pthread_create(&internals->thread, NULL, kni_handle_request, > >> + internals); > >> + if (ret) { > >> + RTE_LOG(ERR, PMD, "Fail to create kni request thread\n"); > >> + return -1; > >> + } > >> + > >> + dev->data->dev_link.link_status =3D 1; > >> + > >> + return 0; > >> +} > >> + > >> +static void > >> +eth_kni_dev_stop(struct rte_eth_dev *dev) > >> +{ > >> + struct pmd_internals *internals =3D dev->data->dev_private; > >> + int ret; > >> + > >> + internals->stop_thread =3D 1; > >> + > >> + ret =3D pthread_cancel(internals->thread); > >> + if (ret) > >> + RTE_LOG(ERR, PMD, "Can't cancel the thread\n"); > >> + > >> + ret =3D pthread_join(internals->thread, NULL); > >> + if (ret) > >> + RTE_LOG(ERR, PMD, "Can't join the thread\n"); > >> + > >> + internals->stop_thread =3D 0; > >> + > >> + dev->data->dev_link.link_status =3D 0; > >> +} > >> + > >> +static int > >> +eth_kni_dev_configure(struct rte_eth_dev *dev __rte_unused) > >> +{ > >> + return 0; > >> +} > >> + > >> +static void > >> +eth_kni_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info > >> *dev_info) > >> +{ > >> + struct rte_eth_dev_data *data =3D dev->data; > >> + > >> + dev_info->driver_name =3D data->drv_name; > >> + dev_info->max_mac_addrs =3D 1; > >> + dev_info->max_rx_pktlen =3D (uint32_t)-1; > >> + dev_info->max_rx_queues =3D KNI_MAX_QUEUE_PER_PORT; > >> + dev_info->max_tx_queues =3D KNI_MAX_QUEUE_PER_PORT; > >> + dev_info->min_rx_bufsize =3D 0; > >> + dev_info->pci_dev =3D NULL; > >> +} > >> + > >> +static int > >> +eth_kni_rx_queue_setup(struct rte_eth_dev *dev, > >> + uint16_t rx_queue_id, > >> + uint16_t nb_rx_desc __rte_unused, > >> + unsigned int socket_id __rte_unused, > >> + const struct rte_eth_rxconf *rx_conf __rte_unused, > >> + struct rte_mempool *mb_pool) > >> +{ > >> + struct pmd_internals *internals =3D dev->data->dev_private; > >> + struct pmd_queue *q; > >> + > >> + q =3D &internals->rx_queues[rx_queue_id]; > >> + q->internals =3D internals; > >> + q->mb_pool =3D mb_pool; > >> + > >> + dev->data->rx_queues[rx_queue_id] =3D q; > >> + > >> + return 0; > >> +} > >> + > >> +static int > >> +eth_kni_tx_queue_setup(struct rte_eth_dev *dev, > >> + uint16_t tx_queue_id, > >> + uint16_t nb_tx_desc __rte_unused, > >> + unsigned int socket_id __rte_unused, > >> + const struct rte_eth_txconf *tx_conf __rte_unused) > >> +{ > >> + struct pmd_internals *internals =3D dev->data->dev_private; > >> + struct pmd_queue *q; > >> + > >> + q =3D &internals->tx_queues[tx_queue_id]; > >> + q->internals =3D internals; > >> + > >> + dev->data->tx_queues[tx_queue_id] =3D q; > >> + > >> + return 0; > >> +} > >> + > >> +static void > >> +eth_kni_queue_release(void *q __rte_unused) > >> +{ > >> +} > >> + > >> +static int > >> +eth_kni_link_update(struct rte_eth_dev *dev __rte_unused, > >> + int wait_to_complete __rte_unused) > >> +{ > >> + return 0; > >> +} > >> + > >> +static void > >> +eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stat= s) > >> +{ > >> + unsigned long rx_packets_total =3D 0, rx_bytes_total =3D 0; > >> + unsigned long tx_packets_total =3D 0, tx_bytes_total =3D 0; > >> + struct rte_eth_dev_data *data =3D dev->data; > >> + unsigned long tx_packets_err_total =3D 0; > >> + unsigned int i, num_stats; > >> + struct pmd_queue *q; > >> + > >> + num_stats =3D RTE_MIN((unsigned > >> int)RTE_ETHDEV_QUEUE_STAT_CNTRS, > >> + data->nb_rx_queues); > >> + for (i =3D 0; i < num_stats; i++) { > >> + q =3D data->rx_queues[i]; > >> + stats->q_ipackets[i] =3D q->rx.pkts; > >> + stats->q_ibytes[i] =3D q->rx.bytes; > >> + rx_packets_total +=3D stats->q_ipackets[i]; > >> + rx_bytes_total +=3D stats->q_ibytes[i]; > >> + } > >> + > >> + num_stats =3D RTE_MIN((unsigned > >> int)RTE_ETHDEV_QUEUE_STAT_CNTRS, > >> + data->nb_tx_queues); > >> + for (i =3D 0; i < num_stats; i++) { > >> + q =3D data->tx_queues[i]; > >> + stats->q_opackets[i] =3D q->tx.pkts; > >> + stats->q_obytes[i] =3D q->tx.bytes; > >> + stats->q_errors[i] =3D q->tx.err_pkts; > >> + tx_packets_total +=3D stats->q_opackets[i]; > >> + tx_bytes_total +=3D stats->q_obytes[i]; > >> + tx_packets_err_total +=3D stats->q_errors[i]; > >> + } > >> + > >> + stats->ipackets =3D rx_packets_total; > >> + stats->ibytes =3D rx_bytes_total; > >> + stats->opackets =3D tx_packets_total; > >> + stats->obytes =3D tx_bytes_total; > >> + stats->oerrors =3D tx_packets_err_total; > >> +} > >> + > >> +static void > >> +eth_kni_stats_reset(struct rte_eth_dev *dev) > >> +{ > >> + struct rte_eth_dev_data *data =3D dev->data; > >> + struct pmd_queue *q; > >> + unsigned int i; > >> + > >> + for (i =3D 0; i < data->nb_rx_queues; i++) { > >> + q =3D data->rx_queues[i]; > >> + q->rx.pkts =3D 0; > >> + q->rx.bytes =3D 0; > >> + } > >> + for (i =3D 0; i < data->nb_tx_queues; i++) { > >> + q =3D data->tx_queues[i]; > >> + q->tx.pkts =3D 0; > >> + q->tx.bytes =3D 0; > >> + q->tx.err_pkts =3D 0; > >> + } > >> +} > >> + > >> +static const struct eth_dev_ops eth_kni_ops =3D { > >> + .dev_start =3D eth_kni_dev_start, > >> + .dev_stop =3D eth_kni_dev_stop, > >> + .dev_configure =3D eth_kni_dev_configure, > >> + .dev_infos_get =3D eth_kni_dev_info, > >> + .rx_queue_setup =3D eth_kni_rx_queue_setup, > >> + .tx_queue_setup =3D eth_kni_tx_queue_setup, > >> + .rx_queue_release =3D eth_kni_queue_release, > >> + .tx_queue_release =3D eth_kni_queue_release, > >> + .link_update =3D eth_kni_link_update, > >> + .stats_get =3D eth_kni_stats_get, > >> + .stats_reset =3D eth_kni_stats_reset, > >> +}; > >> + > >> +static struct rte_vdev_driver eth_kni_drv; > >> + > >> +static struct rte_eth_dev * > >> +eth_kni_create(const char *name, unsigned int numa_node) > >> +{ > >> + struct pmd_internals *internals =3D NULL; > >> + struct rte_eth_dev_data *data; > >> + struct rte_eth_dev *eth_dev; > >> + > >> + RTE_LOG(INFO, PMD, "Creating kni ethdev on numa socket %u\n", > >> + numa_node); > >> + > >> + data =3D rte_zmalloc_socket(name, sizeof(*data), 0, numa_node); > >> + if (data =3D=3D NULL) > >> + goto error; > >> + > >> + internals =3D rte_zmalloc_socket(name, sizeof(*internals), 0, > >> numa_node); > >> + if (internals =3D=3D NULL) > >> + goto error; > >> + > >> + /* reserve an ethdev entry */ > >> + eth_dev =3D rte_eth_dev_allocate(name); > >> + if (eth_dev =3D=3D NULL) > >> + goto error; > >> + > >> + data->dev_private =3D internals; > >> + data->port_id =3D eth_dev->data->port_id; > >> + memmove(data->name, eth_dev->data->name, sizeof(data- > >>> name)); > >> + data->nb_rx_queues =3D 1; > >> + data->nb_tx_queues =3D 1; > >> + data->dev_link =3D pmd_link; > >> + data->mac_addrs =3D ð_addr; > >> + > >> + eth_dev->data =3D data; > >> + eth_dev->dev_ops =3D ð_kni_ops; > >> + eth_dev->driver =3D NULL; > >> + > >> + data->dev_flags =3D RTE_ETH_DEV_DETACHABLE; > >> + data->kdrv =3D RTE_KDRV_NONE; > >> + data->drv_name =3D eth_kni_drv.driver.name; > >> + data->numa_node =3D numa_node; > >> + > >> + return eth_dev; > >> + > >> +error: > >> + rte_free(data); > >> + rte_free(internals); > >> + > >> + return NULL; > >> +} > >> + > >> +static int > >> +kni_init(void) > >> +{ > >> + if (is_kni_initialized =3D=3D 0) > >> + rte_kni_init(MAX_KNI_PORTS); > >> + > >> + is_kni_initialized +=3D 1; > >> + > >> + return 0; > >> +} > >> + > >> +static int > >> +eth_kni_probe(const char *name, const char *params __rte_unused) > >> +{ > >> + struct rte_eth_dev *eth_dev; > >> + int ret; > >> + > >> + RTE_LOG(INFO, PMD, "Initializing eth_kni for %s\n", name); > >> + > >> + ret =3D kni_init(); > >> + if (ret < 0) > >> + /* Not return error to prevent panic in rte_eal_init() */ > >> + return 0; > > > > If we don't return error here, the application that needs to add KNI po= rts > eventually will fail. If it's a fail-stop situation, isn't it better to = return error > where the it happened? >=20 > I am not sure this is fail-stop situation, but instead this gives a > chance to applicaton for a graceful exit. >=20 > If an error value returned here, it will lead to a rte_panic() and > application terminated abnormally! >=20 > But if we return a success at this point, since no ethernet device > created, there is no handler in application to use, which also means no > KNI interface created. > Application can check number of ports and recognize KNI port is missing, > app may chose to terminate or not, also it prefers to terminate, can do > it properly. I might be wrong but as far as I know, other virtual or physical PMDS do n= ot have this behavior. What you proposed makes sense but it also means tha= t the application needs extra logic (checking if all ports are successfully= initialized) to handle such failures (depending on the application, it mig= ht be able to proceed or it might need to fail-stop). Personally I would p= refer consistency across all PMDs here no matter what behavior we choose he= re as that's the "contract" the application needs to know. =20 > > > >> + eth_dev =3D eth_kni_create(name, rte_socket_id()); > >> + if (eth_dev =3D=3D NULL) > >> + return -1; > >> + > >> + eth_dev->rx_pkt_burst =3D eth_kni_rx; > >> + eth_dev->tx_pkt_burst =3D eth_kni_tx; > >> + > >> + return 0; > >> +} > >> + > >> +static int > >> +eth_kni_remove(const char *name) > >> +{ > >> + struct rte_eth_dev *eth_dev; > >> + struct pmd_internals *internals; > >> + > >> + RTE_LOG(INFO, PMD, "Un-Initializing eth_kni for %s\n", name); > >> + > >> + /* find the ethdev entry */ > >> + eth_dev =3D rte_eth_dev_allocated(name); > >> + if (eth_dev =3D=3D NULL) > >> + return -1; > >> + > >> + eth_kni_dev_stop(eth_dev); > >> + > >> + if (eth_dev->data) { > >> + internals =3D eth_dev->data->dev_private; > >> + rte_kni_release(internals->kni); > >> + > >> + rte_free(internals); > >> + } > >> + rte_free(eth_dev->data); > >> + > >> + rte_eth_dev_release_port(eth_dev); > >> + > >> + is_kni_initialized -=3D 1; > >> + if (is_kni_initialized =3D=3D 0) > >> + rte_kni_close(); > >> + > >> + return 0; > >> +} > >> + > >> +static struct rte_vdev_driver eth_kni_drv =3D { > >> + .probe =3D eth_kni_probe, > >> + .remove =3D eth_kni_remove, > >> +}; > >> + > >> +RTE_PMD_REGISTER_VDEV(net_kni, eth_kni_drv); > >> diff --git a/drivers/net/kni/rte_pmd_kni_version.map > >> b/drivers/net/kni/rte_pmd_kni_version.map > >> new file mode 100644 > >> index 0000000..31eca32 > >> --- /dev/null > >> +++ b/drivers/net/kni/rte_pmd_kni_version.map > >> @@ -0,0 +1,4 @@ > >> +DPDK_17.02 { > >> + > >> + local: *; > >> +}; > >> diff --git a/mk/rte.app.mk b/mk/rte.app.mk > >> index f75f0e2..af02816 100644 > >> --- a/mk/rte.app.mk > >> +++ b/mk/rte.app.mk > >> @@ -59,11 +59,6 @@ _LDLIBS-y +=3D -L$(RTE_SDK_BIN)/lib > >> # > >> # Order is important: from higher level to lower level > >> # > >> - > >> -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) > >> -_LDLIBS-$(CONFIG_RTE_LIBRTE_KNI) +=3D -lrte_kni > >> -endif > >> - > >> _LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) +=3D -lrte_pipeline > >> _LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) +=3D -lrte_table > >> _LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) +=3D -lrte_port > >> @@ -84,6 +79,10 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_POWER) +=3D - > >> lrte_power > >> > >> _LDLIBS-y +=3D --whole-archive > >> > >> +ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) > >> +_LDLIBS-$(CONFIG_RTE_LIBRTE_KNI) +=3D -lrte_kni > >> +endif > >> + > >> _LDLIBS-$(CONFIG_RTE_LIBRTE_TIMER) +=3D -lrte_timer > >> _LDLIBS-$(CONFIG_RTE_LIBRTE_HASH) +=3D -lrte_hash > >> _LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) +=3D -lrte_vhost > >> @@ -115,6 +114,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) +=3D > - > >> lrte_pmd_enic > >> _LDLIBS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) +=3D -lrte_pmd_fm10k > >> _LDLIBS-$(CONFIG_RTE_LIBRTE_I40E_PMD) +=3D -lrte_pmd_i40e > >> _LDLIBS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) +=3D -lrte_pmd_ixgbe > >> +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KNI) +=3D -lrte_pmd_kni > >> _LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D -lrte_pmd_mlx4 - > >> libverbs > >> _LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D -lrte_pmd_mlx5 - > >> libverbs > >> _LDLIBS-$(CONFIG_RTE_LIBRTE_MPIPE_PMD) +=3D -lrte_pmd_mpipe - > lgxio > >> -- > >> 2.9.3 > >