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 DA968457A1 for ; Mon, 12 Aug 2024 14:53:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D1A704066C; Mon, 12 Aug 2024 14:53:15 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2076.outbound.protection.outlook.com [40.107.223.76]) by mails.dpdk.org (Postfix) with ESMTP id 436984029C for ; Mon, 12 Aug 2024 14:53:15 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JjNvpG12SqcTaIehJSbWIiZYK8FIv6ScNHeIluBLizXbmZyGw9gGmGUZlidYcfe+cCJNFSUD+5rS13sFAN1u/R8JqXx6UMooyd7KoR+45/oSaQjf6QhR0ZXXMVeoRGqVu7tvgXWa/OwzKXZzMPXyeMpltC8IoecVr6MCfl/xQHNz0Qa4c1zq1TVpMqbhRusVKUsnYM3R2L3C3rxGacTK6QSvRZfhai0TTiqnYOs3PkrExb4bYA7NlUi4BOS/QqOu4Dk53d5YQSUleRs3GH0NYyTfASM+D2cxzMlwnOxpvkDh8HGRKRBDV2Acot41M7K1DHi6aLZxFZxtRuFQVCPhhA== 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=Iiq+H+nePqsruyZ9F2A+pfzZe6Kkx2MrzhZgG4xg6xM=; b=nRQsGlvsp+gj2rut6TIGmp4fWWuomk77q55F31cOcN5oFCrcpIP/ABBKv3KEhv5As98xAPDGUI4IFp7YZZiv0LM2bMU5tzgpBNClK5jFO2hd5lWop4601CND8VAbOlSdXdyqpFN1Hw3us5tY4FJ+qceyLVRjr8xuAz/6FgUesDT5sm8TuEnXJSzipZrZwo4gUWTrFPBvU+5hSQg4YAOZgQf2xHtqBB8aWlvcl4hywb7gylsVsB0L/T2e2yG7On/oGB1sulSitqJk2O2iHH1lVRptbeV4mA/vlnHhdjBoA4cRZXZGEn9v84IWD1n52chx1hD++gVRdMFAAFTnKtLSDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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 (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=Iiq+H+nePqsruyZ9F2A+pfzZe6Kkx2MrzhZgG4xg6xM=; b=rqpYc5ouf/HZC2QSSjau43amHDqhXZlL9UJ1qiwdZaJAufwrCGfFgMZYpC3RTMItd9g1xch67l4V1uBpCNco8DEked8IWzWbKrBdspdPRmErIGY4eLJHNr+kAG1j4Z2CCyrZEA7ng/OOFQxclbcnes7Grn5AWqckuhaXcWBiGHk2I6bYAx52h7bsBl+JTVBvBWIGmbfvXJoftpD9nQjtHNglevhMWOo+hO0SW8DCLpt6/Yvs1OoS9bLHPY/suro4igANkspPR2jf6lRT257hHui9ye5ApmzVW4T/GVm4g+pGfB7wqizYxbvVwaAjBVM3/PD5gQx0Ti8wBAVCJn8k9A== Received: from SA9PR13CA0171.namprd13.prod.outlook.com (2603:10b6:806:28::26) by DS7PR12MB5839.namprd12.prod.outlook.com (2603:10b6:8:7a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:53:08 +0000 Received: from SA2PEPF00003F67.namprd04.prod.outlook.com (2603:10b6:806:28:cafe::45) by SA9PR13CA0171.outlook.office365.com (2603:10b6:806:28::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:53:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF00003F67.mail.protection.outlook.com (10.167.248.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 12:53:08 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:52:57 -0700 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.1544.4; Mon, 12 Aug 2024 05:52:55 -0700 From: Xueming Li To: Ganapati Kundapura CC: , Akhil Goyal , dpdk stable Subject: patch 'cryptodev: fix build without crypto callbacks' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:19 +0800 Message-ID: <20240812125035.389667-23-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00003F67:EE_|DS7PR12MB5839:EE_ X-MS-Office365-Filtering-Correlation-Id: 05272694-f2df-4863-b156-08dcbacdb720 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9r6AZ07AbPPNMgQXgtrstbjsU2Er5aOi189bbn4Q/6UjInbW/zYPJ4FE6AaT?= =?us-ascii?Q?UStQLAkYEe0b4ADbvzVGSAn7sgpJY4cArzIuYKlooIfGaQXKbhzJ5vq1tbsW?= =?us-ascii?Q?kjIog/JURV5qfNSHrzIiLPrLO2/m5ux9HNjYrc8SxWIyYNiGOom4PyxDVTIE?= =?us-ascii?Q?PTXq4CHgbRKEqhwPVzSLLF/vcMomtHo8FiGMO4tSBX1GdnNxhtCO9Mz+txau?= =?us-ascii?Q?n4chsTRgdWeXmLBMTCdS8mslPQcpdZkRRNJPDgU2wKnthwL6Cb2btcmEX5Hl?= =?us-ascii?Q?rurikusiNq+jk99tdGPuJv/SbmCqs2lO2tZmd7rOMtu/SZsNMdJ90alLZ4lL?= =?us-ascii?Q?llZ4uR7BkfcP1Zr2azKaXNCYyUwfv/wEB5xVvHXpewpOAOgaD177vHqPa5xt?= =?us-ascii?Q?K9mByNOYksjZq0LilP7MwoYzGWmgfFQUXk9CxA62TuPD5sINGFHl70JIyLUi?= =?us-ascii?Q?7vQlP8hGcYM69fJO4kK03YTBwQnqFRsYS6HKHVxrasOfOGxvGPjk6KPDyJnN?= =?us-ascii?Q?Rs1JdyT8F4ir/w78H5CIN7sVFT1vRezwI/Lk8E58xz+9ELDarKrHzve0/cpO?= =?us-ascii?Q?twgohD/uVY2axhSIbhk3e0ppoIw/V/U82KEAhlnoSU/fbayG5QhQufVdK8RB?= =?us-ascii?Q?R2robAQFzi9J7vdHvz2ATaS0zLn5pMCZr75is6MIvdn9QZnu8iYGvWN8x5sj?= =?us-ascii?Q?4pnmuxDRnT5NfDSK8xusehRTc2HDZtVvz5Z6BOTwfodNedp7TDomFb3FEGIS?= =?us-ascii?Q?vNcJuSdzbQpedxRyHiHQXrZHQPNL3cZ5yRwmiN8Ep+EJ3gNi3Dn5cW4yCnW3?= =?us-ascii?Q?LCGhWUK1cvJV1LdtKd+08jwXmuMnMEv7i4q0cqdTnIrfntRJSYFLEtFqEN9l?= =?us-ascii?Q?V28iC3vtNl8YTSiBRoCWO5H1l/BtJhMe7oU7hcTmBS+psoatVX7e15DRqXNa?= =?us-ascii?Q?8KD4kjM2F6Ml84Qz0aeJoKcCSyQ+SvHBXxR59/n/WpAVwHGgA3WCqQ8jvjFp?= =?us-ascii?Q?QyOBeGEewaQysk8D3lBD8nZPv8C/PCljlt6ibbJMW5T8Qg3/xfFysG/K/Oeo?= =?us-ascii?Q?j8ZKCcImhId6Gmayyy3q4l274wpwprDBwuV5z8anL5FPiGYQjeuhrUcr7V35?= =?us-ascii?Q?p1Mb2rNY062J+QU0/SsQWXD9B6DvkSpjCcZ3MkVfup/W+W9QaXKTLCijH9Ys?= =?us-ascii?Q?UbRsjCS5VcF0rVBOEwy2RCVY8sLpW6wtu7kVbBJrmHokkImy5HBIm2kpD7be?= =?us-ascii?Q?dTN0Uh/N2VwNMugTsHMCa3IMImkPsMfvBg0vICt5VN5jYYEMPHpFGDsHL1EQ?= =?us-ascii?Q?APOifl/syjrRHgobMbIaxfRzxtAax0PN+vI6uW76dD1hD6e8Pg+qtj8cLcf5?= =?us-ascii?Q?8mpS6vdlXSkB+Hr+uFUxdsxoRY3ls7L/4ZjBmYMg8tUYfVsrODiPUW6yoTa4?= =?us-ascii?Q?NFRzT6O9RHRZXkWSGOGknNOtikao3rCX?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:53:08.0546 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 05272694-f2df-4863-b156-08dcbacdb720 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00003F67.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5839 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 08/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=578ee207209f1b321f12d59104fc9c273374ccee Thanks. Xueming Li --- >From 578ee207209f1b321f12d59104fc9c273374ccee Mon Sep 17 00:00:00 2001 From: Ganapati Kundapura Date: Thu, 27 Jun 2024 05:06:25 -0500 Subject: [PATCH] cryptodev: fix build without crypto callbacks Cc: Xueming Li [ upstream commit cfa443351ef581b7189467842ca102ab710cb7d2 ] Crypto callbacks APIs are available in header files but when the macro RTE_CRYPTO_CALLBACKS unset, test application need to put #ifdef in its code. The test application should be able to build and run, regardless DPDK library is built with RTE_CRYPTO_CALLBACKS defined or not. Added ENOTSUP from the beginning of the APIs implementation if RTE_CRYPTO_CALLBACKS macro is unset/undefined. Fixes: 1c3ffb95595e ("cryptodev: add enqueue and dequeue callbacks") Fixes: 5523a75af539 ("test/crypto: add case for enqueue/dequeue callbacks") Signed-off-by: Ganapati Kundapura Acked-by: Akhil Goyal --- app/test/test_cryptodev.c | 12 ++++++++++++ lib/cryptodev/rte_cryptodev.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 3464df22a1..c3e4737bf9 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -13663,6 +13663,12 @@ test_enq_callback_setup(void) /* Test with invalid crypto device */ cb = rte_cryptodev_add_enq_callback(RTE_CRYPTO_MAX_DEVS, qp_id, test_enq_callback, NULL); + if (rte_errno == ENOTSUP) { + RTE_LOG(ERR, USER1, "%s line %d: " + "rte_cryptodev_add_enq_callback() " + "Not supported, skipped\n", __func__, __LINE__); + return TEST_SKIPPED; + } TEST_ASSERT_NULL(cb, "Add callback on qp %u on " "cryptodev %u did not fail", qp_id, RTE_CRYPTO_MAX_DEVS); @@ -13778,6 +13784,12 @@ test_deq_callback_setup(void) /* Test with invalid crypto device */ cb = rte_cryptodev_add_deq_callback(RTE_CRYPTO_MAX_DEVS, qp_id, test_deq_callback, NULL); + if (rte_errno == ENOTSUP) { + RTE_LOG(ERR, USER1, "%s line %d: " + "rte_cryptodev_add_deq_callback() " + "Not supported, skipped\n", __func__, __LINE__); + return TEST_SKIPPED; + } TEST_ASSERT_NULL(cb, "Add callback on qp %u on " "cryptodev %u did not fail", qp_id, RTE_CRYPTO_MAX_DEVS); diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c index a3a8fc9c07..c5eb4ecb01 100644 --- a/lib/cryptodev/rte_cryptodev.c +++ b/lib/cryptodev/rte_cryptodev.c @@ -1489,6 +1489,10 @@ rte_cryptodev_add_enq_callback(uint8_t dev_id, rte_cryptodev_callback_fn cb_fn, void *cb_arg) { +#ifndef RTE_CRYPTO_CALLBACKS + rte_errno = ENOTSUP; + return NULL; +#endif struct rte_cryptodev *dev; struct rte_cryptodev_cb_rcu *list; struct rte_cryptodev_cb *cb, *tail; @@ -1554,6 +1558,9 @@ rte_cryptodev_remove_enq_callback(uint8_t dev_id, uint16_t qp_id, struct rte_cryptodev_cb *cb) { +#ifndef RTE_CRYPTO_CALLBACKS + return -ENOTSUP; +#endif struct rte_cryptodev *dev; RTE_ATOMIC(struct rte_cryptodev_cb *) *prev_cb; struct rte_cryptodev_cb *curr_cb; @@ -1628,6 +1635,10 @@ rte_cryptodev_add_deq_callback(uint8_t dev_id, rte_cryptodev_callback_fn cb_fn, void *cb_arg) { +#ifndef RTE_CRYPTO_CALLBACKS + rte_errno = ENOTSUP; + return NULL; +#endif struct rte_cryptodev *dev; struct rte_cryptodev_cb_rcu *list; struct rte_cryptodev_cb *cb, *tail; @@ -1694,6 +1705,9 @@ rte_cryptodev_remove_deq_callback(uint8_t dev_id, uint16_t qp_id, struct rte_cryptodev_cb *cb) { +#ifndef RTE_CRYPTO_CALLBACKS + return -ENOTSUP; +#endif struct rte_cryptodev *dev; RTE_ATOMIC(struct rte_cryptodev_cb *) *prev_cb; struct rte_cryptodev_cb *curr_cb; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:03.304583637 +0800 +++ 0022-cryptodev-fix-build-without-crypto-callbacks.patch 2024-08-12 20:44:01.945069265 +0800 @@ -1 +1 @@ -From cfa443351ef581b7189467842ca102ab710cb7d2 Mon Sep 17 00:00:00 2001 +From 578ee207209f1b321f12d59104fc9c273374ccee Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit cfa443351ef581b7189467842ca102ab710cb7d2 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index 75f98b6744..6042db36a4 100644 +index 3464df22a1..c3e4737bf9 100644 @@ -31 +33 @@ -@@ -14920,6 +14920,12 @@ test_enq_callback_setup(void) +@@ -13663,6 +13663,12 @@ test_enq_callback_setup(void) @@ -44 +46 @@ -@@ -15035,6 +15041,12 @@ test_deq_callback_setup(void) +@@ -13778,6 +13784,12 @@ test_deq_callback_setup(void) @@ -58 +60 @@ -index 886eb7adc4..682c9f49d0 100644 +index a3a8fc9c07..c5eb4ecb01 100644 @@ -61 +63 @@ -@@ -1491,6 +1491,10 @@ rte_cryptodev_add_enq_callback(uint8_t dev_id, +@@ -1489,6 +1489,10 @@ rte_cryptodev_add_enq_callback(uint8_t dev_id, @@ -72 +74 @@ -@@ -1556,6 +1560,9 @@ rte_cryptodev_remove_enq_callback(uint8_t dev_id, +@@ -1554,6 +1558,9 @@ rte_cryptodev_remove_enq_callback(uint8_t dev_id, @@ -82 +84 @@ -@@ -1630,6 +1637,10 @@ rte_cryptodev_add_deq_callback(uint8_t dev_id, +@@ -1628,6 +1635,10 @@ rte_cryptodev_add_deq_callback(uint8_t dev_id, @@ -93 +95 @@ -@@ -1696,6 +1707,9 @@ rte_cryptodev_remove_deq_callback(uint8_t dev_id, +@@ -1694,6 +1705,9 @@ rte_cryptodev_remove_deq_callback(uint8_t dev_id,