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 B3F16A0543 for ; Tue, 21 Jun 2022 10:04:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AD0C640151; Tue, 21 Jun 2022 10:04:20 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2052.outbound.protection.outlook.com [40.107.223.52]) by mails.dpdk.org (Postfix) with ESMTP id A48D3427F4 for ; Tue, 21 Jun 2022 10:04:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bBMBRPmcEtdaitvmDmO0FF1jJVx4NAW6JZeFZob9VObYu8ns/h43PUCbG/QCE310O/qfNNLL5u9DqBfAabIsACcrLmKbws5A+uyEqp1L6/NxdVHPqNP0Lg1tTF334+CjcGyiX2/O/XIYnLZNZcW1f2Ig6bcQ9UxZmM3vHRfOYWw4rEsphJBag+e0q1WI2oETA/YVd7e/lzWdwLn756xaftOEkSzqcwYQNR3V0Gjd2BldUUyC2lxdG/ST4oaFwLEMSpkUDw/TJc+MhUgp/lAnjOilV/hh5ndkoHa5ZkpiMGKCNPEVbZZC0kzSe++X+3w39TM9MJHc7HIDIF2zZWp5gQ== 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=UiWaj9JmW4bFHbFT11IZIP3oV++KRH2ABZvjjZIZ1L8=; b=MFxNo6ZPHV9E4HjHekcTeUGt4OLqDo3L4ZFVWdYKYG5Sf1qxL5uLS8ijiTQ986jPykrE6+Z/5GgyfzebmW3px+0PHUyXm2ae2CIVZEJK4nADVSCJtJl3b/lKnkztbBc/6D8YGQ8f4OyOc8eZTjKqNWEweWagfLEl4HwiXwBZa/Qs0qok6Shiwbs+VgaoXN90BfepnHckbcfJEXfyq1cvJVv8/IQ8GLEAKY6Rysysa4YeqG0JdZQFzZRrEg7cdLpIxNfuGarus5b/9Bm11CnKDB/n9B4cDsVLf5/tn/OW9pJUIx95IR0o/INb9cmPGLR+WyTSWTUHM9qzdAuyESzBew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) 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 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=UiWaj9JmW4bFHbFT11IZIP3oV++KRH2ABZvjjZIZ1L8=; b=BJeXvKu6FyMViiiPBwoLacddh5kzSa6UOPEf0bEXDVroD1GEqUT0q/6j8J7rpdfLS9rgntAFTylemGVB7w5ApOC+AaiGOQYjmmd1QnKB4U7mU06K6ngJ3+2Riv/oq3gCc2kRNoJRKsJnSBAvyCRHb37H05pxSYdqzokMu+AuB54Q6gqLJ/0vzO9nMZaWKOgHpQem6u8l3CJFVqvFoPDHJP62eU924PNco+ZUUzn+pRv/IJpCS7/EkEIKqNM6ODZaVgx8jZphAC6DC1yMtxifKrd9p/0ZOAoguyHGIbcRoUtpJ5BaD4OTiHpP9N8EKNLx2+aZpLfylu95D3P/IwAs1Q== Received: from MWHPR12CA0046.namprd12.prod.outlook.com (2603:10b6:301:2::32) by SN6PR12MB2751.namprd12.prod.outlook.com (2603:10b6:805:6c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14; Tue, 21 Jun 2022 08:04:16 +0000 Received: from CO1NAM11FT043.eop-nam11.prod.protection.outlook.com (2603:10b6:301:2:cafe::cf) by MWHPR12CA0046.outlook.office365.com (2603:10b6:301:2::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15 via Frontend Transport; Tue, 21 Jun 2022 08:04:16 +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 CO1NAM11FT043.mail.protection.outlook.com (10.13.174.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:04:16 +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; Tue, 21 Jun 2022 08:04:16 +0000 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.986.22; Tue, 21 Jun 2022 01:04:13 -0700 From: Xueming Li To: Tianhao Chai CC: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'eal: fix C++ include for device event and DMA' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:20 +0300 Message-ID: <20220621080301.2315720-15-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-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: 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: 6ab145a3-b71f-4083-6ef3-08da535ca331 X-MS-TrafficTypeDiagnostic: SN6PR12MB2751:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fkr+RXMSVnSInjZXOy3MYXkjdQgvwNXBAKAdKBiASGwddB571F6fRB48Y63MkXp/u+x4UHA7XXapN9Iug0hp7UDZiUN94uwACSzBEiAgj/OJsYda9nFJozihg4MBHsF9SJjZUVsFHrjwc2ZTJt+QcTrHtfKJvjsCFSTtzLbo7hjeTMPrYQHnvLpvapg5U5RQa3zNwNOfpnZywrlqvqZI6p4p43mfkBkSzeaD0PxOrv3zXM0teRIjfZQIrMCUIP+Bi7VciXjS5e6GX+panjI+oxa1u6SiDkFS2XjdZaBEuh7GLe7e+vaVGlRt2J95uoq9/8Xkl1wevZDNHyMkYRX+dxqs11ic5IEeScWBbs2OI7euIO4fWXN4o5y+pEtiBREcdmtmAB7GrtIAEmSobfsGtac7q8wQDfpBf+8oeQpA0I0MrIVlgbqrposldrPqzOyS1HYI9TwGTOSAH5X/zCmHFWyl5sD2TJ0hmysQxQHybe4/yWX9nqwnqDfU0TM1G5QsIssx46x1ur8CB8A8mYhRqdqeOqhKWekixmnD7u/VkkzwW1GcUjsINU0CobfmVjR4RRMAVMjldny3XkId6oAEGqRrqDLVsSus6VhIlVrt/vAX8FRuZp8F1R4uGHorP8GkgQIB84T5rtu8Szaz9VeGsDrwvnG31kaN2ITXhJd2Hx4chPiFTQbfsyGYKUSXCE85WDS3zVagMZbtiH4q8qefJxvx7HNSNYorxVCB6itOek7XIxaPhkHx15DUKyVfkbi4H/w07bDr+aVSwqhTz6JXx/haRSVZThnqILB606MJjKHyxOx/MGE8rZharAJc4VfJfwj1UdkLEO6AEDPotYqsoTdkr+KpyQafmfEMVGmuby0= 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)(396003)(39860400002)(346002)(136003)(376002)(40470700004)(36840700001)(46966006)(966005)(83380400001)(5660300002)(2906002)(36860700001)(478600001)(36756003)(70586007)(82310400005)(316002)(4326008)(8676002)(54906003)(8936002)(6916009)(6666004)(2616005)(41300700001)(7696005)(26005)(1076003)(186003)(16526019)(6286002)(336012)(426003)(86362001)(40460700003)(55016003)(40480700001)(82740400003)(47076005)(70206006)(81166007)(356005)(53546011)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:04:16.4025 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6ab145a3-b71f-4083-6ef3-08da535ca331 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: CO1NAM11FT043.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2751 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 06/23/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/c1d1c4fdc321979bfbc671c19347d2586c981df9 Thanks. Xueming Li --- >From c1d1c4fdc321979bfbc671c19347d2586c981df9 Mon Sep 17 00:00:00 2001 From: Tianhao Chai Date: Wed, 4 May 2022 23:39:35 -0500 Subject: [PATCH] eal: fix C++ include for device event and DMA Cc: Xueming Li [ upstream commit 28c5d600723a9bb384a4b2f79bf6af8c40950bba ] Currently the "extern C" section ends right before rte_dev_dma_unmap and other DMA function declarations, causing some C++ compilers to produce C++ mangled symbols to rte_dev_dma_unmap instead of C symbols. This leads to build failures later when linking a final executable against this object. Fixes: a753e53d517b ("eal: add device event monitor framework") Signed-off-by: Tianhao Chai Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- lib/librte_eal/include/rte_dev.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/include/rte_dev.h b/lib/librte_eal/include/rte_dev.h index ef3ce849be..616192cdc4 100644 --- a/lib/librte_eal/include/rte_dev.h +++ b/lib/librte_eal/include/rte_dev.h @@ -327,10 +327,6 @@ rte_dev_iterator_next(struct rte_dev_iterator *it); dev != NULL; \ dev = rte_dev_iterator_next(it)) -#ifdef __cplusplus -} -#endif - /** * @warning * @b EXPERIMENTAL: this API may change without prior notice @@ -503,4 +499,8 @@ int rte_dev_dma_unmap(struct rte_device *dev, void *addr, uint64_t iova, size_t len); +#ifdef __cplusplus +} +#endif + #endif /* _RTE_DEV_H_ */ -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:49.933522817 +0800 +++ 0014-eal-fix-C-include-for-device-event-and-DMA.patch 2022-06-21 15:37:48.981117718 +0800 @@ -1 +1 @@ -From 28c5d600723a9bb384a4b2f79bf6af8c40950bba Mon Sep 17 00:00:00 2001 +From c1d1c4fdc321979bfbc671c19347d2586c981df9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 28c5d600723a9bb384a4b2f79bf6af8c40950bba ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ - lib/eal/include/rte_dev.h | 8 ++++---- + lib/librte_eal/include/rte_dev.h | 8 ++++---- @@ -22,5 +24,5 @@ -diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h -index 448a41cb0e..e6ff1218f9 100644 ---- a/lib/eal/include/rte_dev.h -+++ b/lib/eal/include/rte_dev.h -@@ -320,10 +320,6 @@ rte_dev_iterator_next(struct rte_dev_iterator *it); +diff --git a/lib/librte_eal/include/rte_dev.h b/lib/librte_eal/include/rte_dev.h +index ef3ce849be..616192cdc4 100644 +--- a/lib/librte_eal/include/rte_dev.h ++++ b/lib/librte_eal/include/rte_dev.h +@@ -327,10 +327,6 @@ rte_dev_iterator_next(struct rte_dev_iterator *it); @@ -37 +39 @@ -@@ -496,4 +492,8 @@ int +@@ -503,4 +499,8 @@ int