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 63E7EA0350 for ; Mon, 21 Feb 2022 16:40:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5EA7E4013F; Mon, 21 Feb 2022 16:40:44 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 4BC9241145 for ; Mon, 21 Feb 2022 16:40:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458040; 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=MpNGFLRmgg08KaTWGiKiisiey7B+N9wNVKtA520Se88=; b=imt0PU8J0lm7BjHTyuxe64vWQ/6ZZvoMQgTKl/kgPubmPrTSROIq+VgyYN9oF1Yr6lnPmF 4rF3O3lb4DLzZk8f95iyCzjFrDAYW56J6VQXnHdAX1e7cnJpQ5oUSL+GhLC6hgoJGKqeqF x6bf5lF5iP6FPYQvOXBMrqf1WWFAhPY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-479-Kt5mdfDCOWKMnKug9h60CQ-1; Mon, 21 Feb 2022 10:40:34 -0500 X-MC-Unique: Kt5mdfDCOWKMnKug9h60CQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 93D49100C664; Mon, 21 Feb 2022 15:40:33 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 884637E2C5; Mon, 21 Feb 2022 15:40:32 +0000 (UTC) From: Kevin Traynor To: Xiaoyu Min Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: reject jump to root table' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:05 +0000 Message-Id: <20220221153625.152324-116-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.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/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/37d27abc59d3c56577cb31877741c3d6255bedb1 Thanks. Kevin --- >From 37d27abc59d3c56577cb31877741c3d6255bedb1 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 18992b1e26..af90a7fd0a 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -4969,5 +4969,5 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev, 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 = { @@ -5000,4 +5000,8 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev, "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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.126863188 +0000 +++ 0116-net-mlx5-reject-jump-to-root-table.patch 2022-02-21 15:22:44.246704475 +0000 @@ -1 +1 @@ -From 87b26522f7ff65375fb1d773a7f93c70bf857b96 Mon Sep 17 00:00:00 2001 +From 37d27abc59d3c56577cb31877741c3d6255bedb1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 87b26522f7ff65375fb1d773a7f93c70bf857b96 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org