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 3316BA0A0E for ; Mon, 10 May 2021 18:06:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2CD0E4003E; Mon, 10 May 2021 18:06:28 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2065.outbound.protection.outlook.com [40.107.94.65]) by mails.dpdk.org (Postfix) with ESMTP id 221914003E for ; Mon, 10 May 2021 18:06:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B6JvHykkeqlHrnZQHFDGKEYP8pilMzyrQ4Wdgy8+W9MVMUATGocQYfiBcfU9kAJCJ8EHiJdmsjF67HfCIS0aQ0TvKfSCId8xSRG4PZvj+avs2txeEPOdc9rjE9HNvthUt1m5HXg3P+FC8cYkDhq8lDgDncnO0Rkm72blHbIG1pSnKOpFQcvhwHn+iQUQdbhZKOTOA2UGHT7bpDmXo8uQruZhM6SLx0KE04WHofzDfMMuBk5jCAcTGBZ5PhXhbSv+rtnI/nSaCwhNr0HOT7xF0xM0AgnOWq5yQbWcsekDMIdDrzIksiRT1HFoJ/t4N95Tv/UA70gMyfvOdRYEooF/oA== 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-SenderADCheck; bh=zpnd0DIzfFDylQk4LItYZnhc6QSsIOR7X7tlctbnyds=; b=kY4UwQITkgnD9sUNLK02nFXF8yclaGpzem6ww7brDuavqtpVbHOgwhrDUV5XZii5PjcjRS6lvW6sWnmPGuJ50FCm/+9la8/aIgqBtGnElpK+8sATcuhLS/f2FKZ/HS+PzQ52q6InK4Xgl72Q750ntMeDHxleY8q6NDzyKcT5X+iaXp1tFvZRJNjPfn4GaffWx7j4tqxSgyuvOLSlfGoc6jzKeO48QYJEX3sb+cp/78ivzYetUv9rCdxptMig7VbTtYpAi6hMaAn0+0GCMgfWUB/3ZEKy50nzpa7jN6WgDr871P5j5p1D/Vclg+XFToI6u4ByPQGxPXcTpYZq8b/Kbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=zpnd0DIzfFDylQk4LItYZnhc6QSsIOR7X7tlctbnyds=; b=IMFqGrTOphk60hVukILBi7IL9j3silqJ9fmJP76141aPWAlJTgupi/QzC5X8knIzKvT50N62uiJTxBdmRMB1AM+ihuhS3Tutpw5CwrMr+D+BQYG8YLeYlqb+KYOxmdnxCG/6cIiv040FZpexQN761T2iQOJMtSCUTJZuoSRyRVHIeKcdo0/9wPFmniqrKMDbWOMxW9/qm6lwkJC++9ingon4hCfnQWj8vKv80HISUAabfvSpqggscAZwc5uiYjiGwgyp5ZqfPAbuZne4hPZ/wGzttvdDVqhY2V/aY94GCmQccNNNf5H1jN2xWFDa+XbMrR6gUc94IpyhFbPVXlItdg== Received: from BN8PR03CA0020.namprd03.prod.outlook.com (2603:10b6:408:94::33) by MWHPR12MB1934.namprd12.prod.outlook.com (2603:10b6:300:109::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:06:25 +0000 Received: from BN8NAM11FT067.eop-nam11.prod.protection.outlook.com (2603:10b6:408:94:cafe::93) by BN8PR03CA0020.outlook.office365.com (2603:10b6:408:94::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:06:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT067.mail.protection.outlook.com (10.13.177.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:06:24 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:06:19 +0000 From: Xueming Li To: Jiawen Wu CC: Luca Boccassi , dpdk stable Date: Mon, 10 May 2021 23:59:40 +0800 Message-ID: <20210510160258.30982-31-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88822cd5-3858-43d7-1a6d-08d913cd8fab X-MS-TrafficTypeDiagnostic: MWHPR12MB1934: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YcvkJu/44e72bvI5MuozBhNKobaU2t0nuFliK6RiVc/3WqWtr900rIjej9fcvT53GEJ+XZrAaMWWjttGlTXo6p84DBdV5MIeCkF5+4DhObx+iQuNagnYofYJq9QLkXbfOSK/SusA2XcNiJFrVosKc9EpGN3kjqiEYqu1FKJ7H9hOq/A2H3hchb7ENXtznC8IY8jhLCpZbRc7jZJo/b6qw23iddmMWylbUTC2or5eIjcB6BY+OrrZYr5hAisR5/MJwJiJEE6CxRXZnkpWc2AxAo0rVuJPd7R/NAIbHIxUvJGMLNBGehYEDybks1iOP4+3or9ycEgBE4HS4okeTsZqMzBp3A7ASQGPmi0ea8Pc3FoFyUnLOgo8WxFHPK87qHkAFHtUm3FNyxX2s1/O26gTmN5b2rPP4qiC/Hsn0Od6CcxJNFn8EtM32GUg5IwDx3dfCJ8FohhRpnIGJ1R6zQv5XipeV7UgNjXlz9oA+AXBDzULIeUPaQGd47Xas3iWXHCYvkchhKIY3gvLwptEw0IR8NjC2MXaFgkQMKq0NRXsK63wzlErj4gGaRBPpJwHw6uP+NIN4VO4MmcdeWOc7L7DU7rtJWXbxqV4WtDK0b4kW1waJyDKhZ9ZQuJL2Eeg5IEx/xNYZ1Y+UhSECZGtpPKDyAKkQ1y6P0pPtzeMiCcoZedX4vmVh4ADi4aLSOP/CkJT8EU2ly0C56II7XSUDGUdxb2c8BbKUR3w8TWQ6EisOo8Gdw2iCw5V+R6tJstLR3oSEDBgay+MGKcOd1fjbMD9Mw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(376002)(39860400002)(396003)(136003)(346002)(46966006)(36840700001)(82310400003)(26005)(16526019)(966005)(70206006)(6666004)(186003)(36860700001)(8676002)(53546011)(356005)(7636003)(83380400001)(86362001)(8936002)(55016002)(426003)(1076003)(4326008)(36906005)(316002)(47076005)(82740400003)(2616005)(36756003)(54906003)(478600001)(6916009)(336012)(5660300002)(70586007)(6286002)(7696005)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:06:24.6686 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88822cd5-3858-43d7-1a6d-08d913cd8fab X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT067.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1934 Subject: [dpdk-stable] patch 'net/txgbe: fix Rx missed packet counter' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 05/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/4d4ae30d079595fceae005624f66f96fb630fda0 Thanks. Xueming Li --- >From 4d4ae30d079595fceae005624f66f96fb630fda0 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 5 Mar 2021 10:14:36 +0800 Subject: [PATCH] net/txgbe: fix Rx missed packet counter Cc: Luca Boccassi [ upstream commit fa702fde0c3670bf0a206d9e074046274233c516 ] Add the Rx dropped packet counter into stats->imissed, to ensure the stats correct. Fixes: c9bb590d4295 ("net/txgbe: support device statistics") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_type.h | 1 + drivers/net/txgbe/txgbe_ethdev.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/txgbe/base/txgbe_type.h b/drivers/net/txgbe/base/txgbe_type.h index b322a2cac8..4e9a7deb12 100644 --- a/drivers/net/txgbe/base/txgbe_type.h +++ b/drivers/net/txgbe/base/txgbe_type.h @@ -284,6 +284,7 @@ struct txgbe_hw_stats { u64 rx_management_packets; u64 tx_management_packets; u64 rx_management_dropped; + u64 rx_dma_drop; u64 rx_drop_packets; /* Basic Error */ diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index f8dffe1f12..63bae511ef 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -1881,6 +1881,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, hw_stats->rx_bytes += rd64(hw, TXGBE_DMARXOCTL); hw_stats->tx_bytes += rd64(hw, TXGBE_DMATXOCTL); + hw_stats->rx_dma_drop += rd32(hw, TXGBE_DMARXDROP); hw_stats->rx_drop_packets += rd32(hw, TXGBE_PBRXDROP); /* MAC Stats */ @@ -2029,7 +2030,8 @@ txgbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) } /* Rx Errors */ - stats->imissed = hw_stats->rx_total_missed_packets; + stats->imissed = hw_stats->rx_total_missed_packets + + hw_stats->rx_dma_drop; stats->ierrors = hw_stats->rx_crc_errors + hw_stats->rx_mac_short_packet_dropped + hw_stats->rx_length_errors + -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.505093800 +0800 +++ 0032-net-txgbe-fix-Rx-missed-packet-counter.patch 2021-05-10 23:59:26.360000000 +0800 @@ -1 +1 @@ -From fa702fde0c3670bf0a206d9e074046274233c516 Mon Sep 17 00:00:00 2001 +From 4d4ae30d079595fceae005624f66f96fb630fda0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit fa702fde0c3670bf0a206d9e074046274233c516 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index ef8358ae37..2c8a3866a7 100644 +index b322a2cac8..4e9a7deb12 100644 @@ -22 +24 @@ -@@ -353,6 +353,7 @@ struct txgbe_hw_stats { +@@ -284,6 +284,7 @@ struct txgbe_hw_stats { @@ -31 +33 @@ -index 90137d0ceb..1ab8d2cded 100644 +index f8dffe1f12..63bae511ef 100644 @@ -34 +36 @@ -@@ -2080,6 +2080,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, +@@ -1881,6 +1881,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, @@ -42 +44 @@ -@@ -2228,7 +2229,8 @@ txgbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +@@ -2029,7 +2030,8 @@ txgbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)