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 7B2BF1B517 for ; Fri, 30 Nov 2018 00:15:10 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:21:01 +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 wATNCW8V032075; Fri, 30 Nov 2018 01:15:05 +0200 From: Yongseok Koh To: Xiaolong Ye Cc: Qi Zhang , dpdk stable Date: Thu, 29 Nov 2018 15:11:25 -0800 Message-Id: <20181129231202.30436-91-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/i40e: fix offload not supported mask' 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:15:10 -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 b915b36d1b9b7a313f906ccabda24a00c96318eb Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Fri, 26 Oct 2018 14:33:14 +0800 Subject: [PATCH] net/i40e: fix offload not supported mask [ upstream commit 09a62d75691fb935c7767d51b750df5910825985 ] Just as the name I40E_TX_OFFLOAD_NOTSUP_MASK indicates, it should be the mask of unsupported features (either not in PKT_TX_OFFLOAD_MASK or in I40E_TX_OFFLOAD_MASK), however, xor will not get desired result here, assume bit 0 of PKT_TX_OFFLOAD_MASK and I40E_TX_OFFLOAD_MAKS are 0 which means corresponding feature is not supported in both sides, then we get value of bit 0 of I40E_TX_OFFLOAD_NOTSUP_MASK which is 0 via xor, it implies that it is supported which doesn't meet our expectation. Correct it by a NOT-AND operation. Fixes: 3f33e643e5c6 ("net/i40e: add Tx preparation") Signed-off-by: Xiaolong Ye Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index ce6a30507..fb35d1221 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -101,7 +101,7 @@ I40E_TX_IEEE1588_TMST) #define I40E_TX_OFFLOAD_NOTSUP_MASK \ - (PKT_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_MASK) + ~(PKT_TX_OFFLOAD_MASK & I40E_TX_OFFLOAD_MASK) static uint16_t i40e_xmit_pkts_simple(void *tx_queue, struct rte_mbuf **tx_pkts, -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:49.215221295 -0800 +++ 0091-net-i40e-fix-offload-not-supported-mask.patch 2018-11-29 15:01:45.244959000 -0800 @@ -1,8 +1,10 @@ -From 09a62d75691fb935c7767d51b750df5910825985 Mon Sep 17 00:00:00 2001 +From b915b36d1b9b7a313f906ccabda24a00c96318eb Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Fri, 26 Oct 2018 14:33:14 +0800 Subject: [PATCH] net/i40e: fix offload not supported mask +[ upstream commit 09a62d75691fb935c7767d51b750df5910825985 ] + Just as the name I40E_TX_OFFLOAD_NOTSUP_MASK indicates, it should be the mask of unsupported features (either not in PKT_TX_OFFLOAD_MASK or in I40E_TX_OFFLOAD_MASK), however, xor will not get desired result here, @@ -14,7 +16,6 @@ Correct it by a NOT-AND operation. Fixes: 3f33e643e5c6 ("net/i40e: add Tx preparation") -Cc: stable@dpdk.org Signed-off-by: Xiaolong Ye Acked-by: Qi Zhang @@ -23,18 +24,18 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c -index 8bfa25178..e76412207 100644 +index ce6a30507..fb35d1221 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c -@@ -69,7 +69,7 @@ +@@ -101,7 +101,7 @@ I40E_TX_IEEE1588_TMST) #define I40E_TX_OFFLOAD_NOTSUP_MASK \ - (PKT_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_MASK) + ~(PKT_TX_OFFLOAD_MASK & I40E_TX_OFFLOAD_MASK) - static inline void - i40e_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union i40e_rx_desc *rxdp) + static uint16_t i40e_xmit_pkts_simple(void *tx_queue, + struct rte_mbuf **tx_pkts, -- 2.11.0