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 08E5645610 for ; Fri, 12 Jul 2024 12:46:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02E4A402E5; Fri, 12 Jul 2024 12:46:06 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2057.outbound.protection.outlook.com [40.107.212.57]) by mails.dpdk.org (Postfix) with ESMTP id 78AD040261 for ; Fri, 12 Jul 2024 12:46:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eZ6QM6+uFkvSsL9i6xzg1lbXvXus98ia8GbmDJ0ofuQX9vKP5rFTKCdtyKRGmUZY/gOMe/XEbIgACRcRRkC/sNqV2ToAx1uWmLx36zWkF2rAtMdIy9hQVvszHoQNe8eDjTX6DMymiSUbd+tpZRN/1QtB5MwtxxD+iu1TZpSZieO4S5oeq15S4EUNw/7wpupn7rHF1v5GuDY1qEb7iS+ftwROPDefrPQvSdiDJQDiBfsQQ/q9boqojADPEALqOjHo63V0p7BhH0K9esJPVhC7ejHUCOk98WgMy1f8IexVl1n6Ohko8kqmpON+1oui8f8yYr+isBJypTHyAhyBfR/Btg== 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=jgrWolRUd7Ug3FfoPJfd6oyzu588kmJzkg8fT/T1wWs=; b=Uiao3hkadqku6wztEYbAeQ4iUPJouvjehs4KDLGvMLJnuJeJn/OnnZJpbD/NWRBT2jI2IMFKy/lk4iIcLhjNvC3KuX6+t/LNApIMLKbobtcQzEWP0QF5DEOoxnNN3ddK8fM5JekubVw9LvTSgCLDULW0siYdM9Q0+1gn3pO6Dtms4oRVXNYwK/DSYZDj0aTFGIYwSDQWXe0reI5BeWcrA4Y1K9/sPXOIx1fIhSlYs4snoGX793UxhmQdlqmTaz4oM4MBKs+9kpDK11sjHWNTxyu8F5svlIelpe0Y3V1lPddgvghWzE8pn2HIFvsFSiGlJqyjdd0tuAmT0ablmQEVQA== 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=jgrWolRUd7Ug3FfoPJfd6oyzu588kmJzkg8fT/T1wWs=; b=bXFBfeCWOuGdBrNZH2kUlFLKFMgp/0R9+pRZV+8Nf5K7DzQGSOxBzl5upZ716CSRCw3oSYDjRnC8bUl7hy+6uKzYzYsgsCCkUFfIGZ+hFxDDaW3zS50qVFQVDw98D4qFpxPPZvpapiMQUa3Mxj2eQ6nflQFh8rDrWfTDg3Yu4KaxEjgLUG3zV0mauhUp+zLuu/PtdVG/cJ6WnxaSdO+qZVOb5QBino68u5UvNa07vb104usecXE6I+N7viUZi2+6rvOweYqpt5mFJlVzHw0eI62XP+8sC0afCiRxQZM7rQeEc7En7XDfUgJCH2lndAI13SZvcQM/9bNb9dQwS+9YNQ== Received: from SJ0PR05CA0050.namprd05.prod.outlook.com (2603:10b6:a03:33f::25) by CH3PR12MB9195.namprd12.prod.outlook.com (2603:10b6:610:1a3::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.21; Fri, 12 Jul 2024 10:46:01 +0000 Received: from SJ1PEPF000023D6.namprd21.prod.outlook.com (2603:10b6:a03:33f:cafe::14) by SJ0PR05CA0050.outlook.office365.com (2603:10b6:a03:33f::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:46:01 +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 SJ1PEPF000023D6.mail.protection.outlook.com (10.167.244.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:46:01 +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.1544.4; Fri, 12 Jul 2024 03:45:49 -0700 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.1544.4; Fri, 12 Jul 2024 03:45:47 -0700 From: Xueming Li To: Tyler Retzlaff CC: =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'eal: fix type in destructor macro for MSVC' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:43:48 +0800 Message-ID: <20240712104528.308638-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D6:EE_|CH3PR12MB9195:EE_ X-MS-Office365-Filtering-Correlation-Id: bc0c541c-8dd9-4e55-fd55-08dca25fd230 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?OVFGeXVDZjU4VWJveXFQSVdIbmFDeXpQUEVOdXB1UjRSYVhpK2djbnllQlFR?= =?utf-8?B?S3dRdXhFZDRrUmw2T1RCUlFmcFVKL3JROXJoMzFZVWVZQm0yZU1rVlVoekF2?= =?utf-8?B?clgyYk54REt5Q0pqZUNoWHZtbm5mY3ljeHR2ZXVZSGxYYkdKM1RqcDRpZXF4?= =?utf-8?B?ZWNJem9jYzVDZEZVRURyZGR0VW5GYmplaFp3WEJjRURlSWN6RmY0TVpQK2ts?= =?utf-8?B?M1daZVAxcWtRRG53ZllYZnFUY0pLYmpxS08vandhZDhER09ISXB3K29RT1V4?= =?utf-8?B?dFAzanZDQW1ZenlKbUdxMnhMNk8vUEd4VDhvTytTWVRIRDBjSXpqRTJtcENp?= =?utf-8?B?Wkc5dGRaZTFGYlFWY05PNk8yQ0IzbGp0dlVyakN4NHdSbGx5VmxwNzZwUFZh?= =?utf-8?B?ZVJua2lRS2MxUWZiTUVCaEZnRnN4NkhSYmQxTTBIVEJ5UjB4Q21rb01uTnp1?= =?utf-8?B?bkJEWEpDR2JpUTVaa1dnK3FSR0FOREE0SWpOdUFBUHI2QXRGR25LMFVWSHQ4?= =?utf-8?B?eWs4WHRqNTdWMXFlN016MTN4RGt0a01jdXRqVGw4K3VkS2dlSmxQNmJFSVlL?= =?utf-8?B?dXdlaDZ3M1lVMFZwaGFxUXJBaWFkZlVzTE9DWi8veGVUK3hxYWxIRzI1T0pa?= =?utf-8?B?eEl3N3owdlF3NUtzRU5WMHQ3NmlYRy9LOUZ0SVVNQzVlQlNxVUtGWFNpNFlu?= =?utf-8?B?eUxnWG1LSTJUOVlweXhhYk9STlFlVmljZFZZU2k3dzZRTEdveUhESlZIS0Mx?= =?utf-8?B?bTVGTXlndElQS0NnNUhZSkFHVFg3RlZhMG5zSHJSSEpHcWNtNTdoNUF6RUlK?= =?utf-8?B?VFpDdCtTV0lXSEVCekxlVXVaWDd4UmVNQ0JlRGFRSE4yWlZ1Mk5ZazZvMjRU?= =?utf-8?B?VzROUERRSEpObmZiMlhDZFBLaThQUjJkVWtXN3Z4ZTBXRzJLMUw4ZU9GRzh3?= =?utf-8?B?eTVYZkJXcnFNUTVDcUwyN3ZWZkx3eVF2MTJ3U1A0Y3p0alJDZG5CQTJsYUpK?= =?utf-8?B?bDE2OFk5MUwwNkpRaFU0S21UMTU3TkpwNVczTzVMd0RkdHdITTRPRFFWYXhx?= =?utf-8?B?WnBpb1pCbWtHb3VudkZoT2NEaTNmYytIakVSeWd3TnVITzJ2RlBPSlBaZFpX?= =?utf-8?B?dVJDYkhtd0pMQ1BpRGVCaU8zczJyRGtQbU1sSXlPb001ZWc0SmZSOUI3NjRp?= =?utf-8?B?a3NnaHdTaHhudU5OeFdaR1d0bTZnRURnZjYwZEF3akR2cklrMHpYV2x0VytW?= =?utf-8?B?M281M0dvalRlTjJ6SmFWUDJTcXpTcDByb1laSHpJaU5rV25LdnMvWDBDWHNv?= =?utf-8?B?MmpITFUzTFVTUzRoZGt6ZjR0ZE1vc0ppcm5UNkNnM0lIQ0VRVGp4b0o5QlFF?= =?utf-8?B?VzhjRElFdHJrdXUxaUdvOU8wSHIvck8wUXl1SVRQdEcrNVR1K3BUaWxDVzE1?= =?utf-8?B?V3JWQnVlL0NUMEllUVMyRjhieUxZWkJmWU16My9PNFArT1oyT1hROEo4TzdZ?= =?utf-8?B?NUNKSGloc3lDRzNMUVA5UGg0VEZIMnhoeHc0STM4RGpkb0RyZmNBRElFT1pS?= =?utf-8?B?c1BRK3NHd2l0aTNvdXVOSk1XdWxlb1VRWlNFZWd6WFJTQytFQXl5Wnh0L3V3?= =?utf-8?B?bXVlZWdwZFZubDJiNmE4QXIvV2RSeXM4aHJneVVLWkNTS2Z1MXBUM3BTVmhX?= =?utf-8?B?R1ZJbkJ1QkpkbVNjSG1WU21raks5T2ZwTnNNMmM3TWxtYkR0MFR5a1A2bXZ0?= =?utf-8?B?L1A3YlJ1WEdxSDI4aC9ncDJkK1dUODJoMFZuaDJzSHZQMXJkTE96MWltL0ZJ?= =?utf-8?B?cGFZZndUSEtDaE5XemJ5a2hzUDU0U29jZmI5R05IYWNBdG8xSGF3K3gxL3RZ?= =?utf-8?B?di9KdGN3N2ZTRmw5WFNMR3VsWXVIWjJzVG9Odm9LU0x0Y1BqMEVnZGNIeUM3?= =?utf-8?Q?29635aYGnt1qifjCJsirhF1hw+Q7uPWh?= 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:(13230040)(376014)(1800799024)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:46:01.1474 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bc0c541c-8dd9-4e55-fd55-08dca25fd230 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: SJ1PEPF000023D6.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9195 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/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=09e70301eeb0804dfa0b0ed6e1f06177b440c396 Thanks. Xueming Li --- >From 09e70301eeb0804dfa0b0ed6e1f06177b440c396 Mon Sep 17 00:00:00 2001 From: Tyler Retzlaff Date: Tue, 16 Apr 2024 09:33:24 -0700 Subject: [PATCH] eal: fix type in destructor macro for MSVC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit e5bf3e397b34082673b9fe06f4b8f667c8e4913d ] RTE_FINI expansion failed to specify void * type for storage of destructor function pointer resulting it defaulting to type ``int``. Update the macro to specify ``void *`` as the type so the correct size is allocated in the segment. Fixes: 64eff943ca82 ("eal: implement constructors for MSVC") Signed-off-by: Tyler Retzlaff Acked-by: Morten Brørup --- lib/eal/include/rte_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h index c1ba32d00e..40af7164af 100644 --- a/lib/eal/include/rte_common.h +++ b/lib/eal/include/rte_common.h @@ -267,7 +267,7 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void) #define RTE_FINI_PRIO(name, priority) \ static void name(void); \ __pragma(const_seg(DTOR_PRIORITY_TO_SECTION(priority))) \ - __declspec(allocate(DTOR_PRIORITY_TO_SECTION(priority))) name ## _pointer = &name; \ + __declspec(allocate(DTOR_PRIORITY_TO_SECTION(priority))) void *name ## _pointer = &name; \ __pragma(const_seg()) \ static void name(void) #endif -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:14.502547379 +0800 +++ 0002-eal-fix-type-in-destructor-macro-for-MSVC.patch 2024-07-12 18:40:13.896594252 +0800 @@ -1 +1 @@ -From e5bf3e397b34082673b9fe06f4b8f667c8e4913d Mon Sep 17 00:00:00 2001 +From 09e70301eeb0804dfa0b0ed6e1f06177b440c396 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit e5bf3e397b34082673b9fe06f4b8f667c8e4913d ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 298a5c6215..618ed5694c 100644 +index c1ba32d00e..40af7164af 100644 @@ -28 +30 @@ -@@ -291,7 +291,7 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void) +@@ -267,7 +267,7 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void)