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 419ECA046B for ; Tue, 23 Jul 2019 03:03:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 159C21BFC0; Tue, 23 Jul 2019 03:03:36 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id A80C21BFA1 for ; Tue, 23 Jul 2019 03:03:34 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:03:29 +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 x6N11Hg0026580; Tue, 23 Jul 2019 04:03:28 +0300 From: Yongseok Koh To: Bill Hong Cc: Chas Williams , Ferruh Yigit , dpdk stable Date: Mon, 22 Jul 2019 18:00:41 -0700 Message-Id: <20190723010115.6446-74-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: fix Tx VLAN flag for offload emulation' 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 94717db993e40c0d839f28a8ad41ef8c2a93a5ee Mon Sep 17 00:00:00 2001 From: Bill Hong Date: Mon, 25 Mar 2019 11:05:41 -0400 Subject: [PATCH] net: fix Tx VLAN flag for offload emulation [ backported from upstream commit 9ea1b3ccfcfd556ec5144fa91041cf8f86814c5f ] A PMD might use rte_vlan_insert to implement Tx VLAN offload. Typically the PMD will insert the VLAN header in the transmit path and then attempt to send the packets. If this fails, the packets are returned to the application which may attempt to send these packets again. If the PKT_TX_VLAN flag is not cleared, the transmit path may attempt to insert the VLAN header again. Fixes: 47aa48b969f8 ("net: fix stripped VLAN flag for offload emulation") Signed-off-by: Bill Hong Signed-off-by: Chas Williams Reviewed-by: Ferruh Yigit --- lib/librte_net/rte_ether.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index f7a9a86958..9ae2b4e96f 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -409,7 +409,7 @@ static inline int rte_vlan_insert(struct rte_mbuf **m) vh = (struct vlan_hdr *) (nh + 1); vh->vlan_tci = rte_cpu_to_be_16((*m)->vlan_tci); - (*m)->ol_flags &= ~PKT_RX_VLAN_STRIPPED; + (*m)->ol_flags &= ~(PKT_RX_VLAN_STRIPPED | PKT_TX_VLAN_PKT); return 0; } -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:10.450863787 -0700 +++ 0074-net-fix-Tx-VLAN-flag-for-offload-emulation.patch 2019-07-22 17:55:06.259474000 -0700 @@ -1,8 +1,10 @@ -From 9ea1b3ccfcfd556ec5144fa91041cf8f86814c5f Mon Sep 17 00:00:00 2001 +From 94717db993e40c0d839f28a8ad41ef8c2a93a5ee Mon Sep 17 00:00:00 2001 From: Bill Hong Date: Mon, 25 Mar 2019 11:05:41 -0400 Subject: [PATCH] net: fix Tx VLAN flag for offload emulation +[ backported from upstream commit 9ea1b3ccfcfd556ec5144fa91041cf8f86814c5f ] + A PMD might use rte_vlan_insert to implement Tx VLAN offload. Typically the PMD will insert the VLAN header in the transmit path and then attempt to send the packets. If this fails, the packets are returned to @@ -11,7 +13,6 @@ the VLAN header again. Fixes: 47aa48b969f8 ("net: fix stripped VLAN flag for offload emulation") -Cc: stable@dpdk.org Signed-off-by: Bill Hong Signed-off-by: Chas Williams @@ -21,15 +22,15 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h -index 54822df751..3a87ff1849 100644 +index f7a9a86958..9ae2b4e96f 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h -@@ -410,7 +410,7 @@ static inline int rte_vlan_insert(struct rte_mbuf **m) +@@ -409,7 +409,7 @@ static inline int rte_vlan_insert(struct rte_mbuf **m) vh = (struct vlan_hdr *) (nh + 1); vh->vlan_tci = rte_cpu_to_be_16((*m)->vlan_tci); - (*m)->ol_flags &= ~PKT_RX_VLAN_STRIPPED; -+ (*m)->ol_flags &= ~(PKT_RX_VLAN_STRIPPED | PKT_TX_VLAN); ++ (*m)->ol_flags &= ~(PKT_RX_VLAN_STRIPPED | PKT_TX_VLAN_PKT); return 0; }