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 082F0A034F for ; Tue, 1 Mar 2022 11:45:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 040C5426DF; Tue, 1 Mar 2022 11:45:57 +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 915E8407FF for ; Tue, 1 Mar 2022 11:45:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131555; 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=1H0/R9Nz2R/Ya4xR5V8Z6cas0AfMjP7nsxiD31695MQ=; b=bIMgabYmwLeGvBF3yqcV3TD1rQIt6X2XlwR7muwOo56Bua9WtbCeHEpMPO9d0FSlmxQO1b +MY3Du1JQqBEi3Q9D1sRoQ3vuTznC29OWBtgIpZidi7PDX2hZRpv5FQE2c/DWItgGFFW2i eRLn4IkMu+B2hJa1Yoon7E+j5hkbzBY= 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-344-S11PpuDmP4ClVm0VuhuM8A-1; Tue, 01 Mar 2022 05:45:50 -0500 X-MC-Unique: S11PpuDmP4ClVm0VuhuM8A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2124E801AB2; Tue, 1 Mar 2022 10:45:49 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14892752C7; Tue, 1 Mar 2022 10:45:47 +0000 (UTC) From: Kevin Traynor To: Shun Hao Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix meter sub-policy creation' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:38 +0000 Message-Id: <20220301104300.334382-82-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 03/06/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/e311e6045e4f7e9a44a6feda81ffe39fe1f1a8a9 Thanks. Kevin --- >From e311e6045e4f7e9a44a6feda81ffe39fe1f1a8a9 Mon Sep 17 00:00:00 2001 From: Shun Hao Date: Fri, 18 Feb 2022 09:43:08 +0200 Subject: [PATCH] net/mlx5: fix meter sub-policy creation [ upstream commit 94112badf6f579ac76e96bda3b015ffee95a2c68 ] If meter policy action was RSS, the correct items were not provided for sub-policy creation. This fixes the issue by providing original items in meter split, so the sub-policy creation gets the correct items. Fixes: 3c481324baf3 ("net/mlx5: fix meter flow direction check") Signed-off-by: Shun Hao Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index d7cb1eb89b..5d56ce96ea 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -5023,4 +5023,5 @@ flow_meter_split_prep(struct rte_eth_dev *dev, struct rte_flow_item *vlan_item_dst = NULL; const struct rte_flow_item *vlan_item_src = NULL; + const struct rte_flow_item *orig_items = items; struct rte_flow_action *hw_mtr_action; struct rte_flow_action *action_pre_head = NULL; @@ -5147,5 +5148,6 @@ flow_meter_split_prep(struct rte_eth_dev *dev, if (!fm->def_policy) { sub_policy = get_meter_sub_policy(dev, flow, wks, - attr, items, error); + attr, orig_items, + error); if (!sub_policy) return -rte_errno; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.684193512 +0000 +++ 0082-net-mlx5-fix-meter-sub-policy-creation.patch 2022-03-01 10:41:01.425244123 +0000 @@ -1 +1 @@ -From 94112badf6f579ac76e96bda3b015ffee95a2c68 Mon Sep 17 00:00:00 2001 +From e311e6045e4f7e9a44a6feda81ffe39fe1f1a8a9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 94112badf6f579ac76e96bda3b015ffee95a2c68 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 5b5b00cc3e..1c3f648491 100644 +index d7cb1eb89b..5d56ce96ea 100644 @@ -25 +26 @@ -@@ -5022,4 +5022,5 @@ flow_meter_split_prep(struct rte_eth_dev *dev, +@@ -5023,4 +5023,5 @@ flow_meter_split_prep(struct rte_eth_dev *dev, @@ -31 +32 @@ -@@ -5146,5 +5147,6 @@ flow_meter_split_prep(struct rte_eth_dev *dev, +@@ -5147,5 +5148,6 @@ flow_meter_split_prep(struct rte_eth_dev *dev,