From patchwork Tue Jul 18 12:48:22 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: 27031 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 9A41F7CFF; Tue, 18 Jul 2017 14:49:35 +0200 (CEST) Received: from mail-wr0-f175.google.com (mail-wr0-f175.google.com [209.85.128.175]) by dpdk.org (Postfix) with ESMTP id 8EC975A98 for ; Tue, 18 Jul 2017 14:48:52 +0200 (CEST) Received: by mail-wr0-f175.google.com with SMTP id w4so27384240wrb.2 for ; Tue, 18 Jul 2017 05:48:52 -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=lsm9UsWWXUDFLqNcDrYtOKYJm4KTXvZDYmKQ70o6zWU=; b=Dj1+krUGjs7IuM/sSp7RwWaZ3yjw7CLVLW3pLh2m+CCPBCXb0dCSXSRe49xwdBa5Tl S+t7hyE4KGHVbSFfGARYAh3c5U2moFhXgFTyJ1BWURfAE08jwB8sjRAV9YDvonU6e6OV Reyqcnf3cVcBKqARBnLF22gc+20tOvaIlscDMHhEXJrzm+U0aMoHD+kwNUO7/75Z7/yP /i3MfF+2GomxObv6S6J24Xr743+4aP5dD+4AnNMOIWV2HqMrnf5ArEvFV3TIZIbEKEWG rtAIFSaPOwaEZorU83W1yZUr5opLoMfjIistU4dlL4InYABXGnWLIcsV9v5DRSQLSTh2 k4iA== 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=lsm9UsWWXUDFLqNcDrYtOKYJm4KTXvZDYmKQ70o6zWU=; b=aYWJ4ZRLKR6NNwWZd2UkH/LwxL/2wmTWfMnUvcfm1jBR2FMt9/6i9zSYidAHfvLcs5 iaFlRxA+IA/dnJZbYz3Gom270Y1ASyhHLacPeoFE4Jv05cvmuxHadb6wsWQOdhpU5xlK GJMRWbylRg842vjH1v5kXb4Q7ZLoBMXho3LIzM08fE81XuTn8+Uk2chjevPjZgU8rfMZ 7SKxuexJ1+88f8SHLxyffM7nIo4SxrVddbNYrJEqSB/PYqstAXPcA+s/s2SpkPJOSdzl ZELPuUq9QnjmiigXUBghLtyePscLX4VNRWYDqpk4AGcLQNZC1oGVxE6oAkcQBfpr75bc hH/Q== X-Gm-Message-State: AIVw112OTHqpVpTAey75RXbmaqmE5Qdp8jwfQCjo/+s6EjEhwJaN6DMu Pohc5cTemCvdwSPRQDc= X-Received: by 10.28.142.133 with SMTP id q127mr2121100wmd.4.1500382131690; Tue, 18 Jul 2017 05:48:51 -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 j8sm1033960wrj.10.2017.07.18.05.48.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 05:48:50 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Tue, 18 Jul 2017 14:48:22 +0200 Message-Id: <21367b6b68ebee9b450c0e59b48d121e3d6d1a7b.1500381642.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 v11 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 d205f61..a3a8cce 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 0098672..153ceee 100644 --- a/drivers/net/failsafe/failsafe_flow.c +++ b/drivers/net/failsafe/failsafe_flow.c @@ -206,10 +206,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 2c52d2b..0361cf4 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 */