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 C75AC45610 for ; Fri, 12 Jul 2024 12:48:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C0947402E5; Fri, 12 Jul 2024 12:48:10 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2068.outbound.protection.outlook.com [40.107.101.68]) by mails.dpdk.org (Postfix) with ESMTP id 9875240261 for ; Fri, 12 Jul 2024 12:48:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QhXgBxfYibOba6nOhTUgQ2+Zprxw8qfRnR74cVaf4CDunqMMJfX7ZKlElWQhq3yulS5PWyeymbx1WTT9ukwni65MlZrUlrGyUWdAXaNXmQUpE9gSdxR1u4cqkK8/15QXjjV1W021389qfwAsOhxAd5+DY1gkKZn3p2Cs4K0pwButV9QeOPSIyLUlZVYK2mZJwqeib1Pmm7plK82Z7k4QH8FAE9OGjmcDjCriIgYy1K3LClPDSXS6mOP3pa64Yvxl7ZQwHK33vYXjE9IBZ2ijyuUVf/olxiJ9WCLXW2+A1MXv56taGZtg6xs1DsSs1i/ehdoqMqPo3dh+3AzZHL+VoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=jxvSLsl9kyf0aeTtYInWn0vKGa/6G6xvT3t/Irt0I4M=; b=MtCldcRxhMsg0kDAn3zD6FZoM5sJ7YTWYc4ms7CqxoQ5X9bmXZI1JNiTlNOmXUvhAL+Ss4moN2oHfg0b8GwPbzbYcnIP8mIk8yHumgNxN57hQkoboNg3XXgFiMhOax+DOlxrdmiaw0T+MEhvDRReC2ZV5x64vAofqSS9TLpYYp1q7f+CuR4bNG7SMsizDvfUKnpyXwL/XItgjgcp+2bP3puUvUJx6qovREJdF5MDQwFg02a+YbOkNTz1/p2RnORG+AwPZmYk+x8LcFw+dDlfDJ8DEAblLB3yGyPcWSVt7qFb5lFkJ+NyutbqLMLRx0XufwoR3GRhsOrtyZnLmhBkRg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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 (0) 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=jxvSLsl9kyf0aeTtYInWn0vKGa/6G6xvT3t/Irt0I4M=; b=Yx++HMyDfnDbQ8mIYZnJTacyWQ8o2rY0C70l9lj6HgLStBYPgFPBlwzNqylsBLTLcCkp3E4dRR7VTr5uciRfxc5WeRD2ifdpHXPEyN+nhDrJ2pOYEJJncA5hyMyJQzfJomU1M/WbidCbjTNVSJth73YMeVy7Iv+le4z369wqygsyCAzzcjtRp0EIYfliyEt1ywo7QNzB5C+KjrxblqSL/3Rt/AxpoBD6vUv9PpVMfanfp6p38wgisi/SF2aTb3l4BJtb70NOcJCQceP9EvtnKTwhMxX3z4r+OR74aJTbFEck3YFS/qI+9GIrru1Y69UeTpTulY7WWjcHur5B2hGxqA== Received: from SJ0PR05CA0046.namprd05.prod.outlook.com (2603:10b6:a03:33f::21) by DM6PR12MB4153.namprd12.prod.outlook.com (2603:10b6:5:212::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.21; Fri, 12 Jul 2024 10:48:06 +0000 Received: from SJ1PEPF000023D6.namprd21.prod.outlook.com (2603:10b6:a03:33f:cafe::16) by SJ0PR05CA0046.outlook.office365.com (2603:10b6:a03:33f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.22 via Frontend Transport; Fri, 12 Jul 2024 10:48:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF000023D6.mail.protection.outlook.com (10.167.244.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:48:06 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:47:52 -0700 Received: from nvidia.com (10.126.231.35) 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.1544.4; Fri, 12 Jul 2024 03:47:49 -0700 From: Xueming Li To: Ciara Loftus CC: Stephen Hemminger , Maryam Tahhan , dpdk stable Subject: patch 'net/af_xdp: fix stats reset' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:10 +0800 Message-ID: <20240712104528.308638-25-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] 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: SJ1PEPF000023D6:EE_|DM6PR12MB4153:EE_ X-MS-Office365-Filtering-Correlation-Id: 94617490-e12b-45b3-68c4-08dca2601cb0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ruP7SpLM3wtnfEClx2GPrPnDAadUmdTU88nf5iazf/h/SUi6+A/eQu4YKgtL?= =?us-ascii?Q?Q3c33fP/NHD6z4dYp0qqC355d3fxYdsSNtBUSoFh/F4Y64biH4y+CJwVHCFB?= =?us-ascii?Q?FUa3jNejtU1AB4CWLVTmYoxEJUSf6bOhwedt/RnQN6naRCQlaqn6F3CtBsyO?= =?us-ascii?Q?ZXZHHy448B576GdsgNQ3U6CHZCWPAXuK01RdGTCZDqaDKY0BZGPBAfKXV1E2?= =?us-ascii?Q?u+EeiuwT8zSrvDH1EKU2pTh/r0xCB3LC+MnVKFckqTO5awKtaILV1A4SxHXE?= =?us-ascii?Q?HReemWjt/QX0vofgG08u0a66s1tLQwbGl+5x31Xhiqup5WXhwgQhwZiQljSq?= =?us-ascii?Q?JIcfo2+QTEPkE39YGmF5EOD/Xtwo+67yjhFLXVKKgFwnYvYXyQWlWbU/eRf9?= =?us-ascii?Q?RZQp+m0MwTeIh7SfN5Tyutye1XdNMyms323Qwsf30ciXvYPj8N1Nyt9S6ZU0?= =?us-ascii?Q?6QRVIVyKy1w8gw3RwEp9bs+e3VdHQvpfY8i4r9e5F2uZbrRo14J1GELUvQcM?= =?us-ascii?Q?ay8ojkNp3B8HEZoRL0FGOPkBMNRmdXt0HMTEmfynQ6RkeKHOnxoPJg0qveIH?= =?us-ascii?Q?E4YYTciQW+Tr56yPDz4ii0JirN+iPkk+fTS3lebiII7/ufk4mUqqw58ZZ2gI?= =?us-ascii?Q?HCltzMMzxwRxcWrP9Ov7JI8ZASkqfu4lSdyyHa6Rg3uaJ7jP0MkRWGxl7QHv?= =?us-ascii?Q?jmwsJjiqOILplyGTuebCbXPN21TN2h3dqrgyTIW+guumPZJKMSI519qDVL2n?= =?us-ascii?Q?m2FB/64tt2bsGcayjXqN/3pcRUfVlNE2XbSZ36kktouNGFWdVdHG62ql9EAb?= =?us-ascii?Q?qR9TvscoGIjoFDG8/KWtJgm3t6koxwVxp121YGuOlYa3K0DG7GAmM3BrNliR?= =?us-ascii?Q?eu5+O/5/rmdslqQ4oTb/uDF3PalyicCXEANr85Er44tFQQEF3g45E3atLmKl?= =?us-ascii?Q?D1tudmO2rrx7Q6QDgPhOXLk1Ymhk8mvkgSRxVmUjcusZYM9BZR9nYC3uC6ze?= =?us-ascii?Q?+Dvijz7jiaH+knTt2H9OeOKSg8d/E1D30o57fFF46gUphaFRqcRCkGoRDr4N?= =?us-ascii?Q?KNQCglNUPV2bVX4xecxmFrAG4OshfXlamis06dLAYno/48bRtgpo2CjqV+z2?= =?us-ascii?Q?DafxkCOaWsckHQs2AgNi6SiOxIXiJYL7dAj1cogaQeuwfStpr8R+5CRrmYcP?= =?us-ascii?Q?rgb6Bgv6+A/QoP1BCbKa9WpBfk2fjcgzXxDiOLmsdPTm2n9zHIywlIvrmkb1?= =?us-ascii?Q?a36XwPhRinV0HM8D8vkhx/iOvmDIm9b9gOT58nfPlhlvXwxqShSno2SVPKrG?= =?us-ascii?Q?iKQ7y1ciLsD5XGjLMNpxhqo/4NvINmNLer47WVWCM7MW2iMQvNtZKl/h2PNQ?= =?us-ascii?Q?1ty0+vRY3fTBhkEACCWMmhjq/DleltdmUFbGupLtR/7+yEsw11SNTnaEX06f?= =?us-ascii?Q?GcnJL6Nujajs/XDJhTb++JGN+H3hrHgE?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:48:06.1338 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 94617490-e12b-45b3-68c4-08dca2601cb0 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023D6.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4153 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 23.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 07/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=f3cafbb257888e72cdc95b777ff2256772bb8e95 Thanks. Xueming Li --- >From f3cafbb257888e72cdc95b777ff2256772bb8e95 Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Tue, 14 May 2024 08:41:54 +0000 Subject: [PATCH] net/af_xdp: fix stats reset Cc: Xueming Li [ upstream commit 3577b1ee97dcfe9ff1b9e050bed55f17c435a93d ] The imissed statistic was not properly reset because it was read directly from the kernel statistics. To fix this, take note of the kernel statistic when the stats are reset and deduct this value from the kernel statistic read during statistics get. Bugzilla ID: 1430 Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD") Reported-by: Stephen Hemminger Signed-off-by: Ciara Loftus Acked-by: Maryam Tahhan Acked-by: Stephen Hemminger --- drivers/net/af_xdp/rte_eth_af_xdp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index 73fc434ee3..57759e2301 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -125,6 +125,7 @@ struct rx_stats { uint64_t rx_pkts; uint64_t rx_bytes; uint64_t rx_dropped; + uint64_t imissed_offset; }; struct pkt_rx_queue { @@ -888,7 +889,7 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) AF_XDP_LOG(ERR, "getsockopt() failed for XDP_STATISTICS.\n"); return -1; } - stats->imissed += xdp_stats.rx_dropped; + stats->imissed += xdp_stats.rx_dropped - rxq->stats.imissed_offset; stats->opackets += stats->q_opackets[i]; stats->obytes += stats->q_obytes[i]; @@ -901,13 +902,25 @@ static int eth_stats_reset(struct rte_eth_dev *dev) { struct pmd_internals *internals = dev->data->dev_private; - int i; + struct pmd_process_private *process_private = dev->process_private; + struct xdp_statistics xdp_stats; + socklen_t optlen; + int i, ret, fd; for (i = 0; i < internals->queue_cnt; i++) { memset(&internals->rx_queues[i].stats, 0, sizeof(struct rx_stats)); memset(&internals->tx_queues[i].stats, 0, sizeof(struct tx_stats)); + fd = process_private->rxq_xsk_fds[i]; + optlen = sizeof(struct xdp_statistics); + ret = fd >= 0 ? getsockopt(fd, SOL_XDP, XDP_STATISTICS, + &xdp_stats, &optlen) : -1; + if (ret != 0) { + AF_XDP_LOG(ERR, "getsockopt() failed for XDP_STATISTICS.\n"); + return -1; + } + internals->rx_queues[i].stats.imissed_offset = xdp_stats.rx_dropped; } return 0; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:15.361760376 +0800 +++ 0024-net-af_xdp-fix-stats-reset.patch 2024-07-12 18:40:13.976594243 +0800 @@ -1 +1 @@ -From 3577b1ee97dcfe9ff1b9e050bed55f17c435a93d Mon Sep 17 00:00:00 2001 +From f3cafbb257888e72cdc95b777ff2256772bb8e95 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3577b1ee97dcfe9ff1b9e050bed55f17c435a93d ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 0db761a204..25e67851f6 100644 +index 73fc434ee3..57759e2301 100644 @@ -27 +29 @@ -@@ -126,6 +126,7 @@ struct rx_stats { +@@ -125,6 +125,7 @@ struct rx_stats { @@ -35 +37 @@ -@@ -892,7 +893,7 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +@@ -888,7 +889,7 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) @@ -44 +46 @@ -@@ -905,13 +906,25 @@ static int +@@ -901,13 +902,25 @@ static int