From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id DA2631B51D for ; Fri, 23 Nov 2018 11:29:31 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4036C859FF; Fri, 23 Nov 2018 10:29:31 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF662413C; Fri, 23 Nov 2018 10:29:29 +0000 (UTC) From: Kevin Traynor To: Xiaolong Ye Cc: Qi Zhang , dpdk stable Date: Fri, 23 Nov 2018 10:26:32 +0000 Message-Id: <20181123102713.17309-28-ktraynor@redhat.com> In-Reply-To: <20181123102713.17309-1-ktraynor@redhat.com> References: <20181123102713.17309-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 23 Nov 2018 10:29:31 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix offload not supported mask' has been queued to stable release 18.08.1 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: Fri, 23 Nov 2018 10:29:32 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/29/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. Kevin Traynor --- >>From 8d3c198d31cc0cc7932d6b86c85f6b619cb73a73 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 de49f4478..26c2f17bd 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -70,5 +70,5 @@ #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 -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-23 10:22:54.985789217 +0000 +++ 0028-net-i40e-fix-offload-not-supported-mask.patch 2018-11-23 10:22:54.000000000 +0000 @@ -1,8 +1,10 @@ -From 09a62d75691fb935c7767d51b750df5910825985 Mon Sep 17 00:00:00 2001 +From 8d3c198d31cc0cc7932d6b86c85f6b619cb73a73 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,7 +24,7 @@ 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 de49f4478..26c2f17bd 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -70,5 +70,5 @@