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 E8716A00C5 for ; Wed, 20 Jul 2022 10:24:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E3FD241147; Wed, 20 Jul 2022 10:24:48 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2050.outbound.protection.outlook.com [40.107.220.50]) by mails.dpdk.org (Postfix) with ESMTP id 305F241147 for ; Wed, 20 Jul 2022 10:24:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y8ZeMEoQNcDz6JdHxFMXDgEjP++mvlIOBUUnpT1hzzbFdeEHMZHQzA1kP60zIBkBy4GwHoszgUlwKMHpYDl+zpv6zcs/YfI7W0ErZheE/J6vMaySWhCuUfy5t71H2HN1EOtSLUN13yNMmdYb0JYA88F/O2+F+JIVLD4m0Ayxq7szIb6KFeOwNkyMFl9PdWddadr2AzSn9nbo6S9PeOnB05hGMnnrU506fzLWOymAnzPlCx62X5WMQxQf650H0wHrvbgpz6Uouz7Kfj6X7ltQ46+eGBGnYysBDuXGk7TqfRYtUiAYJtKp/wHs1p4CDQ/oUS2d72tqO+Kv9mFn4v7jNg== 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=+t0VYelqqtoPTl8o0Pw6JjYYyyUpn3KTtgsDA17KJ8Y=; b=H7CpwmeLKlSR7M0Ka+InjoIlKsnI25dCeQE27kE7hRWjYEEphu71ZIloIQGh/meA8ssnEvflrZrZNox/4NjyrtXbMQlT56q8UrLAkcHrxvCYWzl8ACHgMFUnruhUQmRUwZ1XNNIm5yPqNlzaL6qnRPBTxp3aPpoAGEO/5N+Yn9DG3BOSt5vYD1wW4ut1YCwHg/EBUceOYfDZtgwMUNbQf1eoW1kOWVPQTV2U7vxL5RNnT4KpioLQWqChemkurTccHE6bnr+w1WuAZVvRCeGkHcWDoP6lzvGpTPy7iflsTbBpxF1ejX1Fp3s18cXc0BdaS43Hhx89j7VY/h/RES3vMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) 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=+t0VYelqqtoPTl8o0Pw6JjYYyyUpn3KTtgsDA17KJ8Y=; b=qG+MN+mfgWzsQgLbxhHEew21C+aGOrYo+qDaDV9ObCAhCcrJX3sN/4PLZCSHuA2gw+53jFrHETDaVZnrcImhf0+lyrHFz4j2agQ8zH2YO9MWyNdsQlwAp5vnM8H1eoPOUkl060gQX1B1JfLQrdV3UJGo4ULUgkEslM5lSp5L0nXDevN/Npz4Nv+dMSkOtME9i5BCR/fHFvem5VcLsE+4iWpUkWKwDEGnDmC4/q9Ryh1ZDyPNx3mxOkDg9iVb0ouhB2Xj8EEGnQ9A4qMWth8VFfzsm861ISo2U05K1LZswjgijMZel95kXvx435FqHjccxitczamE4hinShSxz8F4Ow== Received: from BN9PR03CA0295.namprd03.prod.outlook.com (2603:10b6:408:f5::30) by DM5PR12MB1178.namprd12.prod.outlook.com (2603:10b6:3:6c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.21; Wed, 20 Jul 2022 08:24:46 +0000 Received: from BN8NAM11FT045.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f5:cafe::6) by BN9PR03CA0295.outlook.office365.com (2603:10b6:408:f5::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18 via Frontend Transport; Wed, 20 Jul 2022 08:24:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.234) 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.234 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.234; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.234) by BN8NAM11FT045.mail.protection.outlook.com (10.13.177.47) 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:24:45 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:24:45 +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:24:43 -0700 From: Xueming Li To: Bruce Richardson CC: , dpdk stable Subject: patch 'raw/ioat: fix build when ioat dmadev enabled' has been queued to stable release 20.11.6 Date: Wed, 20 Jul 2022 11:21:04 +0300 Message-ID: <20220720082132.3954126-35-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-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-Office365-Filtering-Correlation-Id: c339b853-5679-450b-6498-08da6a294de8 X-MS-TrafficTypeDiagnostic: DM5PR12MB1178:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vIHxVVw1PpHpLIFViP+/YZ214QJA6p7o+T4KGTXllH/INPICEG4XOZmyuHl0?= =?us-ascii?Q?Ub+rXpXRqwZ/iQvJTSlvq8OkT1nFFQImugG/cGHbzbzDQyodMtI25BNH8kJW?= =?us-ascii?Q?ofCLhMbfbJ1n0+2HxjIcBCbSKj7Jxn1tK3qoGLJOrGiLwub2aUpj201qNncm?= =?us-ascii?Q?enFz75Bg7uY6qfVjQYlvosVTVyRfG0ewpiw6TUTXcC3qn5N79Lo46uIK3aSc?= =?us-ascii?Q?WicaO+85yqvtobC/hFQwWqTnuJnTBccedh4faXKDeF9zyx3rP9Ko/KN/Smn1?= =?us-ascii?Q?0ZIY256+mShSoDWb1l2ehMX+sQqKXV4HiAmNFeW5YXF8DRiJa7IswWrq4Y8a?= =?us-ascii?Q?owu3DmM10dcRn1LogrzuX2y1zLEebEUCFIw0swwAavBv1bsDXB/CcvNB/N8b?= =?us-ascii?Q?QQu4s3sHu+us9gxLtgeAOevq02OCzP0TcwjBuLKL0GfcoqjLIdKuHIZeasf7?= =?us-ascii?Q?ahKbremiK34PCg+GpdiWySDMcisA6sUpuSw99Bi1GS7RMkzdMtEJEfPFVPbK?= =?us-ascii?Q?YSJEPUrV6dxl9c6GpYQY+dpTe5XsarMeEcWVbJfhiz1adaSGKAgs5PSe9VUv?= =?us-ascii?Q?+8OD0kfYkljLyAojUEFFIzpTdFkVnAiATXil9LOImwy9E4tqZjtyFUuaqHic?= =?us-ascii?Q?UnKlZQwtQex6T42XL6F+WEMd5zSXac1pksrg7Q9/Wg/Ez6WYFfF9Ul4GuJDO?= =?us-ascii?Q?ytts5pFSHFg4J3uERSXiJvKZTqXscDw+WLMs/BI/Tr76AUAdsoVhco92h5od?= =?us-ascii?Q?hkFOzDS4M4gOnX0ecMdRQ4/kW59rZuUbYhuCpWCRV9kXL4nKFv18iebLcdv9?= =?us-ascii?Q?dRlx1heAZBqbeGOFW0OtccNC9iJ4F7wVSnH0ddLWGaavLk/831WydRle103T?= =?us-ascii?Q?/LqJJ0JoAP/JKVFKVmuKfo5nocwbyY9C84q5mZv+EnfXHjXDGJbD7/IG+ZBQ?= =?us-ascii?Q?AJ3DriCLF2k7KppFyUySUQ=3D=3D?= X-Forefront-Antispam-Report: CIP:12.22.5.234; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(136003)(396003)(376002)(346002)(36840700001)(46966006)(40470700004)(6666004)(1076003)(82740400003)(81166007)(83380400001)(186003)(41300700001)(426003)(336012)(47076005)(2906002)(2616005)(966005)(478600001)(6286002)(40480700001)(26005)(36860700001)(8936002)(5660300002)(82310400005)(4326008)(6916009)(86362001)(316002)(70586007)(40460700003)(55016003)(356005)(54906003)(7696005)(53546011)(8676002)(70206006)(16526019)(36756003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:24:45.7750 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c339b853-5679-450b-6498-08da6a294de8 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.234]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT045.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1178 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/eb88adfe309ce5f366f566c17b4c42347d9bf93a Thanks. Xueming Li --- >From eb88adfe309ce5f366f566c17b4c42347d9bf93a Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 23 Jun 2022 14:49:32 +0100 Subject: [PATCH] raw/ioat: fix build when ioat dmadev enabled Cc: Xueming Li [ upstream commit 7580f35ea7a6f56f3fb65a3fa8601a6c21515805 ] The build of the raw/ioat driver only occurs when the equivalent dmadev drivers are disabled. Complications occur when the ioat dmadev is being built but not the idxd. In this case, only the idxd part of raw/ioat gets built, but the definition of the logtype is in the ioat part, causing build errors. .../raw_ioat_idxd_bus.c.o: In function `idxd_vdev_mmap_wq': idxd_bus.c:(.text+0x116): undefined reference to `ioat_pmd_logtype' Fix this by moving the logtype definition to the common C file, and renaming it to avoid conflicts with a similarly named value in the dma/ioat driver. Fixes: ff06fa2cf3ba ("raw/ioat: probe idxd PCI") Signed-off-by: Bruce Richardson --- drivers/raw/ioat/ioat_common.c | 2 ++ drivers/raw/ioat/ioat_private.h | 4 ++-- drivers/raw/ioat/ioat_rawdev.c | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/raw/ioat/ioat_common.c b/drivers/raw/ioat/ioat_common.c index 142e171bc9..414b753be7 100644 --- a/drivers/raw/ioat/ioat_common.c +++ b/drivers/raw/ioat/ioat_common.c @@ -9,6 +9,8 @@ #include "ioat_private.h" +RTE_LOG_REGISTER(ioat_rawdev_logtype, rawdev.ioat, INFO); + static const char * const xstat_names[] = { "failed_enqueues", "successful_enqueues", "copies_started", "copies_completed" diff --git a/drivers/raw/ioat/ioat_private.h b/drivers/raw/ioat/ioat_private.h index 6c423811ec..2564eb51e4 100644 --- a/drivers/raw/ioat/ioat_private.h +++ b/drivers/raw/ioat/ioat_private.h @@ -18,10 +18,10 @@ #include #include "rte_ioat_rawdev.h" -extern int ioat_pmd_logtype; +extern int ioat_rawdev_logtype; #define IOAT_PMD_LOG(level, fmt, args...) rte_log(RTE_LOG_ ## level, \ - ioat_pmd_logtype, "%s(): " fmt "\n", __func__, ##args) + ioat_rawdev_logtype, "%s(): " fmt "\n", __func__, ##args) #define IOAT_PMD_DEBUG(fmt, args...) IOAT_PMD_LOG(DEBUG, fmt, ## args) #define IOAT_PMD_INFO(fmt, args...) IOAT_PMD_LOG(INFO, fmt, ## args) diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c index 2c88b4369f..ea193f9d11 100644 --- a/drivers/raw/ioat/ioat_rawdev.c +++ b/drivers/raw/ioat/ioat_rawdev.c @@ -28,8 +28,6 @@ static struct rte_pci_driver ioat_pmd_drv; #define IOAT_DEVICE_ID_BDXF 0x6f2F #define IOAT_DEVICE_ID_ICX 0x0b00 -RTE_LOG_REGISTER(ioat_pmd_logtype, rawdev.ioat, INFO); - #define DESC_SZ sizeof(struct rte_ioat_generic_hw_desc) #define COMPLETION_SZ sizeof(__m128i) -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-20 15:01:00.432143239 +0800 +++ 0035-raw-ioat-fix-build-when-ioat-dmadev-enabled.patch 2022-07-20 15:00:58.744333776 +0800 @@ -1 +1 @@ -From 7580f35ea7a6f56f3fb65a3fa8601a6c21515805 Mon Sep 17 00:00:00 2001 +From eb88adfe309ce5f366f566c17b4c42347d9bf93a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7580f35ea7a6f56f3fb65a3fa8601a6c21515805 ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +32 @@ -index 60de41152a..e44e181e58 100644 +index 142e171bc9..414b753be7 100644 @@ -37 +39 @@ -+RTE_LOG_REGISTER_DEFAULT(ioat_rawdev_logtype, INFO); ++RTE_LOG_REGISTER(ioat_rawdev_logtype, rawdev.ioat, INFO); @@ -43 +45 @@ -index f032d5fe3d..7fb685a3d7 100644 +index 6c423811ec..2564eb51e4 100644 @@ -54,2 +56,2 @@ -- ioat_pmd_logtype, "IOAT: %s(): " fmt "\n", __func__, ##args) -+ ioat_rawdev_logtype, "IOAT: %s(): " fmt "\n", __func__, ##args) +- ioat_pmd_logtype, "%s(): " fmt "\n", __func__, ##args) ++ ioat_rawdev_logtype, "%s(): " fmt "\n", __func__, ##args) @@ -60 +62 @@ -index 5396671d4f..11341fcf5d 100644 +index 2c88b4369f..ea193f9d11 100644 @@ -67 +69 @@ --RTE_LOG_REGISTER_DEFAULT(ioat_pmd_logtype, INFO); +-RTE_LOG_REGISTER(ioat_pmd_logtype, rawdev.ioat, INFO);