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 C87B643B86 for ; Tue, 5 Mar 2024 10:49:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C2BEE41132; Tue, 5 Mar 2024 10:49:55 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2049.outbound.protection.outlook.com [40.107.92.49]) by mails.dpdk.org (Postfix) with ESMTP id 6CA3340271 for ; Tue, 5 Mar 2024 10:49:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ghx+nPPttrf/CBU1QlR1NgrzTK7hKz0+dX9SFncMnJZoFD0tZvLpytwJr2yfZdTO4ZuxFSJOLVd2fM6kOJsIw0ClOjJe5KKUjZ+V9TPq0TqyX6o5skN27OtrY3RCqZKPsrNYLh+9kNhvAURxg5Z7+S3RIFcvh/zCYnyiPOx/4HuZhD1/t+kSNhcprLPRTDX4Of80FgStAQD2DoX3a0HQujj3WwCyF8XRxmTrCEkS/V93NSMHC2omXg7IxCoWX2jLOQbKrmRuF0R4wBCUPCaaV5nFs6vsVrLN5NQmyKGTH0KAkzl/jAzTSPeNiNKbQl9C2EluEl9QO2mNt8IzEhkHvQ== 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=8vS7NWsPMY79OXtRCYHWmMPBOdyGYTjv15ra4w4NN/0=; b=aCmidfpU1ZENLSRtrlnlnSnVriZg1+sGVWrCDJGgStiAkzU6k16o1ytwycorUp95Q7wFcoVYofGwOnioqi00CS4UY0piLwbtf6oO/CDLY3esANHkgHSGsJ3wtpX0q0vQd25ZEVwyJyuOd2zWAT9VZ7nqKXdvO/xdTUvQUJovAnNbnAnp5u2sxFKQmOA0WQeYEX9USjftVM32layI4f/jWBCIJp4WBx2+oVcgParS+i23TW8i6xmf0UDqxNk55zHAUv2mCBqiMMgiVO8teAlY+oBa3FK+VVoMZopjcQ1tU1e9SmG5Vn5HwGiC1XA5NYnwFIBywo5Wz1T3IZEgDTtgVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=8vS7NWsPMY79OXtRCYHWmMPBOdyGYTjv15ra4w4NN/0=; b=a1YYpEOPLSYB6xjRapQZ6TY5C5r1v6nXCo4v1WGTrhYv94gHdvfuSiNELEyzFnfmPMYO1mOYykiJk/uGZSxjoaxltsUF+AJPTTLwQZNyeYfS2nK67dQlYrbNC7IvbtXMFbuoOT5ndsVSAKbg+bf1nSYEouIXP3uLrItct5BBgTGt7VXoBbk+GWLBgShJyK/3uMUGCnBPX+7gfPnixbQVQL1e/3+TWY7F0dmLT4Fw3hTU/8fXGZehYNJDZML/YbSC3OQdlb/X31e7SCTwPwQeTta9MFc3aMVucZDl1+2IK0NroGeDPs8zo030ZOwTWRQoXnSAgeiEhvqo5ckJq7CRMw== Received: from CY5PR03CA0024.namprd03.prod.outlook.com (2603:10b6:930:8::35) by MW4PR12MB6975.namprd12.prod.outlook.com (2603:10b6:303:20a::9) 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:49:52 +0000 Received: from CY4PEPF0000FCC2.namprd03.prod.outlook.com (2603:10b6:930:8:cafe::93) by CY5PR03CA0024.outlook.office365.com (2603:10b6:930:8::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:49:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000FCC2.mail.protection.outlook.com (10.167.242.104) 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:49:51 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) 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:49:39 -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:49:37 -0800 From: Xueming Li To: Bruce Richardson CC: Daxue Gao , dpdk stable Subject: patch 'kernel/freebsd: fix module build on FreeBSD 14' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:45:58 +0800 Message-ID: <20240305094757.439387-18-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: CY4PEPF0000FCC2:EE_|MW4PR12MB6975:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b19018f-578f-4a86-a10e-08dc3cf99a9c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QwF6DvSAme/txy7xxb6a/evF1quZkG2MYcKxts9sRpru/KLLTyGOqh2VNUSdKiO3oibiX10MGxKDT+Zu4H3inkgKDGmaLye6bUo5RaAyrEpD6mz2vQ2OPgHtgx3w0HjLYoONYC4kGu2fntgWJlZkVf59GzLEjylMO6TbE/Kcd2OlNjtsuJdvLQn76zNNwhKCn64RmQU9Refn/5nxrkVAoY3Pl+uPNBTuqrStKUXotRUoMHsTvRB4hL9QHl59lQOGzrpSGjhLicQmYlyp6qck741530sS4YNov31z5ON8/X8OuUaUBK7I6NrDAt7Gzmws3gsCHcmb4c5rd00pwCIarYPltaMXq+BJ097MLVK6QMI3yDUYUhiE/ume0AX+hKiwTnofa/GmrZzDRDPcPakXNuJBlieHveHx2vPeBP+Sxv9FR8e90+a/LlEbggTEc2ed+RvAoC/7mWWe6ENYh1Gn7fQhWYgUb4WIqZ6MXNsI1U/m0z6S40ABpMel1R6EYvxHCt+kYQq0UaEbEc4T+FnR3/BC44ZldQH1ioPDV8qSZjvfgWxEbiuxllouLsrUbdyDm5PMNxqTL7PeuHCQV/a/DGhFZ6rvdCAZBdZFbYiAHOhmbNmFU9iVDb6g2uW2gk+o7AFL6AypOyq9IXlcDkQysGrvaQXA2I+WGpQ+ZAmHDunT3oTrylWCjDf1EA0mKoRjpylmghts8t1G51lmOW0FTjYPVOFJTWgGyF/16MDz41SNml1yR+b5dJv1wS6f4YTt X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.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:49:51.6840 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b19018f-578f-4a86-a10e-08dc3cf99a9c 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000FCC2.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6975 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=54e4045c780242359f0432af50093b09e6496944 Thanks. Xueming Li --- >From 54e4045c780242359f0432af50093b09e6496944 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 19 Dec 2023 11:29:59 +0000 Subject: [PATCH] kernel/freebsd: fix module build on FreeBSD 14 Cc: Xueming Li [ upstream commit 5eedf66ac0e5ce62cd333e523996c63a3c4c2c00 ] When building nic_uio module on FreeBSD 14, a build error is given in the DRIVER_MODULE macro: nic_uio.c:84:81: error: too many arguments provided to function-like macro invocation DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_devclass, nic_uio_modevent, 0); ^ On FreeBSD 14, the devclass parameter is dropped from the macro, so we conditionally compile a different invocation for BSD versions before/after v14. Bugzilla ID: 1335 Signed-off-by: Bruce Richardson Tested-by: Daxue Gao --- kernel/freebsd/nic_uio/nic_uio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/freebsd/nic_uio/nic_uio.c b/kernel/freebsd/nic_uio/nic_uio.c index 7a81694c92..0043892870 100644 --- a/kernel/freebsd/nic_uio/nic_uio.c +++ b/kernel/freebsd/nic_uio/nic_uio.c @@ -78,10 +78,14 @@ struct pci_bdf { uint32_t function; }; -static devclass_t nic_uio_devclass; - DEFINE_CLASS_0(nic_uio, nic_uio_driver, nic_uio_methods, sizeof(struct nic_uio_softc)); + +#if __FreeBSD_version < 1400000 +static devclass_t nic_uio_devclass; DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_devclass, nic_uio_modevent, 0); +#else +DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_modevent, 0); +#endif static int nic_uio_mmap(struct cdev *cdev, vm_ooffset_t offset, vm_paddr_t *paddr, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:31.621323621 +0800 +++ 0017-kernel-freebsd-fix-module-build-on-FreeBSD-14.patch 2024-03-05 17:39:30.683566490 +0800 @@ -1 +1 @@ -From 5eedf66ac0e5ce62cd333e523996c63a3c4c2c00 Mon Sep 17 00:00:00 2001 +From 54e4045c780242359f0432af50093b09e6496944 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5eedf66ac0e5ce62cd333e523996c63a3c4c2c00 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org