From patchwork Wed Mar 9 11:41:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 11282 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 055EA374C; Wed, 9 Mar 2016 12:42:12 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 6A0332C5B for ; Wed, 9 Mar 2016 12:42:09 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 09 Mar 2016 03:42:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,311,1455004800"; d="scan'208";a="905938199" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 09 Mar 2016 03:42:06 -0800 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u29Bg5YH024408; Wed, 9 Mar 2016 11:42:05 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id u29Bg5RN006282; Wed, 9 Mar 2016 11:42:05 GMT Received: (from fyigit@localhost) by sivswdev02.ir.intel.com with id u29Bg5ix006278; Wed, 9 Mar 2016 11:42:05 GMT From: Ferruh Yigit To: dev@dpdk.org Date: Wed, 9 Mar 2016 11:41:28 +0000 Message-Id: <1457523689-6223-4-git-send-email-ferruh.yigit@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1457523689-6223-1-git-send-email-ferruh.yigit@intel.com> References: <1456846920-28770-1-git-send-email-ferruh.yigit@intel.com> <1457523689-6223-1-git-send-email-ferruh.yigit@intel.com> Subject: [dpdk-dev] [PATCH v5 3/4] rte_ctrl_if: add control interface library 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This library gets control messages form kernelspace and forwards them to librte_ether and returns response back to the kernelspace. Library does: 1) Trigger Linux virtual interface creation 2) Initialize the netlink socket communication 3) Provides process() API to the application that does processing the received messages This library requires corresponding kernel module to be inserted. Signed-off-by: Ferruh Yigit Acked-by: Remy Horton --- v5: * Use unsigned primitive types as possible v4: * Add ethtool_get_settings as dummy v3: * Use librte_ethtool * Don't create interfaces for virtual PMDs * Add a new API ...msg_exist() to support port based locking * Add enable/disable promisc, allmulti support v2: * User rtnetlink to create interfaces. * Add more ethtool support: get/set ringparam, set pauseparam. * return defined error instead of hardcoded value --- MAINTAINERS | 1 + config/common_base | 1 + config/common_linuxapp | 1 + doc/api/doxy-api-index.md | 1 + doc/api/doxy-api.conf | 1 + doc/guides/prog_guide/ctrl_if_lib.rst | 52 ++++ doc/guides/prog_guide/index.rst | 1 + doc/guides/rel_notes/release_16_04.rst | 8 + lib/Makefile | 3 +- lib/librte_ctrl_if/Makefile | 58 +++++ lib/librte_ctrl_if/rte_ctrl_ethtool.c | 391 ++++++++++++++++++++++++++++ lib/librte_ctrl_if/rte_ctrl_ethtool.h | 54 ++++ lib/librte_ctrl_if/rte_ctrl_if.c | 395 +++++++++++++++++++++++++++++ lib/librte_ctrl_if/rte_ctrl_if.h | 129 ++++++++++ lib/librte_ctrl_if/rte_ctrl_if_version.map | 10 + lib/librte_ctrl_if/rte_nl.c | 313 +++++++++++++++++++++++ lib/librte_ctrl_if/rte_nl.h | 50 ++++ lib/librte_eal/common/include/rte_log.h | 3 +- mk/rte.app.mk | 3 +- 19 files changed, 1472 insertions(+), 3 deletions(-) create mode 100644 doc/guides/prog_guide/ctrl_if_lib.rst create mode 100644 lib/librte_ctrl_if/Makefile create mode 100644 lib/librte_ctrl_if/rte_ctrl_ethtool.c create mode 100644 lib/librte_ctrl_if/rte_ctrl_ethtool.h create mode 100644 lib/librte_ctrl_if/rte_ctrl_if.c create mode 100644 lib/librte_ctrl_if/rte_ctrl_if.h create mode 100644 lib/librte_ctrl_if/rte_ctrl_if_version.map create mode 100644 lib/librte_ctrl_if/rte_nl.c create mode 100644 lib/librte_ctrl_if/rte_nl.h diff --git a/MAINTAINERS b/MAINTAINERS index b461b77..dd73cc5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -261,6 +261,7 @@ F: doc/guides/sample_app_ug/kernel_nic_interface.rst Linux KCP M: Ferruh Yigit F: lib/librte_eal/linuxapp/kcp/ +F: lib/librte_ctrl_if/ Linux AF_PACKET M: John W. Linville diff --git a/config/common_base b/config/common_base index 86815d6..1c138d7 100644 --- a/config/common_base +++ b/config/common_base @@ -494,6 +494,7 @@ CONFIG_RTE_LIBRTE_ETHTOOL=n # CONFIG_RTE_KCP_KMOD=n CONFIG_RTE_KCP_KO_DEBUG=n +CONFIG_RTE_LIBRTE_CTRL_IF=n # # Compile vhost library diff --git a/config/common_linuxapp b/config/common_linuxapp index e67a546..86bfe3c 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -41,6 +41,7 @@ CONFIG_RTE_KNI_KMOD=y CONFIG_RTE_LIBRTE_KNI=y CONFIG_RTE_LIBRTE_ETHTOOL=y CONFIG_RTE_KCP_KMOD=y +CONFIG_RTE_LIBRTE_CTRL_IF=y CONFIG_RTE_LIBRTE_VHOST=y CONFIG_RTE_LIBRTE_PMD_AF_PACKET=y CONFIG_RTE_LIBRTE_POWER=y diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md index 4cdd3f5..e34250d 100644 --- a/doc/api/doxy-api-index.md +++ b/doc/api/doxy-api-index.md @@ -151,3 +151,4 @@ There are many libraries, so their headers may be grouped by topics: [keepalive] (@ref rte_keepalive.h), [version] (@ref rte_version.h), [ethtool] (@ref rte_ethtool.h), + [control interface] (@ref rte_ctrl_if.h) diff --git a/doc/api/doxy-api.conf b/doc/api/doxy-api.conf index c5b8615..1a7999e 100644 --- a/doc/api/doxy-api.conf +++ b/doc/api/doxy-api.conf @@ -39,6 +39,7 @@ INPUT = doc/api/doxy-api-index.md \ lib/librte_cmdline \ lib/librte_compat \ lib/librte_cryptodev \ + lib/librte_ctrl_if \ lib/librte_distributor \ lib/librte_ether \ lib/librte_ethtool \ diff --git a/doc/guides/prog_guide/ctrl_if_lib.rst b/doc/guides/prog_guide/ctrl_if_lib.rst new file mode 100644 index 0000000..36054b9 --- /dev/null +++ b/doc/guides/prog_guide/ctrl_if_lib.rst @@ -0,0 +1,52 @@ +.. BSD LICENSE + Copyright(c) 2016 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 copyright + 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. + +.. _Ctrl_If_Library: + +Control Interface Library +========================= + +This Library is to create/destroy control interfaces and process messages +received by control interface. + +Control Interface is Linux network interface and it is possible to call +various Linux commands to this interface and commands will be forwarded +to the matching DPDK PMD, and response will be generated by PMD. + +Control interface required KCP kernel module to be inserted to function. + +Control Interface APIS +---------------------- + + +- ``rte_eth_control_interface_create()`` +- ``rte_eth_control_interface_destroy()`` +- ``rte_eth_control_interface_msg_exist()`` +- ``rte_eth_control_interface_msg_process()`` diff --git a/doc/guides/prog_guide/index.rst b/doc/guides/prog_guide/index.rst index 98f4aca..aadc476 100644 --- a/doc/guides/prog_guide/index.rst +++ b/doc/guides/prog_guide/index.rst @@ -52,6 +52,7 @@ Programmer's Guide reorder_lib ip_fragment_reassembly_lib ethtool_lib + ctrl_if_lib multi_proc_support kernel_nic_interface thread_safety_dpdk_functions diff --git a/doc/guides/rel_notes/release_16_04.rst b/doc/guides/rel_notes/release_16_04.rst index a07c292..0a9e188 100644 --- a/doc/guides/rel_notes/release_16_04.rst +++ b/doc/guides/rel_notes/release_16_04.rst @@ -63,6 +63,13 @@ This section should contain new features added in this release. Sample format: space bytes, to boost the performance. In the meanwhile, it deprecated the legacy way via reading/writing sysfile supported by kernel module igb_uio. +* **Control interface support added.** + + To enable controlling DPDK ports by common Linux tools. + Following modules added to DPDK: + + * librte_ctrl_if library + * librte_eal/linuxapp/kcp kernel module Resolved Issues --------------- @@ -162,6 +169,7 @@ The libraries prepended with a plus sign were incremented in this version. librte_acl.so.2 librte_cfgfile.so.2 librte_cmdline.so.1 + + librte_ctrl_if.so.1 librte_distributor.so.1 librte_eal.so.2 + librte_ethtool.so.1 diff --git a/lib/Makefile b/lib/Makefile index 57b66c6..646fee8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright(c) 2010-2015 Intel Corporation. All rights reserved. +# Copyright(c) 2010-2016 Intel Corporation. All rights reserved. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -59,6 +59,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_TABLE) += librte_table DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += librte_pipeline DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += librte_reorder DIRS-$(CONFIG_RTE_LIBRTE_ETHTOOL) += librte_ethtool +DIRS-$(CONFIG_RTE_LIBRTE_CTRL_IF) += librte_ctrl_if ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) DIRS-$(CONFIG_RTE_LIBRTE_KNI) += librte_kni diff --git a/lib/librte_ctrl_if/Makefile b/lib/librte_ctrl_if/Makefile new file mode 100644 index 0000000..fbb418b --- /dev/null +++ b/lib/librte_ctrl_if/Makefile @@ -0,0 +1,58 @@ +# BSD LICENSE +# +# Copyright(c) 2016 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 copyright +# 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. + +include $(RTE_SDK)/mk/rte.vars.mk + +# +# library name +# +LIB = librte_ctrl_if.a + +CFLAGS += -O3 +CFLAGS += $(WERROR_FLAGS) + +EXPORT_MAP := rte_ctrl_if_version.map + +LIBABIVER := 1 + +SRCS-y += rte_ctrl_if.c +SRCS-y += rte_nl.c +SRCS-y += rte_ctrl_ethtool.c + +# +# Export include files +# +SYMLINK-y-include += rte_ctrl_if.h + +# this lib depends upon: +DEPDIRS-y += lib/librte_ether lib/librte_ethtool + +include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ctrl_if/rte_ctrl_ethtool.c b/lib/librte_ctrl_if/rte_ctrl_ethtool.c new file mode 100644 index 0000000..4f9b54e --- /dev/null +++ b/lib/librte_ctrl_if/rte_ctrl_ethtool.c @@ -0,0 +1,391 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2016 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 copyright + * 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. + */ + +#include +#include + +#include + +#include +#include +#include +#include "rte_ctrl_ethtool.h" + +#define ETHTOOL_GEEPROM_LEN 99 +#define ETHTOOL_GREGS_LEN 98 +#define ETHTOOL_GSSET_COUNT 97 + +static int +get_settings(uint8_t port_id __rte_unused, void *data, size_t *data_len) +{ + struct ethtool_cmd *ecmd = data; + + /* No PMD equivalent, added to make get pauseparam work */ + memset(ecmd, 0, sizeof(struct ethtool_cmd)); + + *data_len = sizeof(struct ethtool_cmd); + return 0; +} + +static int +get_drvinfo(uint8_t port_id, void *data, size_t *data_len) +{ + struct ethtool_drvinfo *info = data; + int ret; + + ret = rte_ethtool_get_drvinfo(port_id, info); + if (ret < 0) + return ret; + + *data_len = sizeof(struct ethtool_drvinfo); + + return 0; +} + +static int +get_reg_len(uint8_t port_id, void *data, size_t *data_len) +{ + int reg_length = 0; + + reg_length = rte_ethtool_get_regs_len(port_id); + if (reg_length < 0) + return reg_length; + + *(int *)data = reg_length; + *data_len = sizeof(int); + + return 0; +} + +static int +get_reg_len_internal(uint8_t port_id, size_t *reg_length) +{ + size_t reg_length_out_len; + + return get_reg_len(port_id, reg_length, ®_length_out_len); +} + +static int +get_reg(uint8_t port_id, void *in_data, void *out_data, size_t *out_data_len) +{ + size_t reg_length; + struct ethtool_regs *ethtool_regs = in_data; + int ret; + + ret = get_reg_len_internal(port_id, ®_length); + /* not enough space in out data buffer */ + if (ret < 0 || reg_length > ethtool_regs->len) + return -1; + + ret = rte_ethtool_get_regs(port_id, ethtool_regs, out_data); + if (ret < 0) + return ret; + + *out_data_len = reg_length; + + return 0; +} + +static int +get_link(uint8_t port_id, void *data, size_t *data_len) +{ + int ret; + + ret = rte_ethtool_get_link(port_id); + + *(int *)data = ret; + *data_len = sizeof(size_t); + + return 0; +} + +static int +get_eeprom_length(uint8_t port_id, void *data, size_t *data_len) +{ + int eeprom_length = 0; + + eeprom_length = rte_ethtool_get_eeprom_len(port_id); + if (eeprom_length < 0) + return eeprom_length; + + *(int *)data = eeprom_length; + *data_len = sizeof(int); + + return 0; +} + +static int +get_eeprom(uint8_t port_id, void *in_data, void *out_data, + size_t *out_data_len) +{ + struct ethtool_eeprom *eeprom = in_data; + int ret; + + ret = rte_ethtool_get_eeprom(port_id, eeprom, out_data); + if (ret < 0) + return ret; + + *out_data_len = eeprom->len; + + return 0; +} + +static int +set_eeprom(uint8_t port_id, void *in_data) +{ + struct ethtool_eeprom *eeprom = in_data; + int ret; + + ret = rte_ethtool_set_eeprom(port_id, eeprom, eeprom->data); + if (ret != 0) + return -1; + + return 0; +} + +static int +get_ringparam(uint8_t port_id, void *data, size_t *data_len) +{ + struct ethtool_ringparam *ringparam = data; + int ret; + + ret = rte_ethtool_get_ringparam(port_id, ringparam); + if (ret < 0) + return ret; + + *data_len = sizeof(struct ethtool_ringparam); + + return 0; +} + +static int +set_ringparam(uint8_t port_id, void *data) +{ + struct ethtool_ringparam *ringparam = data; + int ret; + + ret = rte_ethtool_set_ringparam(port_id, ringparam); + if (ret != 0) + return -1; + + return 0; +} + +static int +get_pauseparam(uint8_t port_id, void *data, size_t *data_len) +{ + struct ethtool_pauseparam *pauseparam = data; + int ret; + + ret = rte_ethtool_get_pauseparam(port_id, pauseparam); + if (ret < 0) + return ret; + + *data_len = sizeof(struct ethtool_pauseparam); + + return 0; +} + +static int +set_pauseparam(uint8_t port_id, void *data) +{ + struct ethtool_pauseparam *pauseparam = data; + + return rte_ethtool_set_pauseparam(port_id, pauseparam); +} + +int +rte_eth_dev_ethtool_process(uint32_t cmd_id, uint8_t port_id, void *in_data, + void *out_data, size_t *out_data_len) +{ + if (!rte_eth_dev_is_valid_port(port_id)) + return -ENODEV; + + switch (cmd_id) { + case ETHTOOL_GSET: + return get_settings(port_id, out_data, out_data_len); + case ETHTOOL_GDRVINFO: + return get_drvinfo(port_id, out_data, out_data_len); + case ETHTOOL_GREGS_LEN: + return get_reg_len(port_id, out_data, out_data_len); + case ETHTOOL_GREGS: + return get_reg(port_id, in_data, out_data, out_data_len); + case ETHTOOL_GLINK: + return get_link(port_id, out_data, out_data_len); + case ETHTOOL_GEEPROM_LEN: + return get_eeprom_length(port_id, out_data, out_data_len); + case ETHTOOL_GEEPROM: + return get_eeprom(port_id, in_data, out_data, out_data_len); + case ETHTOOL_SEEPROM: + return set_eeprom(port_id, in_data); + case ETHTOOL_GRINGPARAM: + return get_ringparam(port_id, out_data, out_data_len); + case ETHTOOL_SRINGPARAM: + return set_ringparam(port_id, in_data); + case ETHTOOL_GPAUSEPARAM: + return get_pauseparam(port_id, out_data, out_data_len); + case ETHTOOL_SPAUSEPARAM: + return set_pauseparam(port_id, in_data); + default: + return -EOPNOTSUPP; + } + + return 0; +} + +static int +set_mtu(uint8_t port_id, void *in_data) +{ + int *mtu = in_data; + + return rte_eth_dev_set_mtu(port_id, *mtu); +} + +static int +get_stats(uint8_t port_id, void *data, size_t *data_len) +{ + struct rte_eth_stats stats; + struct rtnl_link_stats64 *if_stats = data; + int ret; + + ret = rte_eth_stats_get(port_id, &stats); + if (ret < 0) + return -EOPNOTSUPP; + + if_stats->rx_packets = stats.ipackets; + if_stats->tx_packets = stats.opackets; + if_stats->rx_bytes = stats.ibytes; + if_stats->tx_bytes = stats.obytes; + if_stats->rx_errors = stats.ierrors; + if_stats->tx_errors = stats.oerrors; + if_stats->rx_dropped = stats.imissed; + if_stats->multicast = stats.imcasts; + + *data_len = sizeof(struct rtnl_link_stats64); + + return 0; +} + +static int +get_mac(uint8_t port_id, void *data, size_t *data_len) +{ + struct ether_addr addr; + + rte_eth_macaddr_get(port_id, &addr); + memcpy(data, &addr, sizeof(struct ether_addr)); + + *data_len = sizeof(struct ether_addr); + + return 0; +} + +static int +set_mac(uint8_t port_id, void *in_data) +{ + struct ether_addr addr; + + memcpy(&addr, in_data, ETHER_ADDR_LEN); + + return rte_eth_dev_default_mac_addr_set(port_id, &addr); +} + +static int +start_port(uint8_t port_id) +{ + rte_eth_dev_stop(port_id); + return rte_eth_dev_start(port_id); +} + +static int +stop_port(uint8_t port_id) +{ + rte_eth_dev_stop(port_id); + return 0; +} + +static int +set_promisc(uint8_t port_id, void *in_data) +{ + int *promisc = in_data; + + if (*promisc) + rte_eth_promiscuous_enable(port_id); + else + rte_eth_promiscuous_disable(port_id); + + return 0; +} + +static int +set_allmulti(uint8_t port_id, void *in_data) +{ + int *allmulti = in_data; + + if (*allmulti) + rte_eth_allmulticast_enable(port_id); + else + rte_eth_allmulticast_disable(port_id); + + return 0; +} + +int +rte_eth_dev_control_process(uint32_t cmd_id, uint8_t port_id, void *in_data, + void *out_data, size_t *out_data_len) +{ + if (!rte_eth_dev_is_valid_port(port_id)) + return -ENODEV; + + switch (cmd_id) { + case RTE_KCP_REQ_CHANGE_MTU: + return set_mtu(port_id, in_data); + case RTE_KCP_REQ_GET_STATS: + return get_stats(port_id, out_data, out_data_len); + case RTE_KCP_REQ_GET_MAC: + return get_mac(port_id, out_data, out_data_len); + case RTE_KCP_REQ_SET_MAC: + return set_mac(port_id, in_data); + case RTE_KCP_REQ_START_PORT: + return start_port(port_id); + case RTE_KCP_REQ_STOP_PORT: + return stop_port(port_id); + case RTE_KCP_REQ_SET_PROMISC: + return set_promisc(port_id, in_data); + case RTE_KCP_REQ_SET_ALLMULTI: + return set_allmulti(port_id, in_data); + default: + return -EOPNOTSUPP; + } + + return 0; +} diff --git a/lib/librte_ctrl_if/rte_ctrl_ethtool.h b/lib/librte_ctrl_if/rte_ctrl_ethtool.h new file mode 100644 index 0000000..26efb43 --- /dev/null +++ b/lib/librte_ctrl_if/rte_ctrl_ethtool.h @@ -0,0 +1,54 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2016 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 copyright + * 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_CTRL_ETHTOOL_H_ +#define _RTE_CTRL_ETHTOOL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#include + +int rte_eth_dev_ethtool_process(uint32_t cmd_id, uint8_t port_id, void *in_data, + void *out_data, size_t *out_data_len); +int rte_eth_dev_control_process(uint32_t cmd_id, uint8_t port_id, void *in_data, + void *out_data, size_t *out_data_len); + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_CTRL_ETHTOOL_H_ */ diff --git a/lib/librte_ctrl_if/rte_ctrl_if.c b/lib/librte_ctrl_if/rte_ctrl_if.c new file mode 100644 index 0000000..eedfed7 --- /dev/null +++ b/lib/librte_ctrl_if/rte_ctrl_if.c @@ -0,0 +1,395 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2016 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 copyright + * 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. + */ + +#include +#include +#include + +#include +#include +#include +#include + +#include +#include "rte_ctrl_if.h" +#include "rte_nl.h" + +#define NAMESZ 32 +#define IFNAME "dpdk" +#define BUFSZ 1024 + +static int kcp_rtnl_fd = -1; +static uint32_t kcp_fd_ref; + +struct kcp_request { + struct nlmsghdr nlmsg; + uint8_t buf[BUFSZ]; +}; + +static int +conrol_interface_rtnl_init(void) +{ + struct sockaddr_nl src; + int ret; + + kcp_rtnl_fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); + if (kcp_rtnl_fd < 0) { + RTE_LOG(ERR, CTRL_IF, "Socket for create failed\n"); + return -1; + } + + memset(&src, 0, sizeof(struct sockaddr_nl)); + + src.nl_family = AF_NETLINK; + src.nl_pid = getpid(); + + ret = bind(kcp_rtnl_fd, (struct sockaddr *)&src, + sizeof(struct sockaddr_nl)); + if (ret < 0) { + RTE_LOG(ERR, CTRL_IF, "Bind for create failed\n"); + return -1; + } + + return 0; +} + +static int +control_interface_init(void) +{ + int ret; + + ret = conrol_interface_rtnl_init(); + if (ret < 0) { + RTE_LOG(ERR, CTRL_IF, "Failed to initialize rtnetlink\n"); + return -1; + } + + ret = control_interface_nl_init(); + if (ret < 0) { + RTE_LOG(ERR, CTRL_IF, "Failed to initialize netlink\n"); + close(kcp_rtnl_fd); + kcp_rtnl_fd = -1; + } + + return ret; +} + +static int +control_interface_ref_get(void) +{ + int ret = 0; + + if (kcp_fd_ref == 0) + ret = control_interface_init(); + + if (ret == 0) + kcp_fd_ref++; + else + RTE_LOG(ERR, CTRL_IF, + "Failed to initialize control interface\n"); + + return kcp_fd_ref; +} + +static void +control_interface_release(void) +{ + close(kcp_rtnl_fd); + control_interface_nl_release(); +} + +static int +control_interface_ref_put(void) +{ + if (kcp_fd_ref == 0) + return 0; + + kcp_fd_ref--; + + if (kcp_fd_ref == 0) + control_interface_release(); + + return kcp_fd_ref; +} + +static int +add_attr(struct kcp_request *req, uint16_t type, void *buf, size_t len) +{ + struct rtattr *rta; + int nlmsg_len; + + nlmsg_len = NLMSG_ALIGN(req->nlmsg.nlmsg_len); + rta = (struct rtattr *)((char *)&req->nlmsg + nlmsg_len); + if (nlmsg_len + RTA_LENGTH(len) > sizeof(struct kcp_request)) + return -1; + rta->rta_type = type; + rta->rta_len = RTA_LENGTH(len); + memcpy(RTA_DATA(rta), buf, len); + req->nlmsg.nlmsg_len = nlmsg_len + RTA_LENGTH(len); + + return 0; +} + +static struct +rtattr *add_attr_nested(struct kcp_request *req, unsigned short type) +{ + struct rtattr *rta; + uint32_t nlmsg_len; + + nlmsg_len = NLMSG_ALIGN(req->nlmsg.nlmsg_len); + rta = (struct rtattr *)((uint8_t *)&req->nlmsg + nlmsg_len); + if (nlmsg_len + RTA_LENGTH(0) > sizeof(struct kcp_request)) + return NULL; + rta->rta_type = type; + rta->rta_len = nlmsg_len; + req->nlmsg.nlmsg_len = nlmsg_len + RTA_LENGTH(0); + + return rta; +} + +static void +end_attr_nested(struct kcp_request *req, struct rtattr *rta) +{ + rta->rta_len = req->nlmsg.nlmsg_len - rta->rta_len; +} + +static int +rte_eth_rtnl_create(uint8_t port_id) +{ + struct kcp_request req; + struct ifinfomsg *info; + struct rtattr *rta1; + struct rtattr *rta2; + uint32_t pid = getpid(); + char name[NAMESZ]; + char type[NAMESZ]; + struct iovec iov; + struct msghdr msg; + struct sockaddr_nl nladdr; + int ret; + uint8_t buf[BUFSZ]; + + memset(&req, 0, sizeof(struct kcp_request)); + + req.nlmsg.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)); + req.nlmsg.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL; + req.nlmsg.nlmsg_flags |= NLM_F_ACK; + req.nlmsg.nlmsg_type = RTM_NEWLINK; + + info = NLMSG_DATA(&req.nlmsg); + + info->ifi_family = AF_UNSPEC; + info->ifi_index = 0; + + snprintf(name, NAMESZ, IFNAME"%u", port_id); + ret = add_attr(&req, IFLA_IFNAME, name, strlen(name) + 1); + if (ret < 0) + return -1; + + rta1 = add_attr_nested(&req, IFLA_LINKINFO); + if (rta1 == NULL) + return -1; + + snprintf(type, NAMESZ, KCP_DEVICE); + ret = add_attr(&req, IFLA_INFO_KIND, type, strlen(type) + 1); + if (ret < 0) + return -1; + + rta2 = add_attr_nested(&req, IFLA_INFO_DATA); + if (rta2 == NULL) + return -1; + + ret = add_attr(&req, IFLA_KCP_PORTID, &port_id, sizeof(uint8_t)); + if (ret < 0) + return -1; + + ret = add_attr(&req, IFLA_KCP_PID, &pid, sizeof(uint32_t)); + if (ret < 0) + return -1; + + end_attr_nested(&req, rta2); + end_attr_nested(&req, rta1); + + memset(&nladdr, 0, sizeof(nladdr)); + nladdr.nl_family = AF_NETLINK; + + iov.iov_base = (void *)&req.nlmsg; + iov.iov_len = req.nlmsg.nlmsg_len; + + memset(&msg, 0, sizeof(struct msghdr)); + msg.msg_name = &nladdr; + msg.msg_namelen = sizeof(nladdr); + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + + ret = sendmsg(kcp_rtnl_fd, &msg, 0); + if (ret < 0) { + RTE_LOG(ERR, CTRL_IF, "Send for create failed %d.\n", errno); + return -1; + } + + memset(buf, 0, sizeof(buf)); + iov.iov_base = buf; + iov.iov_len = sizeof(buf); + + ret = recvmsg(kcp_rtnl_fd, &msg, 0); + if (ret < 0) { + RTE_LOG(ERR, CTRL_IF, "Recv for create failed\n"); + return -1; + } + + return 0; +} + +static int +rte_eth_control_interface_create_one(uint8_t port_id) +{ + int ret; + + if (control_interface_ref_get() != 0) { + ret = rte_eth_rtnl_create(port_id); + RTE_LOG(DEBUG, CTRL_IF, + "Control interface %s for port:%u\n", + ret < 0 ? "failed" : "created", port_id); + } + + return 0; +} + +int +rte_eth_control_interface_create(void) +{ + uint8_t i; + int ret = 0; + + for (i = 0; i < RTE_MAX_ETHPORTS; i++) { + if (rte_eth_dev_is_valid_port(i)) { + if (rte_eth_devices[i].dev_type == RTE_ETH_DEV_VIRTUAL) + continue; + ret = rte_eth_control_interface_create_one(i); + if (ret < 0) + return ret; + } + } + + return ret; +} + +static int +rte_eth_rtnl_destroy(uint8_t port_id) +{ + struct kcp_request req; + struct ifinfomsg *info; + char name[NAMESZ]; + struct iovec iov; + struct msghdr msg; + struct sockaddr_nl nladdr; + int ret; + + memset(&req, 0, sizeof(struct kcp_request)); + + req.nlmsg.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)); + req.nlmsg.nlmsg_flags = NLM_F_REQUEST; + req.nlmsg.nlmsg_type = RTM_DELLINK; + + info = NLMSG_DATA(&req.nlmsg); + + info->ifi_family = AF_UNSPEC; + info->ifi_index = 0; + + snprintf(name, NAMESZ, IFNAME"%u", port_id); + ret = add_attr(&req, IFLA_IFNAME, name, strlen(name) + 1); + if (ret < 0) + return -1; + + memset(&nladdr, 0, sizeof(nladdr)); + nladdr.nl_family = AF_NETLINK; + + iov.iov_base = (void *)&req.nlmsg; + iov.iov_len = req.nlmsg.nlmsg_len; + + memset(&msg, 0, sizeof(struct msghdr)); + msg.msg_name = &nladdr; + msg.msg_namelen = sizeof(nladdr); + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + + ret = sendmsg(kcp_rtnl_fd, &msg, 0); + if (ret < 0) { + RTE_LOG(ERR, CTRL_IF, "Send for destroy failed\n"); + return -1; + } + return 0; +} + +static int +rte_eth_control_interface_destroy_one(uint8_t port_id) +{ + rte_eth_rtnl_destroy(port_id); + control_interface_ref_put(); + RTE_LOG(DEBUG, CTRL_IF, "Control interface destroyed for port:%u\n", + port_id); + + return 0; +} + +int +rte_eth_control_interface_destroy(void) +{ + uint8_t i; + int ret = 0; + + for (i = 0; i < RTE_MAX_ETHPORTS; i++) { + if (rte_eth_dev_is_valid_port(i)) { + if (rte_eth_devices[i].dev_type == RTE_ETH_DEV_VIRTUAL) + continue; + ret = rte_eth_control_interface_destroy_one(i); + if (ret < 0) + return ret; + } + } + + return ret; +} + +uint8_t +rte_eth_control_interface_msg_exist(uint32_t timeout_sec) +{ + return control_interface_msg_exist(timeout_sec); +} + +int +rte_eth_control_interface_msg_process(uint32_t flag) +{ + return control_interface_msg_process(flag); +} diff --git a/lib/librte_ctrl_if/rte_ctrl_if.h b/lib/librte_ctrl_if/rte_ctrl_if.h new file mode 100644 index 0000000..22b0386 --- /dev/null +++ b/lib/librte_ctrl_if/rte_ctrl_if.h @@ -0,0 +1,129 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2016 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 copyright + * 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_CTRL_IF_H_ +#define _RTE_CTRL_IF_H_ + +/** + * @file + * + * Control Interface Library for RTE + */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/** + * Flags values for rte_eth_control_interface_process_msg() API + */ +enum control_interface_process_flag { + /**< Process if msg available. */ + RTE_ETHTOOL_CTRL_IF_PROCESS_MSG, + + /**< Discard msg if available, respond with a error value. */ + RTE_ETHTOOL_CTRL_IF_DISCARD_MSG, +}; + +/** + * Creates control interfaces (Linux virtual network interface)for + * each existing eal port. + * + * This API opens device created by supportive kernel module and initializes + * kernel communication interface. + * + * If supportive kernel module is not inserted this API will return + * an error. + * + * @return + * 0 on success. + * Negative value on error. + */ +int rte_eth_control_interface_create(void); + +/** + * Destroys control interfaces. + * + * This API close device created by supportive kernel module and release + * underlying communication interface. + * + * @return + * 0 on success. + * Negative value on error. + */ +int rte_eth_control_interface_destroy(void); + +/** + * Check if any msg exist to process. + * + * This function can be blocking or unblocking according timeout_sec + * parameter value. If function will be continuous loop, like can be + * called by any forwarding lcore, nonblocking mode should be preferred. + * If a separate thread created to handle control messages, blocking + * mode can be preferred to save CPU cycles. + * + * When this function sends a valid port_id, application must call + * msg_process() afterwards, to accept new commands. + * + * @param timeout_sec + * if 0, function is in nonblocking mode. + * if > 0, blocks for given time, if there is no message available, + * sleeps again same amount of time. Value is in seconds. + * + * @return + * port_id the msg for on success. -1 if no msg waiting. + */ +uint8_t rte_eth_control_interface_msg_exist(uint32_t timeout_sec); + +/** + * Process if any received message is available. + * + * If message exists this function will create a local copy of it and + * process or discard the message according flag. + * + * @param flag + * Defines what to do with message, can be process or discard. + * + * @return + * 0 on success. + * Negative value on error. + */ +int rte_eth_control_interface_msg_process(uint32_t flag); + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_CTRL_IF_H_ */ diff --git a/lib/librte_ctrl_if/rte_ctrl_if_version.map b/lib/librte_ctrl_if/rte_ctrl_if_version.map new file mode 100644 index 0000000..c3a91ab --- /dev/null +++ b/lib/librte_ctrl_if/rte_ctrl_if_version.map @@ -0,0 +1,10 @@ +DPDK_16.04 { + global: + + rte_eth_control_interface_create; + rte_eth_control_interface_destroy; + rte_eth_control_interface_msg_exist; + rte_eth_control_interface_msg_process; + + local: *; +}; diff --git a/lib/librte_ctrl_if/rte_nl.c b/lib/librte_ctrl_if/rte_nl.c new file mode 100644 index 0000000..b883d0f --- /dev/null +++ b/lib/librte_ctrl_if/rte_nl.c @@ -0,0 +1,313 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2016 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 copyright + * 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. + */ + +#include + +#include +#include + +#include +#include +#include "rte_ctrl_ethtool.h" +#include "rte_nl.h" +#include "rte_ctrl_if.h" + +#define MAX_PAYLOAD sizeof(struct kcp_ethtool_msg) + +struct ctrl_if_nl { + union { + struct nlmsghdr nlh; + uint8_t nlmsg[NLMSG_SPACE(MAX_PAYLOAD)]; + }; + struct msghdr msg; + struct iovec iov; + struct sockaddr_nl dest_addr; +}; + +struct ctrl_if_msg_sync { + size_t kcp_ethtool_msg_count; + struct kcp_ethtool_msg msg_storage; + pthread_cond_t cond; + pthread_mutex_t msg_lock; + uint32_t pending_process; +}; + +static int sock_fd = -1; +static pthread_t thread_id; + +static struct ctrl_if_nl nl_s; +static struct ctrl_if_nl nl_r; + +static struct ctrl_if_msg_sync ctrl_if_sync = { + .cond = PTHREAD_COND_INITIALIZER, + .msg_lock = PTHREAD_MUTEX_INITIALIZER, +}; + +static int +nl_send(void *buf, size_t len) +{ + int ret; + + if (nl_s.nlh.nlmsg_len < len) { + RTE_LOG(ERR, CTRL_IF, "Message is too big, len:%zu\n", len); + return -1; + } + + if (!NLMSG_OK(&nl_s.nlh, NLMSG_SPACE(MAX_PAYLOAD))) { + RTE_LOG(ERR, CTRL_IF, "Message is not OK\n"); + return -1; + } + + /* Fill in the netlink message payload */ + memcpy(NLMSG_DATA(nl_s.nlmsg), buf, len); + + ret = sendmsg(sock_fd, &nl_s.msg, 0); + + if (ret < 0) + RTE_LOG(ERR, CTRL_IF, "Failed nl msg send. ret:%d, err:%d\n", + ret, errno); + return ret; +} + +static int +nl_ethtool_msg_send(struct kcp_ethtool_msg *msg) +{ + return nl_send((void *)msg, sizeof(struct kcp_ethtool_msg)); +} + +static void +process_msg(struct kcp_ethtool_msg *msg) +{ + if (msg->cmd_id > RTE_KCP_REQ_UNKNOWN) { + msg->err = rte_eth_dev_control_process(msg->cmd_id, + msg->port_id, msg->input_buffer, + msg->output_buffer, &msg->output_buffer_len); + } else { + msg->err = rte_eth_dev_ethtool_process(msg->cmd_id, + msg->port_id, msg->input_buffer, + msg->output_buffer, &msg->output_buffer_len); + } + + if (msg->err) + memset(msg->output_buffer, 0, msg->output_buffer_len); + + nl_ethtool_msg_send(msg); +} + + +uint8_t +control_interface_msg_exist(uint32_t timeout_sec) +{ + struct timespec ts; + uint8_t port_id; + int ret = 0; + + if (timeout_sec) { + clock_gettime(CLOCK_REALTIME, &ts); + ts.tv_sec += timeout_sec; + } + + pthread_mutex_lock(&ctrl_if_sync.msg_lock); + while (timeout_sec && !ctrl_if_sync.kcp_ethtool_msg_count && !ret) + ret = pthread_cond_timedwait(&ctrl_if_sync.cond, + &ctrl_if_sync.msg_lock, &ts); + + if (ctrl_if_sync.kcp_ethtool_msg_count == 0) { + pthread_mutex_unlock(&ctrl_if_sync.msg_lock); + return -1; + } + + ctrl_if_sync.pending_process = 1; + + port_id = ctrl_if_sync.msg_storage.port_id; + pthread_mutex_unlock(&ctrl_if_sync.msg_lock); + + return port_id; +} + +int +control_interface_msg_process(uint32_t flag) +{ + struct kcp_ethtool_msg msg_storage; + int ret = 0; + + pthread_mutex_lock(&ctrl_if_sync.msg_lock); + if (ctrl_if_sync.kcp_ethtool_msg_count == 0) { + pthread_mutex_unlock(&ctrl_if_sync.msg_lock); + return 0; + } + + memcpy(&msg_storage, &ctrl_if_sync.msg_storage, + sizeof(struct kcp_ethtool_msg)); + ctrl_if_sync.pending_process = 0; + ctrl_if_sync.kcp_ethtool_msg_count = 0; + pthread_mutex_unlock(&ctrl_if_sync.msg_lock); + + switch (flag) { + case RTE_ETHTOOL_CTRL_IF_PROCESS_MSG: + process_msg(&msg_storage); + break; + + case RTE_ETHTOOL_CTRL_IF_DISCARD_MSG: + msg_storage.err = -1; + nl_ethtool_msg_send(&msg_storage); + break; + + default: + ret = -1; + break; + } + + return ret; +} + +static int +msg_add_and_signal(struct nlmsghdr *nlh) +{ + pthread_mutex_lock(&ctrl_if_sync.msg_lock); + + if (ctrl_if_sync.pending_process) { + pthread_mutex_unlock(&ctrl_if_sync.msg_lock); + return -1; + } + + memcpy(&ctrl_if_sync.msg_storage, NLMSG_DATA(nlh), + sizeof(struct kcp_ethtool_msg)); + ctrl_if_sync.kcp_ethtool_msg_count = 1; + ctrl_if_sync.msg_storage.flag = KCP_MSG_FLAG_RESPONSE; + + pthread_cond_signal(&ctrl_if_sync.cond); + + pthread_mutex_unlock(&ctrl_if_sync.msg_lock); + + return 0; +} + +static void * +nl_recv(void *arg) +{ + int ret; + + for (;;) { + ret = recvmsg(sock_fd, &nl_r.msg, 0); + if (ret < 0) + continue; + + if ((unsigned)ret < sizeof(struct kcp_ethtool_msg)) { + RTE_LOG(WARNING, CTRL_IF, + "Received %u bytes, payload %lu\n", + ret, sizeof(struct kcp_ethtool_msg)); + continue; + } + + msg_add_and_signal(&nl_r.nlh); + } + + return arg; +} + +static void +nl_setup_header(struct ctrl_if_nl *nl) +{ + nl->dest_addr.nl_family = AF_NETLINK; + nl->dest_addr.nl_pid = 0; /* For Linux Kernel */ + nl->dest_addr.nl_groups = 0; + + memset(nl->nlmsg, 0, NLMSG_SPACE(MAX_PAYLOAD)); + + /* Fill the netlink message header */ + nl->nlh.nlmsg_len = NLMSG_LENGTH(MAX_PAYLOAD); + nl->nlh.nlmsg_pid = getpid(); /* self pid */ + nl->nlh.nlmsg_flags = 0; + + nl->iov.iov_base = (void *)nl->nlmsg; + nl->iov.iov_len = nl->nlh.nlmsg_len; + memset(&nl->msg, 0, sizeof(struct msghdr)); + nl->msg.msg_name = (void *)&nl->dest_addr; + nl->msg.msg_namelen = sizeof(struct sockaddr_nl); + nl->msg.msg_iov = &nl->iov; + nl->msg.msg_iovlen = 1; +} + +static int +nl_socket_init(void) +{ + struct sockaddr_nl src_addr; + int fd; + int ret; + + fd = socket(PF_NETLINK, SOCK_RAW, KCP_NL_GRP); + if (fd < 0) + return -1; + + src_addr.nl_family = AF_NETLINK; + src_addr.nl_pid = getpid(); + ret = bind(fd, (struct sockaddr *)&src_addr, sizeof(src_addr)); + if (ret) { + close(fd); + return -1; + } + + nl_setup_header(&nl_s); + nl_setup_header(&nl_r); + + return fd; +} + +int +control_interface_nl_init(void) +{ + int ret; + + sock_fd = nl_socket_init(); + if (sock_fd < 0) { + RTE_LOG(ERR, CTRL_IF, "Failed to initialize netlink socket\n"); + return -1; + } + + ret = pthread_create(&thread_id, NULL, nl_recv, NULL); + if (ret != 0) { + RTE_LOG(ERR, CTRL_IF, "Failed to create receive thread\n"); + return -1; + } + + return 0; +} + +void +control_interface_nl_release(void) +{ + pthread_cancel(thread_id); + pthread_join(thread_id, NULL); + close(sock_fd); +} diff --git a/lib/librte_ctrl_if/rte_nl.h b/lib/librte_ctrl_if/rte_nl.h new file mode 100644 index 0000000..19daadc --- /dev/null +++ b/lib/librte_ctrl_if/rte_nl.h @@ -0,0 +1,50 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2016 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 copyright + * 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_NL_H_ +#define _RTE_NL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +int control_interface_nl_init(void); +void control_interface_nl_release(void); +uint8_t control_interface_msg_exist(uint32_t timeout_sec); +int control_interface_msg_process(uint32_t flag); + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_NL_H_ */ diff --git a/lib/librte_eal/common/include/rte_log.h b/lib/librte_eal/common/include/rte_log.h index 2e47e7f..a0a2c9f 100644 --- a/lib/librte_eal/common/include/rte_log.h +++ b/lib/librte_eal/common/include/rte_log.h @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -79,6 +79,7 @@ extern struct rte_logs rte_logs; #define RTE_LOGTYPE_PIPELINE 0x00008000 /**< Log related to pipeline. */ #define RTE_LOGTYPE_MBUF 0x00010000 /**< Log related to mbuf. */ #define RTE_LOGTYPE_CRYPTODEV 0x00020000 /**< Log related to cryptodev. */ +#define RTE_LOGTYPE_CTRL_IF 0x00040000 /**< Log related to control interface. */ /* these log types can be used in an application */ #define RTE_LOGTYPE_USER1 0x01000000 /**< User-defined log type 1. */ diff --git a/mk/rte.app.mk b/mk/rte.app.mk index d94da7a..7d34e2e 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright(c) 2010-2015 Intel Corporation. All rights reserved. +# Copyright(c) 2010-2016 Intel Corporation. All rights reserved. # Copyright(c) 2014-2015 6WIND S.A. # All rights reserved. # @@ -114,6 +114,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_MBUF_OFFLOAD) += -lrte_mbuf_offload _LDLIBS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += -lrte_ip_frag _LDLIBS-$(CONFIG_RTE_LIBRTE_ETHER) += -lethdev _LDLIBS-$(CONFIG_RTE_LIBRTE_ETHTOOL) += -lrte_ethtool +_LDLIBS-$(CONFIG_RTE_LIBRTE_CTRL_IF) += -lrte_ctrl_if _LDLIBS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += -lrte_cryptodev _LDLIBS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += -lrte_mempool _LDLIBS-$(CONFIG_RTE_LIBRTE_RING) += -lrte_ring