diff mbox series

[04/12] net/cxgbe: fix parsing VLAN ID rewrite action

Message ID	c021192e591de960ed8bc70ed5721dc18df2478f.1567799552.git.rahul.lakkireddy@chelsio.com (mailing list archive)
State	Superseded, archived
Delegated to:	Ferruh Yigit
Headers	From: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com> To: dev@dpdk.org Cc: nirranjan@chelsio.com, stable@dpdk.org Date: Sat, 7 Sep 2019 03:22:25 +0530 Message-Id: <c021192e591de960ed8bc70ed5721dc18df2478f.1567799552.git.rahul.lakkireddy@chelsio.com> In-Reply-To: <cover.1567799552.git.rahul.lakkireddy@chelsio.com> References: <cover.1567799552.git.rahul.lakkireddy@chelsio.com> In-Reply-To: <cover.1567799552.git.rahul.lakkireddy@chelsio.com> References: <cover.1567799552.git.rahul.lakkireddy@chelsio.com> Subject: [dpdk-dev] [PATCH 04/12] net/cxgbe: fix parsing VLAN ID rewrite action Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	net/cxgbe: bug fixes and updates for CXGBE/CXGBEVF PMD \| [00/12] net/cxgbe: bug fixes and updates for CXGBE/CXGBEVF PMD [01/12] net/cxgbe: add cxgbe_ prefix to global functions [02/12] net/cxgbe: fix NULL access when allocating CLIP entry [03/12] net/cxgbe: fix slot allocation for IPv6 flows [04/12] net/cxgbe: fix parsing VLAN ID rewrite action [05/12] net/cxgbe: fix prefetch for non-coalesced Tx packets [06/12] net/cxgbe: avoid polling link status before device start [07/12] net/cxgbe: use dynamic logging for debug prints [08/12] net/cxgbe: separate VF only devargs [09/12] net/cxgbe: add devarg to control Tx coalescing [10/12] net/cxgbe: fetch max Tx coalesce limit from firmware [11/12] net/cxgbe: add rte_flow support for matching VLAN [12/12] net/cxgbe: add rte_flow support for setting VLAN PCP

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK
ci/Intel-compilation	success	Compilation OK

Commit Message

Rahul Lakkireddy Sept. 6, 2019, 9:52 p.m. UTC

  Set VLAN action mode to VLAN_REWRITE only if VLAN_INSERT has not been
set yet. Otherwise, the resulting VLAN packets will have their VLAN
header rewritten, instead of pushing a new outer VLAN header.

Also fix the VLAN ID extraction logic and endianness issues.

Cc: stable@dpdk.org
Fixes: 1decc62b1cbe ("net/cxgbe: add flow operations to offload VLAN actions")

Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
---
 drivers/net/cxgbe/cxgbe_flow.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c
index 8a5d06ff3..4c8553039 100644
--- a/drivers/net/cxgbe/cxgbe_flow.c
+++ b/drivers/net/cxgbe/cxgbe_flow.c
@@ -446,18 +446,27 @@  ch_rte_parse_atype_switch(const struct rte_flow_action *a,
 	const struct rte_flow_action_set_tp *tp_port;
 	const struct rte_flow_action_phy_port *port;
 	int item_index;
+	u16 tmp_vlan;
 
 	switch (a->type) {
 	case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID:
 		vlanid = (const struct rte_flow_action_of_set_vlan_vid *)
 			  a->conf;
-		fs->newvlan = VLAN_REWRITE;
-		fs->vlan = vlanid->vlan_vid;
+		/* If explicitly asked to push a new VLAN header,
+		 * then don't set rewrite mode. Otherwise, the
+		 * incoming VLAN packets will get their VLAN fields
+		 * rewritten, instead of adding an additional outer
+		 * VLAN header.
+		 */
+		if (fs->newvlan != VLAN_INSERT)
+			fs->newvlan = VLAN_REWRITE;
+		tmp_vlan = fs->vlan & 0xe000;
+		fs->vlan = (be16_to_cpu(vlanid->vlan_vid) & 0xfff) | tmp_vlan;
 		break;
 	case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN:
 		pushvlan = (const struct rte_flow_action_of_push_vlan *)
 			    a->conf;
-		if (pushvlan->ethertype != RTE_ETHER_TYPE_VLAN)
+		if (be16_to_cpu(pushvlan->ethertype) != RTE_ETHER_TYPE_VLAN)
 			return rte_flow_error_set(e, EINVAL,
 						  RTE_FLOW_ERROR_TYPE_ACTION, a,
 						  "only ethertype 0x8100 "