From patchwork Mon Apr 23 11:09:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 38687 X-Patchwork-Delegate: shahafs@mellanox.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 42FCC2C02; Mon, 23 Apr 2018 13:08:58 +0200 (CEST) Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id EE53E2583 for ; Mon, 23 Apr 2018 13:08:48 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id q3-v6so30069583wrj.6 for ; Mon, 23 Apr 2018 04:08:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=GNBOOvAHGQ6Car58SE8tZarnDOKcAhNTYi745s30DVY=; b=tKkz9U1TrzojG/9Cl/NWQDw0t0N0WA6pIAIYSPUrOepgJVKjKgyMCMF8O/xrRsKO8R Z4hiwk4fzVMEyXqjsm577D1zb2Iu9UtO+zu2VTZNR+agenTVvgzkc/aUFGf6OCq9kR7p zQASDH679/ZP75ZKcuohniAKpKn7bG7zXj0bVk8EFR4w1dU4KzekNjmhIiOCKET3Qb6j 6Aq+eyJ401xnYQK17n066E65319tkpgm9T1Lek9FtG8DtOMLLbLowBsSxhd9B6bdc5KK zkpJksXBzFg8wMWGVVLWWFEDqJAIS9/ZRkO/K2LRY/v459+lzSpkF1goXwxzjxrzWuVy dE2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=GNBOOvAHGQ6Car58SE8tZarnDOKcAhNTYi745s30DVY=; b=gSzzWKKgXCx/evFOeOjJe2FaFbUXGak2Hhp8SukMg6XyHcjcJ3wtkDueZ4T3xRczdC q++iv0J0YDQ1Y6Q6+j2CQKaRbv8bDbXg6JCGeaqc3vfFNnstDaJ1ZksyvQ+RCXXmocgU J//zWfKYxnk4uygcgZf1Qh6W/AiCrsP0CQbm4LvZnA5JlhWs22L8u2KkjKR5+GHNM+rM s1+4deSAcOvhWmKWVF2DYxog3ODmyW/mYBaru5lZE62BQwC8hwARidQO5IV3SOKNhgFp XNhoafMVYI8FbjQ/8M8z1XFW9gDbyIngyP270+GlVPTgSDbAai2LW0M4esQ7owRxjiNT yPNQ== X-Gm-Message-State: ALQs6tB/AFoGQAdtWJ6VQXsNpeQaxoZBoo9yK0aJdkKSdxFFZ7Gyk2CY P2FaqIqHKn80zLQG/4AswyjpoIt6aQ== X-Google-Smtp-Source: AIpwx48cg7s7uskE8jc67OglBBWFc+x7inlJdHI248xvFNmXI/GMMd1i1/YypdyD3+uP5B8CiTTrHw== X-Received: by 2002:adf:b2f4:: with SMTP id g107-v6mr16961812wrd.205.1524481727762; Mon, 23 Apr 2018 04:08:47 -0700 (PDT) Received: from laranjeiro-vm.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id n49-v6sm18642512wrn.50.2018.04.23.04.08.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 04:08:47 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org, Yongseok Koh Cc: Adrien Mazarguil Date: Mon, 23 Apr 2018 13:09:27 +0200 Message-Id: <6e7917509648466661a6a96147154fc384591971.1524477133.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v3 2/3] net/mlx5: split MAC address add/remove code 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Move some code in DPDK callbacks to add/remove MAC addresses to internal function. This modification will be necessary to handle implement the devop set_mc_addr_list. Signed-off-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5_defs.h | 4 +- drivers/net/mlx5/mlx5_ethdev.c | 2 +- drivers/net/mlx5/mlx5_mac.c | 86 +++++++++++++++++++++++++--------- 3 files changed, 68 insertions(+), 24 deletions(-) diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index 3fb2f1480..e3aa03bef 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -13,8 +13,10 @@ /* Reported driver name. */ #define MLX5_DRIVER_NAME "net_mlx5" +/* Maximum number of simultaneous unicast MAC addresses. */ +#define MLX5_MAX_UC_MAC_ADDRESSES 128 /* Maximum number of simultaneous MAC addresses. */ -#define MLX5_MAX_MAC_ADDRESSES 128 +#define MLX5_MAX_MAC_ADDRESSES MLX5_MAX_UC_MAC_ADDRESSES /* Maximum number of simultaneous VLAN filters. */ #define MLX5_MAX_VLAN_IDS 128 diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index ef44cc91f..99ac4cc5c 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -446,7 +446,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) max = 65535; info->max_rx_queues = max; info->max_tx_queues = max; - info->max_mac_addrs = RTE_DIM(priv->mac); + info->max_mac_addrs = MLX5_MAX_UC_MAC_ADDRESSES; info->rx_queue_offload_capa = mlx5_get_rx_queue_offloads(dev); info->rx_offload_capa = (mlx5_get_rx_port_offloads() | info->rx_queue_offload_capa); diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c index f24b5f759..e9334ea4a 100644 --- a/drivers/net/mlx5/mlx5_mac.c +++ b/drivers/net/mlx5/mlx5_mac.c @@ -57,38 +57,30 @@ mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[ETHER_ADDR_LEN]) } /** - * DPDK callback to remove a MAC address. + * Remove a MAC address from the internal array. * * @param dev * Pointer to Ethernet device structure. * @param index * MAC address index. */ -void -mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) +static void +mlx5_internal_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) { struct priv *priv = dev->data->dev_private; const int vf = priv->config.vf; - int ret; - if (index >= MLX5_MAX_MAC_ADDRESSES) - return; + assert(index < MLX5_MAX_MAC_ADDRESSES); if (is_zero_ether_addr(&dev->data->mac_addrs[index])) return; if (vf) mlx5_nl_mac_addr_remove(dev, &dev->data->mac_addrs[index], index); memset(&dev->data->mac_addrs[index], 0, sizeof(struct ether_addr)); - if (!dev->data->promiscuous) { - ret = mlx5_traffic_restart(dev); - if (ret) - DRV_LOG(ERR, "port %u cannot restart traffic: %s", - dev->data->port_id, strerror(rte_errno)); - } } /** - * DPDK callback to add a MAC address. + * Adds a MAC address to the internal array. * * @param dev * Pointer to Ethernet device structure. @@ -96,24 +88,19 @@ mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) * MAC address to register. * @param index * MAC address index. - * @param vmdq - * VMDq pool index to associate address with (ignored). * * @return * 0 on success, a negative errno value otherwise and rte_errno is set. */ -int -mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac, - uint32_t index, uint32_t vmdq __rte_unused) +static int +mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac, + uint32_t index) { struct priv *priv = dev->data->dev_private; const int vf = priv->config.vf; unsigned int i; - if (index >= MLX5_MAX_MAC_ADDRESSES) { - rte_errno = EINVAL; - return -rte_errno; - } + assert(index < MLX5_MAX_MAC_ADDRESSES); if (is_zero_ether_addr(mac)) { rte_errno = EINVAL; return -rte_errno; @@ -136,6 +123,61 @@ mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac, return ret; } dev->data->mac_addrs[index] = *mac; + return 0; +} + +/** + * DPDK callback to remove a MAC address. + * + * @param dev + * Pointer to Ethernet device structure. + * @param index + * MAC address index. + */ +void +mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) +{ + int ret; + + if (index >= MLX5_MAX_UC_MAC_ADDRESSES) + return; + mlx5_internal_mac_addr_remove(dev, index); + if (!dev->data->promiscuous) { + ret = mlx5_traffic_restart(dev); + if (ret) + DRV_LOG(ERR, "port %u cannot restart traffic: %s", + dev->data->port_id, strerror(rte_errno)); + } +} + +/** + * DPDK callback to add a MAC address. + * + * @param dev + * Pointer to Ethernet device structure. + * @param mac_addr + * MAC address to register. + * @param index + * MAC address index. + * @param vmdq + * VMDq pool index to associate address with (ignored). + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + */ +int +mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac, + uint32_t index, uint32_t vmdq __rte_unused) +{ + int ret; + + if (index >= MLX5_MAX_UC_MAC_ADDRESSES) { + rte_errno = EINVAL; + return -rte_errno; + } + ret = mlx5_internal_mac_addr_add(dev, mac, index); + if (ret < 0) + return ret; if (!dev->data->promiscuous) return mlx5_traffic_restart(dev); return 0;