From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AF0DBA04B1; Sun, 22 Nov 2020 16:33:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F377CFFA; Sun, 22 Nov 2020 16:33:00 +0100 (CET) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 27C56FFA for ; Sun, 22 Nov 2020 16:32:58 +0100 (CET) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id BDCAC5C0116; Sun, 22 Nov 2020 10:32:53 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 22 Nov 2020 10:32:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s=fm2; bh= cBXWDScnPM0W/RXtoaqZm9n1zuvoRAnr5NPQ5GDyQAg=; b=jnCQiRTJiB5jo6eo Q1REuqbEioCkboWGog0kEcF2j32k8UftnwDpZ19R0vkOsDFRSHfiI4Qt0OWo57NG RPhxQpNPDpc0ze3W8zMWPLih3jR8mb5eS655dKBTxHrXKYU/0eviQ/2C49Xetf8C 1W5C4iYZadxuzZDMswH7fCKtNyxiFvAWwH9o5yODsKlb5SOLGZNbN05k7iBG4Ja0 sMDubWK5BYpWw0c27IBsQfich0cUXuXKUmm/ji2l8dEb2jApRW/RnOJYq+T614+P DGVVYJeDpnL1LspOU05fdk8LdxdcFsqimDuSYqcbkB5JrY9C5WQ6YuSjbAoS3xza iSSdiA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=cBXWDScnPM0W/RXtoaqZm9n1zuvoRAnr5NPQ5GDyQ Ag=; b=TTRpKwNKv2FFV5CrStNJ1BKtMxzz0UWVZrreo2okEipyfcAB9VoKGNSzb BypoM7hu39B5bFM9ELKqv+qOD3yx57hmrl53Q0EBZGIaqNM1h1lRMHYtNtwZDfu1 TKbNXZ1iEG6Q0VhYKyNT8mOsbsxmUwirC64WF0Rbcg41eUoPKOI+sjNjBiG3CP4z WzCS7cUKgyfULeHLLrnBGTomcf1nGW91xXS3B2ldUJ2rDjD/WVcyt5K1DSFvHGsQ ZqMFTvBYbpxte1+KTSR4BH6LOkvVoXQYc9x4+6Hh00O/HQHjdQOcWtlCrMuPax8Z HhFjJLExn207ywpfjKpJChAZuF02A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudeggedgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkfgjfhgggfgtsehtufertddttddvnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepudeggfdvfeduffdtfeeglefghfeukefgfffhueejtdetuedtjeeu ieeivdffgeehnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl ohhnrdhnvght X-ME-Proxy: Received: from xps.localnet (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id A96A63280063; Sun, 22 Nov 2020 10:32:52 -0500 (EST) From: Thomas Monjalon To: Matan Azrad , Viacheslav Ovsiienko Cc: dev@dpdk.org, Xiaoyu Min , orika@mellanox.com, suanmingm@nvidia.com, asafp@nvidia.com Date: Sun, 22 Nov 2020 16:32:51 +0100 Message-ID: <2669658.zoTC9YsCJE@thomas> In-Reply-To: <493405ea9f0f86ef8e0cfa08cab0d5ae764ae8be.1605493464.git.jackmin@nvidia.com> References: <493405ea9f0f86ef8e0cfa08cab0d5ae764ae8be.1605493464.git.jackmin@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Subject: Re: [dpdk-dev] [PATCH 1/5] net/mlx5: fix protocol size for raw encap judgement 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" 16/11/2020 08:55, Xiaoyu Min: > From: Xiaoyu Min > > The rte_flow_item_eth and rte_flow_item_vlan items are refined. > The structs do not exactly represent the packet bits captured on the > wire anymore. > Should use real header instead of the whole struct. > > Replace the rte_flow_item_* with the existing corresponding rte_*_hdr. > > Fixes: 09315fc83861 ("ethdev: add VLAN attributes to ethernet and VLAN items") > > Signed-off-by: Xiaoyu Min > --- > drivers/net/mlx5/mlx5_flow.c | 12 ++++++------ > drivers/net/mlx5/mlx5_flow.h | 4 ++-- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index 324349ed19..34b7a2f137 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -3655,8 +3655,8 @@ flow_check_hairpin_split(struct rte_eth_dev *dev, > case RTE_FLOW_ACTION_TYPE_RAW_ENCAP: > raw_encap = actions->conf; > if (raw_encap->size > > - (sizeof(struct rte_flow_item_eth) + > - sizeof(struct rte_flow_item_ipv4))) > + (sizeof(struct rte_ether_hdr) + > + sizeof(struct rte_ipv4_hdr))) > split++; > action_n++; > break; > @@ -4092,8 +4092,8 @@ flow_hairpin_split(struct rte_eth_dev *dev, > case RTE_FLOW_ACTION_TYPE_RAW_ENCAP: > raw_encap = actions->conf; > if (raw_encap->size > > - (sizeof(struct rte_flow_item_eth) + > - sizeof(struct rte_flow_item_ipv4))) { > + (sizeof(struct rte_ether_hdr) + > + sizeof(struct rte_ipv4_hdr))) { > memcpy(actions_tx, actions, > sizeof(struct rte_flow_action)); > actions_tx++; > @@ -4107,8 +4107,8 @@ flow_hairpin_split(struct rte_eth_dev *dev, > case RTE_FLOW_ACTION_TYPE_RAW_DECAP: > raw_decap = actions->conf; > if (raw_decap->size < > - (sizeof(struct rte_flow_item_eth) + > - sizeof(struct rte_flow_item_ipv4))) { > + (sizeof(struct rte_ether_hdr) + > + sizeof(struct rte_ipv4_hdr))) { > memcpy(actions_tx, actions, > sizeof(struct rte_flow_action)); > actions_tx++; > diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h > index 5fac8672fc..3b28c48a1d 100644 > --- a/drivers/net/mlx5/mlx5_flow.h > +++ b/drivers/net/mlx5/mlx5_flow.h > @@ -345,8 +345,8 @@ enum mlx5_feature_name { > #define MLX5_GENEVE_OPT_LEN_0 14 > #define MLX5_GENEVE_OPT_LEN_1 63 > > -#define MLX5_ENCAPSULATION_DECISION_SIZE (sizeof(struct rte_flow_item_eth) + \ > - sizeof(struct rte_flow_item_ipv4)) > +#define MLX5_ENCAPSULATION_DECISION_SIZE (sizeof(struct rte_ether_hdr) + \ > + sizeof(struct rte_ipv4_hdr)) This constant should be used above in hairpin functions. Will change while merging.