From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 03635A034C for ; Fri, 25 Feb 2022 18:17:18 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F2ABD4114D; Fri, 25 Feb 2022 18:17:17 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 1D5C64113D for ; Fri, 25 Feb 2022 18:17:16 +0100 (CET) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 90DD03FCA5 for ; Fri, 25 Feb 2022 17:17:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809434; bh=8Cs9KyheW1LuBcHYZzMjQ+zS0W3DE+CRH7HTta25xbQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JCCk3xYo+hT05O32wkGJT69a3AUFP87xLcIsba2U8ngfIxekpC10Vg5N/P9wyhnsl HoIqrABwAVABGheCYz+iCmXX6BGpagvHcD/tQ7PxL1RJbd6ozwDvEI6Vac/2ZGs0iX jIX3leBC8hYMsm81GcPctST0LQGEoDBhAGeHakmo776f1HlRW7eSYPLDBJCH0r+1vo T9AAZ0ZuHur6VsWqmwaQhi5eFpzgIpEOQgzURCsv/Qoy2JgpOHCCx29OhBM8NssTsN gnxMm2SKdZJGxP7Qv/aWCOVvh+PWwVtGZocyNzY/6tGLgPAZFuTaP4kYzMwjqH98vP iBNNxhXDbRoAA== Received: by mail-wm1-f71.google.com with SMTP id l31-20020a05600c1d1f00b00380e3425ba7so1590437wms.9 for ; Fri, 25 Feb 2022 09:17:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8Cs9KyheW1LuBcHYZzMjQ+zS0W3DE+CRH7HTta25xbQ=; b=eqi93A5ZFwEZtAo/QsWDxtiHEA06YTze/bx06Q1JJtB7qAz8dHxgJUM4Gj8eYAznWv HaxoP2cUlHvoOIP1dmqs4jnasUph2ef0cls8n22Xd9mTyXxFLK9I6uOhT6vob7J1Rfw1 +yWTCCAHyxJtXCNPTLbPEW97eoYchwxOkQdUbmlTCGcRUy6Gfrtdv2TAD17qFMc3uOzx oxdNZWtJ+AxmyvtHOa38pdSkI0vNYsgZnZteJIK6/kN0/E7zho1i6/Mu2xV2Sr1jwX9S Nj+dgBURpv6D/tHmhaX1RMLQrhZ+tdzR/aSHSkVmqvchvVUcxhxdmG2aPmUWftuGc6Uj xf3g== X-Gm-Message-State: AOAM531eEFQtYcFEQdNuqMy5F+/z00rqnwJ5IRT2sJWUoaPM20qbcFUK cvfCvJ6lIi2y0wZVBJlxFPthK0om9uAGroNTUY2RtUt8ICvZ3jD2YFgRyME0qRZI2UxJTynwYC/ JBK3GUcK85PGoyd4Tklxuu1tp X-Received: by 2002:adf:e804:0:b0:1ea:9c3b:8f41 with SMTP id o4-20020adfe804000000b001ea9c3b8f41mr7053842wrm.53.1645809433849; Fri, 25 Feb 2022 09:17:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJyq6J87lFQgoY2B+c+QH6j5d0VjTUKvXGCKyVpKiqsUD2s8MN/4CZKtwnKPwuPyEFBkFekQwQ== X-Received: by 2002:adf:e804:0:b0:1ea:9c3b:8f41 with SMTP id o4-20020adfe804000000b001ea9c3b8f41mr7053824wrm.53.1645809433620; Fri, 25 Feb 2022 09:17:13 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id t8-20020a5d6908000000b001e3169cc6afsm2823779wru.94.2022.02.25.09.17.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:17:13 -0800 (PST) From: christian.ehrhardt@canonical.com To: Xiaoyu Min Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: reject jump to root table' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:22 +0100 Message-Id: <20220225171550.3499040-29-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 19.11.12 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/27/22. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/7e275590e51019b5b34b86c54b0d126523da93ae Thanks. Christian Ehrhardt --- >From 7e275590e51019b5b34b86c54b0d126523da93ae Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Tue, 18 Jan 2022 19:38:50 +0800 Subject: [PATCH] net/mlx5: reject jump to root table [ upstream commit 87b26522f7ff65375fb1d773a7f93c70bf857b96 ] Currently root table as destination is not supported. The jump action which finally be translated to underlying root table in rdma-core should be rejected. Fixes: f78f747f41d0 ("net/mlx5: allow jump to group lower than current") Signed-off-by: Xiaoyu Min Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index e16a98be3b..6f0876f233 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -3487,7 +3487,7 @@ flow_dv_validate_action_jump(const struct rte_flow_action *action, const struct rte_flow_attr *attributes, bool external, struct rte_flow_error *error) { - uint32_t target_group, table; + uint32_t target_group, table = 0; int ret = 0; if (action_flags & (MLX5_FLOW_FATE_ACTIONS | @@ -3515,6 +3515,10 @@ flow_dv_validate_action_jump(const struct rte_flow_action *action, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "target group must be other than" " the current flow group"); + if (table == 0) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION_CONF, + NULL, "root table shouldn't be destination"); return 0; } -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:45.391847134 +0100 +++ 0029-net-mlx5-reject-jump-to-root-table.patch 2022-02-25 16:58:44.244990416 +0100 @@ -1 +1 @@ -From 87b26522f7ff65375fb1d773a7f93c70bf857b96 Mon Sep 17 00:00:00 2001 +From 7e275590e51019b5b34b86c54b0d126523da93ae Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 87b26522f7ff65375fb1d773a7f93c70bf857b96 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 18992b1e26..af90a7fd0a 100644 +index e16a98be3b..6f0876f233 100644 @@ -23 +24 @@ -@@ -4968,7 +4968,7 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev, +@@ -3487,7 +3487,7 @@ flow_dv_validate_action_jump(const struct rte_flow_action *action, @@ -30,3 +31,3 @@ - struct flow_grp_info grp_info = { - .external = !!external, -@@ -4999,6 +4999,10 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev, + + if (action_flags & (MLX5_FLOW_FATE_ACTIONS | +@@ -3515,6 +3515,10 @@ flow_dv_validate_action_jump(const struct rte_flow_action *action,