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 0EE0A41D52 for ; Thu, 23 Feb 2023 16:10:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 09F6443228; Thu, 23 Feb 2023 16:10:03 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 8388543228 for ; Thu, 23 Feb 2023 16:09:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164990; 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=9lk4fVBxVTY9JPIC5L7OyVZ2HTu5m3fLP7u4tP+o7R4=; b=Mmgez2793RFrx5dOvO9ZW9NmNhmaEdwad2imY9a9ppdJw1u/fu79ehu6YEWVxtW2sUo69v y8vBeO2wgSJ9JdQYeshS3FlXtuh1fVdKrfIUXqXPUb63tZDn0uz2JGXHEnJojha7lWmJPi 5LprYbhLlKPxq6Iqve5Lf4YnKmLBsa4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-520-AyT5tNz-MsCkmRK40cUQeg-1; Thu, 23 Feb 2023 10:08:39 -0500 X-MC-Unique: AyT5tNz-MsCkmRK40cUQeg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB91118E092D; Thu, 23 Feb 2023 15:08:14 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 482782166B29; Thu, 23 Feb 2023 15:08:14 +0000 (UTC) From: Kevin Traynor To: Jiawei Wang Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix flow sample with ConnectX-5' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:06:03 +0000 Message-Id: <20230223150631.723699-72-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.4 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/28/23. 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/e8b6b06faa7d4f3042c2ff3d0e44e051108fa583 Thanks. Kevin --- >From e8b6b06faa7d4f3042c2ff3d0e44e051108fa583 Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Fri, 9 Dec 2022 16:34:06 +0200 Subject: [PATCH] net/mlx5: fix flow sample with ConnectX-5 [ upstream commit 7aa6d7998a9e59dc510e4e5706f675493855ff27 ] The sample flow tried to get the reserved metadata register for the match implicitly, and if the reserved metadata register was invalid then back to use the application tag. The assertion failure was caused while getting registered due to the reserved metadata regC is invalid on CX-5 trusted device(VF/SF). This patch adds the checking for reserved metadata register before getting the register, to avoid assertion failure. Fixes: 9a726360dd30 ("net/mlx5: fix sample flow action on trusted device") Signed-off-by: Jiawei Wang Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index eee8c8196e..79b4847f39 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -5749,11 +5749,12 @@ flow_sample_split_prep(struct rte_eth_dev *dev, append_index++; set_tag = (void *)(actions_pre + actions_n + append_index); - ret = mlx5_flow_get_reg_id(dev, MLX5_SAMPLE_ID, 0, error); /* Trust VF/SF on CX5 not supported meter so that the reserved * metadata regC is REG_NON, back to use application tag * index 0. */ - if (unlikely(ret == REG_NON)) + if (unlikely(priv->mtr_color_reg == REG_NON)) ret = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, 0, error); + else + ret = mlx5_flow_get_reg_id(dev, MLX5_SAMPLE_ID, 0, error); if (ret < 0) return ret; -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:25.544438248 +0000 +++ 0072-net-mlx5-fix-flow-sample-with-ConnectX-5.patch 2023-02-23 14:46:23.842236217 +0000 @@ -1 +1 @@ -From 7aa6d7998a9e59dc510e4e5706f675493855ff27 Mon Sep 17 00:00:00 2001 +From e8b6b06faa7d4f3042c2ff3d0e44e051108fa583 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7aa6d7998a9e59dc510e4e5706f675493855ff27 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 51547aa78f..ea2016598e 100644 +index eee8c8196e..79b4847f39 100644 @@ -29 +30 @@ -@@ -6187,11 +6187,12 @@ flow_sample_split_prep(struct rte_eth_dev *dev, +@@ -5749,11 +5749,12 @@ flow_sample_split_prep(struct rte_eth_dev *dev,