From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <nelio.laranjeiro@6wind.com>
Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com
[209.85.128.170]) by dpdk.org (Postfix) with ESMTP id 1B7BE1B209
for <dev@dpdk.org>; Thu, 5 Oct 2017 14:50:40 +0200 (CEST)
Received: by mail-wr0-f170.google.com with SMTP id o44so8967396wrf.11
for <dev@dpdk.org>; Thu, 05 Oct 2017 05:50:40 -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=2sP2OQGDaq+rB+QKBgOun7198O8n6SaD4Frqlk9r6JQ=;
b=vl8ctBq0NuDoMIUSB+e1ZP3PmRdcomrljim8wOIIX8Qa7vgZxqE9E7+DW64D2ozPJL
JBdR/a1K4nbujDB8yOIaW3aW0wRhY0uVbz57T9EVjnENnuMRq/71Tium3kDUzWWI0qyi
/ag2G6wW7pbS7JNk2s/K9fzhMAcW1AGSzE9XtG2ZOjFG2o6OdZ4AlxUn91rUh9iYEPBj
talHnuT+ggvh97rz4qeTHkvO3iny8EymoBxVnx81tIidB/XUFlkCIaTsUAq0VjcSh00j
xqzT38StgjaLcB5fcYRoEykrBQsX8avl8YxS9ZHMJC6oMi4GiPKiev6sxct5zSEjIYL5
Lpjg==
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=2sP2OQGDaq+rB+QKBgOun7198O8n6SaD4Frqlk9r6JQ=;
b=RxpXA/Fw5TA/NuIFG3Jgb5NLSXuDK/O5Noh8wC+ZL820LSoYLyjsc6WgZRGfy2AbvG
el05aFmQkQHMsM4sPIaASw4LPPtwTfU7H1C9ndqFTQ6iEzzVlCEge/MwUYlUufNg3KTx
9DA8JeozBN2ZJxWuc5yoovSdK10UG5uMefl2MJ+JmsJ7AKviL0qGGclzsne4x2+46WeK
Sk3uE4QQ7PphXaX/ovvSE2USUEgRgV6pKhfEklqOnJh5ynZOFADHRBv6u8Wjc9QBwxQb
x/GofYxz9tL8SVCtoK8ZmFAG1S7bIiOFN2qqk+F9GE7vXiacVC0tPzAsfed0VEHJxuXs
ltWQ==
X-Gm-Message-State: AHPjjUiWjK+tWG/UEjHAiCRFc1s5Z69vpCwHCvy4y2gSFz16VkCFzrKH
o0d1YXD7B/hQhXA2T0xo6AJsGRNGpQ==
X-Google-Smtp-Source: AOwi7QBd0P89xye5e1nLIuKNUXC9deefy3UBZKttGW3Nw2LacvpX10G/5djuuTQLdQZpF0RW7UkZ2A==
X-Received: by 10.223.159.11 with SMTP id l11mr23878714wrf.148.1507207840283;
Thu, 05 Oct 2017 05:50:40 -0700 (PDT)
Received: from ping.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com.
[62.23.145.78])
by smtp.gmail.com with ESMTPSA id k9sm26405823wrk.27.2017.10.05.05.50.39
(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Thu, 05 Oct 2017 05:50:39 -0700 (PDT)
From: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
To: dev@dpdk.org
Cc: adrien.mazarguil@6wind.com,
yskoh@mellanox.com,
ferruh.yigit@intel.com
Date: Thu, 5 Oct 2017 14:49:50 +0200
Message-Id: <ec07f7fc65492976ab86abc57db96bef2e6d37b9.1507207731.git.nelio.laranjeiro@6wind.com>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <cover.1507205686.git.nelio.laranjeiro@6wind.com>
References: <cover.1507205686.git.nelio.laranjeiro@6wind.com>
In-Reply-To: <cover.1507207731.git.nelio.laranjeiro@6wind.com>
References: <cover.1501681927.git.nelio.laranjeiro@6wind.com>
<cover.1507207731.git.nelio.laranjeiro@6wind.com>
Subject: [dpdk-dev] [PATCH v2 18/30] net/mlx5: use flow to enable all multi
mode
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Oct 2017 12:50:41 -0000
RSS hash configuration is currently ignored by the PMD, this commits
removes the RSS feature on promiscuous mode.
This functionality will be added in a later commit.
Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
---
drivers/net/mlx5/mlx5.h | 1 -
drivers/net/mlx5/mlx5_rxmode.c | 52 ++++++++++++++---------------------------
drivers/net/mlx5/mlx5_rxq.c | 7 ++----
drivers/net/mlx5/mlx5_rxtx.h | 3 ---
drivers/net/mlx5/mlx5_trigger.c | 2 ++
5 files changed, 22 insertions(+), 43 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 2699917..45673b1 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -108,7 +108,6 @@ struct priv {
/* Device properties. */
uint16_t mtu; /* Configured MTU. */
uint8_t port; /* Physical port number. */
- unsigned int allmulti_req:1; /* All multicast mode requested. */
unsigned int hw_csum:1; /* Checksum offload is supported. */
unsigned int hw_csum_l2tun:1; /* Same for L2 tunnels. */
unsigned int hw_vlan_strip:1; /* VLAN stripping is supported. */
diff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c
index f469f41..0c75889 100644
--- a/drivers/net/mlx5/mlx5_rxmode.c
+++ b/drivers/net/mlx5/mlx5_rxmode.c
@@ -53,18 +53,6 @@
/* Initialization data for special flows. */
static const struct special_flow_init special_flow_init[] = {
- [HASH_RXQ_FLOW_TYPE_ALLMULTI] = {
- .dst_mac_val = "\x01\x00\x00\x00\x00\x00",
- .dst_mac_mask = "\x01\x00\x00\x00\x00\x00",
- .hash_types =
- 1 << HASH_RXQ_UDPV4 |
- 1 << HASH_RXQ_IPV4 |
- 1 << HASH_RXQ_UDPV6 |
- 1 << HASH_RXQ_IPV6 |
- 1 << HASH_RXQ_ETH |
- 0,
- .per_vlan = 0,
- },
[HASH_RXQ_FLOW_TYPE_BROADCAST] = {
.dst_mac_val = "\xff\xff\xff\xff\xff\xff",
.dst_mac_mask = "\xff\xff\xff\xff\xff\xff",
@@ -332,7 +320,7 @@ priv_special_flow_enable_all(struct priv *priv)
if (priv->isolated)
return 0;
- for (flow_type = HASH_RXQ_FLOW_TYPE_ALLMULTI;
+ for (flow_type = HASH_RXQ_FLOW_TYPE_BROADCAST;
flow_type != HASH_RXQ_FLOW_TYPE_MAC;
++flow_type) {
int ret;
@@ -359,7 +347,7 @@ priv_special_flow_disable_all(struct priv *priv)
{
enum hash_rxq_flow_type flow_type;
- for (flow_type = HASH_RXQ_FLOW_TYPE_ALLMULTI;
+ for (flow_type = HASH_RXQ_FLOW_TYPE_BROADCAST;
flow_type != HASH_RXQ_FLOW_TYPE_MAC;
++flow_type)
priv_special_flow_disable(priv, flow_type);
@@ -416,19 +404,17 @@ mlx5_promiscuous_disable(struct rte_eth_dev *dev)
void
mlx5_allmulticast_enable(struct rte_eth_dev *dev)
{
- struct priv *priv = dev->data->dev_private;
- int ret;
+ struct rte_flow_item_eth eth = {
+ .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+ .src.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+ .type = 0,
+ };
if (mlx5_is_secondary())
return;
-
- priv_lock(priv);
- priv->allmulti_req = 1;
- ret = priv_rehash_flows(priv);
- if (ret)
- ERROR("error while enabling allmulticast mode: %s",
- strerror(ret));
- priv_unlock(priv);
+ dev->data->all_multicast = 1;
+ if (dev->data->dev_started)
+ claim_zero(mlx5_ctrl_flow(dev, ð, ð, 1));
}
/**
@@ -440,17 +426,15 @@ mlx5_allmulticast_enable(struct rte_eth_dev *dev)
void
mlx5_allmulticast_disable(struct rte_eth_dev *dev)
{
- struct priv *priv = dev->data->dev_private;
- int ret;
+ struct rte_flow_item_eth eth = {
+ .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+ .src.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+ .type = 0,
+ };
if (mlx5_is_secondary())
return;
-
- priv_lock(priv);
- priv->allmulti_req = 0;
- ret = priv_rehash_flows(priv);
- if (ret)
- ERROR("error while disabling allmulticast mode: %s",
- strerror(ret));
- priv_unlock(priv);
+ dev->data->all_multicast = 0;
+ if (dev->data->dev_started)
+ claim_zero(mlx5_ctrl_flow(dev, ð, ð, 0));
}
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index d3d1355..d3cd58e 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -571,16 +571,13 @@ priv_destroy_hash_rxqs(struct priv *priv)
int
priv_allow_flow_type(struct priv *priv, enum hash_rxq_flow_type type)
{
+ (void)priv;
switch (type) {
- case HASH_RXQ_FLOW_TYPE_ALLMULTI:
- return !!priv->allmulti_req;
case HASH_RXQ_FLOW_TYPE_BROADCAST:
case HASH_RXQ_FLOW_TYPE_IPV6MULTI:
- /* If allmulti is enabled, broadcast and ipv6multi
- * are unnecessary. */
- return !priv->allmulti_req;
case HASH_RXQ_FLOW_TYPE_MAC:
return 1;
+ return 1;
default:
/* Unsupported flow type is not allowed. */
return 0;
diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
index a9af1ec..7107a6b 100644
--- a/drivers/net/mlx5/mlx5_rxtx.h
+++ b/drivers/net/mlx5/mlx5_rxtx.h
@@ -237,7 +237,6 @@ struct special_flow_init {
};
enum hash_rxq_flow_type {
- HASH_RXQ_FLOW_TYPE_ALLMULTI,
HASH_RXQ_FLOW_TYPE_BROADCAST,
HASH_RXQ_FLOW_TYPE_IPV6MULTI,
HASH_RXQ_FLOW_TYPE_MAC,
@@ -248,8 +247,6 @@ static inline const char *
hash_rxq_flow_type_str(enum hash_rxq_flow_type flow_type)
{
switch (flow_type) {
- case HASH_RXQ_FLOW_TYPE_ALLMULTI:
- return "allmulticast";
case HASH_RXQ_FLOW_TYPE_BROADCAST:
return "broadcast";
case HASH_RXQ_FLOW_TYPE_IPV6MULTI:
diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 085abcc..27e7890 100644
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -165,6 +165,8 @@ mlx5_dev_start(struct rte_eth_dev *dev)
}
if (dev->data->promiscuous)
mlx5_promiscuous_enable(dev);
+ else if (dev->data->all_multicast)
+ mlx5_allmulticast_enable(dev);
err = priv_flow_start(priv, &priv->ctrl_flows);
if (err) {
ERROR("%p: an error occurred while configuring control flows:"
--
2.1.4