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 5AE31428F8 for ; Sun, 9 Apr 2023 17:28:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5670142B71; Sun, 9 Apr 2023 17:28:54 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2046.outbound.protection.outlook.com [40.107.92.46]) by mails.dpdk.org (Postfix) with ESMTP id B81E14067E for ; Sun, 9 Apr 2023 17:28:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RyZm+WuUrDQCNC20ZlKaXG9avBnFoFv2vrWH9+JpkiVjm7y4hqy8aRlXmbhLAmPZAABkL3aEAl1v90f680FeWCTw1U5cNAcv7IU9aVc3Qsmwz8DP8AHcfUDUBbAV/AvZmCz2u/QrbVuvZO7j5eiAYfXpGsbi1yODLBFc4WC+btd/LqlkimHO0COA7anrkZk3SZLLeZ7YSxxE5A0vZZquv5fZFqnWeUkUTr1koWbtELZPWpiuqDSx+koroFf0DfiNtZ3g3lAj8p44J8tfj1ZR3LgP7vFJbSNQosXMk0FF6aI1X9FSEZei/Txr6LFd4YNKysyBgTk8nEco/QTapEI9kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NmqOqAFS9J6Vp8ndYdUg5jzDz9FYVNxNKfOawXLNYlw=; b=S7uiRZcBLTHannHz+xqYS0We8YPyAoUZIqHTq3/RJaJNdObklwbq91wneqgTTbgtjRDEI1pniALIq0y0x7214qijroBL7st723a9k2NLJyOskzY6HHlhcUbHp7S2qaHT5BWge7druGZ7JYaxPH0vHnYTHGhQyWdxbN4/ThixXo/UjjrsluBIICsNnRIPhzVSK/d4Pcomhe/8IxxpoVYyyGWBSTpF16d95iCld12aBA+FjfrjcTmRqi+D+Bs3gIPEuNyd43gxKzds5O5T30M/l0YCWmvYVfsdtdo1xMp+qIjVJO/eiGaVhH+nHTlfYXTGaIyikAC4gKcuwEExuXwJnQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=microsoft.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NmqOqAFS9J6Vp8ndYdUg5jzDz9FYVNxNKfOawXLNYlw=; b=DEh6AfM7RmqqN18UuIASQlgYC3KrTxZI60F9JYCH1XX0jZgMT0YDh8HovkImm8K0jC4BoYijKpFYfULoPU0jvcmE9A17pdIrmV+PLxrfYH5MJQD2pslZZ7m53AlddmRXKdptN/dSUktBOGu72RZwL60JvyHchuKBeOgOrH3bEn1rOjM5u+PBce+7SuaOPY6WRbHHDAZ5cfVHDsm8bT0JfiHs0R8o7E/rqHVFxy99GnPCgPgpdk49czUljuOX11KEAQfwXJUX/v6GvjsegAVVYkX36/TEO8it3t6VYDpgZEQGoLjQioiR9/fysgQNrm8cGgwhqh36Z+kq2+wClhsoNQ== Received: from DS7PR05CA0005.namprd05.prod.outlook.com (2603:10b6:5:3b9::10) by CY8PR12MB7633.namprd12.prod.outlook.com (2603:10b6:930:9c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Sun, 9 Apr 2023 15:28:49 +0000 Received: from DM6NAM11FT012.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b9:cafe::14) by DS7PR05CA0005.outlook.office365.com (2603:10b6:5:3b9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:28:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT012.mail.protection.outlook.com (10.13.173.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:28:48 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:28:46 -0700 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:28:45 -0700 From: Xueming Li To: Long Li CC: Ferruh Yigit , dpdk stable Subject: patch 'net/mana: fix stats counters' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:44 +0800 Message-ID: <20230409152529.5308-37-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT012:EE_|CY8PR12MB7633:EE_ X-MS-Office365-Filtering-Correlation-Id: ede0c26f-189a-4e9f-6fee-08db390f1dc4 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m2015GOHNSUQnKwc07e3NB4U5QB2cUk6HWEf/D2/K8BMQdUtZyK6E5w3xN9Ca799EAla3KPtw+XhxrFItGI2MCXajb2xaMsAEMzryF1rth3CxZQIl89PnHId6la9cbLzjMT9YYX+id8xlMoskqm/dUb1iLf0N7uskEIHOxJAqqAi+KWZBhFUb2E/wulluiG+7NJd67QNZ2Z2w+BaSOIAYreWuz5ZW+2NMyhiMYJyZ61LBf6IK4yFpdE4Eh6tikym92RPVQ34w7t+HyQyP+KwlZdqk3Mtu7w3ibjb2YDQfdR8i6SbIiVCFOxrraJPiMPzx3/H5gLSBNUGr1jgUY/c1Ndw/U4k6TxlR8Q5o7dZKJkI3F0EjgtsdT2BlRvIPs5teuW+p/qrlYXSPpaOE9e+HQ5oU+GXwnOt3Ix2WwcgCQ7w/tGVbSz59/ltT2I0RXe0j06/699gUz6cJedryU4nuawbGWsZOj5CgQB2d3dZKj7smZ6PSqsBQANUOkbMKdcqwSmO73LZxeEOOwc1XKhMAYoSFb/5Rw4sDqPkKvPe9dgq8U0Io3nobSGv7gjGHg8Y6IM/Dd5zF0tKCvsVd3zmIV7XxqwF52lf5GgoHKUj7o0T3mMbwUasRE+9iFo3psQRvpjq5j3TqgDbTn3ph8xFjKz6hBx7BOBaLtttTko3+kY/+0VuN1z7+rlnRZWZ8j6W0EquHpuKzYk2Xpb9CNDmnY7zDQTgky3lPK0bDofuAhGaUAl3gi73K1oU3TeDherzi9NCnwV65gxVsecVx1NBt6kwEmcdmHAr8ExeaputxtuIOtcCoqNg9O/6wgjIuWIpXgGdrkELvC9EEyTyqz06UQ== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(39860400002)(376002)(451199021)(46966006)(36840700001)(40470700004)(45080400002)(478600001)(7696005)(54906003)(316002)(53546011)(1076003)(26005)(16526019)(6286002)(186003)(966005)(2906002)(4326008)(70586007)(70206006)(8676002)(6916009)(41300700001)(8936002)(5660300002)(82310400005)(7636003)(356005)(82740400003)(86362001)(55016003)(40480700001)(36756003)(40460700003)(47076005)(83380400001)(2616005)(426003)(336012)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:28:48.8200 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ede0c26f-189a-4e9f-6fee-08db390f1dc4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT012.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7633 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 22.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 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/5475d251f17b88d7353956d9a9be958cb773fcf1 Thanks. Xueming Li --- >From 5475d251f17b88d7353956d9a9be958cb773fcf1 Mon Sep 17 00:00:00 2001 From: Long Li Date: Wed, 22 Feb 2023 15:27:24 -0800 Subject: [PATCH] net/mana: fix stats counters Cc: Xueming Li [ upstream commit eb6f507afed56915fec7b9e5da3389eb5853ab10 ] For per port counters and we should report summed values from all queues. Fixes: e350b56889bb ("net/mana: report queue statistics") Signed-off-by: Long Li Acked-by: Ferruh Yigit --- drivers/net/mana/mana.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/mana/mana.c b/drivers/net/mana/mana.c index 43221e743e..8a782c0d63 100644 --- a/drivers/net/mana/mana.c +++ b/drivers/net/mana/mana.c @@ -616,9 +616,9 @@ mana_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) if (!txq) continue; - stats->opackets = txq->stats.packets; - stats->obytes = txq->stats.bytes; - stats->oerrors = txq->stats.errors; + stats->opackets += txq->stats.packets; + stats->obytes += txq->stats.bytes; + stats->oerrors += txq->stats.errors; if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) { stats->q_opackets[i] = txq->stats.packets; @@ -633,9 +633,9 @@ mana_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) if (!rxq) continue; - stats->ipackets = rxq->stats.packets; - stats->ibytes = rxq->stats.bytes; - stats->ierrors = rxq->stats.errors; + stats->ipackets += rxq->stats.packets; + stats->ibytes += rxq->stats.bytes; + stats->ierrors += rxq->stats.errors; /* There is no good way to get stats->imissed, not setting it */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:39.720847100 +0800 +++ 0036-net-mana-fix-stats-counters.patch 2023-04-09 21:45:38.619042200 +0800 @@ -1 +1 @@ -From eb6f507afed56915fec7b9e5da3389eb5853ab10 Mon Sep 17 00:00:00 2001 +From 5475d251f17b88d7353956d9a9be958cb773fcf1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit eb6f507afed56915fec7b9e5da3389eb5853ab10 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org