From patchwork Wed Apr 18 11:24:26 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: 38410 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 E8A8F7CDB; Wed, 18 Apr 2018 13:24:05 +0200 (CEST) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 32D4F5F6E for ; Wed, 18 Apr 2018 13:24:03 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id f14-v6so3800598wre.4 for ; Wed, 18 Apr 2018 04:24:03 -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=ffAX+wHVbzn0p2p3/FprgURnhCB3ugNK+D+8hy2KGNU=; b=bwimMfWoMlTCauizKP9qJYHMOo/4ufvCzzMrez34TKQfXa146h1LCJ8seaEJv4KFuI pPwbfmLU3a1GdDBtGno+bDDlG3QI1EiXpTYqc1Q0EZbWYCvKTJvm9IGHhdnudtJ5yt2K nLg/7XiiIvkYnH1S/2SwsjiQelIrUwRwl6NErPUoLw56Bl/CQIvfME09saX1oRCWfCwn HeCaxRBCdumui3rFWx3Sa9rJwpJNis+nBJVMrqswFh1BClKb+Ezg4FOy9y3ZPNlIr2Ah VfYxfKjTghW6FZlNGMPZuWzZzX6uVuQ7IytvqmbR612c0wbdGGgSeadrDbTn1fy4kiDD MOeg== 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=ffAX+wHVbzn0p2p3/FprgURnhCB3ugNK+D+8hy2KGNU=; b=pt0qcwe8IK8pFU4Ur7rV+Nngd3M9LGwVBfTUNiXhJL8oZ+fxak2K/UAfaacA66LnMS OcQWaHpBP4+BA/rGF6L8zyDW5aMW9C4oF4P0UXz926uQEgKmeqg4m7YbPU8C0DJ9cPgv oj8p23LZXJzKrsS7GWX00dQbvdSEc04AOT9pZHA9LT0wJr+lSuz6Pgk9MAfkdP0FgB3g nPoR+QzvVNVtzRk/PT5CQVQQgJQR2xtaOEz3eHuYuQwaVFJgcxSEe6+lKLaotrmVc7A/ wmhn9fmVglXmMDQF3iRRaBqpdHt8ii/2t++t9ivJiq8pDAa+MqVgfP2+u322X86iInVF I6mQ== X-Gm-Message-State: ALQs6tCSRgAC2XYA/JcSJX5Lo0wSjQOTNizsue0Er5qTahhZY+Buw6v4 9y/HlE/9i/SG5+SelBKUYbpeDJ0NlQ== X-Google-Smtp-Source: AIpwx48KE1miemNhZjrBdX1D7L9sWsBZKWNR9fxEtoo8sMhQ1j3ADsI5OgBulrB87phfOgYP8kPDPw== X-Received: by 2002:adf:c644:: with SMTP id u4-v6mr1373515wrg.186.1524050642684; Wed, 18 Apr 2018 04:24:02 -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 u13-v6sm899723wrg.9.2018.04.18.04.24.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 04:24:02 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org, Yongseok Koh Cc: Adrien Mazarguil Date: Wed, 18 Apr 2018 13:24:26 +0200 Message-Id: X-Mailer: git-send-email 2.17.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH 1/2] 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 | 92 ++++++++++++++++++++++++++++------ 3 files changed, 80 insertions(+), 18 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 edc7a32ae..9470520b1 100644 --- a/drivers/net/mlx5/mlx5_mac.c +++ b/drivers/net/mlx5/mlx5_mac.c @@ -57,35 +57,32 @@ 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. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. */ -void -mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) +static int +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; assert(index < MLX5_MAX_MAC_ADDRESSES); 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)); - } + return 0; } /** - * DPDK callback to add a MAC address. + * Adds a MAC address to the internal array. * * @param dev * Pointer to Ethernet device structure. @@ -93,15 +90,13 @@ 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; @@ -126,6 +121,71 @@ 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) { + rte_errno = ENOMEM; + DRV_LOG(ERR, + "port %u not enough room to add the MAC address: %s", + dev->data->port_id, strerror(rte_errno)); + return; + } + ret = mlx5_internal_mac_addr_remove(dev, index); + if (ret < 0) { + DRV_LOG(ERR, + "port %u failed to remove the MAC address: %s", + dev->data->port_id, strerror(rte_errno)); + } + 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 = ENOMEM; + 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;