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 5457AA0555 for ; Thu, 9 Jun 2022 13:37:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4266B40220; Thu, 9 Jun 2022 13:37:50 +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 6F51A40220 for ; Thu, 9 Jun 2022 13:37:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774667; 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=LPtQ+geUZFYBKa89h8zvs2N40exsW/pQJL2xWlFTe6M=; b=XT6ivAFaUoMHydIU8p7KCIEE50NZ51bW6EVqOiYJSAVHRJnoGQjA3kqrvBYw5Pg+O5eCZW 4//HRDqn3Sz1z3ttGS/eGqTSsX+kR0Q1lkxFM5VSSY5dDjA9mGdjGHqjJerCaQI6nN/HNM kS/8qg3z4+A3NxsC0Ie9Pcf5600nGig= 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-241-ESJbxtELP8CfimTMBm6XBA-1; Thu, 09 Jun 2022 07:37:44 -0400 X-MC-Unique: ESJbxtELP8CfimTMBm6XBA-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 3D350185A7A4; Thu, 9 Jun 2022 11:37:44 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3EBAC18EA3; Thu, 9 Jun 2022 11:37:43 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Andrew Rybchenko , dpdk stable Subject: patch 'net/axgbe: fix xstats get return if xstats is null' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:11 +0100 Message-Id: <20220609113701.386938-24-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/b6a52d1937f975baa402c5d4aa4c856c75e78a2a Thanks. Kevin --- >From b6a52d1937f975baa402c5d4aa4c856c75e78a2a Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 13 May 2022 10:53:54 +0800 Subject: [PATCH] net/axgbe: 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 93041fd5149a4f8cc795ea8ebb229415e2994e51 ] Many user (e.g. telemetry) invokes rte_eth_xstats_get(port_id, NULL, 0) to retrieve the required number of elements, but currently axgbe 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: 9d1ef6b2e731 ("net/axgbe: add xstats") Signed-off-by: Chengwen Feng Acked-by: Morten Brørup Reviewed-by: Andrew Rybchenko --- drivers/net/axgbe/axgbe_ethdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index e9546469f3..5add403235 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -1012,10 +1012,10 @@ axgbe_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, unsigned int i; - if (!stats) - return 0; + if (n < AXGBE_XSTATS_COUNT) + return AXGBE_XSTATS_COUNT; axgbe_read_mmc_stats(pdata); - for (i = 0; i < n && i < AXGBE_XSTATS_COUNT; i++) { + for (i = 0; i < AXGBE_XSTATS_COUNT; i++) { stats[i].id = i; stats[i].value = *(u64 *)((uint8_t *)&pdata->mmc_stats + @@ -1023,5 +1023,5 @@ axgbe_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, } - return i; + return AXGBE_XSTATS_COUNT; } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.340636450 +0100 +++ 0024-net-axgbe-fix-xstats-get-return-if-xstats-is-null.patch 2022-06-09 12:34:29.678980526 +0100 @@ -1 +1 @@ -From 93041fd5149a4f8cc795ea8ebb229415e2994e51 Mon Sep 17 00:00:00 2001 +From b6a52d1937f975baa402c5d4aa4c856c75e78a2a Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 93041fd5149a4f8cc795ea8ebb229415e2994e51 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 951da5cc26..e6822fa711 100644 +index e9546469f3..5add403235 100644 @@ -31 +32 @@ -@@ -1014,10 +1014,10 @@ axgbe_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, +@@ -1012,10 +1012,10 @@ axgbe_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, @@ -45 +46 @@ -@@ -1025,5 +1025,5 @@ axgbe_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, +@@ -1023,5 +1023,5 @@ axgbe_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,