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 1A089A0350 for ; Mon, 21 Feb 2022 16:43:08 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 10810410F2; Mon, 21 Feb 2022 16:43:08 +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 D326F410E0 for ; Mon, 21 Feb 2022 16:43:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458185; 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=QPCKUo0730mYhYj6sKRgmM8nqDK9c/YtxghHy153Lk4=; b=Vtypwt3PdkfeAca2l3UNH5lyu0YoQCII/BgB5pORwZKgJWwnPuqHbOhL6EOQWNGrv5sT0N twjlT3f1Co20/Qvwc1o5fYt7mp57dmbgxUYxYYh2bTGNG4VSBwqhFhgQWEwyd7p5fVkI6x 3o69pjBkaPr5/in4EESDw0dpqeqT4T8= 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-150-lvCsY5TUPJKFQp8I8qL_qQ-1; Mon, 21 Feb 2022 10:43:01 -0500 X-MC-Unique: lvCsY5TUPJKFQp8I8qL_qQ-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 86DEF185302B; Mon, 21 Feb 2022 15:43:00 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A6837E131; Mon, 21 Feb 2022 15:42:59 +0000 (UTC) From: Kevin Traynor To: Alexander Kozyrev Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix meter capabilities reporting' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:36:04 +0000 Message-Id: <20220221153625.152324-175-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/3831da6c7b464a23aa7a2f39ba248bd61ee4f46a Thanks. Kevin --- >From 3831da6c7b464a23aa7a2f39ba248bd61ee4f46a Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Mon, 7 Feb 2022 15:29:41 +0200 Subject: [PATCH] net/mlx5: fix meter capabilities reporting [ upstream commit eb11edd9dbe0b0c18c60cef03472e48075ca0f7c ] Meter capabilities reporting is not up to date. Mellanox NICs support RFC2698 and RFC4115 as well as RFC2697. Add these marker operations to the capabilities list. Fixes: 6bc327b94fe8 ("net/mlx5: fill meter capabilities using DevX") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- 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 d0f8bcd100..4f5de5e422 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -440,9 +440,12 @@ mlx5_flow_mtr_cap_get(struct rte_eth_dev *dev, cap->n_max = 1 << (qattr->log_max_num_meter_aso + 1); cap->srtcm_rfc2697_packet_mode_supported = 1; + cap->trtcm_rfc2698_packet_mode_supported = 1; + cap->trtcm_rfc4115_packet_mode_supported = 1; } else { cap->n_max = 1 << qattr->log_max_flow_meter; - cap->srtcm_rfc2697_packet_mode_supported = 0; } cap->srtcm_rfc2697_byte_mode_supported = 1; + cap->trtcm_rfc2698_byte_mode_supported = 1; + cap->trtcm_rfc4115_byte_mode_supported = 1; cap->n_shared_max = cap->n_max; cap->identical = 1; @@ -452,5 +455,8 @@ mlx5_flow_mtr_cap_get(struct rte_eth_dev *dev, cap->chaining_n_mtrs_per_flow_max = 1; /* Chaining is not supported. */ cap->meter_srtcm_rfc2697_n_max = qattr->flow_meter_old ? cap->n_max : 0; + cap->meter_trtcm_rfc2698_n_max = qattr->flow_meter_old ? cap->n_max : 0; + cap->meter_trtcm_rfc4115_n_max = qattr->flow_meter_old ? cap->n_max : 0; cap->meter_rate_max = 1ULL << 40; /* 1 Tera tokens per sec. */ + cap->meter_policy_n_max = cap->n_max; cap->stats_mask = RTE_MTR_STATS_N_BYTES_DROPPED | RTE_MTR_STATS_N_PKTS_DROPPED; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:48.339071710 +0000 +++ 0175-net-mlx5-fix-meter-capabilities-reporting.patch 2022-02-21 15:22:44.346704700 +0000 @@ -1 +1 @@ -From eb11edd9dbe0b0c18c60cef03472e48075ca0f7c Mon Sep 17 00:00:00 2001 +From 3831da6c7b464a23aa7a2f39ba248bd61ee4f46a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit eb11edd9dbe0b0c18c60cef03472e48075ca0f7c ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org