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 591A8A0555 for ; Thu, 9 Jun 2022 13:38:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5082C427F9; Thu, 9 Jun 2022 13:38:31 +0200 (CEST) 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 107A040A7D for ; Thu, 9 Jun 2022 13:38:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774709; 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=sZCjUl4BFNphpUfBdO9OvBIVYLUbLyO7WcYlU9HzIJs=; b=aJmJe0gnpMteVssvDpfKi24IC9Xh/sbpcmFkbGyQY9qoonSE6Vz+IpFKHAhuWtymGbw+3S kknpcE4SE+NjFtyQpJ8W31Za96TiEQvCpB7dn4OpBJYpGTQI9F8KRkN1pttPUnDBC5do4X /fucs5taT43WUGlHQ+ySX2djqlX2WkU= 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-106-paryyynKMMWT9Jsoqd33qQ-1; Thu, 09 Jun 2022 07:38:24 -0400 X-MC-Unique: paryyynKMMWT9Jsoqd33qQ-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 D6DDD800882; Thu, 9 Jun 2022 11:38:23 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9C0A18EA6; Thu, 9 Jun 2022 11:38:22 +0000 (UTC) From: Kevin Traynor To: Cc: Didier Pallard , =?UTF-8?q?Geoffrey=20Le=20Gourri=C3=A9rec?= , Bassam Zaid AlKilani , Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix statistics read on Linux' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:40 +0100 Message-Id: <20220609113701.386938-53-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/2d0228a9e95bfc46513969fb7f098d43a34e0d64 Thanks. Kevin --- >From 2d0228a9e95bfc46513969fb7f098d43a34e0d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20Le=20Gourri=C3=A9rec?= Date: Thu, 17 Mar 2022 14:23:48 +0100 Subject: [PATCH] net/mlx5: fix statistics read on Linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit eadc35df59a1a1a5017c0db1c7a9978ca8eb56e9 ] This patch encompasses a few fixes carried by a previous patch that aimed to support bonding device stats counting. - If mlx5_os_read_dev_stat fails, it returns 1 instead of a negative value, causing mlx5_xstats_get to return an invalid number of counters. Since this error is not blocking, do not mess ret value with mlx5_os_read_dev_stat returned value. This allows avoiding the very annoying log: "n_xstats != n_xstats_names => skipping" - Invert the check for mlx5_os_read_dev_stat(), currently leading us to store the result if the function failed, and use a backup value if it succeeded, which is the opposite of what we actually want. Revert to the original (correct) test. - Add missing test on _mlx5_os_read_dev_counters() to prevent using trash stats values. Fixes: 7ed15acdcd69 ("net/mlx5: improve xstats of bonding port") Signed-off-by: Didier Pallard Signed-off-by: Geoffrey Le Gourriérec Tested-by: Bassam Zaid AlKilani Acked-by: Matan Azrad --- drivers/net/mlx5/linux/mlx5_ethdev_os.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c index 8fe73f1adb..b5819cc656 100644 --- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c +++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c @@ -1387,4 +1387,6 @@ mlx5_os_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats) } else { ret = _mlx5_os_read_dev_counters(dev, -1, stats); + if (ret) + return ret; } /* Read IB counters. */ @@ -1392,8 +1394,7 @@ mlx5_os_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats) if (!xstats_ctrl->info[i].dev) continue; - ret = mlx5_os_read_dev_stat(priv, xstats_ctrl->info[i].ctr_name, - &stats[i]); /* return last xstats counter if fail to read. */ - if (ret != 0) + if (mlx5_os_read_dev_stat(priv, xstats_ctrl->info[i].ctr_name, + &stats[i]) == 0) xstats_ctrl->xstats[i] = stats[i]; else -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.985373149 +0100 +++ 0053-net-mlx5-fix-statistics-read-on-Linux.patch 2022-06-09 12:34:29.769980681 +0100 @@ -1 +1 @@ -From eadc35df59a1a1a5017c0db1c7a9978ca8eb56e9 Mon Sep 17 00:00:00 2001 +From 2d0228a9e95bfc46513969fb7f098d43a34e0d64 Mon Sep 17 00:00:00 2001 @@ -9,0 +10,2 @@ +[ upstream commit eadc35df59a1a1a5017c0db1c7a9978ca8eb56e9 ] + @@ -30 +31,0 @@ -Cc: stable@dpdk.org @@ -41 +42 @@ -index 6fbfcfad48..8d30ad0994 100644 +index 8fe73f1adb..b5819cc656 100644