From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by dpdk.org (Postfix) with ESMTP id 139EF7CBF for ; Thu, 8 Jun 2017 02:00:28 +0200 (CEST) Received: by mail-wm0-f47.google.com with SMTP id d64so11803871wmf.1 for ; Wed, 07 Jun 2017 17:00:28 -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=fN0MeGkX5wM+npgc5He4n5sOKVnR+rtwLzCrM0q2Uh4=; b=nGE/Bu/0+YrsTYiMImBxkxRwdk8bzC6Swl61i5NvhDyClFPH+8/6T3lE9cugte8LQM Z8+1qkDD05iPePqrP1DNnRHFXjFHHQAgauG7LD2pvehyp2ZwRS/ylvWx4RyXfCiGOT+4 GDS8aIwrghhk21CtnFqneJYTo8r9AWQXUbqV8UeMP0FpsMxueG1JOk23xs7loD7qclO8 BbcaVq+DHvsaIJqm7Lmm6G7dXZT1dqhdjj8lZHXAmsdbcpJ88lAl6DLPMg2LYHr//08A RrukTYYWmfrwsLE+7IPtm55hGShjIReJMdEePtto+2p0ojricHCrPo7dnNyAbP30d+NV pjuw== 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=fN0MeGkX5wM+npgc5He4n5sOKVnR+rtwLzCrM0q2Uh4=; b=ghSmWzJUAmNRpGkGfN+93jF5fz9J0cfTI9RqLBxhGqru691LaNnoKKdZE8H1ztkiRT 9xlvvy/ynEwzRgyLcBkXfXZwoKc1mEMzk++Z9Qs9PqzMXrrVJoVIDUYA7Fpx1ezUYbmf HuqbRvtPdn2gRgxz+/vDEweAGdFaPxa+rLWIsJQwQtGzrXC3wLaDsyERLBaCTXtimZW+ GDVBh8F2EsnK0yaEvmjqCWCQLK3ugAFzTPPWgxvzKbJVfcCcy/VgrjaF/zehmfCgd6rk TjCxKZwRpPoYHC/yNggOTyyD3HNOnEGJjYyuOhGzZnoYucnEsa/XlUF6Ax7+v7BRhePg uTag== X-Gm-Message-State: AKS2vOxC2lJP8t57bVEsh3mIq6ygLpWEeyQu6G7MlbwUgFRU+6GDTue3 3tTZR20JPhtb/wTXL20= X-Received: by 10.28.15.14 with SMTP id 14mr1317503wmp.51.1496880027575; Wed, 07 Jun 2017 17:00:27 -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 s10sm4337785wmb.8.2017.06.07.17.00.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 17:00:26 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 8 Jun 2017 02:00:02 +0200 Message-Id: <831198b9f9178d26b020b2a7372829b5948de967.1496877105.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 v5 12/12] 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: , X-List-Received-Date: Thu, 08 Jun 2017 00:00:28 -0000 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 06f950b..fb64111 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) { @@ -331,9 +353,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 cb8fad2..c029633 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