From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 55FBEA0B0A for ; Tue, 14 May 2019 16:45:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3FB0F5F36; Tue, 14 May 2019 16:45:23 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 6C0735F24 for ; Tue, 14 May 2019 16:45:21 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC06D308A10C; Tue, 14 May 2019 14:45:15 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-124.ams2.redhat.com [10.36.116.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id B12FA608A7; Tue, 14 May 2019 14:45:12 +0000 (UTC) From: Kevin Traynor To: Wei Zhao Cc: Peng Yuan , dpdk stable Date: Tue, 14 May 2019 15:44:05 +0100 Message-Id: <20190514144406.7526-21-ktraynor@redhat.com> In-Reply-To: <20190514144406.7526-1-ktraynor@redhat.com> References: <20190514144406.7526-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 14 May 2019 14:45:20 +0000 (UTC) Subject: [dpdk-stable] patch 'app/testpmd: fix offload flags after port config' has been queued to LTS release 18.11.2 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.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 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 Tested-by: Peng Yuan --- 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@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)