From patchwork Wed May 24 13:44:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 24487 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 7046D7CD1; Wed, 24 May 2017 15:44:38 +0200 (CEST) Received: from mail-wr0-f179.google.com (mail-wr0-f179.google.com [209.85.128.179]) by dpdk.org (Postfix) with ESMTP id 7EC697CD0 for ; Wed, 24 May 2017 15:44:36 +0200 (CEST) Received: by mail-wr0-f179.google.com with SMTP id j27so1487344wre.1 for ; Wed, 24 May 2017 06:44:36 -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; bh=KbbnRWkBXHDETBjRuZ00+0nack4CC/VgSgI3yDnxnvM=; b=pMzsw27Ucxm2wDLQvt2aZ81VWPIc6RjlGGySRjnh91bOIhDqhvMA+BYI/K27rMcxsy N7BVHM2q/VEJa4x4nu7PyneFHKUXT251ABjeWF1ircc25VcOLaoKXionXD61IqKP6NJE VGyUrtgAlUsQXA0J2kgFBuIetnrOpgnM2G7fskhMYLE2RhTyK5I9CuRJITBLVCtQjgV+ PWI1LXNs+8ld5IK6YcRXUAkoj4kQpngrViVyBDjKzpHa1oAYOOpoeRUDS2BDApobYs1q UwXlcrg9+DNiGYuxKiJUTy4Rqn9EwOxxzEZwZ0vI3fQKkaPKXaXlO/Q6hymaQhNW1rui 8KGg== 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; bh=KbbnRWkBXHDETBjRuZ00+0nack4CC/VgSgI3yDnxnvM=; b=OgSEh1oP9b9zKwQ2bdY+mXQxQUebPRyk9p6YKMHXXULmws1fEzYkuuWbQvOvvtUlGs 1IoHXn2lEv8Ub08GmGGACvMJUHgHwpf5h16MQTBLcT9OmfUcriYYj7hO1qE/xoUAeVpY k2NSr2LSULiSLXrxNF1QYtCOlhVRoHk8BQAzAjFwk+65yjaMZBk4UyYXtmsS3y6aU2tr H3Jear2ImddYiw3LLpY5pGTwBNQa8h/DJU23uygkAgp2l5MSOvhTpVZqplyba7pXI6Jx bzrtrcvx5buW/WcTv2+rPYEApvUNJeU5WtLzqOExqmnRXOxRMFp2HMhq+Mv2C2iADMF4 FfEw== X-Gm-Message-State: AODbwcCThUlVb9ub3JssqlVv0FrcTLyyHlr8eipDN/XXBMugCNJSTCoG IIEIJ9YJGdbs/aJF+Rxnyw== X-Received: by 10.223.171.26 with SMTP id q26mr19352448wrc.15.1495633474788; Wed, 24 May 2017 06:44:34 -0700 (PDT) Received: from ping.vm.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id y6sm5892276wrc.51.2017.05.24.06.44.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 May 2017 06:44:34 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Adrien Mazarguil , Shahaf Shuler Date: Wed, 24 May 2017 15:44:08 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 Subject: [dpdk-dev] [PATCH] net/mlx5: implement isolated mode from flow API 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: Nelio Laranjeiro Acked-by: Adrien Mazarguil Acked-by: Shahaf Shuler --- Depends on: http://dpdk.org/ml/archives/dev/2017-April/064327.html http://dpdk.org/dev/patchwork/patch/23741/ --- drivers/net/mlx5/mlx5.h | 2 ++ drivers/net/mlx5/mlx5_fdir.c | 1 + drivers/net/mlx5/mlx5_flow.c | 27 +++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_mac.c | 2 ++ drivers/net/mlx5/mlx5_rxmode.c | 2 ++ drivers/net/mlx5/mlx5_rxq.c | 2 ++ 6 files changed, 36 insertions(+) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 67fd742..20f46c9 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -129,6 +129,7 @@ struct priv { unsigned int pending_alarm:1; /* An alarm is pending. */ unsigned int tso:1; /* Whether TSO is supported. */ unsigned int tunnel_en:1; + unsigned int isolated:1; /* Whether isolated mode is enabled. */ /* Whether Tx offloads for tunneled packets are supported. */ unsigned int max_tso_payload_sz; /* Maximum TCP payload for TSO. */ unsigned int txq_inline; /* Maximum packet size for inlining. */ @@ -311,6 +312,7 @@ struct rte_flow *mlx5_flow_create(struct rte_eth_dev *, int mlx5_flow_destroy(struct rte_eth_dev *, struct rte_flow *, struct rte_flow_error *); int mlx5_flow_flush(struct rte_eth_dev *, struct rte_flow_error *); +int mlx5_flow_isolate(struct rte_eth_dev *, int, struct rte_flow_error *); int priv_flow_start(struct priv *); void priv_flow_stop(struct priv *); int priv_flow_rxq_in_use(struct priv *, struct rxq *); diff --git a/drivers/net/mlx5/mlx5_fdir.c b/drivers/net/mlx5/mlx5_fdir.c index f80c58b..4b21e5a 100644 --- a/drivers/net/mlx5/mlx5_fdir.c +++ b/drivers/net/mlx5/mlx5_fdir.c @@ -1050,6 +1050,7 @@ static const struct rte_flow_ops mlx5_flow_ops = { .destroy = mlx5_flow_destroy, .flush = mlx5_flow_flush, .query = NULL, + .isolate = mlx5_flow_isolate, }; /** diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index adcbe3f..5660f3c 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1584,3 +1584,30 @@ priv_flow_rxq_in_use(struct priv *priv, struct rxq *rxq) } return 0; } + +/** + * Isolated mode. + * + * @see rte_flow_isolate() + * @see rte_flow_ops + */ +int +mlx5_flow_isolate(struct rte_eth_dev *dev, + int enable, + struct rte_flow_error *error) +{ + struct priv *priv = dev->data->dev_private; + + priv_lock(priv); + if (priv->started) { + rte_flow_error_set(error, EBUSY, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "port must be stopped first"); + priv_unlock(priv); + return -rte_errno; + } + priv->isolated = !!enable; + priv_unlock(priv); + return 0; +} diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c index 79e0c41..8489ea6 100644 --- a/drivers/net/mlx5/mlx5_mac.c +++ b/drivers/net/mlx5/mlx5_mac.c @@ -443,6 +443,8 @@ priv_mac_addrs_enable(struct priv *priv) unsigned int i; int ret; + if (priv->isolated) + return 0; if (!priv_allow_flow_type(priv, HASH_RXQ_FLOW_TYPE_MAC)) return 0; for (i = 0; (i != priv->hash_rxqs_n); ++i) { diff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c index 173e6e8..a67e542 100644 --- a/drivers/net/mlx5/mlx5_rxmode.c +++ b/drivers/net/mlx5/mlx5_rxmode.c @@ -347,6 +347,8 @@ priv_special_flow_enable_all(struct priv *priv) { enum hash_rxq_flow_type flow_type; + if (priv->isolated) + return 0; for (flow_type = HASH_RXQ_FLOW_TYPE_PROMISC; flow_type != HASH_RXQ_FLOW_TYPE_MAC; ++flow_type) { diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 2a26839..0e31df3 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -363,6 +363,8 @@ priv_create_hash_rxqs(struct priv *priv) assert(priv->hash_rxqs_n == 0); assert(priv->pd != NULL); assert(priv->ctx != NULL); + if (priv->isolated) + return 0; if (priv->rxqs_n == 0) return EINVAL; assert(priv->rxqs != NULL);