[dpdk-stable] patch 'app/testpmd: fix offloads config' has been queued to LTS release 18.11.3

[Zhao1, Wei]

Hi, I have discussion with Intel validation team before, there is no problem caused by these two patch by now.
ALL caused issue has been fixed by other patch.

> -----Original Message-----
> From: Kevin Traynor [mailto:ktraynor at redhat.com]
> Sent: Thursday, September 5, 2019 1:44 AM
> To: Zhao1, Wei <wei.zhao1 at intel.com>; Lu, Wenzhuo <wenzhuo.lu at intel.com>;
> Wu, Jingjing <jingjing.wu at intel.com>; Iremonger, Bernard
> <bernard.iremonger at intel.com>
> Cc: Peng, Yuan <yuan.peng at intel.com>; Yigit, Ferruh <ferruh.yigit at intel.com>;
> dpdk stable <stable at dpdk.org>
> Subject: Re: [dpdk-stable] patch 'app/testpmd: fix offloads config' has been
> queued to LTS release 18.11.3
> 
> On 23/08/2019 10:59, Kevin Traynor wrote:
> > On 23/08/2019 10:43, Kevin Traynor wrote:
> >> 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 08/28/19. So please
> >> shout if anyone has objections.
> >>
> >
> > Hi, the first of these 2 squashed patches in isolation caused a
> > regression found by Intel validation team which required a lot of
> > investigation and it being reverted at the last moment before 18.11.2.
> >
> > In this case I would like an Ack from Zhao and one of the testpmd
> > maintainers that they will support this before applying the patch below.
> >
> 
> Ping Zhao and testpmd maintainers
> 
> > thanks,
> > Kevin.
> >
> >> 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/df34973221d9
> >> e24d74b5381e540e95561ae69458
> >>
> >> Thanks.
> >>
> >> Kevin Traynor
> >>
> >> ---
> >> From df34973221d9e24d74b5381e540e95561ae69458 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 offloads config
> >>
> >> [ upstream commit 5e91aeef218c452c370aacf74265c7a42b67dffa ] [
> >> upstream commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517 ]
> >>
> >> This is a squashed commit of the above upstream master commits.
> >>
> >> 5e91aeef218c was previously applied to stable as:
> >> c14f54bd7fea ("app/testpmd: fix offload flags after port config") but
> >> had to be reverted in:
> >> 4d1815fe6a73 ("Revert "app/testpmd: fix offload flags after port
> >> config"") as it caused a regression.
> >>
> >> Now that 575e0fd1a0b3 is available in upstream master to fix that
> >> regression, squashing those two commits and applying to stable.
> >>
> >> Original upstream master commit messages:
> >>
> >> commit 5e91aeef218c452c370aacf74265c7a42b67dffa
> >> Author: Wei Zhao <wei.zhao1 at intel.com>
> >> Date:   Thu May 9 15:20:47 2019 +0800
> >>
> >>     app/testpmd: fix offload flags after port config
> >>
> >>     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")
> >>     Cc: stable at dpdk.org
> >>
> >>     Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
> >>     Tested-by: Peng Yuan <yuan.peng at intel.com>
> >>
> >> commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517
> >> Author: Wei Zhao <wei.zhao1 at intel.com>
> >> Date:   Mon Jun 10 14:45:10 2019 +0800
> >>
> >>     app/testpmd: fix offloads config
> >>
> >>     There is no need to use default offloads configuration
> >>     if offloads configuration has been pass down from upper layer.
> >>     The default offloads are overwritten if not zero.
> >>
> >>     Fixes: 5e91aeef218c ("app/testpmd: fix offload flags after port config")
> >>     Cc: stable at dpdk.org
> >>
> >>     Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
> >>     Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
> >>
> >> Cc: Wenzhuo Lu <wenzhuo.lu at intel.com>
> >> Cc: Jingjing Wu <jingjing.wu at intel.com>
> >> Cc: Bernard Iremonger <bernard.iremonger at intel.com>
> >> ---
> >>  app/test-pmd/testpmd.c | 7 +++++++
> >>  1 file changed, 7 insertions(+)
> >>
> >> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
> >> b4215c75d..41283b481 100644
> >> --- a/app/test-pmd/testpmd.c
> >> +++ b/app/test-pmd/testpmd.c
> >> @@ -2736,7 +2736,11 @@ 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;
> >> +		if (offloads != 0)
> >> +			port->rx_conf[qid].offloads = offloads;
> >>
> >>  		/* Check if any Rx parameters have been passed */ @@ -
> 2760,5
> >> +2764,8 @@ 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;
> >> +		if (offloads != 0)
> >> +			port->tx_conf[qid].offloads = offloads;
> >>
> >>  		/* Check if any Tx parameters have been passed */
> >>
> >