From patchwork Wed Apr 18 11:24: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: 38411 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 81E038E59; Wed, 18 Apr 2018 13:24:08 +0200 (CEST) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by dpdk.org (Postfix) with ESMTP id DEA445F6E for ; Wed, 18 Apr 2018 13:24:03 +0200 (CEST) Received: by mail-wr0-f193.google.com with SMTP id q6-v6so3801835wrd.6 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=uUT4PKnVuAPlWpeCYLtes0l9UB/NRnIwEOJ/H+j+F6Q=; b=AsutZ4jrLcHaUve0gu5wQKNXPwHBYUJKwDNSUDIhZWSuavPhMayy2T9HRS3UVZf0xr /36MfIKwaHW4vMX1+7TfAJOtGNiXFyfZA/hJzwJhYJsizzEBDqzi9ZVl0uXMpiLEHBHr ccJ8r0k5AyxBpoYfYK1hW8Q8nW/qU+RVOUMoT/kTlwAI3/Sr45BxCU9/tUCPQI5VEPUh MkzrED78jJbMtfzjdRm2NGTWUmoJ098pVBcdIfZPVaUvk0St296msGuc0t7Fk2GupC9H TpEwh5YZPn3iZOQLckJdCEGlHNuTjojdaXymoubbdaeiDFPfpM4lefTc6eNepYI0DlC1 1hMA== 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=uUT4PKnVuAPlWpeCYLtes0l9UB/NRnIwEOJ/H+j+F6Q=; b=ti8I09VeHWM6ybDSBMcCXPNQBOQMWHHCjZSP7Md/EL+Lrzt/1dkDPURzrjUamaS+CB MSY+sixWuU+H2vlVIKFFa2w2CfzRhYzOtrR0tTV/4RX5/qDZh3ttaxd8/KV5xvrAnKYV D7yTRybl952UqzFJhfDU0S+GztRJQeGZ09Hnv18wXooXv62spNj2QCLO0dO3IsP+nFTE KHQu2j3bRfYqsDPO/rvuxjaYXuTjmKCNHqLKlcaRUUtSUCpMjHqZVgQj74J1Nlxl61RA G/T5FX8d9e60kvdGyk6+i2Xh+WjXFvST4qspOkrWano+8qIZ8l0L4cNpU4u2LOCRe4jK fQTA== X-Gm-Message-State: ALQs6tBR9g0ITf5XdRyx8PDjbYDVydyfjDL2q23Ph+kBTvviuBt6Jx9k Oq1GSk7YKq6VSDuooHnZjsb5FiWtpw== X-Google-Smtp-Source: AIpwx48SgYQrkMG6wqdxzGaHiJltdvN8jIRgwLhMJiDD50Ur1aDTQpPE9fZ2U9BzfYk5/GDa5w6OCQ== X-Received: by 2002:adf:988a:: with SMTP id w10-v6mr1427820wrb.34.1524050643468; Wed, 18 Apr 2018 04:24:03 -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:27 +0200 Message-Id: X-Mailer: git-send-email 2.17.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH 2/2] net/mlx5: implement multicast add list devop 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" Signed-off-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5.c | 2 ++ drivers/net/mlx5/mlx5.h | 2 ++ drivers/net/mlx5/mlx5_defs.h | 5 +++- drivers/net/mlx5/mlx5_mac.c | 52 ++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 68783c3ac..887924d07 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -277,6 +277,7 @@ const struct eth_dev_ops mlx5_dev_ops = { .mac_addr_remove = mlx5_mac_addr_remove, .mac_addr_add = mlx5_mac_addr_add, .mac_addr_set = mlx5_mac_addr_set, + .set_mc_addr_list = mlx5_set_mc_addr_list, .mtu_set = mlx5_dev_set_mtu, .vlan_strip_queue_set = mlx5_vlan_strip_queue_set, .vlan_offload_set = mlx5_vlan_offload_set, @@ -329,6 +330,7 @@ const struct eth_dev_ops mlx5_dev_ops_isolate = { .mac_addr_remove = mlx5_mac_addr_remove, .mac_addr_add = mlx5_mac_addr_add, .mac_addr_set = mlx5_mac_addr_set, + .set_mc_addr_list = mlx5_set_mc_addr_list, .mtu_set = mlx5_dev_set_mtu, .vlan_strip_queue_set = mlx5_vlan_strip_queue_set, .vlan_offload_set = mlx5_vlan_offload_set, diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 6ad41390a..64f025d22 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -203,6 +203,8 @@ void mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index); int mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac, uint32_t index, uint32_t vmdq); int mlx5_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr); +int mlx5_set_mc_addr_list(struct rte_eth_dev *dev, + struct ether_addr *mc_addr_set, uint32_t nb_mc_addr); /* mlx5_rss.c */ diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index e3aa03bef..5973742a7 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -15,8 +15,11 @@ /* Maximum number of simultaneous unicast MAC addresses. */ #define MLX5_MAX_UC_MAC_ADDRESSES 128 +/* Maximum number of simultaneous Multicast MAC addresses. */ +#define MLX5_MAX_MC_MAC_ADDRESSES 128 /* Maximum number of simultaneous MAC addresses. */ -#define MLX5_MAX_MAC_ADDRESSES MLX5_MAX_UC_MAC_ADDRESSES +#define MLX5_MAX_MAC_ADDRESSES \ + (MLX5_MAX_UC_MAC_ADDRESSES + MLX5_MAX_MC_MAC_ADDRESSES) /* Maximum number of simultaneous VLAN filters. */ #define MLX5_MAX_VLAN_IDS 128 diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c index 9470520b1..deeed9598 100644 --- a/drivers/net/mlx5/mlx5_mac.c +++ b/drivers/net/mlx5/mlx5_mac.c @@ -209,3 +209,55 @@ mlx5_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr) dev->data->port_id); return mlx5_mac_addr_add(dev, mac_addr, 0, 0); } + +/** + * DPDK callback to set Multicast Addresses list. + * + * @param dev + * Pointer to Ethernet device structure. + * @param mac_addr_set + * Multicast MAC address pointer array. + * @param nb_mac_addr + * Number of entries in the array. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + */ +int +mlx5_set_mc_addr_list(struct rte_eth_dev *dev, + struct ether_addr *mc_addr_set, uint32_t nb_mc_addr) +{ + uint32_t i; + int ret; + int idx; + + for (i = MLX5_MAX_UC_MAC_ADDRESSES; + i != MLX5_MAX_UC_MAC_ADDRESSES + MLX5_MAX_MC_MAC_ADDRESSES; + ++i) + if (!is_zero_ether_addr(&dev->data->mac_addrs[i])) { + ret = mlx5_internal_mac_addr_remove(dev, i); + if (ret < 0) + return ret; + } + for (idx = MLX5_MAX_UC_MAC_ADDRESSES, i = 0; + i != nb_mc_addr; + ++i) { + if (!is_multicast_ether_addr(mc_addr_set)) { + rte_errno = EINVAL; + goto rollback; + } + ret = mlx5_internal_mac_addr_add(dev, mc_addr_set++, idx++); + if (ret < 0) + return ret; + } + if (!dev->data->promiscuous) + return mlx5_traffic_restart(dev); + return 0; +rollback: + ret = rte_errno; /* Save rte_errno before cleanup. */ + for (i = MLX5_MAX_UC_MAC_ADDRESSES; i != MLX5_MAX_MC_MAC_ADDRESSES; ++i) + if (!is_zero_ether_addr(&dev->data->mac_addrs[i])) + mlx5_internal_mac_addr_remove(dev, i); + rte_errno = ret; /* Restore rte_errno. */ + return -rte_errno; +}