From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 6B9361B512 for ; Fri, 30 Nov 2018 00:13:51 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:19:44 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW7j032075; Fri, 30 Nov 2018 01:13:49 +0200 From: Yongseok Koh To: Hyong Youb Kim Cc: John Daley , dpdk stable Date: Thu, 29 Nov 2018 15:10:39 -0800 Message-Id: <20181129231202.30436-45-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/enic: set Rx VLAN offload flag for non-stripped packets' has been queued to LTS release 17.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2018 23:13:51 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/01/18. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From 9a22a39b269525ab585f51d4b358a2075f3fd4f8 Mon Sep 17 00:00:00 2001 From: Hyong Youb Kim Date: Tue, 25 Sep 2018 19:54:19 -0700 Subject: [PATCH] net/enic: set Rx VLAN offload flag for non-stripped packets [ upstream commit fe5383d133f484d7cb2ad385bbf1e43ad7078682 ] The NIC indicates VLAN TCI to the driver even when VLAN stripping is disabled. The driver sets mbuf's vlan_tci but not PKT_RX_VLAN. Set PKT_RX_VLAN to indicate that vlan_tci is valid. Fixes: c6f455507411 ("net/enic: add ethernet VLAN packet type") Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley --- drivers/net/enic/enic_rxtx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c index 831c90a1c..f8dd09c35 100644 --- a/drivers/net/enic/enic_rxtx.c +++ b/drivers/net/enic/enic_rxtx.c @@ -246,10 +246,12 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf) pkt_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED; mbuf->packet_type |= RTE_PTYPE_L2_ETHER; } else { - if (vlan_tci != 0) + if (vlan_tci != 0) { + pkt_flags |= PKT_RX_VLAN; mbuf->packet_type |= RTE_PTYPE_L2_ETHER_VLAN; - else + } else { mbuf->packet_type |= RTE_PTYPE_L2_ETHER; + } } mbuf->vlan_tci = vlan_tci; -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:47.226240479 -0800 +++ 0045-net-enic-set-Rx-VLAN-offload-flag-for-non-stripped-p.patch 2018-11-29 15:01:45.091968000 -0800 @@ -1,14 +1,15 @@ -From fe5383d133f484d7cb2ad385bbf1e43ad7078682 Mon Sep 17 00:00:00 2001 +From 9a22a39b269525ab585f51d4b358a2075f3fd4f8 Mon Sep 17 00:00:00 2001 From: Hyong Youb Kim Date: Tue, 25 Sep 2018 19:54:19 -0700 Subject: [PATCH] net/enic: set Rx VLAN offload flag for non-stripped packets +[ upstream commit fe5383d133f484d7cb2ad385bbf1e43ad7078682 ] + The NIC indicates VLAN TCI to the driver even when VLAN stripping is disabled. The driver sets mbuf's vlan_tci but not PKT_RX_VLAN. Set PKT_RX_VLAN to indicate that vlan_tci is valid. Fixes: c6f455507411 ("net/enic: add ethernet VLAN packet type") -Cc: stable@dpdk.org Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley @@ -17,10 +18,10 @@ 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c -index 7129e1217..0eb113d75 100644 +index 831c90a1c..f8dd09c35 100644 --- a/drivers/net/enic/enic_rxtx.c +++ b/drivers/net/enic/enic_rxtx.c -@@ -233,10 +233,12 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf) +@@ -246,10 +246,12 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf) pkt_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED; mbuf->packet_type |= RTE_PTYPE_L2_ETHER; } else {