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 925DA4625C for ; Tue, 18 Feb 2025 13:39:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BC7E402A0; Tue, 18 Feb 2025 13:39:27 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2052.outbound.protection.outlook.com [40.107.236.52]) by mails.dpdk.org (Postfix) with ESMTP id 222E1402A0 for ; Tue, 18 Feb 2025 13:39:26 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=npruemrogHrBzykHsnvjxLk/uWFH3Gru91yLf/aGJViCHr68x9q5vDpKXQAYOy7UWKiOQV7sMcYXW1Pt049lY/qLa/wptYGy60xEWbqGZ0mjeIXcjowY8DLVA8f3Q/OXg4178wBTq1eSzrvQYzEe0wdfne/ZMwBZXcduFbeI05YC3YfJ0yK0x1MhFLQs8PnXfXhsl6Djwbm3brDtQ5GiEDKAM3uzdkW8N6htzLX1Y8O1M8XsZ2lkPhv8naaMenHFBWebj7L3+yWl26NTQubjZUjrFFRV2R/WChgGUG9Ikpkw9AscLGUg/ik6tMhFW093T8SXIsh+Ql2k1v00K7CIDg== 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=lub4xofqZhqoKXg+tE+U59/bPF3wIUlAWsE6yF6nXEk=; b=iG8s2wfNt4uPdXcA6wXYA4sc9HESW+za2qTuqf+Pn1RITtRjr/U+2/8QVPQEjMJzuB6kN+cNM+YuXGtIdX5intwx9WEuAGGu4IYVUnI/+3nveZeqFygM0jsjFr8cDzEAosL7gXTBJ9zmVe/Vf4+SaIjCQ0SbvCGZQsxeYQJNpsU6XMnYkRzBCPqeRtGHDTgSRY3mJadp/ekfu9JPiBWOF4/0+Ke1YLdASbGeG9wh9kEaa5TXuOHAeq3+U+SyHTycx+bIzLwk/j5xxKZ/whukPsqvOVFOKBaAcs7Lgj0KrGP3TI55fwfArab+A5jXjfsEZ4AaX09FZ9I8ZUrjxJi0hA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=gmail.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=lub4xofqZhqoKXg+tE+U59/bPF3wIUlAWsE6yF6nXEk=; b=GNYPRPt5F+fX2pN9hEQrIq04BYlav+imXrnkyISCzVJ8KJc4556w8EFIJGKFNwz/BwCqU2/0LE3m0ctK3D2hTvP3WwHgEGUjbzRZj5TYMzNYZYfLUZOfNq9VJAvC6bWQPCvlq3agl9eBUTpHUGVhS6vDtWQq0oMI8cn48kZfN4dJXUajzhF2++wSgQwT1G0/V7XsxTR/WqRW7flnzd2pf/sgMgOTwxj2zD3IablM+Zt3XJM6ySRdsaPGkZmPOLi3Bol+vjs8Sk3x+Z+VF68LJQ3dY4tYdGrPB/dATu0LqplluNq81isCorNJx7tbpBwYLynmXLjZfKMp2qyiltrO7A== Received: from MW4PR03CA0066.namprd03.prod.outlook.com (2603:10b6:303:b6::11) by IA0PPFAF883AE17.namprd12.prod.outlook.com (2603:10b6:20f:fc04::be1) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.14; Tue, 18 Feb 2025 12:39:22 +0000 Received: from MWH0EPF000989EA.namprd02.prod.outlook.com (2603:10b6:303:b6:cafe::52) by MW4PR03CA0066.outlook.office365.com (2603:10b6:303:b6::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.17 via Frontend Transport; Tue, 18 Feb 2025 12:39:22 +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 MWH0EPF000989EA.mail.protection.outlook.com (10.167.241.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:39:22 +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; Tue, 18 Feb 2025 04:39:15 -0800 Received: from nvidia.com (10.126.230.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.14; Tue, 18 Feb 2025 04:39:14 -0800 From: Xueming Li To: Tudor Cornea CC: , dpdk stable Subject: patch 'net/af_packet: fix socket close on device stop' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:30 +0800 Message-ID: <20250218123523.36836-36-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989EA:EE_|IA0PPFAF883AE17:EE_ X-MS-Office365-Filtering-Correlation-Id: fc62401d-28eb-46bf-6f83-08dd5019454d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|1800799024|82310400026|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4PD+CrMlYQzRntcVgJRToKDdyNJ+DxFS7xRQwyxgpkoxhiNPNs21AEcahSUP?= =?us-ascii?Q?BzBt4eDx1sGBJOCr2twl0IbPHl2VsfgysvyPTwpDKFgKFlWDAOaZ5CiaiMOG?= =?us-ascii?Q?qMQq0pqp+C2CYIm5Nni8Tf5BqNB2eem9zB0n09u9/SAjdDxhz7iz4rzjmzY6?= =?us-ascii?Q?DUtwqpdtqmoW/7VDLxSh0v/CT392TrG8qmWLw5hdiGUjtzJdk81EF6R/NVpM?= =?us-ascii?Q?g0muYYabIQ/eUm3kE0utkUgvFag2/LBxT6mgCtGCKH5HFJ7AlLzXvwCqOPv8?= =?us-ascii?Q?T6R3CYBA4NvpU1+MHFCmM11z9hUMr140GpnCv2KziO0KCaS2UvB9Y4jYYbfE?= =?us-ascii?Q?1rIq3GJVx1vAZkJQ6PUFqiDZRImlGk/NltJVwi1IchGZKl6UZIbr2cT9C0f/?= =?us-ascii?Q?IH8xZzay3AKEIuWBr4vKfpS+lPue7JbF6TPWBkNKWwwAA+csdqkQatLdDTao?= =?us-ascii?Q?KD0/AlEA48gFg3Z2TdI8A+anU7nJZ1BIQrTn8iZ2jPsVqFBGOMnRpofwkwJO?= =?us-ascii?Q?SmM59YpS1ZyU7M6jbHPg/0uaFuZKyJS8k67+UEcr6EsggusHZYaPVGm0iHRC?= =?us-ascii?Q?XjncyMJrwDR8g7cd4Jm3ymJlmejMUbfobSD9OFUkCDtpAfvzB5ddtTpcoxIx?= =?us-ascii?Q?OxYRqQh37AT0zounwZobmo+D15uMp+ooJV7cMJ3RsN1fPwxLBS/c8sJgU+by?= =?us-ascii?Q?mW8op/J+1DKlpNBoUiDiCFrjZ2AkumGs7O2gkZU9jEZl43RR6OdLVNY4kf00?= =?us-ascii?Q?YpfJz7GNS0h1Fc564T7AxOU06D1vbkwIujGnudD8DXujIKbgUph8/Pv1ovUb?= =?us-ascii?Q?K0mYq9E7m1Ckjxww3zNC1J6JwomjjdGwXM4Y7KqmjJzpJ00zxuYyHsA46tXE?= =?us-ascii?Q?ESITswh+VVfJ/33Gq6sQR14nqMzAf/om70Vyc0YEhWMCJZoltBxsweD+3Svi?= =?us-ascii?Q?02yKTa6WwYwi5L0VCqrVcPC0ebIHU6DrOzMqxSDUIzmMoqfcSt5/cvgDs0Hi?= =?us-ascii?Q?9Jhp5JYhQ1MoY2CsBBtHaoqZeUAt/4Hkm2dnW4U1jNYCxKaLDHpk2AOlUWc4?= =?us-ascii?Q?doxwWNRZjqe0EjI6N3csytPy6WPWGmToUQaJayfY+Z06+vQt5byvJtFbdTYX?= =?us-ascii?Q?utsr8uaa76d546oOlY7CbYZciMHcqO8sssTJv4TUfB4jS/W2Tsy1DboFq6X5?= =?us-ascii?Q?Qr7tsf+B+ueSKWMDCuqvqBxmmzcpeaEchAI/dEMPCfURqxbxM0/ZYO/MVEt+?= =?us-ascii?Q?P2YsigHT0Ewxj8vaZq4eIshjBVG5zd8S/qjJXtGIKLBAIcNGO4rJubs15XOn?= =?us-ascii?Q?1mBW5O0q2jrAE6gEG9u0JmtGS7hscPAMCGpp1Q7zGvyMdrnS0WXDtf+VDGSu?= =?us-ascii?Q?uPSef3kDRBTaoP40SOiLP8FRyVkqGh+xjBSMQ9P4E0azu229XLH/7bxxgqSI?= =?us-ascii?Q?W1+gcXQUrQvopNQUu6ASRbTNi2JpujXxyEwgvit8ZTAlhJT+zUI47DsOFrkQ?= =?us-ascii?Q?kFjDTR3yaAbmbtA=3D?= 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)(36860700013)(376014)(1800799024)(82310400026)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:39:22.2960 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fc62401d-28eb-46bf-6f83-08dd5019454d 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: MWH0EPF000989EA.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PPFAF883AE17 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=6594bba195d9047e43e30d22170baab5f103d08a Thanks. Xueming Li --- >From 6594bba195d9047e43e30d22170baab5f103d08a Mon Sep 17 00:00:00 2001 From: Tudor Cornea Date: Tue, 4 Feb 2025 18:45:08 +0200 Subject: [PATCH] net/af_packet: fix socket close on device stop Cc: Xueming Li [ upstream commit 872e846f6bb31afbdd508903380cf05a3d313a3a ] Currently, if we call rte_eth_dev_stop(), the sockets are closed. If we attempt to start the port again, socket related operations will not work correctly. This can be alleviated by closing the socket at the same place in which we currently free the memory, in eth_dev_close(). If an application calls rte_eth_dev_stop() on a port managed by the af_packet PMD, the port becomes unusable. This is in contrast with ports managed by other drivers (e.g virtio). I also managed to reproduce the issue using testpmd. sudo ip link add test-veth0 type veth peer name test-veth1 sudo ip link set test-veth0 up sudo ip link set test-veth1 up AF_PACKET_ARGS=\ "blocksz=4096,framesz=2048,framecnt=512,qpairs=1,qdisc_bypass=0" sudo ./dpdk-testpmd \ -l 0-3 \ -m 1024 \ --no-huge \ --no-shconf \ --no-pci \ --vdev=net_af_packet0,iface=test-veth0,${AF_PACKET_ARGS} \ --vdev=net_af_packet1,iface=test-veth1,${AF_PACKET_ARGS} \ -- \ -i testpmd> start tx_first Forwarding will start, and we will see traffic on the interfaces. testpmd> stop testpmd> port stop 0 Stopping ports... Checking link statuses... Done testpmd> port stop 1 Stopping ports... Checking link statuses... Done testpmd> port start 0 AFPACKET: eth_dev_macaddr_set(): receive socket not found Port 0: CA:65:81:63:81:B2 Checking link statuses... Done testpmd> port start 1 AFPACKET: eth_dev_macaddr_set(): receive socket not found Port 1: CA:12:D0:BE:93:3F Checking link statuses... Done testpmd> start tx_first When we start forwarding again, we can see that there is no traffic on the interfaces. This does not happen when testing with other PMD drivers (e.g virtio). With the patch, the port should re-initialize correctly. testpmd> port start 0 Port 0: CA:65:81:63:81:B2 Checking link statuses... Done Fixes: 364e08f2bbc0 ("af_packet: add PMD for AF_PACKET-based virtual devices") Signed-off-by: Tudor Cornea --- drivers/net/af_packet/rte_eth_af_packet.c | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 6b7b16f348..0b059bfd0b 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -332,27 +332,12 @@ static int eth_dev_stop(struct rte_eth_dev *dev) { unsigned i; - int sockfd; struct pmd_internals *internals = dev->data->dev_private; for (i = 0; i < internals->nb_queues; i++) { - sockfd = internals->rx_queue[i].sockfd; - if (sockfd != -1) - close(sockfd); - - /* Prevent use after free in case tx fd == rx fd */ - if (sockfd != internals->tx_queue[i].sockfd) { - sockfd = internals->tx_queue[i].sockfd; - if (sockfd != -1) - close(sockfd); - } - - internals->rx_queue[i].sockfd = -1; - internals->tx_queue[i].sockfd = -1; dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } - dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN; return 0; } @@ -447,6 +432,7 @@ eth_dev_close(struct rte_eth_dev *dev) struct pmd_internals *internals; struct tpacket_req *req; unsigned int q; + int sockfd; if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; @@ -457,6 +443,20 @@ eth_dev_close(struct rte_eth_dev *dev) internals = dev->data->dev_private; req = &internals->req; for (q = 0; q < internals->nb_queues; q++) { + sockfd = internals->rx_queue[q].sockfd; + if (sockfd != -1) + close(sockfd); + + /* Prevent use after free in case tx fd == rx fd */ + if (sockfd != internals->tx_queue[q].sockfd) { + sockfd = internals->tx_queue[q].sockfd; + if (sockfd != -1) + close(sockfd); + } + + internals->rx_queue[q].sockfd = -1; + internals->tx_queue[q].sockfd = -1; + munmap(internals->rx_queue[q].map, 2 * req->tp_block_size * req->tp_block_nr); rte_free(internals->rx_queue[q].rd); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.988448413 +0800 +++ 0035-net-af_packet-fix-socket-close-on-device-stop.patch 2025-02-18 19:39:00.528244065 +0800 @@ -1 +1 @@ -From 872e846f6bb31afbdd508903380cf05a3d313a3a Mon Sep 17 00:00:00 2001 +From 6594bba195d9047e43e30d22170baab5f103d08a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 872e846f6bb31afbdd508903380cf05a3d313a3a ] @@ -77 +79,0 @@ -Cc: stable@dpdk.org @@ -85 +87 @@ -index 7fcd27ee0c..ab34285ed9 100644 +index 6b7b16f348..0b059bfd0b 100644 @@ -88 +90 @@ -@@ -363,27 +363,12 @@ static int +@@ -332,27 +332,12 @@ static int @@ -116 +118 @@ -@@ -510,6 +495,7 @@ eth_dev_close(struct rte_eth_dev *dev) +@@ -447,6 +432,7 @@ eth_dev_close(struct rte_eth_dev *dev) @@ -124 +126 @@ -@@ -520,6 +506,20 @@ eth_dev_close(struct rte_eth_dev *dev) +@@ -457,6 +443,20 @@ eth_dev_close(struct rte_eth_dev *dev)