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 10424A046B for ; Tue, 23 Jul 2019 03:03:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 02DE91BEF8; Tue, 23 Jul 2019 03:03:05 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 5DC3B1BF8B for ; Tue, 23 Jul 2019 03:03:04 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:03:03 +0300 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 x6N11Hfi026580; Tue, 23 Jul 2019 04:03:02 +0300 From: Yongseok Koh To: Xiao Wang Cc: dpdk stable Date: Mon, 22 Jul 2019 18:00:25 -0700 Message-Id: <20190723010115.6446-58-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/fm10k: fix VLAN strip offload flag' has been queued to LTS release 17.11.7 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Yongseok --- >From 76fe930def41f51fc31d76c31e27a0d9c0d857e9 Mon Sep 17 00:00:00 2001 From: Xiao Wang Date: Wed, 27 Mar 2019 13:09:03 +0800 Subject: [PATCH] net/fm10k: fix VLAN strip offload flag [ upstream commit ae843c69aa55d25b1c0ef7984501b2356ed5fe88 ] Since the VLAN header is stripped from mbuf data, PKT_RX_VLAN_STRIPPED should be set in offload flag. Fixes: 6b59a3bc82b1 ("fm10k: fix VLAN in Rx mbuf") Fixes: 7092be8437bd ("fm10k: add vector Rx") Signed-off-by: Xiao Wang --- drivers/net/fm10k/fm10k_rxtx.c | 4 ++-- drivers/net/fm10k/fm10k_rxtx_vec.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c index 59459212b3..979c16ef3d 100644 --- a/drivers/net/fm10k/fm10k_rxtx.c +++ b/drivers/net/fm10k/fm10k_rxtx.c @@ -163,7 +163,7 @@ fm10k_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, * So, always PKT_RX_VLAN flag is set and vlan_tci * is valid for each RX packet's mbuf. */ - mbuf->ol_flags |= PKT_RX_VLAN; + mbuf->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED; mbuf->vlan_tci = desc.w.vlan; /** * mbuf->vlan_tci_outer is an idle field in fm10k driver, @@ -324,7 +324,7 @@ fm10k_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, * So, always PKT_RX_VLAN flag is set and vlan_tci * is valid for each RX packet's mbuf. */ - first_seg->ol_flags |= PKT_RX_VLAN; + first_seg->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED; first_seg->vlan_tci = desc.w.vlan; /** * mbuf->vlan_tci_outer is an idle field in fm10k driver, diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c index ce042d3d2a..1a66dc3dbf 100644 --- a/drivers/net/fm10k/fm10k_rxtx_vec.c +++ b/drivers/net/fm10k/fm10k_rxtx_vec.c @@ -81,8 +81,10 @@ fm10k_desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts) const __m128i pkttype_msk = _mm_set_epi16( 0x0000, 0x0000, 0x0000, 0x0000, - PKT_RX_VLAN, PKT_RX_VLAN, - PKT_RX_VLAN, PKT_RX_VLAN); + PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED, + PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED, + PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED, + PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED); /* mask everything except rss type */ const __m128i rsstype_msk = _mm_set_epi16( -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:09.618386790 -0700 +++ 0058-net-fm10k-fix-VLAN-strip-offload-flag.patch 2019-07-22 17:55:06.170473000 -0700 @@ -1,14 +1,15 @@ -From ae843c69aa55d25b1c0ef7984501b2356ed5fe88 Mon Sep 17 00:00:00 2001 +From 76fe930def41f51fc31d76c31e27a0d9c0d857e9 Mon Sep 17 00:00:00 2001 From: Xiao Wang Date: Wed, 27 Mar 2019 13:09:03 +0800 Subject: [PATCH] net/fm10k: fix VLAN strip offload flag +[ upstream commit ae843c69aa55d25b1c0ef7984501b2356ed5fe88 ] + Since the VLAN header is stripped from mbuf data, PKT_RX_VLAN_STRIPPED should be set in offload flag. Fixes: 6b59a3bc82b1 ("fm10k: fix VLAN in Rx mbuf") Fixes: 7092be8437bd ("fm10k: add vector Rx") -Cc: stable@dpdk.org Signed-off-by: Xiao Wang --- @@ -17,10 +18,10 @@ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c -index 1d0f09d258..fb02e1152a 100644 +index 59459212b3..979c16ef3d 100644 --- a/drivers/net/fm10k/fm10k_rxtx.c +++ b/drivers/net/fm10k/fm10k_rxtx.c -@@ -134,7 +134,7 @@ fm10k_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, +@@ -163,7 +163,7 @@ fm10k_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, * So, always PKT_RX_VLAN flag is set and vlan_tci * is valid for each RX packet's mbuf. */ @@ -29,7 +30,7 @@ mbuf->vlan_tci = desc.w.vlan; /** * mbuf->vlan_tci_outer is an idle field in fm10k driver, -@@ -295,7 +295,7 @@ fm10k_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, +@@ -324,7 +324,7 @@ fm10k_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, * So, always PKT_RX_VLAN flag is set and vlan_tci * is valid for each RX packet's mbuf. */ @@ -39,10 +40,10 @@ /** * mbuf->vlan_tci_outer is an idle field in fm10k driver, diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c -index 005fda6305..96b46a2bdf 100644 +index ce042d3d2a..1a66dc3dbf 100644 --- a/drivers/net/fm10k/fm10k_rxtx_vec.c +++ b/drivers/net/fm10k/fm10k_rxtx_vec.c -@@ -52,8 +52,10 @@ fm10k_desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts) +@@ -81,8 +81,10 @@ fm10k_desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts) const __m128i pkttype_msk = _mm_set_epi16( 0x0000, 0x0000, 0x0000, 0x0000,