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 9B82E45612 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 90BDC42ED3; Fri, 12 Jul 2024 12:48:01 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2050.outbound.protection.outlook.com [40.107.223.50]) by mails.dpdk.org (Postfix) with ESMTP id 2637840261 for ; Fri, 12 Jul 2024 12:48:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kfZ1H6MCkc1sRx80H9EKZJj4j3I2IhuoArJZpuh2u9VYHP1OByr4KN/Jl64pb5sjHn9lOWdgqY04pIjdYV/oHqBQ85qSTdlJKWGUWf0qHnctnroDvXJBAUu4GVwezYTnH2k0EiT2FelIwRrCi7WF+wbfHwIlOYYo4a++Dqnn5n9Y6B/iMSoC0K2hvHZGadnisQ8YHDWFQzAg/qN5Ypx/Mv6t2ARin2DRvDRvAPcO4ZEGa6H/08SeKTRNFdWZmCJ5wzel6HtpBBKucUXLAvmxdFFyReCOUjBbsgQT9Ys0oTafBzKWseuUSnPrFuTuvKB8hy0kxfJ2j8hl81Eyd7eTzw== 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=ccSB4ae2lcuVWz/+HHFowoOCmqmFbHxKAeGJkagSb9U=; b=TWWaetTHc18yJVnpPzOEEnGRHEX9VpDUF9Jcp2Ydg0inNdrEdNdxT/UOUis2xySCGLLi1ZWUkhpDUTiFoXXKXLzoE0KZEuX1JJ4QH9I/lpUTUMRORVRjaSh7vvuWaXW9JUPE1AX22JRlMzdRJv94wbmmDU46BZYAVsCBy23CT0B/xt+bTEuqBdr+OBkIYvEDcTVwuT+g0VsO5WZ5iEW+KKmd+ay6OkyiUDxThrU8cdhFrxyD+wgJz/7/7VnZwWGXQlS+20jQXOGjMIOG6n4RZZ8kyRwzQ/cKTZPHkbw/JLR8H9RlIYgDKOPxeJxNRoBsrXaEHDj3cMOQuf/BJjElXg== 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=ccSB4ae2lcuVWz/+HHFowoOCmqmFbHxKAeGJkagSb9U=; b=kWI6FrEdKC/x2Mo0HtuB2fzjzQCQCkWcD/3CNWctGQA1Zd9nPEiMQT3uy9eipT7Zax/1q4Ct+FmUTvJqEhpxEjrx//Qy1KuNEQ+EBwfIPkQ+3Bj30V6deK8Y9LCdU8eMAr6o6cmOZQTkrX+AiW4rnb+N5/VTyTY0rcEF6OTj1ZaTCS+5JKz53/QdmUPm9OOjUwMTq2/ZO6r7u0ymvj7nyCykBlEQ0ZST88gwqemiOEys60boxrIdTujAb6G8HiVoJGMlq5OWuGcf1Ti6NAechGdI2ON8Mq3fl8ISwrJlVGUvYSSjLN7iJso23+pvkk6MicY4uPGMv0ZpwPai5Hl9WQ== Received: from DS7PR06CA0007.namprd06.prod.outlook.com (2603:10b6:8:2a::25) by PH8PR12MB6865.namprd12.prod.outlook.com (2603:10b6:510:1c8::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Fri, 12 Jul 2024 10:47:56 +0000 Received: from DS1PEPF00017099.namprd05.prod.outlook.com (2603:10b6:8:2a:cafe::fa) by DS7PR06CA0007.outlook.office365.com (2603:10b6:8:2a::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.24 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 DS1PEPF00017099.mail.protection.outlook.com (10.167.18.103) 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:55 +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:47 -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:45 -0700 From: Xueming Li To: Ciara Loftus CC: Stephen Hemminger , Maryam Tahhan , dpdk stable Subject: patch 'net/af_xdp: fix port ID in Rx mbuf' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:08 +0800 Message-ID: <20240712104528.308638-23-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: DS1PEPF00017099:EE_|PH8PR12MB6865:EE_ X-MS-Office365-Filtering-Correlation-Id: 8777c5a3-4839-4851-14a0-08dca26016ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?SkmoS9OeYzp83e/axcUjv/IikgcLAUwWNTsU1GrNUQVe8qURdpXxl33UQdVV?= =?us-ascii?Q?KQ7iBBvDRqkALVGKGlJi6Oj7hZ1uNu1ZsIyAPEjT6O18A8Yf3nL3MC5Xb2gL?= =?us-ascii?Q?4v3vrsq7kQnTxEFtV1Lc5DMBoQ11aJmOkgeTvQ2w6ANZ3c9OKhUTn2xsgShn?= =?us-ascii?Q?C0L3Lorr9ct+jMnaB7EXH46SE58J24YnQ0pkpsfX0R6oohYHMIslHXSBkXZj?= =?us-ascii?Q?Wrs3/mlifHaliyBQwdAQVl11sULy7ZF8tESTl+DyKwDzrO64WWxkpUeJmmeY?= =?us-ascii?Q?WVukwUXz4N9GrOi0qnfUyyPk8SZpgk0lP9u3HKiY7RQ5BpSDZt45ZuXmzEZ7?= =?us-ascii?Q?8oDTWY5k8YULKA8zyCkxvK6wgabFEStBcxVLPwumWArpyCSGtp+oVNL89ZM/?= =?us-ascii?Q?s/cHy8h0L/uKMuNiBZYZFFuPPJLVUtfigfykjVxEx67M5CKvPgZJ39viO/FE?= =?us-ascii?Q?JlO+Kj5UiCcS+uoXtEO/u03VIrhgfPxJdzWGAFsSmMLgx/naNndhZvqom7SS?= =?us-ascii?Q?DKrxmNJ+vJvH7zT1Ka/qKpQwqOWwgeLOg2eaYrusZqmBznRUmdR5oTcF684o?= =?us-ascii?Q?3PLoe385lZudW1Y2SLDw4oJBy/bVH5hIsVCF0PWnKSIDKdjQ3ph0IUkGxjuz?= =?us-ascii?Q?8tvSBOqBmjWPw1AfF71UD9SUUCm2Qex0+NdHJArbiozr/fVhbHc6hEAFCNoE?= =?us-ascii?Q?4VPzusjVosDNMwId6IdM+OeiBgm2k3a6M3SAhX3//CCQrH5Q6tk6tMfdKcUx?= =?us-ascii?Q?1xI1nc0/YB4/xF/66BRCxCoQHqI9VBMX7mlD8tOHPkjNvUQ7ifs5Fg/ysKav?= =?us-ascii?Q?BrzhrdslmwegfbHMuK86HkRGf7E0GD7atJXlKgXeDwcHBqXhWvD0hYleaELy?= =?us-ascii?Q?a+lWGaekh3FZt/3suP3SkD6BDz9Ynwj6BPHtUXYvsbVz0msb0HUZZOpDM5bl?= =?us-ascii?Q?gf8P1dr0M6T8MiVHOGPdzghemoAHvJt1ses9LmoXTIVWi/FoGoDPdz7d1AzX?= =?us-ascii?Q?7APL4MYDKx/uxfOuq+u+uaRW3q8Lm1yOFu1TkmP64yjn5eQLOok5/SAv3ETO?= =?us-ascii?Q?zLTCIftq/bOL0NcE+DgU3pYkUdDaFFR5m2YpdV/6OlSDb0/i2x4o39YIixpU?= =?us-ascii?Q?zOFMvAup/jVPq2nDi5wxFeZSiDoVtfBLLKuLcsJGBmk7ck99vYGObFC694Up?= =?us-ascii?Q?OXzjeIFqjLXgDcVKnsLukxSffFCFdu+VUXWz+kwzo84b3sdavtqWdpBJf9ud?= =?us-ascii?Q?mvaJZ6AsvfXnuJkbZ/cxw29s9I3iPseqYdA6AryepAbUn3ZwSzMKDzfLXpAt?= =?us-ascii?Q?b87QtLlCYVishHyF0LReZDpLg4lRnsc/9fhXRs2DTKq0TVR8VrDOTUgvogwe?= =?us-ascii?Q?p7o03eT6QkH0frjLPhSc2R8fZtgR/NdyNz+HHHdF3jwLyeeE2uEXZM5H3evo?= =?us-ascii?Q?P0fBMAO32kq13Q7jzI63pp6rqZ5FKTt4?= 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)(376014)(36860700013)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:47:55.9076 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8777c5a3-4839-4851-14a0-08dca26016ab 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: DS1PEPF00017099.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6865 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=19c5590927871df0eb265404d003016fdedf22c5 Thanks. Xueming Li --- >From 19c5590927871df0eb265404d003016fdedf22c5 Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Tue, 14 May 2024 08:41:52 +0000 Subject: [PATCH] net/af_xdp: fix port ID in Rx mbuf Cc: Xueming Li [ upstream commit 9bab1d2667aec4942ae1d384671e5148960bd88f ] Record the port id in the af_xdp rx queue structure and use it to set the port id of the mbuf of a received packed. Bugzilla ID: 1428 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 | 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 dea3bab983..539bfd76e1 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -132,6 +132,7 @@ struct pkt_rx_queue { struct xsk_umem_info *umem; struct xsk_socket *xsk; struct rte_mempool *mb_pool; + uint16_t port; struct rx_stats stats; @@ -364,6 +365,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) bufs[i]->data_off = offset - sizeof(struct rte_mbuf) - rte_pktmbuf_priv_size(umem->mb_pool) - umem->mb_pool->header_size; + bufs[i]->port = rxq->port; rte_pktmbuf_pkt_len(bufs[i]) = len; rte_pktmbuf_data_len(bufs[i]) = len; @@ -430,6 +432,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) rte_pktmbuf_data_len(mbufs[i]) = len; rx_bytes += len; bufs[i] = mbufs[i]; + bufs[i]->port = rxq->port; } xsk_ring_cons__release(rx, nb_pkts); @@ -1783,6 +1786,8 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, process_private->rxq_xsk_fds[rx_queue_id] = rxq->fds[0].fd; + rxq->port = dev->data->port_id; + dev->data->rx_queues[rx_queue_id] = rxq; 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.283999986 +0800 +++ 0022-net-af_xdp-fix-port-ID-in-Rx-mbuf.patch 2024-07-12 18:40:13.976594243 +0800 @@ -1 +1 @@ -From 9bab1d2667aec4942ae1d384671e5148960bd88f Mon Sep 17 00:00:00 2001 +From 19c5590927871df0eb265404d003016fdedf22c5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9bab1d2667aec4942ae1d384671e5148960bd88f ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 2d6f64337e..0997543ee5 100644 +index dea3bab983..539bfd76e1 100644 @@ -25 +27 @@ -@@ -133,6 +133,7 @@ struct pkt_rx_queue { +@@ -132,6 +132,7 @@ struct pkt_rx_queue { @@ -33 +35 @@ -@@ -368,6 +369,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -364,6 +365,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -41 +43 @@ -@@ -434,6 +436,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -430,6 +432,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -49 +51 @@ -@@ -1813,6 +1816,8 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, +@@ -1783,6 +1786,8 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,