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 7C487A0518 for ; Fri, 24 Jul 2020 14:01:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 72F9D1C02A; Fri, 24 Jul 2020 14:01:14 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 6C8E71C036 for ; Fri, 24 Jul 2020 14:01:13 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id 184so8042564wmb.0 for ; Fri, 24 Jul 2020 05:01:13 -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=rVE1E00vM8XfdOFlhMOPQryHZ37QPv8Yb1GmdIg9RsQ=; b=PEZclUU/22fQ9wQUx8g7s20vx2cVmLLL9SGjM9uQY+gvYJqkpkUyKpVwLbMYVbACo/ LB7TVmsKxdhfmltugBVhzrmwrVTpVpewB1yy4UVdV5TBk+/cALoz4j1oHXt5f5dVLTF4 jcSC4znuyubzIOw4r08oGUIXiudA9jfehafkw1XqQUJqCWVT4W3idae8+iWiKIkjaSPc 0wF+OuP4oUdEpHL4DvPjXPkOBc3tms7RguoYd7L/IZmTrQ2K3z/VT8lN8JyQ2O41YW/J q9CBCee12vcsS3xqwLXnJPLBfl+QxEAVGJrdxr4asbwc1vMf8yMwgG5YTIfK5sINVzmc ViaA== 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=rVE1E00vM8XfdOFlhMOPQryHZ37QPv8Yb1GmdIg9RsQ=; b=COicZZ6lKwZNvN0Tv4KN/7FwnTi5SUgeRuZB8k4npA/wk7Mgc7kt1rYhv51cPRF+vN icD/21XXbfGcwxz5WTGM7sfZXuXadAWdiID1wlPIuCn+N6dxEUQo/dOMR69R24hw2b9M rYcxvKa++lKEmR9SRtbsdLrwmAlxQU1mxDVj3YjRLquoAShx96jQlLOmDPWROF0tBu+N AyjBlKvndyjipIqT8zq4UVRs+BsKFIEDxfVvO8S0P62lLNW4949B+fSucTJUHm26EyIN dbjgd14O6HV+bE/qfNIRHBDJp2jqgvre1m5xkeLj9Z7HGrHL/o5MwN23MV+YX+XEiDHh zPPg== X-Gm-Message-State: AOAM5318LoCcFciZ0BjkLilrn/DehRMUZfcXKBM5bY90H09ze12MYXPT rbMa2tiIUG54Bih6Br4rhok= X-Google-Smtp-Source: ABdhPJxjc34DBxds+2O2cyPZ9oJbFOMAPTu+Gi/35tjLhz1vD7iBFStC4bE4BGdi5pTEAQswtWiJmQ== X-Received: by 2002:a1c:28c4:: with SMTP id o187mr8105939wmo.62.1595592073159; Fri, 24 Jul 2020 05:01:13 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h11sm1165471wrb.68.2020.07.24.05.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:01:12 -0700 (PDT) From: luca.boccassi@gmail.com To: Michael Baum Cc: Matan Azrad , dpdk stable Date: Fri, 24 Jul 2020 12:57:31 +0100 Message-Id: <20200724120030.1863487-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix unreachable MPLS error path' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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 edd6234fbd3b8698fab41e7f41ed0aea5b2a80ea Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Wed, 27 May 2020 08:37:57 +0000 Subject: [PATCH] net/mlx5: fix unreachable MPLS error path [ upstream commit 01de93f2451730d480db8db18921e1bca7cb1f3e ] The mlx5_flow_validate_item_mpls function checks MPLS item validation. It first checks if the device supports MPLS, it is done using the ifdef condition that if it fails to skip to endif and return the appropriate error. When MPLS is supported, the preprocessor will copy the body of the function ending with return 0 followed by the lines that report MPLS support. In fact, these lines are unreachable because before them the function returns 0 and in any case they are unnecessary. Replace the endif by else and move endif to the end of the function. Fixes: 23c1d42c7138 ("net/mlx5: split flow validation to dedicated function") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index e05c35a41..400273f25 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2230,11 +2230,12 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, if (ret < 0) return ret; return 0; -#endif +#else return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, item, "MPLS is not supported by Verbs, please" " update."); +#endif } /** -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:49.096437178 +0100 +++ 0013-net-mlx5-fix-unreachable-MPLS-error-path.patch 2020-07-24 12:53:48.167004224 +0100 @@ -1,8 +1,10 @@ -From 01de93f2451730d480db8db18921e1bca7cb1f3e Mon Sep 17 00:00:00 2001 +From edd6234fbd3b8698fab41e7f41ed0aea5b2a80ea Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Wed, 27 May 2020 08:37:57 +0000 Subject: [PATCH] net/mlx5: fix unreachable MPLS error path +[ upstream commit 01de93f2451730d480db8db18921e1bca7cb1f3e ] + The mlx5_flow_validate_item_mpls function checks MPLS item validation. It first checks if the device supports MPLS, it is done using the ifdef condition that if it fails to skip to endif and return the appropriate @@ -18,7 +20,6 @@ function. Fixes: 23c1d42c7138 ("net/mlx5: split flow validation to dedicated function") -Cc: stable@dpdk.org Signed-off-by: Michael Baum Acked-by: Matan Azrad @@ -27,10 +28,10 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c -index ae478a510..f2c3cf90d 100644 +index e05c35a41..400273f25 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c -@@ -2269,11 +2269,12 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, +@@ -2230,11 +2230,12 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, if (ret < 0) return ret; return 0;