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 73E60A04DD for ; Wed, 28 Oct 2020 11:50:48 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6D1582C2A; Wed, 28 Oct 2020 11:50:47 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 77A8D2C2A for ; Wed, 28 Oct 2020 11:50:45 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id i1so5190856wro.1 for ; Wed, 28 Oct 2020 03:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mqQbJoGpZdgt53S46A3kiQOhOh05g/UGOjPzxhr4tDU=; b=SHHBxZpDclERp2wnzhstaNuDNHa8iOjvBmwiL+EHOx7JqVbwS30F3PIQ98jkKBE9iX +sH0cgKGY/gVM7NCP6Xq5J97Mg9yPELpJLUfLuZU863Y4FAKbnx8OuD7uCitDWc+JcdG QTUGOYlyuJsoPUqRSU6Y3hRVpXHNeQ2MH2WzMbzHRq9wW1GjTGQzO9EaeiaPyLJPNgac eHUBOFpGCstdw3I6+DgkahZULeTz+ce/hw4SHW+3X9xvAq1xMJccoo3zPlSaPwjWwJW+ xRJDxOTdA4AYoWCvFN+wr7lSdpNPfuzITBMkdf/C4PsbJxvoIsBkVPxEKJJyCcWjlvgK Drgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mqQbJoGpZdgt53S46A3kiQOhOh05g/UGOjPzxhr4tDU=; b=HAYzmbyZhbQCCHV58v5WJtyWd5gsDX+BPB4fFibWrhAKVWYpWbCC1q9WRVNIxiYnbp 6ogPBQ6oMdjqj1RIIXcnUo+RWQa58JcAH5XoN4crdH6xLVKcP4jAFGnCqjxM0OnCQIsP Be8WLolQtS+ng9OhlxHXl8EK3ymu1tOmGUzraiDWFEMtSIXxbSaitDHB2fNSoTSjFM34 D73pz9QjoyJ488FJL6xPvePpkyrv3KmgDWUvRaaEZtT5/OqXfn8/hKXBOnXEdT6kzztB PiDpA9iyFDmbDWlGf6vFtYBwr4pZCLxbJBbcmuxdVLpQV6qNU89aKT7W0HYUhK8UBlPj G2Dw== X-Gm-Message-State: AOAM533H9Z1gN5+j6JB0Cug0ioIkhQNVc5dHwu4TiRuwJTcsXB2SA8sr vkH8vgOTO+7BMeHJAC2JIAs= X-Google-Smtp-Source: ABdhPJyIuMedwpRdAc/hIYSDrTYimfjiaHAtEhbps1A3FmmVYcD90HZ+FIqGcypTAfUavH1Hs7zMWg== X-Received: by 2002:adf:de89:: with SMTP id w9mr8061317wrl.212.1603882245116; Wed, 28 Oct 2020 03:50:45 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h62sm3566232wrh.82.2020.10.28.03.50.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:50:44 -0700 (PDT) From: luca.boccassi@gmail.com To: Chengchang Tang Cc: Wei Hu , Ferruh Yigit , dpdk stable Date: Wed, 28 Oct 2020 10:44:05 +0000 Message-Id: <20201028104606.3504127-86-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix VLAN configuration on failure' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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. Thanks. Luca Boccassi --- >From b0be1fb74d1114f9debcd1c1796faba238c45e96 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 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 01c984d025..139475bd6d 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -3080,9 +3080,11 @@ 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; } @@ -3107,9 +3109,11 @@ 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; } @@ -3148,9 +3152,11 @@ 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; } @@ -3175,9 +3181,11 @@ 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); + return; + } ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.454441032 +0000 +++ 0086-app-testpmd-fix-VLAN-configuration-on-failure.patch 2020-10-28 10:35:11.624831790 +0000 @@ -1,8 +1,10 @@ -From 57d4198a0b50f93d921b4b3d30cbdea7f4131db5 Mon Sep 17 00:00:00 2001 +From b0be1fb74d1114f9debcd1c1796faba238c45e96 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 @@ -12,7 +14,6 @@ configuration when execution fails. Fixes: 384161e00627 ("app/testpmd: adjust on the fly VLAN configuration") -Cc: stable@dpdk.org Signed-off-by: Chengchang Tang Signed-off-by: Wei Hu (Xavier) @@ -22,10 +23,10 @@ 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c -index 03bf26bc94..0bec547f51 100644 +index 01c984d025..139475bd6d 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c -@@ -3509,9 +3509,11 @@ vlan_extend_set(portid_t port_id, int on) +@@ -3080,9 +3080,11 @@ vlan_extend_set(portid_t port_id, int on) } diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload); @@ -38,7 +39,7 @@ ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads; } -@@ -3536,9 +3538,11 @@ rx_vlan_strip_set(portid_t port_id, int on) +@@ -3107,9 +3109,11 @@ rx_vlan_strip_set(portid_t port_id, int on) } diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload); @@ -51,7 +52,7 @@ ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads; } -@@ -3577,9 +3581,11 @@ rx_vlan_filter_set(portid_t port_id, int on) +@@ -3148,9 +3152,11 @@ rx_vlan_filter_set(portid_t port_id, int on) } diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload); @@ -64,7 +65,7 @@ ports[port_id].dev_conf.rxmode.offloads = port_rx_offloads; } -@@ -3604,9 +3610,11 @@ rx_vlan_qinq_strip_set(portid_t port_id, int on) +@@ -3175,9 +3181,11 @@ rx_vlan_qinq_strip_set(portid_t port_id, int on) } diag = rte_eth_dev_set_vlan_offload(port_id, vlan_offload);