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 BE26AA04DD for ; Wed, 28 Oct 2020 11:50:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 56A47CA0C; Wed, 28 Oct 2020 11:50:36 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by dpdk.org (Postfix) with ESMTP id 5B1E74CA7 for ; Wed, 28 Oct 2020 11:50:35 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id e2so4300906wme.1 for ; Wed, 28 Oct 2020 03:50:35 -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=xxmXdYMR1MdZaeMo8FeNBJ51Q4nHwXWRBQ6L1sY5rZQ=; b=XlwwMnSwVyBO7jmBj6cy34Lgfiz52sbrvJ3CAm89bUbQ3nmVIWbAyzwJaUBGzUy5fh 7z7bhKHwuCtgFj7tR/6wKTaqTuTMXySlPw9O/phlIo84EJvh/RElIM20ZmI5P7DffEAT r+g3WpwP62DvTse8xbAS4uH+yfdmXUXg1oE9vb0hdnBgd4g2yGC6ODZJoEQqmjHNUQQK 9VFosVL6x6tzDzYU93a8Ngk7pEWQ86N5GIeYAC+wsdCQ48pmOQ55jsehVQAyylniIKuf bUufw44XWWlCyXN+WMjWjwi1fzSveoKCMj+K0DTt4rO85G53tDPx2iTGCvHVacBqTe0+ UvNQ== 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=xxmXdYMR1MdZaeMo8FeNBJ51Q4nHwXWRBQ6L1sY5rZQ=; b=b4zHiKdNddMg71mJDVHDZjMqEUssFz2nMet+3/qFv3B7JRqwkcfSo75M6g3l0aVMdm TpT2xrcmeBd/y+9bTGiKLtE7VtiX2ufgCnBUx5jWf21pGs11csEoqrlU7IuBlO1ndtBi Kv7iBGn8AtJX25+ozZpJwenFuMk8Ix24pTjrY18G/VzR81FjL4agpnVX/FDd1txivaOe MXk5ODol5jejhIHSaWBpD5Trg8NFt/loPVCVTo3l24UEKhq8NJqeRNly24W5MwEgB50J BM1YOq8X4Vn083C6qAqLmAhPO5491xlQwPtTWQUl97aWdM1wQDapBp2jHBeJf8aBLohw QuFg== X-Gm-Message-State: AOAM532faf8K9+KPimAdqEvwPkUrqBSv2jWIBjEVYY6f3THjfWhqNyWd Wqi1gnXHVFZafI+kNTLbXIVSFqYgZmv9UwA9 X-Google-Smtp-Source: ABdhPJzqerZntSFLMoLimpH4vhYNH77aXjCw7fJYARZzwnPIdwS6CE5aLZ/ZCVDf2JmawZyXEe0LAg== X-Received: by 2002:a7b:cf04:: with SMTP id l4mr8083265wmg.137.1603882234138; Wed, 28 Oct 2020 03:50:34 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i126sm6098823wmi.0.2020.10.28.03.50.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:50:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Chengchang Tang Cc: Wei Hu , Ferruh Yigit , dpdk stable Date: Wed, 28 Oct 2020 10:44:04 +0000 Message-Id: <20201028104606.3504127-85-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 port id check in Tx VLAN command' 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 ca5779171268ff3d969e2df74252bf69090652a4 Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Fri, 25 Sep 2020 20:47:14 +0800 Subject: [PATCH] app/testpmd: fix port id check in Tx VLAN command [ upstream commit b428e71775e43acc7b074c82b0d9e08f401dde6b ] To set Tx vlan offloads, it is required to stop port firstly. But before checking whether the port is stopped, the port id entered by the user is not checked for validity. When the port id is illegal, it would lead to a segmentation fault since it attempts to access a member of non-existent port. This patch adds verification of port id in tx vlan offloads and remove duplicated check. Fixes: 597f9fafe13b ("app/testpmd: convert to new Tx offloads API") Signed-off-by: Chengchang Tang Signed-off-by: Wei Hu (Xavier) Reviewed-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 9 +++++++++ app/test-pmd/config.c | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 2d18b6caf2..f522b599b7 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -4168,6 +4168,9 @@ cmd_tx_vlan_set_parsed(void *parsed_result, { struct cmd_tx_vlan_set_result *res = parsed_result; + if (port_id_is_invalid(res->port_id, ENABLED_WARN)) + return; + if (!port_is_stopped(res->port_id)) { printf("Please stop port %d first\n", res->port_id); return; @@ -4222,6 +4225,9 @@ cmd_tx_vlan_set_qinq_parsed(void *parsed_result, { struct cmd_tx_vlan_set_qinq_result *res = parsed_result; + if (port_id_is_invalid(res->port_id, ENABLED_WARN)) + return; + if (!port_is_stopped(res->port_id)) { printf("Please stop port %d first\n", res->port_id); return; @@ -4335,6 +4341,9 @@ cmd_tx_vlan_reset_parsed(void *parsed_result, { struct cmd_tx_vlan_reset_result *res = parsed_result; + if (port_id_is_invalid(res->port_id, ENABLED_WARN)) + return; + if (!port_is_stopped(res->port_id)) { printf("Please stop port %d first\n", res->port_id); return; diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 726a263421..01c984d025 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -3235,8 +3235,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id) struct rte_eth_dev_info dev_info; int ret; - if (port_id_is_invalid(port_id, ENABLED_WARN)) - return; if (vlan_id_is_invalid(vlan_id)) return; @@ -3267,8 +3265,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) struct rte_eth_dev_info dev_info; int ret; - if (port_id_is_invalid(port_id, ENABLED_WARN)) - return; if (vlan_id_is_invalid(vlan_id)) return; if (vlan_id_is_invalid(vlan_id_outer)) @@ -3294,8 +3290,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) void tx_vlan_reset(portid_t port_id) { - if (port_id_is_invalid(port_id, ENABLED_WARN)) - return; ports[port_id].dev_conf.txmode.offloads &= ~(DEV_TX_OFFLOAD_VLAN_INSERT | DEV_TX_OFFLOAD_QINQ_INSERT); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.408825386 +0000 +++ 0085-app-testpmd-fix-port-id-check-in-Tx-VLAN-command.patch 2020-10-28 10:35:11.620831731 +0000 @@ -1,8 +1,10 @@ -From b428e71775e43acc7b074c82b0d9e08f401dde6b Mon Sep 17 00:00:00 2001 +From ca5779171268ff3d969e2df74252bf69090652a4 Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Fri, 25 Sep 2020 20:47:14 +0800 Subject: [PATCH] app/testpmd: fix port id check in Tx VLAN command +[ upstream commit b428e71775e43acc7b074c82b0d9e08f401dde6b ] + To set Tx vlan offloads, it is required to stop port firstly. But before checking whether the port is stopped, the port id entered by the user is not checked for validity. When the port id is illegal, it would lead @@ -13,7 +15,6 @@ duplicated check. Fixes: 597f9fafe13b ("app/testpmd: convert to new Tx offloads API") -Cc: stable@dpdk.org Signed-off-by: Chengchang Tang Signed-off-by: Wei Hu (Xavier) @@ -24,10 +25,10 @@ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c -index 08e123fe69..524c75b267 100644 +index 2d18b6caf2..f522b599b7 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c -@@ -4294,6 +4294,9 @@ cmd_tx_vlan_set_parsed(void *parsed_result, +@@ -4168,6 +4168,9 @@ cmd_tx_vlan_set_parsed(void *parsed_result, { struct cmd_tx_vlan_set_result *res = parsed_result; @@ -37,7 +38,7 @@ if (!port_is_stopped(res->port_id)) { printf("Please stop port %d first\n", res->port_id); return; -@@ -4348,6 +4351,9 @@ cmd_tx_vlan_set_qinq_parsed(void *parsed_result, +@@ -4222,6 +4225,9 @@ cmd_tx_vlan_set_qinq_parsed(void *parsed_result, { struct cmd_tx_vlan_set_qinq_result *res = parsed_result; @@ -47,7 +48,7 @@ if (!port_is_stopped(res->port_id)) { printf("Please stop port %d first\n", res->port_id); return; -@@ -4461,6 +4467,9 @@ cmd_tx_vlan_reset_parsed(void *parsed_result, +@@ -4335,6 +4341,9 @@ cmd_tx_vlan_reset_parsed(void *parsed_result, { struct cmd_tx_vlan_reset_result *res = parsed_result; @@ -58,10 +59,10 @@ printf("Please stop port %d first\n", res->port_id); return; diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c -index 17a6efed24..03bf26bc94 100644 +index 726a263421..01c984d025 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c -@@ -3664,8 +3664,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id) +@@ -3235,8 +3235,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id) struct rte_eth_dev_info dev_info; int ret; @@ -70,7 +71,7 @@ if (vlan_id_is_invalid(vlan_id)) return; -@@ -3696,8 +3694,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) +@@ -3267,8 +3265,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) struct rte_eth_dev_info dev_info; int ret; @@ -79,7 +80,7 @@ if (vlan_id_is_invalid(vlan_id)) return; if (vlan_id_is_invalid(vlan_id_outer)) -@@ -3723,8 +3719,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) +@@ -3294,8 +3290,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) void tx_vlan_reset(portid_t port_id) {