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 8A5D041D8C for ; Mon, 27 Feb 2023 08:03:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82E9240A84; Mon, 27 Feb 2023 08:03:26 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id 7460C410FB for ; Mon, 27 Feb 2023 08:03:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JyyLVf/KmT85evVEiuUa8eF/+AqxeKNa/mH+b83dN9x33IzyPcll34DlbVz/ImIw+ADlEVPsCMM/iWY+dYkNdOkO4zJnhkDpe25MDhDLSMhQpgIhfiwUuZxCxy0UuT7+xlbJ4Led53x8o6RvNaZKPrCNQ0W0Gy5KsajGToTHzqwlDbpYI+OaTgBK09BCbIm1AIh3budKMcP1DdmyvFMlFr1HTkgEnwuxqqU6TrGidFdseVjZnIy0uNws3IsIEU8QBJj3ei6q+7+H3jhh8Ydpgw4Fq8xkUmZqa7MIs+b8cc0gujEFD/uBqzv154HQ9w91bDph5FXp4dWx4gwzoV48JA== 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=NMke5qN+qTpKyfVQ0+cXlka0iGziA6FiBMkcPfmdLrs=; b=mkVXVtfa0ROtMseUfaqVt5Uu21gS12JVJDeOr90cKukD5u7SHMQyrsWP2OHDO5DqJFKm5QWN5+vBw9fUVPdS1S+nMD7S4cZBX7bE1DfwvRtqIBNI+0wodByCrXyEvrxPpDweFTBWLiUWEHNiBsGYqbQu0BHNVSE9d1h5Q3nwOKhELbFawxOAtJUXDEoIsVXq7AhOex5AK1xVwGeIlKYj+8LBhY6cCNaf6vQjrwRKhAp/LD88IpZo0ibQk/sJ4oypxCGQGX17NM4CSRglgSAbt6T7gLjDH/gAz9FH8njfgiNfpSmhljWq+J5PauzPsptSUbzKd+y1ecBOdXTHL86FUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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=NMke5qN+qTpKyfVQ0+cXlka0iGziA6FiBMkcPfmdLrs=; b=b0TzioENZqjxZ8rwMhqDoM0lTZE25fViB8ZSL32HEGp6n4qKcKeMDNFxCE1lzUe5EpflBde8IMn1r+hTksBSZYw9LT/O2c2TPOUtiiO2rXgt7dC2W9onR0boyXmb6L7QV6UJYg+S6APwYH0HLLGu3me+So21xCVgjn/7+01PCu7HHnAIy5cndLg1P3OgVxvMc53T5LpaP5G8wDi1MI2wjVU7MtGIjrvMkmA9l7Jloo+mk7o/nqSY5wj/CJZEafek5tjUmv1iL8AUk7XuD87WFoq4K26Z4d7pIlZa7Y6p6OzqN9wvM1khhyz6UkHbhoI78vhpbajiIWmyCDIHj4+wIw== Received: from MN2PR16CA0027.namprd16.prod.outlook.com (2603:10b6:208:134::40) by PH0PR12MB8006.namprd12.prod.outlook.com (2603:10b6:510:28d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.21; Mon, 27 Feb 2023 07:03:23 +0000 Received: from BL02EPF000108E9.namprd05.prod.outlook.com (2603:10b6:208:134:cafe::2f) by MN2PR16CA0027.outlook.office365.com (2603:10b6:208:134::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:03:22 +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 BL02EPF000108E9.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:03:22 +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.36; Sun, 26 Feb 2023 23:03:13 -0800 Received: from nvidia.com (10.126.230.37) 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.37; Sun, 26 Feb 2023 23:03:10 -0800 From: Xueming Li To: Pablo de Lara CC: Thomas Monjalon , Kai Ji , "dpdk stable" Subject: patch 'crypto/qat: fix build' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:58:48 +0800 Message-ID: <20230227070107.15664-20-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] 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-TrafficTypeDiagnostic: BL02EPF000108E9:EE_|PH0PR12MB8006:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a1de379-b3d5-44d8-6966-08db1890b707 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: Ypg15X2ONK6GjKz7W+qbP9dhkdRp5M3VZ7yoDRhTPAiBbQt2NOI+WsiPgqTy1RxWCul1CVhdkQRFFle6AqsmPjAlbqkohdV6twmhlgvKMIRBVENFtD+Xci1bH4wifXKgR0AoFT5KrvGtULuE9VK9GRbEcBiSY/q3QiFvh47jAZQTeBWTRQBBeFOALCVqhFYCPEVd+c4w5gkfQaBWqrCBiv/aK5D/6ysD5mtsdtQ4dMmnpy1YXpxLsoQtTG+EXyXRR/9rjUSnC/sSZNC5+NpaOLv7rrAqB22Kn2+OcX8OhT8jsGWC0N7Mg9S+3tfGuDJwu2apZUvIzz+lvI16i0NzctTUEIs/oD/kEL0XUBN9Z+9I+irL1yS4iMUfayjxTbHjBqmWjij6t/ZwzNpprsJV0c4pv70EkDY2sKWJEIKg5RrOad6NNDKfvoY5H5cmQxc1PR1FhOXyqKUxcjMkRvECFfgnd1FUVSLVN1jO7G2GJDfPKCoWqgkYs/AX1V5b83hP+iGz3qegd8r06eQcogLJiIYc+MvNAb7TIvnrPykrQZKkkj8SCnqvUCWQSfiH8sKOmpL6y22fmUlcVJb+h5eFgxget/RMFXiRaVS+/pwpc50e2YVR0ec7IEZjUcCkxjIXBxwP0fMpipAkFD2XFQ/WGOeeXHwmjEFnIcx3geaCTHqr0luZ9KcCmEmyyukIOrVZmzspyY1xMVH6soDdwMSSEQQI8M5wHzb/i8ifw4dG9kCY0CKuPQGW6pgIxdvaLrunSLR/tWb20xt9SLkSAerKHDh7+dn/ptONt9V8/MDwGcg= 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:(13230025)(4636009)(346002)(136003)(376002)(39860400002)(396003)(451199018)(40470700004)(36840700001)(46966006)(2616005)(41300700001)(6666004)(36860700001)(83380400001)(5660300002)(6286002)(16526019)(55016003)(8936002)(54906003)(478600001)(356005)(86362001)(186003)(6916009)(26005)(4326008)(82310400005)(8676002)(70586007)(7636003)(40460700003)(53546011)(426003)(1076003)(40480700001)(47076005)(70206006)(316002)(82740400003)(36756003)(966005)(336012)(2906002)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:03:22.5943 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2a1de379-b3d5-44d8-6966-08db1890b707 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: BL02EPF000108E9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8006 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.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 03/01/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=a0b1faaad2070f0965d21cf83196bfb06c4a3f4a Thanks. Xueming Li --- >From a0b1faaad2070f0965d21cf83196bfb06c4a3f4a Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Wed, 18 Jan 2023 11:05:58 +0000 Subject: [PATCH] crypto/qat: fix build Cc: Xueming Li [ upstream commit 2a211079a92e962bbd0ec81e425a6ffc32890e67 ] When building QAT PMD, the following issue comes up: intel-ipsec-mb.h:333: error: "AES_BLOCK_SIZE" redefined 333 | #define AES_BLOCK_SIZE IMB_AES_BLOCK_SIZE In file included from drivers/crypto/qat/qat_sym_session.c:8: /usr/include/openssl/aes.h:26: previous definition 26 | # define AES_BLOCK_SIZE 16 By defining NO_COMPAT_IMB_API_053, it prevents legacy macros like AES_BLOCK_SIZE from being defined from IPSec MB library, avoiding the redefinition. Fixes: 3227bc7138f5 ("crypto/qat: use intel-ipsec-mb for partial hash and AES") Reported-by: Thomas Monjalon Signed-off-by: Pablo de Lara Acked-by: Kai Ji --- drivers/crypto/qat/qat_sym_session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c index dfff1f4afb..46a30d6539 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c @@ -10,6 +10,7 @@ #include /* Needed for bpi runt block processing */ #ifdef RTE_QAT_LIBIPSECMB +#define NO_COMPAT_IMB_API_053 #if defined(RTE_ARCH_ARM) #include #else -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:41.639405000 +0800 +++ 0021-crypto-qat-fix-build.patch 2023-02-27 14:08:40.739237000 +0800 @@ -1 +1 @@ -From 2a211079a92e962bbd0ec81e425a6ffc32890e67 Mon Sep 17 00:00:00 2001 +From a0b1faaad2070f0965d21cf83196bfb06c4a3f4a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 2a211079a92e962bbd0ec81e425a6ffc32890e67 ] @@ -19 +21,0 @@ -Cc: stable@dpdk.org @@ -29 +31 @@ -index 622a3120f8..466482d225 100644 +index dfff1f4afb..46a30d6539 100644