[dpdk-stable] patch 'net/fm10k: fix descriptor filling in vector Tx' has been queued to LTS release 18.11.3

[Kevin Traynor]

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 <xiao.w.wang at intel.com>
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 <xiao.w.wang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 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 at dpdk.org