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 254C7A0032 for ; Fri, 18 Feb 2022 13:43:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1BDD840141; Fri, 18 Feb 2022 13:43:04 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id CF9DE40141 for ; Fri, 18 Feb 2022 13:43:02 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id y6-20020a7bc186000000b0037bdc5a531eso5911226wmi.0 for ; Fri, 18 Feb 2022 04:43:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UtmiA0v4EH02BU1VljekBlroBUx6xsjaCwT3H8UDVJw=; b=QtldiA9v6H1X70aGSnYDxovoJMTFvRIPNb1nkoBaFwGpjpfQAdD8Bg0ljbwEqf+Cxv SwPbNTtUc14SA40r2wx5NNRmg+RbITuvuiXfbktlxgZGxMoN7HNUyZCESKITXei/WmUA goO324nchVJlQ3ay+3HgVuoQx/+gj60dm0HpS7ph+wsUOAomMIExDiqqoBjnnKE5uJ3h Wjsr9eTcPdoq7s/f307Y9IqOFtX5rvZuCGrk0h2Ikr6qpO9swZYeBuWrJxIWcCw/WyHd kBgCcZdjbuPuI7tI1ruyt9qCuCleom5DBTfHzLjIE/NGBlDeT2YKXaVzdwaHFTdaXLTO 1JQg== 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=UtmiA0v4EH02BU1VljekBlroBUx6xsjaCwT3H8UDVJw=; b=DZFvU/UfCR5/ch2hcs5Wr/sX9qJEafwpi4jssncw7uWfLKJCCt5aLR8T0mNCaO37F3 dqlJ8HwPJxpKiporwROoLyeZqTAlv+GuRmmZArqfIuhrSEK8yawzAPpzo37reC5f4Wqb uhnxQxAS+/0oinhAUEzpHzSliCr72EqTZBExMwDvh18xRz6NonGTXz46InADFe8KZd3+ /LDgrgnD3Z5AMZ6x8Dy0zUr9qm2dSjGAnUyRwuKGBDKbCoEZ4BLq4MZV7aHPZxO4nTiD v6mxoCz3v0GLx9kBi8F2Z+w96e/6ln+0QerHpizlE3+n7knPDJCgIHfhFnyWyZCngjOE 8uhg== X-Gm-Message-State: AOAM531G7FkJ7mvJckFb9szC3mLefL1wP6z5mCDCNxljIKWaIrc+ev1O kZcl6mAF2KOEhm8pqnKk6zrwwnRastXASliA X-Google-Smtp-Source: ABdhPJzaGqqr5V7FtXVG6O0V3wCLqRHlIuR2DIwpg+HTbxYom+5IwQKrsgePPyERTdNfF82Ng+r7jA== X-Received: by 2002:a05:600c:1d20:b0:37b:b441:d8d7 with SMTP id l32-20020a05600c1d2000b0037bb441d8d7mr7100494wms.170.1645188182608; Fri, 18 Feb 2022 04:43:02 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id 12sm17386805wry.111.2022.02.18.04.43.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:43:02 -0800 (PST) From: luca.boccassi@gmail.com To: Xiaoyu Min Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: reject jump to root table' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:35 +0000 Message-Id: <20220218123931.1749595-66-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/12eaf885f5d033b7d15fa98ba9a0d37b4b9ff9fb Thanks. Luca Boccassi --- >From 12eaf885f5d033b7d15fa98ba9a0d37b4b9ff9fb 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 977072ba32..35c87e1fc5 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -3977,7 +3977,7 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev, 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; struct flow_grp_info grp_info = { .external = !!external, @@ -4018,6 +4018,10 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev, 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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:40.527893562 +0000 +++ 0066-net-mlx5-reject-jump-to-root-table.patch 2022-02-18 12:37:37.738792992 +0000 @@ -1 +1 @@ -From 87b26522f7ff65375fb1d773a7f93c70bf857b96 Mon Sep 17 00:00:00 2001 +From 12eaf885f5d033b7d15fa98ba9a0d37b4b9ff9fb 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 977072ba32..35c87e1fc5 100644 @@ -23 +24 @@ -@@ -4968,7 +4968,7 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev, +@@ -3977,7 +3977,7 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev, @@ -32 +33 @@ -@@ -4999,6 +4999,10 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev, +@@ -4018,6 +4018,10 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev,