From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by dpdk.org (Postfix) with ESMTP id C028537B8 for ; Wed, 9 Nov 2016 10:58:23 +0100 (CET) Received: by mail-wm0-f45.google.com with SMTP id a197so296324795wmd.0 for ; Wed, 09 Nov 2016 01:58:23 -0800 (PST) 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=deVqCSKDonLWHfyVq+DfKQHHM3auKz2FWAh67sYLsis=; b=RbjYhoAh5IgNbE+vsrOyqkQfYmqTh0b7gmf0qXzxmEOeA+WnHfHsN5cIzmpS7X+pns zlkd0XQbwznKE1rhV4i8Eg/hn9EYyvoTsrh/L3H/pdGhUanrgiLL2CopK+5LVD8JptOh yng0A5w8C+/qfb//KwngdeKhAIJ85fuiqRMtZrgbyudL/Gg1w/h5NsBe0fQ86d4VmKf4 dpnP5lB9+6O7gUVxkc8Qcwx5Uo7MUi3j2nR/ujygOE8V8QqdFtGrQBGh6zwd5IEG+jva /GORjWhTDBl8bUK4dcbinqmhSFG4mWJEKrFW4RWEKZwzm8w5j1BgNJDs9PaPGfvycuuA oEhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=deVqCSKDonLWHfyVq+DfKQHHM3auKz2FWAh67sYLsis=; b=jCU0z5ry5BFE/0b95zk3DzjeM0oIXntNnjwKAs+Tz1OWLwl6jn0OxrL733VWiNo1dT ICXC8YRAWdFmTZ63mSPsi4TsJyQw/zoXjV3achJ7j8HBK0pW35jyEFozo56gFNX58QuH cOh89T6TphRRlJucVQta/b25h9JRCn4gO6oJ8jksP2Ei9FauMm0X/rZu41kxWy/K5koV 0hjuMm6ji233V2LJ84ovXXEdWMks5jaQ3iHot/dds8LXEaL/TblDf1oSkN6cJ50q/qMY BlsxGXscyYTunqxGVM1YlGm0u8HKWursSYnqIUx8B9nYtfTMMbP+0cLiIh/CHKAxuE9u e5wg== X-Gm-Message-State: ABUngve8mmJVyZAVsTTvL5b3X5VHiVBvXlm0PBs+kda8Bzh8Bm8noHGv+uPDEWN1QmXf7gtD X-Received: by 10.28.152.79 with SMTP id a76mr16169016wme.47.1478685503320; Wed, 09 Nov 2016 01:58:23 -0800 (PST) Received: from ping.vm.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id c133sm13926057wme.12.2016.11.09.01.58.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Nov 2016 01:58:22 -0800 (PST) From: Nelio Laranjeiro To: stable@dpdk.org, Yuanhan Liu Cc: Yaacov Hazan , Adrien Mazarguil Date: Wed, 9 Nov 2016 10:57:46 +0100 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-stable] [PATCH v2 07/12] net/mlx5: fix flow director drop mode X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Nov 2016 09:58:24 -0000 From: Yaacov Hazan [ upstream commit ade188a51664a32eea120a995ce84661294cc8af ] Packet rejection was routed to a polled queue. This patch route them to a dummy queue which is not polled. Fixes: 76f5c99e6840 ("mlx5: support flow director") Signed-off-by: Yaacov Hazan Signed-off-by: Adrien Mazarguil Signed-off-by: Nelio Laranjeiro --- doc/guides/nics/mlx5.rst | 3 ++- drivers/net/mlx5/mlx5.h | 1 + drivers/net/mlx5/mlx5_fdir.c | 41 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 5c10cd3..8923173 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -84,7 +84,8 @@ Features - Promiscuous mode. - Multicast promiscuous mode. - Hardware checksum offloads. -- Flow director (RTE_FDIR_MODE_PERFECT and RTE_FDIR_MODE_PERFECT_MAC_VLAN). +- Flow director (RTE_FDIR_MODE_PERFECT, RTE_FDIR_MODE_PERFECT_MAC_VLAN and + RTE_ETH_FDIR_REJECT). - Secondary process TX is supported. - KVM and VMware ESX SR-IOV modes are supported. diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 9d78dcd..82172e4 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -134,6 +134,7 @@ struct priv { unsigned int (*reta_idx)[]; /* RETA index table. */ unsigned int reta_idx_n; /* RETA index size. */ struct fdir_filter_list *fdir_filter_list; /* Flow director rules. */ + struct fdir_queue *fdir_drop_queue; /* Flow director drop queue. */ rte_spinlock_t lock; /* Lock for control functions. */ }; diff --git a/drivers/net/mlx5/mlx5_fdir.c b/drivers/net/mlx5/mlx5_fdir.c index 4a82dc9..1acf682 100644 --- a/drivers/net/mlx5/mlx5_fdir.c +++ b/drivers/net/mlx5/mlx5_fdir.c @@ -75,6 +75,7 @@ struct fdir_flow_desc { struct mlx5_fdir_filter { LIST_ENTRY(mlx5_fdir_filter) next; uint16_t queue; /* Queue assigned to if FDIR match. */ + enum rte_eth_fdir_behavior behavior; struct fdir_flow_desc desc; struct ibv_exp_flow *flow; }; @@ -567,6 +568,33 @@ priv_get_fdir_queue(struct priv *priv, uint16_t idx) } /** + * Get or flow director drop queue. Create it if it does not exist. + * + * @param priv + * Private structure. + * + * @return + * Flow director drop queue on success, NULL otherwise. + */ +static struct fdir_queue * +priv_get_fdir_drop_queue(struct priv *priv) +{ + struct fdir_queue *fdir_queue = priv->fdir_drop_queue; + + if (fdir_queue == NULL) { + unsigned int socket = SOCKET_ID_ANY; + + /* Select a known NUMA socket if possible. */ + if (priv->rxqs_n && (*priv->rxqs)[0]) + socket = container_of((*priv->rxqs)[0], + struct rxq_ctrl, rxq)->socket; + fdir_queue = priv_fdir_queue_create(priv, NULL, socket); + priv->fdir_drop_queue = fdir_queue; + } + return fdir_queue; +} + +/** * Enable flow director filter and create steering rules. * * @param priv @@ -588,7 +616,11 @@ priv_fdir_filter_enable(struct priv *priv, return 0; /* Get fdir_queue for specific queue. */ - fdir_queue = priv_get_fdir_queue(priv, mlx5_fdir_filter->queue); + if (mlx5_fdir_filter->behavior == RTE_ETH_FDIR_REJECT) + fdir_queue = priv_get_fdir_drop_queue(priv); + else + fdir_queue = priv_get_fdir_queue(priv, + mlx5_fdir_filter->queue); if (fdir_queue == NULL) { ERROR("failed to create flow director rxq for queue %d", @@ -707,6 +739,10 @@ priv_fdir_disable(struct priv *priv) priv_fdir_queue_destroy(priv, rxq_ctrl->fdir_queue); rxq_ctrl->fdir_queue = NULL; } + if (priv->fdir_drop_queue) { + priv_fdir_queue_destroy(priv, priv->fdir_drop_queue); + priv->fdir_drop_queue = NULL; + } } /** @@ -807,8 +843,9 @@ priv_fdir_filter_add(struct priv *priv, return err; } - /* Set queue. */ + /* Set action parameters. */ mlx5_fdir_filter->queue = fdir_filter->action.rx_queue; + mlx5_fdir_filter->behavior = fdir_filter->action.behavior; /* Convert to mlx5 filter descriptor. */ fdir_filter_to_flow_desc(fdir_filter, -- 2.1.4