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 567A6A055A for ; Thu, 27 Feb 2020 10:35:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4989A1BFF7; Thu, 27 Feb 2020 10:35:32 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by dpdk.org (Postfix) with ESMTP id 77C0B1C01 for ; Thu, 27 Feb 2020 10:35:31 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id j16so871603wrt.3 for ; Thu, 27 Feb 2020 01:35:31 -0800 (PST) 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=O2fzEx9pQzmTOFe4Bfa+D9sckkWZ8RnBxY0LExnDWkg=; b=r/FJn7IuOeSti5ebZMHiZPWW4zf+/S0e1b4liMca+16xGAQySLibS7oqRSAbd/KHCo +F4HUJsDrXcFipHw8by7oWDvUNCcP24suESS7lQmDei5d1oFna5Wr+xppIB/LGqxmlUT Ec+Bc2K9YsgYRn4aBTc4bQdo3H1+cUWa4cubQUFwiIK7uG5JJNBF2qC7GDiIq7vAWxEv nTqjJStk9uEi08Y0Vy9HYF/7q1arK2KiGB0X51pOVPHa9wHVDm/qaf7uhUs8t5bx2Nac dLWQXNU44fE0y0gtfP+RQeJ1mhNwUuN54Rwo/F5EE/riSAUcoKyYAHuuUSEMJ6eIgl6a WRqQ== 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=O2fzEx9pQzmTOFe4Bfa+D9sckkWZ8RnBxY0LExnDWkg=; b=lFQJkomxghGHlX2t/MHbli2+Cd7YRBDHMq9frJBh5IPung24HIWhTTQYm5B3FM4yJg KsOqjRNMfegFpd6Z0/xpCrL92g7hjJarD9dZjKUKYjnYTFqwZNFa3fVmeUI/Cd5E+TZX 9/aO3K9uRRpyVqzFynebG1tPHPUxecWSZjUqVCzEMDdvD/EzsYeqQXnVy/bVL4QkuaPC fp6g69eHj4VcJr/t5lHBBd/Z/lZOP2wgj3cUIESiRrwRGZvJs830EuEro8PLUMxTotQN qt7LxT2QeIGsHpMhu9VotzXThLxTnDsiNf8DGOkTmrFxZ6Z0cyWtNvN2L5Fj8rfXhCoy dDHA== X-Gm-Message-State: APjAAAX7YfT/qc6ItmqXR/XbOYJCNKvqbY1U5yPl5vaP6G25OUaTI8ps KsgMkmMPbJg6aciDzYkWRB0= X-Google-Smtp-Source: APXvYqwYDB6xVZPSi1q1utSxs17hdcJSUlOOV4+sF95IwpKtc47C+5qEVKIMLNS+woARv3GWINW2uw== X-Received: by 2002:a5d:4384:: with SMTP id i4mr3702533wrq.215.1582796131163; Thu, 27 Feb 2020 01:35:31 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z2sm854208wrq.95.2020.02.27.01.35.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 01:35:30 -0800 (PST) From: luca.boccassi@gmail.com To: Luca Boccassi Cc: dpdk stable Date: Thu, 27 Feb 2020 09:33:53 +0000 Message-Id: <20200227093402.17690-33-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200227093402.17690-1-luca.boccassi@gmail.com> References: <20200217174546.25334-54-luca.boccassi@gmail.com> <20200227093402.17690-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'Revert "net/mlx5: fix layer validation with decapsulation"' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/29/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 14ecda7bce99cf45330ab89bda35d4b35342e987 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 26 Feb 2020 20:05:15 +0000 Subject: [PATCH] Revert "net/mlx5: fix layer validation with decapsulation" This reverts commit f9cb01862aabf54ab0b88cd755602fe966a73c2a. --- drivers/net/mlx5/mlx5_flow_dv.c | 36 ++++++--------------------------- 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index aa65300d9c..e39d3c4299 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -3015,14 +3015,10 @@ flow_dv_validate_action_modify_ipv4(const uint64_t action_flags, struct rte_flow_error *error) { int ret = 0; - uint64_t layer; ret = flow_dv_validate_action_modify_hdr(action_flags, action, error); if (!ret) { - layer = (action_flags & MLX5_FLOW_ACTION_DECAP) ? - MLX5_FLOW_LAYER_INNER_L3_IPV4 : - MLX5_FLOW_LAYER_OUTER_L3_IPV4; - if (!(item_flags & layer)) + if (!(item_flags & MLX5_FLOW_LAYER_L3_IPV4)) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, @@ -3053,14 +3049,10 @@ flow_dv_validate_action_modify_ipv6(const uint64_t action_flags, struct rte_flow_error *error) { int ret = 0; - uint64_t layer; ret = flow_dv_validate_action_modify_hdr(action_flags, action, error); if (!ret) { - layer = (action_flags & MLX5_FLOW_ACTION_DECAP) ? - MLX5_FLOW_LAYER_INNER_L3_IPV6 : - MLX5_FLOW_LAYER_OUTER_L3_IPV6; - if (!(item_flags & layer)) + if (!(item_flags & MLX5_FLOW_LAYER_L3_IPV6)) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, @@ -3091,14 +3083,10 @@ flow_dv_validate_action_modify_tp(const uint64_t action_flags, struct rte_flow_error *error) { int ret = 0; - uint64_t layer; ret = flow_dv_validate_action_modify_hdr(action_flags, action, error); if (!ret) { - layer = (action_flags & MLX5_FLOW_ACTION_DECAP) ? - MLX5_FLOW_LAYER_INNER_L4 : - MLX5_FLOW_LAYER_OUTER_L4; - if (!(item_flags & layer)) + if (!(item_flags & MLX5_FLOW_LAYER_L4)) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "no transport layer " @@ -3130,14 +3118,10 @@ flow_dv_validate_action_modify_tcp_seq(const uint64_t action_flags, struct rte_flow_error *error) { int ret = 0; - uint64_t layer; ret = flow_dv_validate_action_modify_hdr(action_flags, action, error); if (!ret) { - layer = (action_flags & MLX5_FLOW_ACTION_DECAP) ? - MLX5_FLOW_LAYER_INNER_L4_TCP : - MLX5_FLOW_LAYER_OUTER_L4_TCP; - if (!(item_flags & layer)) + if (!(item_flags & MLX5_FLOW_LAYER_OUTER_L4_TCP)) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "no TCP item in" @@ -3179,14 +3163,10 @@ flow_dv_validate_action_modify_tcp_ack(const uint64_t action_flags, struct rte_flow_error *error) { int ret = 0; - uint64_t layer; ret = flow_dv_validate_action_modify_hdr(action_flags, action, error); if (!ret) { - layer = (action_flags & MLX5_FLOW_ACTION_DECAP) ? - MLX5_FLOW_LAYER_INNER_L4_TCP : - MLX5_FLOW_LAYER_OUTER_L4_TCP; - if (!(item_flags & layer)) + if (!(item_flags & MLX5_FLOW_LAYER_OUTER_L4_TCP)) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "no TCP item in" @@ -3227,14 +3207,10 @@ flow_dv_validate_action_modify_ttl(const uint64_t action_flags, struct rte_flow_error *error) { int ret = 0; - uint64_t layer; ret = flow_dv_validate_action_modify_hdr(action_flags, action, error); if (!ret) { - layer = (action_flags & MLX5_FLOW_ACTION_DECAP) ? - MLX5_FLOW_LAYER_INNER_L3 : - MLX5_FLOW_LAYER_OUTER_L3; - if (!(item_flags & layer)) + if (!(item_flags & MLX5_FLOW_LAYER_L3)) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, -- 2.20.1