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 BC13C43B7D for ; Tue, 5 Mar 2024 10:56:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B56AA40A89; Tue, 5 Mar 2024 10:56:42 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2057.outbound.protection.outlook.com [40.107.237.57]) by mails.dpdk.org (Postfix) with ESMTP id F306B4026B for ; Tue, 5 Mar 2024 10:56:39 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H2RB2c8DkHYnpKiWOqjpq71/aRdgs+0mSWVPn92c6oEqiiPklWxf1EoeQ6sHw7JffxD7inao1WMjD0uMTc4Ifnl2+AhbuhJzTXS1e1wl6/splxaKUzv1DQof1wrfXAqZmn38pCaODCnS3R5PUTlCX81oiWAleNYVf5/nT2br4o0kOv+gbHcHv1RWFekhkKekaJI72XuODYJTfIa/gCrey7hPjsqyiZVQEQoeS6gkfsP4ADNOXOzKpyOUcY1RTgZIUO5cfs90VxiMZmSp0X5qYZ/4pRb0tK7dTUhtTctPodggtZLpQxQPAlc1LBs+tRnfnzojXnXjFOElAq1httul5A== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H+xbZgXccBPqSfTg80Dcxr9JSMiuYXFmsP0+HT2XeOk=; b=LtexcC/xt60A7fIMI0gXilQ6Bir+dMPofmDctnkia+2oFQU+8MGRCoXeMmm15eZqKcX84CQMQ+DqyCVl7Ob0FUOy8UfDlnjWM5Yjie4rV6shcjPKAicjSHXX3QAO+jSZV7H4WYq/WQVCR806NCGaFSc4nCHzxBMQHkrKePlSsltqQZkgyfE7mQYkA2gxMDzf90sCX2+hEQSFUd1exYGyMWgqDiSJeITfkt/tKJ3rBjR+S1QN3b4Fo22Y011Z1jLa1aNOuZeQKpEwo+vegUplDUuLVacZEAkBi0g3+qr2z1nFmFKKIexW7tV6iyTd1lKvQuGbO3jki+x8CtRecJhQCg== 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=H+xbZgXccBPqSfTg80Dcxr9JSMiuYXFmsP0+HT2XeOk=; b=BFRrzvlvdJeFkTlIh3wKit9Gn7DW65Ty1vXOSqGg4JFkWwxtYokfOwGSJaouHpfJh5amSsWVY9586FkQUipVd2svIpyo4Fqi41jNf1YgShxZmhRRd6UgNP0qJpUaAjIZLLLHCYWaF94vxPfEDOpQXbpWLKJuo+5BGgMUK32UaFsdGQJbpw7f1NBoh1/+00W6T823pgWMIhzHjJlqavkUL5DWxEqAVz1kMcydaUzNp2MLJiXlKWCpvvPwsBEU6ns3kE8ZtvJBG/pdk0o7KIx2kTPI1G/K7lrUyB3glDKHzISCoNqcpZvhB+WI7sFxDBqJqn3C9mHg5wk41x2QP6w2Ww== Received: from BYAPR05CA0057.namprd05.prod.outlook.com (2603:10b6:a03:74::34) by IA1PR12MB6484.namprd12.prod.outlook.com (2603:10b6:208:3a7::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 09:56:36 +0000 Received: from SJ5PEPF000001D4.namprd05.prod.outlook.com (2603:10b6:a03:74:cafe::6e) by BYAPR05CA0057.outlook.office365.com (2603:10b6:a03:74::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.23 via Frontend Transport; Tue, 5 Mar 2024 09:56:36 +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 SJ5PEPF000001D4.mail.protection.outlook.com (10.167.242.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:56:36 +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.986.41; Tue, 5 Mar 2024 01:56:21 -0800 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.1258.12; Tue, 5 Mar 2024 01:56:19 -0800 From: Xueming Li To: Bruce Richardson CC: Lewis Donzis , Ferruh Yigit , "dpdk stable" Subject: patch 'net/vmxnet3: fix initialization on FreeBSD' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:15 +0800 Message-ID: <20240305094757.439387-95-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D4:EE_|IA1PR12MB6484:EE_ X-MS-Office365-Filtering-Correlation-Id: fa6ad290-b4ab-45d2-f785-08dc3cfa8b96 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1Dcv5rdi+CVp/ws/gOKntqnJ/91/zTtIyxIqPXtVZiUEllJitRlecgFbAHZvuSYOKltKNpaHWwbXM8Ilgqam38meN72JkkC6WBdcEsw4GoIfMVg+QjJSIG7UIKlI1l8hRlpPyfGBAMLaIbpurwKeUHO5rdqe9OOT7Iikwrj+JSz6TwFQ6iKhHRLq0fyNnrsHLnDaEyzfiFIb8hkwtxq4rwtEGz0bSTM7vA3h4UHA4A70Na+ezjZ5+bjIHuCMfls7EMRIsY83/NZKnE9hPUUjqvm/4uXQsNjG6ZGLlYd6e+WHU0zDSrvezg2SXp7XNrP1PqRl9bDOxYZTCkNe8JrQ4UVXVIVQo1yIveVVSpndi2iZLWwUtcCN+lgcttN8tXA0W7LwVITX0JFmuHFKMnDxeo7g+9H/+bhahvmwR0S5CvCULwdkULI6x/4DO8lUK2z0zo+kGkyOigkpzrih+hffregY9XgpU9Sh1g4j0C4QcfBFgmhqJ6gOlGelezEy4QmjZNOsIbEV9O6QK5Fv99vnbY+5umXKGYsWmWsvysB4rfIzhFPfXfQv+lB/pczlGU710hy04oDh6kpoP9r9sKuDm6PN8qLLUWyILPgt2lAn5VexMyiCj9eUIEGwsPXsl5bBPKhn0gy1fCmHYot3H4t5UVGYCu6gQ0KNRJBg7r8Nd4PnhTTJuIWHRebsNhlvdwW6SJPCZ474Jtf7tvC9c6E4HzYIGbihXQ2sVLQjMFO6impNGHKNs+tFrI9e10M43xm7 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:(13230031)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:56:36.0872 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fa6ad290-b4ab-45d2-f785-08dc3cfa8b96 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: SJ5PEPF000001D4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6484 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/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=c65a2bfc264067ab34b81bad07f6f273524488ce Thanks. Xueming Li --- >From c65a2bfc264067ab34b81bad07f6f273524488ce Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 9 Jan 2024 14:23:43 +0000 Subject: [PATCH] net/vmxnet3: fix initialization on FreeBSD Cc: Xueming Li [ upstream commit 40d5676ff1ea43cc2c121fd66d19a29a1c9107bb ] DPDK does not support interrupts on FreeBSD, so the vmxnet3 driver returns error when enabling interrupts as it initializes. We can fix this by #ifdef'ing out the interrupt calls when building for FreeBSD, allowing the driver to initialize correctly. Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt") Reported-by: Lewis Donzis Signed-off-by: Bruce Richardson Tested-by: Lewis Donzis Acked-by: Ferruh Yigit --- .mailmap | 1 + drivers/net/vmxnet3/vmxnet3_ethdev.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.mailmap b/.mailmap index 540a3caab7..aada8ea84c 100644 --- a/.mailmap +++ b/.mailmap @@ -785,6 +785,7 @@ Leszek Zygo Levend Sayar Lev Faerman Lewei Yang +Lewis Donzis Leyi Rong Liang Ma Liang-Min Larry Wang diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index e49191718a..7032f0e324 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -257,6 +257,7 @@ vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw) vmxnet3_disable_intr(hw, i); } +#ifndef RTE_EXEC_ENV_FREEBSD /* * Enable all intrs used by the device */ @@ -280,6 +281,7 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw) vmxnet3_enable_intr(hw, i); } } +#endif /* * Gets tx data ring descriptor size. @@ -1129,6 +1131,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) /* Setting proper Rx Mode and issue Rx Mode Update command */ vmxnet3_dev_set_rxmode(hw, VMXNET3_RXM_UCAST | VMXNET3_RXM_BCAST, 1); +#ifndef RTE_EXEC_ENV_FREEBSD /* Setup interrupt callback */ rte_intr_callback_register(dev->intr_handle, vmxnet3_interrupt_handler, dev); @@ -1140,6 +1143,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) /* enable all intrs */ vmxnet3_enable_all_intrs(hw); +#endif vmxnet3_process_events(dev); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:33.839424795 +0800 +++ 0094-net-vmxnet3-fix-initialization-on-FreeBSD.patch 2024-03-05 17:39:30.863566496 +0800 @@ -1 +1 @@ -From 40d5676ff1ea43cc2c121fd66d19a29a1c9107bb Mon Sep 17 00:00:00 2001 +From c65a2bfc264067ab34b81bad07f6f273524488ce Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 40d5676ff1ea43cc2c121fd66d19a29a1c9107bb ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index d85e074fbd..32ff4ceb4b 100644 +index 540a3caab7..aada8ea84c 100644 @@ -27 +29 @@ -@@ -786,6 +786,7 @@ Leszek Zygo +@@ -785,6 +785,7 @@ Leszek Zygo @@ -36 +38 @@ -index b239ea3ede..1e6febb092 100644 +index e49191718a..7032f0e324 100644 @@ -39 +41 @@ -@@ -258,6 +258,7 @@ vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw) +@@ -257,6 +257,7 @@ vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw) @@ -47 +49 @@ -@@ -281,6 +282,7 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw) +@@ -280,6 +281,7 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw) @@ -55 +57 @@ -@@ -1130,6 +1132,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) +@@ -1129,6 +1131,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) @@ -63 +65 @@ -@@ -1141,6 +1144,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) +@@ -1140,6 +1143,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)