[dpdk-stable] patch 'app/testpmd: fix offload flags after port config' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/20/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/c14f54bd7feabbd28d80b069f6089fccf71b23ea

Thanks.

Kevin Traynor

---
>From c14f54bd7feabbd28d80b069f6089fccf71b23ea Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1 at intel.com>
Date: Thu, 9 May 2019 15:20:47 +0800
Subject: [PATCH] app/testpmd: fix offload flags after port config

[ upstream commit 5e91aeef218c452c370aacf74265c7a42b67dffa ]

There is an error in function rxtx_port_config(), which may overwrite
offloads configuration get from function launch_args_parse() when run
testpmd app. So rxtx_port_config() should do "or" for port offloads.

Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")

Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
Tested-by: Peng Yuan <yuan.peng at intel.com>
---
 app/test-pmd/testpmd.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index cf983b16b..cf1fc7ab5 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2736,7 +2736,10 @@ rxtx_port_config(struct rte_port *port)
 {
 	uint16_t qid;
+	uint64_t offloads;
 
 	for (qid = 0; qid < nb_rxq; qid++) {
+		offloads = port->rx_conf[qid].offloads;
 		port->rx_conf[qid] = port->dev_info.default_rxconf;
+		port->rx_conf[qid].offloads |= offloads;
 
 		/* Check if any Rx parameters have been passed */
@@ -2760,5 +2763,7 @@ rxtx_port_config(struct rte_port *port)
 
 	for (qid = 0; qid < nb_txq; qid++) {
+		offloads = port->tx_conf[qid].offloads;
 		port->tx_conf[qid] = port->dev_info.default_txconf;
+		port->tx_conf[qid].offloads |= offloads;
 
 		/* Check if any Tx parameters have been passed */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:08.310485890 +0100
+++ 0021-app-testpmd-fix-offload-flags-after-port-config.patch	2019-05-14 15:39:07.325558571 +0100
@@ -1 +1 @@
-From 5e91aeef218c452c370aacf74265c7a42b67dffa Mon Sep 17 00:00:00 2001
+From c14f54bd7feabbd28d80b069f6089fccf71b23ea Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5e91aeef218c452c370aacf74265c7a42b67dffa ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 6fbfd29dd..f0061d99f 100644
+index cf983b16b..cf1fc7ab5 100644
@@ -23 +24 @@
-@@ -2810,7 +2810,10 @@ rxtx_port_config(struct rte_port *port)
+@@ -2736,7 +2736,10 @@ rxtx_port_config(struct rte_port *port)
@@ -34 +35 @@
-@@ -2834,5 +2837,7 @@ rxtx_port_config(struct rte_port *port)
+@@ -2760,5 +2763,7 @@ rxtx_port_config(struct rte_port *port)