From: Kevin Traynor <ktraynor@redhat.com>
To: Wei Zhao <wei.zhao1@intel.com>
Cc: Peng Yuan <yuan.peng@intel.com>,
Ferruh Yigit <ferruh.yigit@intel.com>,
Wenzhuo Lu <wenzhuo.lu@intel.com>,
Jingjing Wu <jingjing.wu@intel.com>,
Bernard Iremonger <bernard.iremonger@intel.com>,
dpdk stable <stable@dpdk.org>
Subject: Re: [dpdk-stable] patch 'app/testpmd: fix offloads config' has been queued to LTS release 18.11.3
Date: Fri, 23 Aug 2019 10:59:42 +0100 [thread overview]
Message-ID: <523fa4cd-0589-cee9-abbe-052073e1b0eb@redhat.com> (raw)
In-Reply-To: <20190823094336.12078-46-ktraynor@redhat.com>
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.
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/df34973221d9e24d74b5381e540e95561ae69458
>
> Thanks.
>
> Kevin Traynor
>
> ---
> From df34973221d9e24d74b5381e540e95561ae69458 Mon Sep 17 00:00:00 2001
> From: Wei Zhao <wei.zhao1@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@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@dpdk.org
>
> Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> Tested-by: Peng Yuan <yuan.peng@intel.com>
>
> commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517
> Author: Wei Zhao <wei.zhao1@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@dpdk.org
>
> Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
>
> Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>
> Cc: Jingjing Wu <jingjing.wu@intel.com>
> Cc: Bernard Iremonger <bernard.iremonger@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 */
>
next prev parent reply other threads:[~2019-08-23 9:59 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-23 9:42 [dpdk-stable] patch 'net/bnx2x: fix warnings from invalid assert' " Kevin Traynor
2019-08-23 9:42 ` [dpdk-stable] patch 'net/qede: " Kevin Traynor
2019-08-23 9:42 ` [dpdk-stable] patch 'eal: correct log for alarm error' " Kevin Traynor
2019-08-23 9:42 ` [dpdk-stable] patch 'eal/linux: fix return after alarm registration failure' " Kevin Traynor
2019-08-23 9:42 ` [dpdk-stable] patch 'kernel/freebsd: fix module build on latest head' " Kevin Traynor
2019-08-23 9:42 ` [dpdk-stable] patch 'kernel/linux: fix modules install path' " Kevin Traynor
2019-08-23 10:04 ` Igor Ryzhov
2019-08-23 9:42 ` [dpdk-stable] patch 'ip_frag: fix IPv6 fragment size calculation' " Kevin Traynor
2019-08-23 9:42 ` [dpdk-stable] patch 'test/hash: fix off-by-one check on core count' " Kevin Traynor
2019-08-23 9:42 ` [dpdk-stable] patch 'test/hash: rectify slave id to point to valid cores' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'bus/vmbus: skip non-network devices' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'bpf: fix check array size' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'eal: hide internal hotplug function' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'vfio: remove incorrect experimental tag' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'mem: remove incorrect experimental tag on static symbol' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'telemetry: add missing header include' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'eal: fix positive error codes from probe/remove' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'net/bnx2x: fix invalid free on unplug' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'drivers/net: fix double free on init failure' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'net: fix encapsulation markers for inner L3 offset' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'net/mlx5: fix 32-bit build' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'net/netvsc: fix RSS offload settings' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'net/netvsc: fix xstats id' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'net/netvsc: fix xstats for VF device' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'doc: fix typos in flow API guide' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'net: fix how L4 checksum choice is tested' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'eal/freebsd: fix init completion' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'raw/skeleton: fix test of attribute set/get' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'examples/l3fwd-vf: remove unused Rx/Tx configuration' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'doc: remove useless Rx configuration in l2fwd guide' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'test: add rawdev autotest to meson' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'event/dpaa2: fix timeout ticks' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'eventdev: fix doxygen comment' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'app/eventdev: fix order test port creation' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'test/eventdev: fix producer core validity checks' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'net/mvneta: fix ierror statistics' " Kevin Traynor
2019-08-25 11:41 ` [dpdk-stable] [EXT] " Liron Himi
2019-08-23 9:43 ` [dpdk-stable] patch 'net: fix definition of IPv6 traffic class mask' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'examples: fix pkg-config detection with older make' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'bpf: fix validate for function return value' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'raw/ifpga/base: fix use of untrusted scalar " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'raw/ifpga/base: fix physical address info' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'usertools: fix refresh binding infos' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'doc: add a note for multi-process in mempool guide' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'table: fix crash in LPM IPv6' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'test: fix autotest crash' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'telemetry: fix build' " Kevin Traynor
2019-08-23 9:43 ` [dpdk-stable] patch 'app/testpmd: fix offloads config' " Kevin Traynor
2019-08-23 9:59 ` Kevin Traynor [this message]
2019-09-04 17:44 ` Kevin Traynor
2019-09-05 2:14 ` Zhao1, Wei
2019-09-11 14:46 ` Kevin Traynor
2019-09-13 9:27 ` Iremonger, Bernard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=523fa4cd-0589-cee9-abbe-052073e1b0eb@redhat.com \
--to=ktraynor@redhat.com \
--cc=bernard.iremonger@intel.com \
--cc=ferruh.yigit@intel.com \
--cc=jingjing.wu@intel.com \
--cc=stable@dpdk.org \
--cc=wei.zhao1@intel.com \
--cc=wenzhuo.lu@intel.com \
--cc=yuan.peng@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).