From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 929EDA04B1 for ; Thu, 5 Nov 2020 13:41:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8ADFCC31B; Thu, 5 Nov 2020 13:41:31 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id DA6AAC31D for ; Thu, 5 Nov 2020 13:41:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H6BTk/rsSsdVuw7LOVEkuxAZJxsXgOk1TCZuTovWkKE=; b=KUF+Alcb+Jkeucb79ua++fFUYQeSe/IqODJBaCjBJK0YRnAY7gP2YypaiL5Y/E2TlhFFoH Ti9sBLIKrIEMnu5ynu0Z5ocq9yv8WY14zOso38ncOb4aGlmpMYjgl97jlj9ZynQYie8Th9 mJydKoyN6MGVEvjY51yYt2S0E3bsCic= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-553-GLVmnoMPOemXyuAVrrLEXA-1; Thu, 05 Nov 2020 07:41:25 -0500 X-MC-Unique: GLVmnoMPOemXyuAVrrLEXA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 69DBD805EFD; Thu, 5 Nov 2020 12:41:24 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1806E5C3E1; Thu, 5 Nov 2020 12:41:22 +0000 (UTC) From: Kevin Traynor To: Chengchang Tang Cc: Wei Hu , Ferruh Yigit , dpdk stable Date: Thu, 5 Nov 2020 12:39:38 +0000 Message-Id: <20201105124015.306404-31-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'app/testpmd: fix VLAN configuration on failure' has been queued to LTS release 18.11.11 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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. 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/4d4942b0a24e17d3f662141f752fb814cd70ad77 Thanks. Kevin. --- >From 4d4942b0a24e17d3f662141f752fb814cd70ad77 Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Fri, 25 Sep 2020 20:47:15 +0800 Subject: [PATCH] app/testpmd: fix VLAN configuration on failure [ upstream commit 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 ] When failing to configure VLAN offloads after the port was started, there is no need to update the port configuration. Currently, when user configure an unsupported VLAN offloads and fails, and then restart the port, it will fails since the configuration has been refreshed. This patch makes the function return directly instead of refreshing the configuration when execution fails. Fixes: 384161e00627 ("app/testpmd: adjust on the fly VLAN configuration") Signed-off-by: Chengchang Tang Signed-off-by: Wei Hu (Xavier) Reviewed-by: Ferruh Yigit --- app/test-pmd/config.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 6c4a6423d5..e5945426fa 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2886,7 +2886,9 @@ vlan_extend_set(portid_t port_id, int on) diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload); - if (diag < 0) + if (diag < 0) { printf("rx_vlan_extend_set(port_pi=%d, on=%d) failed " "diag=%d\n", port_id, on, diag); + return; + } ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads; } @@ -2913,7 +2915,9 @@ rx_vlan_strip_set(portid_t port_id, int on) diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload); - if (diag < 0) + if (diag < 0) { printf("rx_vlan_strip_set(port_pi=%d, on=%d) failed " "diag=%d\n", port_id, on, diag); + return; + } ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads; } @@ -2954,7 +2958,9 @@ rx_vlan_filter_set(portid_t port_id, int on) diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload); - if (diag < 0) + if (diag < 0) { printf("rx_vlan_filter_set(port_pi=%d, on=%d) failed " "diag=%d\n", port_id, on, diag); + return; + } ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.860303505 +0000 +++ 0031-app-testpmd-fix-VLAN-configuration-on-failure.patch 2020-11-05 12:38:54.227896010 +0000 @@ -1 +1 @@ -From 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 Mon Sep 17 00:00:00 2001 +From 4d4942b0a24e17d3f662141f752fb814cd70ad77 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -21,2 +22,2 @@ - app/test-pmd/config.c | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) + app/test-pmd/config.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) @@ -25 +26 @@ -index 03bf26bc94..0bec547f51 100644 +index 6c4a6423d5..e5945426fa 100644 @@ -28 +29 @@ -@@ -3510,7 +3510,9 @@ vlan_extend_set(portid_t port_id, int on) +@@ -2886,7 +2886,9 @@ vlan_extend_set(portid_t port_id, int on) @@ -39 +40 @@ -@@ -3537,7 +3539,9 @@ rx_vlan_strip_set(portid_t port_id, int on) +@@ -2913,7 +2915,9 @@ rx_vlan_strip_set(portid_t port_id, int on) @@ -50 +51 @@ -@@ -3578,7 +3582,9 @@ rx_vlan_filter_set(portid_t port_id, int on) +@@ -2954,7 +2958,9 @@ rx_vlan_filter_set(portid_t port_id, int on) @@ -57,11 +57,0 @@ -+ return; -+ } - ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads; - } -@@ -3605,7 +3611,9 @@ rx_vlan_qinq_strip_set(portid_t port_id, int on) - - diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload); -- if (diag < 0) -+ if (diag < 0) { - printf("%s(port_pi=%d, on=%d) failed " - "diag=%d\n", __func__, port_id, on, diag);