From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gaetan.rivet@6wind.com>
Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com
[209.85.128.171]) by dpdk.org (Postfix) with ESMTP id E5DB77CEF
for <dev@dpdk.org>; Tue, 11 Jul 2017 01:20:20 +0200 (CEST)
Received: by mail-wr0-f171.google.com with SMTP id k67so158646027wrc.2
for <dev@dpdk.org>; Mon, 10 Jul 2017 16:20:20 -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=tK8N38zv+1XCLQBHkQzhQtH8NHRU/Dnje/JLwgZdags=;
b=fz8QbRk7dJ/JtmUX60BiDfkHqRo5ZWTWD+6i/Xft3DxQJGGHbn+QTjrZEWkCBF4mKE
iVEnxF74tuAkA+TY8i4NP3S9uRRhie5WrC5cDekqQANi+2+tMSgG16r+rEIJB3yvZI1c
i4WfUsUVuFDNFbS+Y4Y82QDgmgkUHipe703ObQGkqqtkUU+31J2UZWHoa0NBNQaT1yTS
SBAL0VLY0wzFOoUuBnp2yehmjqy32fV1T+b7hmYTycw6h0TcpbLdQbF+QPk427KV6hMP
aW2we0Pr/qggBX6WOz1723LITNsCLCiC8+62Z7k65jQtZBKi+3kmBmjV/kXXGvZW6Xg1
Qfnw==
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=tK8N38zv+1XCLQBHkQzhQtH8NHRU/Dnje/JLwgZdags=;
b=boScULswSGWTDpALKZvDoZf0B6k5g+wCaGtdT9Vf/LPGXlC0g2NYNN9B81lG5K3KIt
Z4F8SBMZNCoI4iiTb1w2kyBKQaAkeeCybLX3iTjD7gVdVXiq8mj7FFMH5qyYpMr4//ms
supJQyrTIisPAfgXdSGS4NLv6ZQVdi8cPBRytmAhk/Lmd1gt3++ptRNMPXMPUSlPOG7x
jACNrh8kvnCuLzqEHQvWdHwdAAKP5J6nHEh6sdD+Gf2UG/3+D9Y+JItjOvjRpxoTtvpu
WdxnMfPi/YvY1PLY9grO1rl6SSeCnd4NsW6WQB1bVMTtxaK/yMxU6hfTyfsYL0HLmvuA
FLNA==
X-Gm-Message-State: AIVw1132Xtx23kDwx3bLjOr2ty/f5du4szy6pI340pVkxhnYE7fhc4zo
gdIJnSR29D3uM9ImsDs=
X-Received: by 10.28.169.5 with SMTP id s5mr380853wme.90.1499728820362;
Mon, 10 Jul 2017 16:20:20 -0700 (PDT)
Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com.
[62.23.145.78])
by smtp.gmail.com with ESMTPSA id k137sm11805038wmd.22.2017.07.10.16.20.19
(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Mon, 10 Jul 2017 16:20:19 -0700 (PDT)
From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Gaetan Rivet <gaetan.rivet@6wind.com>
Date: Tue, 11 Jul 2017 01:19:52 +0200
Message-Id: <c623655bd02263b741701aae789f19841cc88cfe.1499728587.git.gaetan.rivet@6wind.com>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <cover.1499728587.git.gaetan.rivet@6wind.com>
References: <cover.1499564333.git.gaetan.rivet@6wind.com>
<cover.1499728587.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1499728587.git.gaetan.rivet@6wind.com>
References: <cover.1499728587.git.gaetan.rivet@6wind.com>
Subject: [dpdk-dev] [PATCH v8 11/11] net/failsafe: support flow API
isolation 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: Mon, 10 Jul 2017 23:20:21 -0000
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
drivers/net/failsafe/failsafe_ether.c | 34 +++++++++++++++++++++++++++++++--
drivers/net/failsafe/failsafe_flow.c | 29 ++++++++++++++++++++++++++++
drivers/net/failsafe/failsafe_private.h | 4 ++++
3 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
index a694b4d..c8b9c8a 100644
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -74,6 +74,28 @@ fs_flow_complain(struct rte_flow_error *error)
}
static int
+eth_dev_flow_isolate_set(struct rte_eth_dev *dev,
+ struct sub_device *sdev)
+{
+ struct rte_flow_error ferror;
+ int ret;
+
+ if (!PRIV(dev)->flow_isolated) {
+ DEBUG("Flow isolation already disabled");
+ } else {
+ DEBUG("Enabling flow isolation");
+ ret = rte_flow_isolate(PORT_ID(sdev),
+ PRIV(dev)->flow_isolated,
+ &ferror);
+ if (ret) {
+ fs_flow_complain(&ferror);
+ return ret;
+ }
+ }
+ return 0;
+}
+
+static int
fs_eth_dev_conf_apply(struct rte_eth_dev *dev,
struct sub_device *sdev)
{
@@ -334,9 +356,17 @@ failsafe_eth_dev_state_sync(struct rte_eth_dev *dev)
if (PRIV(dev)->state < DEV_ACTIVE)
return 0;
inactive = 0;
- FOREACH_SUBDEV(sdev, i, dev)
- if (sdev->state == DEV_PROBED)
+ FOREACH_SUBDEV(sdev, i, dev) {
+ if (sdev->state == DEV_PROBED) {
inactive |= UINT32_C(1) << i;
+ ret = eth_dev_flow_isolate_set(dev, sdev);
+ if (ret) {
+ ERROR("Could not apply configuration to sub_device %d",
+ i);
+ goto err_remove;
+ }
+ }
+ }
ret = dev->dev_ops->dev_configure(dev);
if (ret)
goto err_remove;
diff --git a/drivers/net/failsafe/failsafe_flow.c b/drivers/net/failsafe/failsafe_flow.c
index d8f59a1..a5598ae 100644
--- a/drivers/net/failsafe/failsafe_flow.c
+++ b/drivers/net/failsafe/failsafe_flow.c
@@ -207,10 +207,39 @@ fs_flow_query(struct rte_eth_dev *dev,
return -1;
}
+static int
+fs_flow_isolate(struct rte_eth_dev *dev,
+ int set,
+ struct rte_flow_error *error)
+{
+ struct sub_device *sdev;
+ uint8_t i;
+ int ret;
+
+ FOREACH_SUBDEV(sdev, i, dev) {
+ if (sdev->state < DEV_PROBED)
+ continue;
+ DEBUG("Calling rte_flow_isolate on sub_device %d", i);
+ if (PRIV(dev)->flow_isolated != sdev->flow_isolated)
+ WARN("flow isolation mode of sub_device %d in incoherent state.",
+ i);
+ ret = rte_flow_isolate(PORT_ID(sdev), set, error);
+ if (ret) {
+ ERROR("Operation rte_flow_isolate failed for sub_device %d"
+ " with error %d", i, ret);
+ return ret;
+ }
+ sdev->flow_isolated = set;
+ }
+ PRIV(dev)->flow_isolated = set;
+ return 0;
+}
+
const struct rte_flow_ops fs_flow_ops = {
.validate = fs_flow_validate,
.create = fs_flow_create,
.destroy = fs_flow_destroy,
.flush = fs_flow_flush,
.query = fs_flow_query,
+ .isolate = fs_flow_isolate,
};
diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
index 6b34998..a071ad9 100644
--- a/drivers/net/failsafe/failsafe_private.h
+++ b/drivers/net/failsafe/failsafe_private.h
@@ -108,6 +108,8 @@ struct sub_device {
struct rte_eth_dev *fs_dev;
/* flag calling for recollection */
volatile unsigned int remove:1;
+ /* flow isolation state */
+ int flow_isolated:1;
};
struct fs_priv {
@@ -139,6 +141,8 @@ struct fs_priv {
*/
enum dev_state state;
unsigned int pending_alarm:1; /* An alarm is pending */
+ /* flow isolation state */
+ int flow_isolated:1;
};
/* MISC */
--
2.1.4