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 12287A0555 for ; Thu, 9 Jun 2022 13:37:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E9A74281A; Thu, 9 Jun 2022 13:37:46 +0200 (CEST) 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 0067740220 for ; Thu, 9 Jun 2022 13:37:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774664; 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=/FB8H27aK8oDJO1IBaI9xGZPzEjlzM69SJaVPi26Dz4=; b=LW85GpdP5X6KWl0o7RxU7c8aa9DDIY+Tnoijwiw+/IuCH6dWwLQB3njzCEfti/Qzi8Wsvx xNcEBflDjeIFxN4EQ6U8XfmVwgV1zstwhEBXoNvZbv4W+fASQe7slestXGihWwg+HPxj1f nkd1PoS60CoxqM18NE3UbN5Ted3ew0g= 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-29-GLZd4JXgPhuclJQMOV3q0g-1; Thu, 09 Jun 2022 07:37:43 -0400 X-MC-Unique: GLZd4JXgPhuclJQMOV3q0g-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E70BC101AA64; Thu, 9 Jun 2022 11:37:42 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id BEF6718EA4; Thu, 9 Jun 2022 11:37:41 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Andrew Rybchenko , dpdk stable Subject: patch 'net/mvpp2: fix xstats get return if xstats is null' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:10 +0100 Message-Id: <20220609113701.386938-23-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/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/d26f48cdcf6b38663dd9f6e1b3d08d753c24ee10 Thanks. Kevin --- >From d26f48cdcf6b38663dd9f6e1b3d08d753c24ee10 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 13 May 2022 10:53:53 +0800 Subject: [PATCH] net/mvpp2: fix xstats get return if xstats is null MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit d853d24b27d6524f26a2a830c7ef678ba739cfce ] Many user (e.g. telemetry) invokes rte_eth_xstats_get(port_id, NULL, 0) to retrieve the required number of elements, but currently mvpp2 PMD returns zero when xstats is null. Remove the logic of "return zero when xstats is NULL", and add the logic of "return the required number of entries when n is lower than the required number of entries". Fixes: a77b5378cd41 ("net/mrvl: add extended statistics") Signed-off-by: Chengwen Feng Acked-by: Morten Brørup Reviewed-by: Andrew Rybchenko --- drivers/net/mvpp2/mrvl_ethdev.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index f86701d248..735efb6cfc 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -1627,11 +1627,12 @@ mrvl_xstats_get(struct rte_eth_dev *dev, struct mrvl_priv *priv = dev->data->dev_private; struct pp2_ppio_statistics ppio_stats; - unsigned int i; + unsigned int i, count; - if (!stats) - return 0; + count = RTE_DIM(mrvl_xstats_tbl); + if (n < count) + return count; pp2_ppio_get_statistics(priv->ppio, &ppio_stats, 0); - for (i = 0; i < n && i < RTE_DIM(mrvl_xstats_tbl); i++) { + for (i = 0; i < count; i++) { uint64_t val; @@ -1649,5 +1650,5 @@ mrvl_xstats_get(struct rte_eth_dev *dev, } - return n; + return count; } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.319097862 +0100 +++ 0023-net-mvpp2-fix-xstats-get-return-if-xstats-is-null.patch 2022-06-09 12:34:29.676980523 +0100 @@ -1 +1 @@ -From d853d24b27d6524f26a2a830c7ef678ba739cfce Mon Sep 17 00:00:00 2001 +From d26f48cdcf6b38663dd9f6e1b3d08d753c24ee10 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit d853d24b27d6524f26a2a830c7ef678ba739cfce ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org