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 6C78043E57 for ; Sat, 13 Apr 2024 15:00:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 668E640E32; Sat, 13 Apr 2024 15:00:55 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2088.outbound.protection.outlook.com [40.107.237.88]) by mails.dpdk.org (Postfix) with ESMTP id 66E7D400D6 for ; Sat, 13 Apr 2024 15:00:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cNPf2LL67BPda0RFqdwuawADedVunOwDRjY9Asl4uKPs0rYLUpgjbUP9qAlVHO5gc0cCIe5J/tkauNW9/HAi/tcBkSI+2i97OULcsOfGM+DciTtG7rCHRz7WfhGLMCzMnPet+t+1tPC80qCPpIH0H7isvMGCD2XW/DADO8hEfQnlaYl7lM5NjiyVlEfHi75K28qDneH8W2kR/Xxyq/Asw+/RuPFZThnn1nTreez5Bw+9HFY9jK6tGDyn+hSz1Q/20HrEwfeHadqV7tSA2dRVOp+IfNShZb8FU696LGMOcAtZWRhSGJDRDMwcN2mrP0cwqAsoA3X84LUV2IKqvCV5Lg== 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=5sDY47zpnQr0hFJDJ3rjwgkqTk5e8YaQbCwUirEIj9A=; b=fjiJhBpist73+gT7WL1oqnzyy+blpWPgO63BoDpELRtQ+wPPUVU/rG2AFE31zwgKlRiQOmofegzjqrmAlAuWPGb5bKRdPfYpQFH/+V3iJMJe2xeRoON5T44jbIsaH+wqYwUr4YHjAA4CX9Q3pkjwPLKgrIn7gDgCWgq2WYBm/pToBxUQiHBBJONQ5gcKYA+UjEQ8KSYoZHH2GYwPUz4JuJMAhA4dZaXEIJdErOax6Q+gJ69GKMwTvm9RM3cReGr9DPCGTCGXDgZWP29+scQgykWnY+xbfgQ5uus4yG1ANCHBwGJxNo56MOJl2cwAwPW5ZoILnuC94gY3UKVhuNYm4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=freebsd.org 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=5sDY47zpnQr0hFJDJ3rjwgkqTk5e8YaQbCwUirEIj9A=; b=dwo92UKIHyC9nVAwN2DEX7oXStwidfJlHn7hebPp0xrNezvfACP/R8Ex0Ffta8XS83/PBvHUQ0G9EMU/yWkqGvcDU+Vz+/V5pA7MsNXq5LCSNYNA15e9khHGyCqu84pCvjUkrNAucqAyUd7SS2+jrkXWq8fp4aUi0QgAAFHvEXAjBtA1WesXGga9NeLDUL5YZV2Vnm4mS4Xoumb0JVQbkVOQdnNAyE8yDUZbidExw4z7fCpR7as+AH5KjHEhrAtBgsp6TNmUo+futLXmVH3D5AORKuhf41csoGIjR+SG7lIj2PjbkUbeKtaYOS7sdEVG5Gmm+CZ7LQfRrdNzAyWTaw== Received: from MW4PR04CA0294.namprd04.prod.outlook.com (2603:10b6:303:89::29) by MN6PR12MB8492.namprd12.prod.outlook.com (2603:10b6:208:472::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.56; Sat, 13 Apr 2024 13:00:49 +0000 Received: from MWH0EPF000989E9.namprd02.prod.outlook.com (2603:10b6:303:89:cafe::9c) by MW4PR04CA0294.outlook.office365.com (2603:10b6:303:89::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.27 via Frontend Transport; Sat, 13 Apr 2024 13:00:48 +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 MWH0EPF000989E9.mail.protection.outlook.com (10.167.241.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 13:00:48 +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; Sat, 13 Apr 2024 06:00:26 -0700 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.1258.12; Sat, 13 Apr 2024 06:00:24 -0700 From: Xueming Li To: Tom Jones CC: Ferruh Yigit , dpdk stable Subject: patch 'net/vmxnet3: ignore Rx queue interrupt setup on FreeBSD' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:55 +0800 Message-ID: <20240413125005.725659-115-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-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: MWH0EPF000989E9:EE_|MN6PR12MB8492:EE_ X-MS-Office365-Filtering-Correlation-Id: d2c5cc77-3c28-45eb-4239-08dc5bb9bd85 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2BDHYvmqzDV9PWEV4SkquVS0ns4xmGiWGfp11QUd0n9sNUa6wzsMf5a6rHsItLlvnby9l9Rp9UfHWWBRwgKqRRRmu3tuyRIFI88ba0HYrBTpxQ9tA/ZUqgtlMwReQ4n9MAOsfusLSHL66bLTYHQ0QrjtpXGtpc2eh5+EKCHvG2ktDOXAcPHKp8YWqxiGnr+kPxxoxFj6a12LqsNaDgNy5jCRRqCGfB4aSJT/wF61i5b5Fp5uinKCKq64xHucjWVkv0agmU3qPKBeuBSVm0hyW0MEmDCDShi4+OAP0BSZRLR8elhLgeZ+bUb+m+NXdNZ2H8EzakIFg1CEckLEhLznNToELL4mfOM7VljnrA6gwgAqsqRYyuotS6uycmYBTN/U6oJZwbM/MHRzN3idZSXafJb/uSY09tP2n2fPqY7ESz4rND274kJBmoY3CY0F0g8DXfBmu6zozLgJtqoXTLaS5m6jpP3ZllOekCnZ90dbFThQYAaRbcVspfyQISD82HUFtrRzEX05vH06fbvIWxNKsDXfQnWTN8K7zRUEepPD6NAxliIjvUoEJc+Vm5vaI6hsOXhNnt8oZndWMyn6wImQWw32zRdJm9CkdmB4mZd1vPbUGE/yhX68n8d4jBAhy5kzj5pTXwjnYsfJoIZgbXodXxw/EeS4S2LgKVkL8L0bFAvEqiw+640CsAwkqKYsTp3wO9LF9B2l4HDiqVE2vHBOo4cHPeNpWq2OVGAvnTxUFPIG19E11vD8qLLUEcwIo1+/ 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)(36860700004)(82310400014)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 13:00:48.5534 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d2c5cc77-3c28-45eb-4239-08dc5bb9bd85 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: MWH0EPF000989E9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8492 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 04/15/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=07fde8240d6ad3bbf6a42b515d12d8a1bec650ca Thanks. Xueming Li --- >From 07fde8240d6ad3bbf6a42b515d12d8a1bec650ca Mon Sep 17 00:00:00 2001 From: Tom Jones Date: Thu, 21 Mar 2024 10:31:33 +0000 Subject: [PATCH] net/vmxnet3: ignore Rx queue interrupt setup on FreeBSD Cc: Xueming Li [ upstream commit 19fede459e0d22f5ac891366465dce07e68196bc ] Interrupts disabled on FreeBSD for the vmxnet3 driver as they are not supported. Rx queue interrupts were missed by this change, don't attempt to enable them on FreeBSD. Without this change applications enabling interrupts encounter an immediate abort on FreeBSD. Fixes: 40d5676ff1ea ("net/vmxnet3: fix initialization on FreeBSD") Signed-off-by: Tom Jones Acked-by: Ferruh Yigit --- .mailmap | 1 + drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.mailmap b/.mailmap index 57e72894c0..69ef5145a9 100644 --- a/.mailmap +++ b/.mailmap @@ -1446,6 +1446,7 @@ Tomasz Kulasek Tomasz Zawadzki Tom Barbette Tom Crugnale +Tom Jones Tom Millington Tom Rix Tomer Shmilovich diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index 7032f0e324..70ae9c6035 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -1932,11 +1932,13 @@ done: static int vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) { +#ifndef RTE_EXEC_ENV_FREEBSD struct vmxnet3_hw *hw = dev->data->dev_private; vmxnet3_enable_intr(hw, rte_intr_vec_list_index_get(dev->intr_handle, queue_id)); +#endif return 0; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:08.557236082 +0800 +++ 0115-net-vmxnet3-ignore-Rx-queue-interrupt-setup-on-FreeB.patch 2024-04-13 20:43:05.147753736 +0800 @@ -1 +1 @@ -From 19fede459e0d22f5ac891366465dce07e68196bc Mon Sep 17 00:00:00 2001 +From 07fde8240d6ad3bbf6a42b515d12d8a1bec650ca Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 19fede459e0d22f5ac891366465dce07e68196bc ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index a0b19832b5..491af1f6ff 100644 +index 57e72894c0..69ef5145a9 100644 @@ -27 +29 @@ -@@ -1458,6 +1458,7 @@ Tomasz Kulasek +@@ -1446,6 +1446,7 @@ Tomasz Kulasek @@ -36 +38 @@ -index 2707b25148..ce7c347254 100644 +index 7032f0e324..70ae9c6035 100644 @@ -39 +41 @@ -@@ -1936,11 +1936,13 @@ done: +@@ -1932,11 +1932,13 @@ done: