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 E09E6A00C3; Fri, 13 May 2022 05:00:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 29F794284E; Fri, 13 May 2022 05:00:00 +0200 (CEST) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 19EF3427F1 for ; Fri, 13 May 2022 04:59:54 +0200 (CEST) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Kztd95XDfzfbT7; Fri, 13 May 2022 10:58:37 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 13 May 2022 10:59:52 +0800 From: Chengwen Feng To: , , , , , , CC: , , Subject: [PATCH v4 5/9] net/mvpp2: adjust return value of xstats-get ops Date: Fri, 13 May 2022 10:53:53 +0800 Message-ID: <20220513025357.52275-6-fengchengwen@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220513025357.52275-1-fengchengwen@huawei.com> References: <20220416010747.40714-1-fengchengwen@huawei.com> <20220513025357.52275-1-fengchengwen@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml500024.china.huawei.com (7.185.36.10) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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. In the previous patch, the framework defines that the required number of entries should be returned when n is lower than the required number of entries, and makes sure xstats must not be NULL when n is non-zero. This patch removes the logic of "return zero when xstats is NULL", and adds 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") Cc: stable@dpdk.org Signed-off-by: Chengwen Feng --- 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 @@ -1626,13 +1626,14 @@ 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; if (mrvl_xstats_tbl[i].size == sizeof(uint32_t)) @@ -1648,7 +1649,7 @@ mrvl_xstats_get(struct rte_eth_dev *dev, stats[i].value = val; } - return n; + return count; } /** -- 2.33.0