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 6DDCB45611 for ; Fri, 12 Jul 2024 12:48:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 649A8402E5; Fri, 12 Jul 2024 12:48:01 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2087.outbound.protection.outlook.com [40.107.244.87]) by mails.dpdk.org (Postfix) with ESMTP id 4728F42ECA for ; Fri, 12 Jul 2024 12:47:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hqzw8c9iK3RQMrn8sgW6rPzjF73WeEr9sQc/K94F9zi1M2eElp5udJbgk54L5MYDfhfA3/o9jySaJVcdHVxLlLqBif78Yg+jObdRozay+SeQXmGN5b8J5z1d4YXIzDz1xcWtT0elj/+hvDvh8hIghXmhoXBRI/A3TgnwJTEaHeqsTgo4yw/0XML6WEVnTsMQv8a/UPmH5gygMZ1qPdzA9Y6dbgDkfyM/oIwRe/RLDjaegoplyjiShNshynJKk5EyFpJVhQy5I+trDcBhl/VNbmlhmw80ftJ50V/p/1y9Ax7nXyIRA6L3F9uqo6x8LmoKE+GaegSADuwTnDWb2LtAsQ== 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=zv82ftPi7Xw++AQq6LG9Aua2EwbzjZJMub6huqgH7M8=; b=dlM4LOCDunPOl/ody2B5UACK6gwR/v0HJ2Bz3r4onjuRWFyW0eLZXkN6yIFZ2+4BsfthZGXDB6KaDckR0/cFbUvBVsTQPKvwWojVBkAD7RjTjNDMM7F0SyPkgkZ9ow32NyluJxaHO2TMma6LZbFwAk7rig4jJg3MANBzSAlIy94/viTU9jokpZ9qFI2H9SXHDZ1IFLQGgpVvffDottA16fsqDh0+SwKIW+ohIFv2f/ahMyc0qfNhUaIpMcMicWsYvA5DYL8GtA1+LOFknwkPpNRyAoayAhUx2VaQxd+eVEf4t38sE71/I1Ik2A5bK5grIZj/X8lwe4VAwg0H7lF/oA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=zv82ftPi7Xw++AQq6LG9Aua2EwbzjZJMub6huqgH7M8=; b=JffvMGmgyiO6M3/e05CJ9edDZy75BWhvpYk9gbRrzvpPe9UTYs5hHnuYv2Aa4UyjKRz2Nt64nkWJHK5jLbFROCSLs8CwVqhaqd8m2//gDFNkQ6XRedhZ6GwuKskrN9lTRYVfkqqVpRCCMzTXyMCGNo1xJ4gjjB4WcJjfc3mEc0sDoQrAmeax+g8HodP2uak3jsDt4tPb+v2/gLcZaYjqCmrOukOp52lus8uTS9sj3w6Nt/DRo0NXSqG3xLB+R9BGAMMFsn0oM+VgMkJOaHrTOxgvb/iDH7vbIL2Qf7ODYlOTYfMF2XgIgaP8eX1q9P+c4nvIVmazSdsok39mxg8Ryw== Received: from DM6PR02CA0149.namprd02.prod.outlook.com (2603:10b6:5:332::16) by CY5PR12MB6273.namprd12.prod.outlook.com (2603:10b6:930:22::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.36; Fri, 12 Jul 2024 10:47:56 +0000 Received: from DS1PEPF00017098.namprd05.prod.outlook.com (2603:10b6:5:332:cafe::78) by DM6PR02CA0149.outlook.office365.com (2603:10b6:5:332::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:47:56 +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 DS1PEPF00017098.mail.protection.outlook.com (10.167.18.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:47:56 +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.1544.4; Fri, 12 Jul 2024 03:47:49 -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:47 -0700 From: Xueming Li To: Ciara Loftus CC: Stephen Hemminger , dpdk stable Subject: patch 'net/af_xdp: count mbuf allocation failures' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:09 +0800 Message-ID: <20240712104528.308638-24-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: DS1PEPF00017098:EE_|CY5PR12MB6273:EE_ X-MS-Office365-Filtering-Correlation-Id: ea746494-3cdb-4cec-e2b4-08dca26016c4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6OnEnJvk9qzUb3RQMkB7DY1f0L2Ym3jSyAHHFkZDDZe2IGqxaLHzz52e7/JS?= =?us-ascii?Q?kdIH5iNKrUytsKhmvazWRk/4ecKhzmxSZwAsYA2tsgxwnXHzeLLh3x6Be/Fg?= =?us-ascii?Q?1ggtliH1lOAH6YNmvZMxAId13EATh5gzxZ8mjOj7snoKz11om/vF9zmeSMYs?= =?us-ascii?Q?NOIeEHQRU5miP++KY26Nzl/CVHoVMHj9DchCW01RUXC36sKSRPXT3WoFxH8g?= =?us-ascii?Q?PAYU18cgOGxEFgD0cyfepdV+98dHOhd35o6TKBN2GZdO6b+v61ctVowkfJVo?= =?us-ascii?Q?MsXxCc2O+33PlO0+J/Iq9avwrvQLhmFjEO1P7Hy4YnDHazsn/9HAzm4emol7?= =?us-ascii?Q?0w035UpDSpsiSOf/Yr1o/tkWkiZZ0EfCeF2TJh50qDfQk0/w04Qj6KQQrgwN?= =?us-ascii?Q?Q6MPbYeQ1MJvyP3R+1zSStD7nYJES64Oxwj6UrCbF1x167r+zO+6YWE+06lJ?= =?us-ascii?Q?hNa+dBNVVrH1B8u4eqLGiU3nfnDwvwf6bk1BuJ9D7A/EvN0lG5hK3cbzrN8W?= =?us-ascii?Q?cswk8OYScQdbG78DfrU69RzRWIvwmz5LhRbPLw4WlDQjlxTvRnlzbfNy+P3O?= =?us-ascii?Q?V/TClafLH8DwwYOX/hyHBOOSSIUiZPstMMKgb48IschhnYTsQx6fucxc19MT?= =?us-ascii?Q?/6j3K7nBLGaF5SJc9tRBDEA36SWGd1rd4TQjsyIgGfvSCWHAFocya9yMxr6s?= =?us-ascii?Q?KPFMgN4zwPTsDBd4WI285JOGGB7jpZ49lBXF9v9kSpcS1XwVUi5bvBBe75DS?= =?us-ascii?Q?PQDnE59Ht6CNXwA/FkK9TehbyEGy2WpYU9Qx+XdfbkaApgq4a4I/uQPv28ST?= =?us-ascii?Q?nZZYdFNmpaQD4AX1YTzNgqArvuqVxrzrMihtdoK+HEekRhLEEGe1iFt+lb7s?= =?us-ascii?Q?xnr/kut3jN1FFRitB9CE7HzzmyZYyyVPgWx4s9MA7v0m139bxx6vmR5QZtDZ?= =?us-ascii?Q?OgNl6fFAR5eVauCmyVe+ASKDnwD+vXcVJ01i0VcW4mtwfqhhYuq6PoxoYKih?= =?us-ascii?Q?uT24Wf9rOcaZ82V0bnrXfWA63j0sG0TghNYB+jNX1jTSeJUTbi9IvWaxzVUY?= =?us-ascii?Q?1ThUPIX+pIDPSMMO0/a99Q/XDLb1duAdo4rG/fj+t3EJqKmoQtbSi+5v0KON?= =?us-ascii?Q?feYbdNsD0wJTx1bKRGm8RilD89wwGA0yoX/FTjBNJpbKeMIJf87z7sZwBEkm?= =?us-ascii?Q?b7RA/ocBHoC1dv9NHdmTV1hv9GrHB+SzBEdPdmGRNpp+BrvqeK21Ra22V+SW?= =?us-ascii?Q?ImbeT3PmWskUmpcbslWjS8W6696/ku0uFrz3DqqcrJSDxdcFuvAQP6Hc67IR?= =?us-ascii?Q?wdT/kJtQqtU/G9uuAf4DkPzlyMCsrKVWnsNekzBkNnzRoesI+YFWTVGi3WIn?= =?us-ascii?Q?VuS+O7nelenZrJwagcuo+W9cYVPGD0BWomng5A/0T9rjgwGjR/Dwsk2ycgqz?= =?us-ascii?Q?J8ghWmR+bqI1LwWCeJJL2CxTBHVsCu93?= 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:(13230040)(82310400026)(1800799024)(36860700013)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:47:56.0767 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea746494-3cdb-4cec-e2b4-08dca26016c4 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: DS1PEPF00017098.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6273 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=00d025dc224497dca97616a6fbeda163da05fed8 Thanks. Xueming Li --- >From 00d025dc224497dca97616a6fbeda163da05fed8 Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Tue, 14 May 2024 08:41:53 +0000 Subject: [PATCH] net/af_xdp: count mbuf allocation failures Cc: Xueming Li [ upstream commit f294405ab98594aa41269507dde95cc89bb20a61 ] Failures to allocate mbufs in the receive path were not being accounted for in the ethdev statistics. Fix this. Bugzilla ID: 1429 Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD") Reported-by: Stephen Hemminger Signed-off-by: Ciara Loftus Acked-by: Stephen Hemminger --- drivers/net/af_xdp/rte_eth_af_xdp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index 539bfd76e1..73fc434ee3 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -316,6 +316,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) unsigned long rx_bytes = 0; int i; struct rte_mbuf *fq_bufs[ETH_AF_XDP_RX_BATCH_SIZE]; + struct rte_eth_dev *dev = &rte_eth_devices[rxq->port]; nb_pkts = xsk_ring_cons__peek(rx, nb_pkts, &idx_rx); @@ -343,6 +344,8 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) * xsk_ring_cons__peek */ rx->cached_cons -= nb_pkts; + dev->data->rx_mbuf_alloc_failed += nb_pkts; + return 0; } @@ -394,6 +397,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) int i; uint32_t free_thresh = fq->size >> 1; struct rte_mbuf *mbufs[ETH_AF_XDP_RX_BATCH_SIZE]; + struct rte_eth_dev *dev = &rte_eth_devices[rxq->port]; if (xsk_prod_nb_free(fq, free_thresh) >= free_thresh) (void)reserve_fill_queue(umem, nb_pkts, NULL, fq); @@ -412,6 +416,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) * xsk_ring_cons__peek */ rx->cached_cons -= nb_pkts; + dev->data->rx_mbuf_alloc_failed += nb_pkts; 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.324492881 +0800 +++ 0023-net-af_xdp-count-mbuf-allocation-failures.patch 2024-07-12 18:40:13.976594243 +0800 @@ -1 +1 @@ -From f294405ab98594aa41269507dde95cc89bb20a61 Mon Sep 17 00:00:00 2001 +From 00d025dc224497dca97616a6fbeda163da05fed8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f294405ab98594aa41269507dde95cc89bb20a61 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 0997543ee5..0db761a204 100644 +index 539bfd76e1..73fc434ee3 100644 @@ -24 +26 @@ -@@ -320,6 +320,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -316,6 +316,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -32 +34 @@ -@@ -347,6 +348,8 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -343,6 +344,8 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -41 +43 @@ -@@ -398,6 +401,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -394,6 +397,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -49 +51 @@ -@@ -416,6 +420,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -412,6 +416,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)