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 E49DB46A63 for ; Thu, 26 Jun 2025 14:08:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DFDC6402A1; Thu, 26 Jun 2025 14:08:15 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2070.outbound.protection.outlook.com [40.107.244.70]) by mails.dpdk.org (Postfix) with ESMTP id A8B71400D6 for ; Thu, 26 Jun 2025 14:08:14 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=msyQmXw9j4u7e2g9lZsHyMxWO63ePNdxx/5wrKld9IQ2wpZ48Drv1MfhjFyZsigNj5kEFT4a3Wj8FMeG3sZ1SRBnpu0KE54JyddK34jn9FYeTAuIAKXJbYjtNEDjchDbY5ZjQLmraW08jGfdIauGErNkauDP9N8v5iVkaDDgHZbDC1U/LZzwVcWDAa1cyEHnCY5IUNUzHJvN734BXM+ZkENRK/T27CGzhW04MNK3u17VL1YPCWK5Th5rR5+oBC0fTE2Rl0yOO6Zc4bMdlA1QeQsP2HKz5yV3LHa0nokL5+DCM31KT5jUrTqmhDxg8kEWG2K/nBDPhVcsIK1eB/cIwQ== 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=P9tTAEtQDrBVZ+QdMM37r1dNJG45/QModlnWP00muvE=; b=wx6NQ1YOE3SHX6p9/MFb+5k3e4dBeGwy7ojlcl8vALhIQbUpdRx5ieK4Q7vhWGCbIKqXjal/4hSAcKprMD0tyhz+TvASTRkAT6LxoKBIK+XKMhAqpChLn3w1C2up+V/h5hOWTb3o3ftSkZ+rGCJT/O6Jzrkaigs8qMt4F7NOHsF9O1Uvwh7JacpqhtTHSp7FdFQUqF6fFui9iMDd9VFg8UM/5irg5eCvb9ab1DZ7+C19bvmBBxNVmjmKw32JiZpI8AXLamzu4ejFnvbL3Y1/y6X4JhWh7einMEgB2f3O7rLewuOHceFcztnM/XyGI8eoaZ3U18+2gptbcrZfOLJMnQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.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=P9tTAEtQDrBVZ+QdMM37r1dNJG45/QModlnWP00muvE=; b=MNXKNzSsMyquYzr5Y6LXAWX9I8JUrN/gaa/AkKMkG0Ba9cFn42HoGf8TmU1DAV1SudaWsa1YkIe0JtE5ZtG6/tdvCXcNQFVlpDL0GBX47X76H7pnAbMTuf7I+lSi4fr3Zl6YLe9qkfYdQxpKhmXYN0t2JlnlrzbzW2vzVrG4b1yihqiwfkJFVZaIkC+Q9SuuC2D3dL786atLoeiYcChM808RopjAE8PqP8BWowdVyQ6Y3iuVgR34gG7bmPFQAZ/YU8pCc5iHqewg42u6ve7dB8w2R2w1zSIAIlUleQ1CzyyG4jDkLBXz2m1WZ30RPT7NtNEThydyWFSnuCFZl5hQdQ== Received: from MW4PR03CA0275.namprd03.prod.outlook.com (2603:10b6:303:b5::10) by PH0PR12MB7792.namprd12.prod.outlook.com (2603:10b6:510:281::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.30; Thu, 26 Jun 2025 12:08:11 +0000 Received: from SJ5PEPF000001D0.namprd05.prod.outlook.com (2603:10b6:303:b5:cafe::fd) by MW4PR03CA0275.outlook.office365.com (2603:10b6:303:b5::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.18 via Frontend Transport; Thu, 26 Jun 2025 12:08:11 +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 SJ5PEPF000001D0.mail.protection.outlook.com (10.167.242.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:08:11 +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; Thu, 26 Jun 2025 05:07: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.14; Thu, 26 Jun 2025 05:07:56 -0700 From: Xueming Li To: Rajesh Mudimadugula CC: Xueming Li , Akhil Goyal , "dpdk stable" Subject: patch 'crypto/virtio: fix driver ID' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:29 +0800 Message-ID: <20250626120145.27369-70-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-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: SJ5PEPF000001D0:EE_|PH0PR12MB7792:EE_ X-MS-Office365-Filtering-Correlation-Id: 8b050d8d-5fbd-4c5b-3efb-08ddb4aa1ef0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Prea7P9Mds7tuddV4G8mpbJACjaSD/76nQRcEzpLs6fwbCHJxMyqideQ2dDi?= =?us-ascii?Q?DgX2p5Gmqw9rr0tkI3IfL+ecRs7/1PCVqUbvPU7hGUlaZu9vKPZkrveRn5Wn?= =?us-ascii?Q?e+4agDpqpVHheFwfMVbIo/2M9HFzUivxnx+P29NNHuotHSMH0uVQymEYfExn?= =?us-ascii?Q?oANyLKsNaml9WMQTGWRtjkijXFo0Oxs980+926OTb8/Zzsm1WATaWqZ7RMVx?= =?us-ascii?Q?z9MyHLHbjcMu8LSajRe41XuKS6zB2Z0rh7JF/PITI5FqLLxLaKAIig2LDLxW?= =?us-ascii?Q?mNqYzegwGr2ePOfREtjtnMrFqbkFYEQcDmIAV1Sdi3ZeiIXHj5J0/7D+0px9?= =?us-ascii?Q?aZT62Te0UZi6CVs3+LE3SSzVLSklzvTEyeh8/8XopvF47L/HVd41Ux2CovdA?= =?us-ascii?Q?UQheIflyaf/Fu8WHcBec7u23Qk8+L5QvllE0OhiHp+/qc91CxOaz2dpCkSEq?= =?us-ascii?Q?VfVpWGoLdQpRiK9yCo4znZDLjOfZXt5joXOey5oAhnOEiM0IBYc4orEyP7/Q?= =?us-ascii?Q?VRgPsPKaKihORver9Xre6rmSF/+CjVgigcNMMqMDM48uK7GBIPEoKv5Kmn0g?= =?us-ascii?Q?IKHPmdKCIXL+Ium5nvZO1NDMnix7RpUEnTfmdJ74P8Xr4U2jZp1cs9SsoNOz?= =?us-ascii?Q?nd0uhkB1oGJw8w8waX2IrA1NQuFI5dXOfBW7bB24vjJVM9z3aWKwbTOD+mY+?= =?us-ascii?Q?LcpWYk/oVte7+BD20pRzP9AvoQAJp1YcpHDlQoKDlEXYWBTYMIMuIpCRtBYw?= =?us-ascii?Q?P7HRQWUmaUesi5FyQ52CnqDgDMY3mELlObbaB0P5+pF+pSTt+/h65lY9qZa/?= =?us-ascii?Q?sOu8fJrV4xvRFCXYcrOr6TRBsC7AnRsc6VBtQe+GtDlgpP0e6Dl0N1iycDyd?= =?us-ascii?Q?l75nVPqbQL3BE0uHdqVUVKhtSIcWp5CsvSgDMt14OC7YiUQjdFd4F0zKbD4U?= =?us-ascii?Q?HGqLoKCAh0XGR0UxFalr6lEiypmaK+V1/4cGldKjscl2lyAJShEs774VgA1+?= =?us-ascii?Q?h2X/GK6b+DKRNqvDCPFAHU22EjgIO0idteZH20Cjw1Ppoxo4PUCgzZwBZmxc?= =?us-ascii?Q?JK4fuNf89y2Jl/N9++WGYOD+xfLWGs9CFSQvRHpO3QuL9Rbh2NR+xCcBAvEg?= =?us-ascii?Q?Sy+euRTXGEC/yVXPh1yorXCJMoQD7fd0f3eobaUveI1dyd4C9BolVdGD0SGu?= =?us-ascii?Q?DREqgS0EE7mSm+g3S5Gdx5ZSG2SfaO3cb9SZ4szZTCMNO331qZeGxB00Vf9Z?= =?us-ascii?Q?TqlyE5kbQxwS7fFuEswJz9ZoOHunRnpSY2MHWfGQ8Mpq5rzWIHvE2z0SyPok?= =?us-ascii?Q?ZmGxmhPl6B8gGmHjJfvcFy8Bb2hn07jilb6P9ML7zPzbQBMohlxMUFVfCurw?= =?us-ascii?Q?L+ScJiMeVcOv8zfH5ziIMcpepz3tgjL1nLE5sKvo8FBHRLohQGHRaQUMzyyi?= =?us-ascii?Q?PRXVODHyxZpTD3Yob2a9eGx1woCe17YzsfIWdCxsA9048AVx2frp554ClMEl?= =?us-ascii?Q?br79xk+T4TMvSKyfQfwaUS/RCgA7xcXe5S23JCWnqZoSCFTl+1KFLJahYw?= =?us-ascii?Q?=3D=3D?= 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)(1800799024)(36860700013)(376014)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:08:11.2380 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8b050d8d-5fbd-4c5b-3efb-08ddb4aa1ef0 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: SJ5PEPF000001D0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7792 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.5 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/28/25. 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=9c9ce1e0cef63b173df003aa9d5f0d975ed85cf2 Thanks. Xueming Li --- >From 9c9ce1e0cef63b173df003aa9d5f0d975ed85cf2 Mon Sep 17 00:00:00 2001 From: Rajesh Mudimadugula Date: Wed, 28 May 2025 10:53:47 +0000 Subject: [PATCH] crypto/virtio: fix driver ID Cc: Xueming Li [ upstream commit 9843181aa5e764fd6876f50e8a795353e9261cb1 ] This patch corrects driver id for virtio and virtio_user pmds. Fixes: 25500d4b8076 ("crypto/virtio: support device init") Signed-off-by: Rajesh Mudimadugula Acked-by: Akhil Goyal --- drivers/crypto/virtio/virtio_cryptodev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/virtio/virtio_cryptodev.c b/drivers/crypto/virtio/virtio_cryptodev.c index d99b53b2ef..c208e76c7a 100644 --- a/drivers/crypto/virtio/virtio_cryptodev.c +++ b/drivers/crypto/virtio/virtio_cryptodev.c @@ -731,7 +731,6 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev, if (cryptodev == NULL) return -ENODEV; - cryptodev->driver_id = cryptodev_virtio_driver_id; cryptodev->dev_ops = &virtio_crypto_dev_ops; cryptodev->enqueue_burst = virtio_crypto_pkt_tx_burst; @@ -755,6 +754,7 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev, if (virtio_crypto_init_device(cryptodev, VIRTIO_CRYPTO_PMD_GUEST_FEATURES) < 0) + cryptodev->driver_id = cryptodev_virtio_driver_id; return -1; rte_cryptodev_pmd_probing_finish(cryptodev); @@ -1392,7 +1392,7 @@ virtio_crypto_dev_info_get(struct rte_cryptodev *dev, PMD_INIT_FUNC_TRACE(); if (info != NULL) { - info->driver_id = cryptodev_virtio_driver_id; + info->driver_id = dev->driver_id; info->feature_flags = dev->feature_flags; info->max_nb_queue_pairs = hw->max_dataqueues; /* No limit of number of sessions */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:20.370336119 +0800 +++ 0069-crypto-virtio-fix-driver-ID.patch 2025-06-26 19:59:17.474418040 +0800 @@ -1 +1 @@ -From 9843181aa5e764fd6876f50e8a795353e9261cb1 Mon Sep 17 00:00:00 2001 +From 9c9ce1e0cef63b173df003aa9d5f0d975ed85cf2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9843181aa5e764fd6876f50e8a795353e9261cb1 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -15,3 +17,2 @@ - drivers/crypto/virtio/virtio_cryptodev.c | 4 ++-- - drivers/crypto/virtio/virtio_user_cryptodev.c | 5 +++-- - 2 files changed, 5 insertions(+), 4 deletions(-) + drivers/crypto/virtio/virtio_cryptodev.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) @@ -20 +21 @@ -index 299898e585..d661ce8025 100644 +index d99b53b2ef..c208e76c7a 100644 @@ -23,3 +24,3 @@ -@@ -550,7 +550,6 @@ crypto_virtio_dev_init(struct rte_cryptodev *cryptodev, uint64_t features, - { - struct virtio_crypto_hw *hw; +@@ -731,7 +731,6 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev, + if (cryptodev == NULL) + return -ENODEV; @@ -31,3 +32 @@ -@@ -599,6 +598,7 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev, - if (cryptodev == NULL) - return -ENODEV; +@@ -755,6 +754,7 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev, @@ -34,0 +34,2 @@ + if (virtio_crypto_init_device(cryptodev, + VIRTIO_CRYPTO_PMD_GUEST_FEATURES) < 0) @@ -36,2 +36,0 @@ - if (crypto_virtio_dev_init(cryptodev, VIRTIO_CRYPTO_PMD_GUEST_FEATURES, - pci_dev) < 0) @@ -39 +38,3 @@ -@@ -1694,7 +1694,7 @@ virtio_crypto_dev_info_get(struct rte_cryptodev *dev, + + rte_cryptodev_pmd_probing_finish(cryptodev); +@@ -1392,7 +1392,7 @@ virtio_crypto_dev_info_get(struct rte_cryptodev *dev, @@ -48,30 +48,0 @@ -diff --git a/drivers/crypto/virtio/virtio_user_cryptodev.c b/drivers/crypto/virtio/virtio_user_cryptodev.c -index 992e8fb43b..4daa188e1d 100644 ---- a/drivers/crypto/virtio/virtio_user_cryptodev.c -+++ b/drivers/crypto/virtio/virtio_user_cryptodev.c -@@ -26,6 +26,8 @@ - - #define virtio_user_get_dev(hwp) container_of(hwp, struct virtio_user_dev, hw) - -+uint8_t cryptodev_virtio_user_driver_id; -+ - static void - virtio_user_read_dev_config(struct virtio_crypto_hw *hw, size_t offset, - void *dst, int length __rte_unused) -@@ -460,6 +462,7 @@ virtio_user_pmd_probe(struct rte_vdev_device *vdev) - goto end; - } - -+ cryptodev->driver_id = cryptodev_virtio_user_driver_id; - if (crypto_virtio_dev_init(cryptodev, VIRTIO_USER_CRYPTO_PMD_GUEST_FEATURES, - NULL) < 0) { - PMD_INIT_LOG(ERR, "crypto_virtio_dev_init fails"); -@@ -563,8 +566,6 @@ static struct rte_vdev_driver virtio_user_driver = { - - static struct cryptodev_driver virtio_crypto_drv; - --uint8_t cryptodev_virtio_user_driver_id; -- - RTE_PMD_REGISTER_VDEV(crypto_virtio_user, virtio_user_driver); - RTE_PMD_REGISTER_CRYPTO_DRIVER(virtio_crypto_drv, - virtio_user_driver.driver,