From patchwork Tue Jul 11 23:26:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 26850 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 2C6F07D4B; Wed, 12 Jul 2017 01:27:22 +0200 (CEST) Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) by dpdk.org (Postfix) with ESMTP id 2EC677D26 for ; Wed, 12 Jul 2017 01:27:01 +0200 (CEST) Received: by mail-wr0-f176.google.com with SMTP id k67so9821488wrc.2 for ; Tue, 11 Jul 2017 16:27:01 -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=b8oELhejZv+12fgugzm9+KM0osrgRa9jRU1pW1vCxVdzIo063fkV6eD72ynYMYc/84 hTpEcCqn0JfNpscib3T0tCljtL1e+oy3dOxHGfuQrZMP1wGhwpcqp/XhBPl/rcYSM/Az xuAepMJTLJxzb0PlFsSi4ljEPGaTOKXll9GLAWGe9noEIcuLplsM56acbE/GIQOtE3iJ upcAXxR8xqtMlkFAIcIikZ0ILodbmbQtHVfRDuwx86s7TcOXs0btaByyV/apF0Q/KLGv JI7KhYbCIRNJwHfCU8uYIxZXLyWS8owZ5XHcE+z+uecyU2pkT0nXIgxLZ5sY2q4ux1v1 w6bg== 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=gQEz7NpjnU99FNJr4p2+lY8nF27dJLXxe+7+sckfQyF98CWVUsSq5DNdGKmtAfmtLx 6/ucnxx/7MbUqUHPEQMo2Chr+GZMzkmjMi3as37XEHcz/eIjh/cQJMc/42DEEzQmIiMX J+KkaUVRZ5/G4aSVFvJWWOY2ab6SDHfGzOOBXmrkiev+5hFM4kWU6R7zFiw/BJaaOkMx DKPauHz/5qtNs12f3t8vphw5RlxuOjIq06T1YParyAAocPPA1xLWKjLmMQCo8hNRR1H6 k6Q0Cv78qK6wrZ+0D1eYzzzh9gPN/mIZyvT675wKEGoOVtWNF3Q1p4FH4Vztbc9BFgri qEGQ== X-Gm-Message-State: AIVw11132BE0/AS8u0CGriE+icPxlFDslZlE+JiiDdaZi9G4/wl8xPsk nXaUulprHycUJ7yDi64= X-Received: by 10.28.32.5 with SMTP id g5mr449928wmg.70.1499815620550; Tue, 11 Jul 2017 16:27:00 -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 w30sm740855wrb.49.2017.07.11.16.26.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Jul 2017 16:26:59 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 12 Jul 2017 01:26:31 +0200 Message-Id: <0d3fac30845e9fa318515aafe3ecb4e1e7c833a7.1499815140.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v9 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Gaetan Rivet --- 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 */