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 36DA4A0613 for ; Tue, 27 Aug 2019 11:31:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D6A21BFF1; Tue, 27 Aug 2019 11:31:42 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E25631BFF1 for ; Tue, 27 Aug 2019 11:31:40 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 63E0481F0E; Tue, 27 Aug 2019 09:31:40 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10B4A5C1D6; Tue, 27 Aug 2019 09:31:38 +0000 (UTC) From: Kevin Traynor To: Xiao Wang Cc: Qi Zhang , dpdk stable Date: Tue, 27 Aug 2019 10:30:16 +0100 Message-Id: <20190827093032.20423-39-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 27 Aug 2019 09:31:40 +0000 (UTC) Subject: [dpdk-stable] patch 'net/fm10k: fix descriptor filling in vector Tx' has been queued to LTS release 18.11.3 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 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/03/19. 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. 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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/04b68044ad996b6894e7d080231cafa9f833b942 Thanks. Kevin Traynor --- >From 04b68044ad996b6894e7d080231cafa9f833b942 Mon Sep 17 00:00:00 2001 From: Xiao Wang Date: Wed, 3 Jul 2019 10:53:32 +0800 Subject: [PATCH] net/fm10k: fix descriptor filling in vector Tx [ upstream commit e62d90f2a21b5196aa7606a933923c068a500bee ] The shift left operation "pkt->vlan_tci << 16" gets vlan_tci extended to signed type and may cause invalid descriptor. Also the same issue for the "data_len" field. This patch fixes it by casting them to uint64_t. Fixes: 21f13c541eb0 ("fm10k: add vector Tx") Signed-off-by: Xiao Wang Acked-by: Qi Zhang --- drivers/net/fm10k/fm10k_rxtx_vec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c index 96b46a2bd..788e2484a 100644 --- a/drivers/net/fm10k/fm10k_rxtx_vec.c +++ b/drivers/net/fm10k/fm10k_rxtx_vec.c @@ -712,5 +712,5 @@ vtx1(volatile struct fm10k_tx_desc *txdp, { __m128i descriptor = _mm_set_epi64x(flags << 56 | - pkt->vlan_tci << 16 | pkt->data_len, + (uint64_t)pkt->vlan_tci << 16 | (uint64_t)pkt->data_len, MBUF_DMA_ADDR(pkt)); _mm_store_si128((__m128i *)txdp, descriptor); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:13.047059825 +0100 +++ 0039-net-fm10k-fix-descriptor-filling-in-vector-Tx.patch 2019-08-27 09:40:10.933144072 +0100 @@ -1 +1 @@ -From e62d90f2a21b5196aa7606a933923c068a500bee Mon Sep 17 00:00:00 2001 +From 04b68044ad996b6894e7d080231cafa9f833b942 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e62d90f2a21b5196aa7606a933923c068a500bee ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org