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 833D8A0093 for ; Thu, 10 Mar 2022 13:12:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7CA1341155; Thu, 10 Mar 2022 13:12:20 +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 313FA4114A for ; Thu, 10 Mar 2022 13:12:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646914338; 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=H1wbV6OJeGdzWNKLl8T981XUD9Z56q9G16X8/HZ07MA=; b=K7F6R9eH6lqCD4fJqDo7JX4DcNjoUgiiYCK1L5Jq4kVOQBOMPLPtV2fzPjute4USzzwquv PGyzFvHpc+JWzhns5DMRkdlEvedW5OKrhRsdvzVvbJbbj2Ln0hDqLjvEMqrUnlWWeny3NN F8b4p2V2GHhH4h834JKKh0vppcckq3k= 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-60-GWZSyFwUOpWz-E-P4AtmHw-1; Thu, 10 Mar 2022 07:12:16 -0500 X-MC-Unique: GWZSyFwUOpWz-E-P4AtmHw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6531D800D55; Thu, 10 Mar 2022 12:12:15 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C2B12D1F8; Thu, 10 Mar 2022 12:12:14 +0000 (UTC) From: Kevin Traynor To: Rongwei Liu Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix meter creation default state' has been queued to stable release 21.11.1 Date: Thu, 10 Mar 2022 12:11:21 +0000 Message-Id: <20220310121127.1324802-15-ktraynor@redhat.com> In-Reply-To: <20220310121127.1324802-1-ktraynor@redhat.com> References: <20220310121127.1324802-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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/14/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/ee836190a112912e101a8b754c500c87ae3ed3cd Thanks. Kevin --- >From ee836190a112912e101a8b754c500c87ae3ed3cd Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Mon, 7 Mar 2022 10:00:35 +0200 Subject: [PATCH] net/mlx5: fix meter creation default state [ upstream commit c3130c78e87864d5139d6672e48df807b1c0e2db ] Disable means there is no packet drop in the meter. Meter is active always but programmed with another CIR/CBS value. If the user wants to disable the meter in creation, PMD calls the disable() API manually after meter initialized. Fixes: 444320186393 ("net/mlx5: support meter creation with policy") Signed-off-by: Rongwei Liu Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_meter.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index 4f5de5e422..a58e30dc83 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -16,4 +16,7 @@ #include "mlx5_flow.h" +static int mlx5_flow_meter_disable(struct rte_eth_dev *dev, + uint32_t meter_id, struct rte_mtr_error *error); + /** * Create the meter action. @@ -1289,5 +1292,5 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, /* Add to the flow meter list. */ fm->active_state = 1; /* Config meter starts as active. */ - fm->is_enable = 1; + fm->is_enable = params->meter_enable; fm->shared = !!shared; __atomic_add_fetch(&fm->profile->ref_cnt, 1, __ATOMIC_RELAXED); @@ -1314,5 +1317,8 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, if (mlx5_l3t_set_entry(priv->mtr_idx_tbl, meter_id, &data)) goto error; + } else if (!params->meter_enable && mlx5_flow_meter_disable(dev, meter_id, error)) { + goto error; } + fm->active_state = params->meter_enable; if (mtr_policy) __atomic_add_fetch(&mtr_policy->ref_cnt, 1, __ATOMIC_RELAXED); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-10 12:05:31.882320931 +0000 +++ 0022-net-mlx5-fix-meter-creation-default-state.patch 2022-03-10 12:05:31.317630899 +0000 @@ -1 +1 @@ -From c3130c78e87864d5139d6672e48df807b1c0e2db Mon Sep 17 00:00:00 2001 +From ee836190a112912e101a8b754c500c87ae3ed3cd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c3130c78e87864d5139d6672e48df807b1c0e2db ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 06ab7c4a88..a3d1f2c08d 100644 +index 4f5de5e422..a58e30dc83 100644