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 D14C9A053D for ; Fri, 17 Jul 2020 18:32:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C87801BED3; Fri, 17 Jul 2020 18:32:40 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 16CE21BEB4 for ; Fri, 17 Jul 2020 18:32:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595003558; 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=0kzD2FaYwmXLkEKXWCVa4xg4Cu79sld3n+jKAfIuVqo=; b=TghdqQUjHCQp1cU+0aabB5f7ELmA5CwNpaVy2ac4npfiucRt36oLpTjAwmL7kFPNvHkqgX nEM8jV4No6LxGF+A/0Z+MhEvUWUa9tRVHAmmqzxEJrLIwkeTNchJymgDCnhJiNvzxCVMWM tOU5dab4MqbVZEpAMpjM/ipA9rvzXHI= 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-432-8MD3fVYIPouxwrLF0SE-zg-1; Fri, 17 Jul 2020 12:32:27 -0400 X-MC-Unique: 8MD3fVYIPouxwrLF0SE-zg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 79E918015F4; Fri, 17 Jul 2020 16:32:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97FC472E48; Fri, 17 Jul 2020 16:32:25 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: Matan Azrad , dpdk stable Date: Fri, 17 Jul 2020 17:31:51 +0100 Message-Id: <20200717163214.4839-3-ktraynor@redhat.com> In-Reply-To: <20200717163214.4839-1-ktraynor@redhat.com> References: <20200717163214.4839-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix unreachable MPLS error path' has been queued to LTS release 18.11.10 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.10 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/23/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/b05ad22ad0e0147637336afe6f5617795e7079bf Thanks. Kevin. --- >From b05ad22ad0e0147637336afe6f5617795e7079bf 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 30d5b66e64..0350d72efd 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1672,9 +1672,10 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, 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.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-17 17:17:00.161670040 +0100 +++ 0003-net-mlx5-fix-unreachable-MPLS-error-path.patch 2020-07-17 17:16:59.955771961 +0100 @@ -1 +1 @@ -From 01de93f2451730d480db8db18921e1bca7cb1f3e Mon Sep 17 00:00:00 2001 +From b05ad22ad0e0147637336afe6f5617795e7079bf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 01de93f2451730d480db8db18921e1bca7cb1f3e ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index ae478a510a..f2c3cf90d4 100644 +index 30d5b66e64..0350d72efd 100644 @@ -33 +34 @@ -@@ -2270,9 +2270,10 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, +@@ -1672,9 +1672,10 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused,