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 92519A00C5 for ; Wed, 20 Jul 2022 10:22:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 892EC40697; Wed, 20 Jul 2022 10:22:18 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2068.outbound.protection.outlook.com [40.107.212.68]) by mails.dpdk.org (Postfix) with ESMTP id 317EC4003C for ; Wed, 20 Jul 2022 10:22:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m5yHL8YDsqd7mPx7auNEjGp7DpAJbtsd+G+OAJqH05a3m2x3BQB762lb9VnxB3wz8fRFBtCmBdD4REUOubKQc5LO8ziAa1RuRop9SO2NfIhWgG9jMCLF8F9FceNJ5tkbfUG6CGBqHVmR/46TMWCP8WP75MBy20Jfh8GPL5fwQN6K0E9H1Nf76KnqIWkdCPAo/UgDoUq3xy9rEuiMKoMyEro7B+Hinb+8uaMQcXrrZA3njrZfryrRkhbTxKYvLHL0XVU3N0X7LITZjPjwAfWidZs7ga0pTAMcp2eqZH8ohdn7mTtV+Mjo56vzF8TC5RB57/1ERkjisMZ1AhAOEj9sYQ== 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=Cl57bql1lhMgTsjo5YdOQlNnnOI/YHg5p7e3S86v900=; b=FCb3GbWZFZtnOCqSasCUU62oBA7gzve6BwDEnbdiKkO/vrDAUvq0+QOn7pDDWF603Ob4ScadiU3a7eQ49FmBl0eoKQNlfYQWMFOoZgl9HFt71OUyMCpTiRTpbwt+rp9lq6AHvn5EczZRJCqSiTXgvyOCP0qXCWV7kxai/o1vu4vmND0oYQzumcLjNo4Gtcsqc98TJkQxIo7P8Fb9xNHFAmDie/yXhEA+2B6zihPPYYxTivwLZDB1IrrPcLTwKA1n5PzClacqGeja4FLf58ovt8wK/zTFU83MP4LUx7Zlijk1lSmREpR4t4q7lIrPQURNejOBggkPR3Zbeba0JtZ5ZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=dpdk.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 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=Cl57bql1lhMgTsjo5YdOQlNnnOI/YHg5p7e3S86v900=; b=no6D5rs2VW74BPPVYObFXEjhFaoHW3ggXwHSfdORkjH3jbThagwdbMvZvOXpp+Kfk6y+7qW1v2TNX07VRvZxxVZHaKwG8Qnx5TjqnhO1mhB9HSDsN2lncNxJNfbUcm5p2fgPynXkqSd8zD8ZM2R4Z0LX+jxhp+8iRL7y9yVSIYq8JlGHF8opzrJz9uQm8YkxanDpRQ2/g7EvD/38Ni1TzEcEz73IcQQEx7x7qUCr0s3AI/EbohpKGs2vYN8822W8364Qd5KFSmy8z/A63unQythiH1P3eQyqkLMqw164ZWIwXsQ0lBFH2LLV6rDSleRwmmWg5pqVx24utkFYGEniwA== Received: from BN9P221CA0001.NAMP221.PROD.OUTLOOK.COM (2603:10b6:408:10a::16) by MN2PR12MB2911.namprd12.prod.outlook.com (2603:10b6:208:a9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23; Wed, 20 Jul 2022 08:22:13 +0000 Received: from BN8NAM11FT049.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10a:cafe::bf) by BN9P221CA0001.outlook.office365.com (2603:10b6:408:10a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Wed, 20 Jul 2022 08:22:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) 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 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.235) by BN8NAM11FT049.mail.protection.outlook.com (10.13.177.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5458.17 via Frontend Transport; Wed, 20 Jul 2022 08:22:13 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:22:12 +0000 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.26; Wed, 20 Jul 2022 01:22:10 -0700 From: Xueming Li To: David Marchand CC: , =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'eal/x86: drop export of internal alignment macro' has been queued to stable release 20.11.6 Date: Wed, 20 Jul 2022 11:20:33 +0300 Message-ID: <20220720082132.3954126-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220720082132.3954126-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> <20220720082132.3954126-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7bf7528f-9a80-4450-3b37-08da6a28f311 X-MS-TrafficTypeDiagnostic: MN2PR12MB2911:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?utf-8?B?OGhFajZkSEtkTVQ0ajI1MnBBWWdFOEowTFMvZTVyRFRLQlVrbzdHanlzaVNk?= =?utf-8?B?QzIvL2g3KzV6cDlEeDJialZsRTV5YWpNWUxFeHd5bWwvZ1lPVTZnN0EvQ3NK?= =?utf-8?B?eGpZOTVDQmdSV2wyaHROUWZteWJCN3ZQa3d4K1pOY0Y2Ykg1NUpNZzFtczY4?= =?utf-8?B?Z3V2SmF6akFkVDNuT0FoSUtwaG5GWmtMT2U3N0dGbTF4TllhTWE4a1dOOU9M?= =?utf-8?B?TVJTMTVaSzF3QjRqaGEzMkxObzFhTEcvcFpmWDBGSlJJZHRnY0xTMStkL001?= =?utf-8?B?NzdTNm1RQWZVS0g4UVd0WEx1TDRGNlRSMHFtUnZFaXVCM1BRME03bGcwY2xX?= =?utf-8?B?OVVQU2FIaUFkL3BRK2tjSXhaWWdEZjhSamlIZUZ1TGlHbEJHcHdpS2Nrdmtt?= =?utf-8?B?N0FpK2x3aHh1Lzg0NGloV1ZXc2E4b1N5Syt5ejJQMGZEMmpmZmJ2QzlBYkYr?= =?utf-8?B?bXpxM25GdVdEY1Rud3RGU1VYZERDbmxqcGIrOWU3cmRMZHlJTG81Z203Qnh1?= =?utf-8?B?UGNvMXhWUFc4YnFlK0htOGxIdFJ3WHZoRjBjalg2Q2V1U3JaRExGblJRNTdS?= =?utf-8?B?Tm1LVFNwbXV1cXZqUUNjNlVkc1Jsb1BJRTRuQ0liYWlGOTBkRWU2Y0lFZldu?= =?utf-8?B?NEJZWTZ4VGxaSGtCNWxoWGY1cjJueU5Cb1lJQlk3TDEzVmtEUDdheTg0dFA2?= =?utf-8?B?ZjgxcEtxaWdkV0tJNXhEaC9pM2N0cWdhMnZNUzlNOTl0dHBXMDZwZDFhcWgz?= =?utf-8?B?ZG1FUnFYdXFUUUVoQzlQTzBLTU9sa0lZcEk2bERLTHVYWEo5OVRjcTc0MExL?= =?utf-8?B?NUtyb0I3UW9qUmIrc3F5a0krUHN4SG1NR24vNndkUU9TRUJqaUQ5Ry9nOFFH?= =?utf-8?B?UThDTGVUTitOTUxyVGVlaUIwdmdFT0N4MGhLc2Q1YlhpSC9qdlExd3Y0dkxk?= =?utf-8?B?dkh5eWRYYWU0bkh0R0llNGx1cnh2Qk1YZlM3OTRRVU9OWXFjV1BBN0xPdktk?= =?utf-8?B?YllkNVBLQ3NoSDV5eGIrbWF5RWFWVzVLMVJXa3lVZyt0Zmk1WWNJdllEZkFL?= =?utf-8?B?RnJydmZRWWVCRGx5OElHVEhuUXVSVy9DV2ZVNzZUUlZUU21HdTJCSE9EWlZD?= =?utf-8?B?ZUpSYytpNk1CcnpNWi9BbS84eWlEMDNvbEJiQUhQcGhBaVBpSlduTTBRbmtV?= =?utf-8?B?RTlIZ2NSM3ZrSkxvenFMOXE5bUdYZmRGcDRRZ0IzcDRSMStoY3R1cEFBU2JM?= =?utf-8?B?NllKcmIrcndvcjhuV0luRmxCOGZMa29LM3NwOFlsYS9yd0p1UT09?= X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(136003)(396003)(346002)(39860400002)(376002)(36840700001)(40470700004)(46966006)(47076005)(2616005)(82740400003)(66574015)(81166007)(1076003)(186003)(356005)(2906002)(36756003)(40480700001)(70586007)(55016003)(4326008)(8936002)(36860700001)(16526019)(336012)(70206006)(5660300002)(426003)(478600001)(316002)(7696005)(53546011)(966005)(8676002)(41300700001)(26005)(6916009)(86362001)(6286002)(82310400005)(6666004)(54906003)(40460700003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:22:13.3856 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7bf7528f-9a80-4450-3b37-08da6a28f311 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT049.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB2911 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 20.11.6 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/22/22. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/10cdabfc105d755bbc5fcab507fb807c2024dd21 Thanks. Xueming Li --- >From 10cdabfc105d755bbc5fcab507fb807c2024dd21 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 21 Jun 2022 16:13:25 +0200 Subject: [PATCH] eal/x86: drop export of internal alignment macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 11f61ea2f6fcdd88df2a81b82235ddb7033c3e5d ] ALIGNMENT_MASK is only used internally. Besides it lacks a DPDK-related prefix. Hide it from external eyes. Fixes: f5472703c0bd ("eal: optimize aligned memcpy on x86") Reported-by: Morten Brørup Signed-off-by: David Marchand --- lib/librte_eal/x86/include/rte_memcpy.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/librte_eal/x86/include/rte_memcpy.h b/lib/librte_eal/x86/include/rte_memcpy.h index 18aa4e43a7..b678b5c942 100644 --- a/lib/librte_eal/x86/include/rte_memcpy.h +++ b/lib/librte_eal/x86/include/rte_memcpy.h @@ -851,6 +851,8 @@ rte_memcpy(void *dst, const void *src, size_t n) return rte_memcpy_generic(dst, src, n); } +#undef ALIGNMENT_MASK + #if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION >= 100000) #pragma GCC diagnostic pop #endif -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-20 15:00:59.004076628 +0800 +++ 0004-eal-x86-drop-export-of-internal-alignment-macro.patch 2022-07-20 15:00:58.641000610 +0800 @@ -1 +1 @@ -From 11f61ea2f6fcdd88df2a81b82235ddb7033c3e5d Mon Sep 17 00:00:00 2001 +From 10cdabfc105d755bbc5fcab507fb807c2024dd21 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 11f61ea2f6fcdd88df2a81b82235ddb7033c3e5d ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ - lib/eal/x86/include/rte_memcpy.h | 2 ++ + lib/librte_eal/x86/include/rte_memcpy.h | 2 ++ @@ -22 +24 @@ -diff --git a/lib/eal/x86/include/rte_memcpy.h b/lib/eal/x86/include/rte_memcpy.h +diff --git a/lib/librte_eal/x86/include/rte_memcpy.h b/lib/librte_eal/x86/include/rte_memcpy.h @@ -24,2 +26,2 @@ ---- a/lib/eal/x86/include/rte_memcpy.h -+++ b/lib/eal/x86/include/rte_memcpy.h +--- a/lib/librte_eal/x86/include/rte_memcpy.h ++++ b/lib/librte_eal/x86/include/rte_memcpy.h