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 180AF433D8 for ; Mon, 11 Dec 2023 11:22:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E55C40ED2; Mon, 11 Dec 2023 11:22:24 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2069.outbound.protection.outlook.com [40.107.220.69]) by mails.dpdk.org (Postfix) with ESMTP id D0BD840E0F for ; Mon, 11 Dec 2023 11:22:22 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TkNAO2+OI/1fECV/QRjBEbouSB+rB+KP/AU3j5uc1V1wye2z80zT+w1+vKSnh+NIFlnsIiwl2eOVt6YJFJ6rcT7jEBoIu88QM4Vx6kqd1WwAHov04jt5vD6DrN0uRsAc8NQ/+l8mE39HIED/pyVaq8Vt6jvGftFkEN8n47Cb52+rOqQBEv+qoxN0SIOmp4O4F+YJ7QYUdznHneLRmiDvWXO3uxac6o8wk2PYWkuCupz0NPUpt3gGIxPNg+xoBEnLW7MvaSDZhfPGzbhjOGaQh0KDWAmqhAG4dG5u4WVqZcKAMmFWbGrLmyiDlRhFB3mQtqs/29tYrRWmT4lYuPWqtw== 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=aMJti7e0vUVrvY4nV5mTQzl3JhIxAOUkLKCEGtcAA6A=; b=fAlOJdMPQxYomq9qPyVyWfXhofz9p7Kf9FvmDwqd6Dk/QE865owwy8M6kQuUYzewa3wvW6Tfs+LlXVrw4RCBB5t3LAkxJhggVObMlwsfNCzrrKBlLSsV3bniJIbmOxTsKYyuJbKQYVBV8qXi7mmpPyaQEK67dlmxxwfETnHBcUjtXIW2oV0j1YFfRJEcfVkMV26sUDy5HowW+hEwFG4lS1r8kENJtzhW0M4w2IzB3hNPH8P/hW+JGF8tkXR/M+FQxKDyx0POqjhiIHxmbUHGlIl+at8DYdc47MnbgOHBGjpur+eXsHJ1bRslEZg2polW3aAGTbUkxesPZmHZiJYZyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=linux.microsoft.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=aMJti7e0vUVrvY4nV5mTQzl3JhIxAOUkLKCEGtcAA6A=; b=OKYDwaAZHmuCGYkn2FEvbKfIQTIu8lqYLdwmBtn6E7EyKKn9LGR5eEmcSSmjbt30+2svxHLpjztnxVkQIoLiBsW4SGFD+Tn1FvsJkULBQYg0m2mjW1l7eFO8f6XmqRFbZxrGsP6MDWCbFdGtY6ZMBsbwjA5m2RohF/qMomajnewLhLyxCkJbO/42NLPH1v3Gj38b4SOnVWQ70BCGCiVM32TCkt7rGmQX3iZ2FMhyyr0nY+IRA90A+HbmJ6VEkbmjYuFRSPkJoGyU1Ap4dIsQt+vahFe9QuWvtSPo2+BhZict1uz0YcgBVJiG8xMKur6PW6Z67fGIrn5WS5JJ5Lv1sw== Received: from PH7PR17CA0061.namprd17.prod.outlook.com (2603:10b6:510:325::11) by BY5PR12MB4195.namprd12.prod.outlook.com (2603:10b6:a03:200::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:22:20 +0000 Received: from SA2PEPF000015CD.namprd03.prod.outlook.com (2603:10b6:510:325:cafe::17) by PH7PR17CA0061.outlook.office365.com (2603:10b6:510:325::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:22:19 +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 SA2PEPF000015CD.mail.protection.outlook.com (10.167.241.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:22:19 +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; Mon, 11 Dec 2023 02:22:07 -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.986.41; Mon, 11 Dec 2023 02:22:05 -0800 From: Xueming Li To: Gregory Etelson CC: Tyler Retzlaff , Dmitry Kozlyuk , Thomas Monjalon , "dpdk stable" Subject: patch 'eal/windows: fix build with recent MinGW' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:12:10 +0800 Message-ID: <20231211101226.2122-106-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-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: 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: SA2PEPF000015CD:EE_|BY5PR12MB4195:EE_ X-MS-Office365-Filtering-Correlation-Id: 2f7a9abb-5b30-4876-88cd-08dbfa330e87 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NXhQtPO+1tV1RP4bvgFPoObvqL3LVC1FvoJaFWg9B/sTMrKRKf5ta4UEetuESLfpB1UmdMagzcqjzncqn4qZACr9Zdq6XN5bhnp7Qd+k0dgFzu/qb0je/NPThRL2grF6LHC0C4mR2/j9UFO3KjD2fNq+QGSSUUP2WtZIGxZ2wUM2upORRmkv+JfUPDFHntjqc2qnaXBydBXISWRPVcIslX6qlsl2Y30hzpL4U2jDd4AJ7MlrhdpU/JxGHu5j2JbFyP1ckH2c6DZykdBTu5PACxxvR0miYayYfFxZTPn5a7zFN3rQs4pJmGOBEjFQorE3NUb8PPKz/EINJqWTLstHqpUVR1T1R1k2k/5KoVPdsMC6actYvHmNw9zIWVwzrOm1oKAu0Fo394+3bWpdoHSTiLsr/3cGbuF75Xpg2eUq1Ya6b+WMjCin0Luwhd374nW4IjYuKDFFW4U2fN7vOUwYlzVOufwYS3Srpj09uAqClgukVQF+znAvvuQOWuGkwGDBBLCt37n5/vRUD642Spo+rFogBjFJU3zeQ4qthy2JNq9cuFWj7pnlgbpuv9okVjJBgElPcY6A4ZGkbLuGMr+nRn/hJXHkmigiuIoz2jDrVEBLgNvnGLoQcvJVwfQjNDD8ZL6U3CULb/3MYpSkJRFh5IfWFzc/m35DQ4ycHr/+7pZJStVH6C8+mFlxlD1Yc7R2a6prwncNAAqMqwUTvGFYTlDX9oqIjTexZYY7zJaO5SRyDMogawIkVtioArzApTakAQfalxSx3boQrPVfaAzJF6GwS/32M2jPbds5nRK3Vxo= 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)(4636009)(136003)(39850400004)(346002)(376002)(396003)(230922051799003)(64100799003)(451199024)(82310400011)(1800799012)(186009)(36840700001)(40470700004)(46966006)(55016003)(40480700001)(41300700001)(4001150100001)(40460700003)(2906002)(5660300002)(316002)(6636002)(6862004)(4326008)(8936002)(8676002)(70586007)(54906003)(70206006)(37006003)(356005)(82740400003)(7636003)(2616005)(86362001)(36756003)(36860700001)(19627235002)(47076005)(966005)(426003)(26005)(478600001)(6666004)(6286002)(336012)(1076003)(16526019)(7696005)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:22:19.5690 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2f7a9abb-5b30-4876-88cd-08dbfa330e87 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: SA2PEPF000015CD.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4195 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 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=364faab59ac86473cbbc5d8ec1a242ea6cf6664b Thanks. Xueming Li --- >From 364faab59ac86473cbbc5d8ec1a242ea6cf6664b Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Tue, 14 Nov 2023 19:05:29 +0200 Subject: [PATCH] eal/windows: fix build with recent MinGW Cc: Xueming Li [ upstream commit c6221c664e52a94baf259a29ea73645496502af1 ] Windows compilation with cross-mingw on Fedora 39 failed because MEM_REPLACE_PLACEHOLDER and MEM_RESERVE_PLACEHOLDER were already defined in the compiler environment: eal_memory.c:77: error: "MEM_REPLACE_PLACEHOLDER" redefined /usr/x86_64-w64-mingw32/sys-root/mingw/include/winnt.h:5710: note: this is the location of the previous definition eal_memory.c:78: error: "MEM_RESERVE_PLACEHOLDER" redefined /usr/x86_64-w64-mingw32/sys-root/mingw/include/winnt.h:5715: note: this is the location of the previous definition The patch masks MEM_REPLACE_PLACEHOLDER and MEM_RESERVE_PLACEHOLDER macros if they were pre-defined by compiler. The patch also masks MEM_COALESCE_PLACEHOLDERS and MEM_PRESERVE_PLACEHOLDER to prevent similar errors. Fixes: 2a5d547a4a9b ("eal/windows: implement basic memory management") Signed-off-by: Gregory Etelson Acked-by: Tyler Retzlaff Acked-by: Dmitry Kozlyuk Acked-by: Thomas Monjalon --- lib/eal/windows/eal_memory.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/eal/windows/eal_memory.c b/lib/eal/windows/eal_memory.c index 215d768e2c..31410a41fd 100644 --- a/lib/eal/windows/eal_memory.c +++ b/lib/eal/windows/eal_memory.c @@ -72,10 +72,18 @@ static VirtualAlloc2_type VirtualAlloc2_ptr; #ifdef RTE_TOOLCHAIN_GCC +#ifndef MEM_COALESCE_PLACEHOLDERS #define MEM_COALESCE_PLACEHOLDERS 0x00000001 +#endif +#ifndef MEM_PRESERVE_PLACEHOLDER #define MEM_PRESERVE_PLACEHOLDER 0x00000002 +#endif +#ifndef MEM_REPLACE_PLACEHOLDER #define MEM_REPLACE_PLACEHOLDER 0x00004000 +#endif +#ifndef MEM_RESERVE_PLACEHOLDER #define MEM_RESERVE_PLACEHOLDER 0x00040000 +#endif int eal_mem_win32api_init(void) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:26.485848200 +0800 +++ 0105-eal-windows-fix-build-with-recent-MinGW.patch 2023-12-11 17:56:23.217652300 +0800 @@ -1 +1 @@ -From c6221c664e52a94baf259a29ea73645496502af1 Mon Sep 17 00:00:00 2001 +From 364faab59ac86473cbbc5d8ec1a242ea6cf6664b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c6221c664e52a94baf259a29ea73645496502af1 ] @@ -25 +27,0 @@ -Cc: stable@dpdk.org