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 3D67F4625C for ; Tue, 18 Feb 2025 13:38:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 353E7402E1; Tue, 18 Feb 2025 13:38:14 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2043.outbound.protection.outlook.com [40.107.102.43]) by mails.dpdk.org (Postfix) with ESMTP id 74EB2402DF for ; Tue, 18 Feb 2025 13:38:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dqqkn6FzNIiK+u60520E7SudH7+j9hNCDvktcd2tH7vabYEWt5auz4qKTS7d0xpr3DqYS66EM3kLsVVJ2hgiiXSTuqvTPh2y0Tc0W7dR0hrsuxfDX+xIgLF1w8OL7PL84X0QgAMRRdTmW+a2T2iN5fzVgsTvn5D9rjwIyRHrFYwvH334M5W7T4OOQeffOWaIaT55zrQAt8XL3clRT6r/yY9UipiSiTniLPm1s4XGRQ8V8XzlR+Bfn9d5pq5KjgfHoh7oQubrbfbSAi1rxWES3Cmq1nCwL+8s2XSfCuf0zDJTEcjonOVIO7VsmK9u1Td+PTtsgaHn0iRoYKLvTKqaQQ== 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=fQ164qLbc8adfKOL3MGTxiqfttyhURmrdmIhtN5Nds4=; b=kxl7g8oeZC3gkZ9OgjLuPs+BO6h+lwtIopyGeV9KgrdmOVylw9M6iKDD5gS/Z5giIJNyhljJxxHEr6i7IMo6Rv7MyC4PZ7I3CTlcFUS7iLu/IvuCG7702sFZOfaxUBRrUrBUYX32FnVtwhmyyXhsoaOA0DKhSGyEaK4BQw32aJQpCXbZj1Fv79fv46yvtGfN90gCkXTyP+ajd4x+aA/ENpOisXWPUAx9Lu5NZTZVxL4G49ove3MTdW9e07lSP12mhmgUbA0yKjpPlSZMxmwGpbR8G1ke6pVeg0fJrSopCJOgHl+mIFkQdTbhrhx8fK2GM2OGNcFwg7NVdz7BS6vqEw== 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=fQ164qLbc8adfKOL3MGTxiqfttyhURmrdmIhtN5Nds4=; b=ef2JmyxVmjD/ASxAQqoDD8Uu6GAQ7HjQbcqiBO6r/mJKJ3JylCWLtHpvwNeAaJ2xHbw3wC4Abuqmv46Tyx02Wjj7vGE53+DyDJmx1YeDJkfXuVN78GQyuEvKvuaXtWiu04fLQeEH4I8iP6t98r01neXC0ja4y94A3K8lzk5hxpZSMirhiD89W/nvai1VLYyAtMVrOTC0Eo5exqzRkqPs2MndgomyPuLaCZ3AOzbmVgVTO87i6AraYodOtITDzNf+ANZ4jjai3W7V4QS89Xpd3IzYHSCgm5XfGXKUOPjaXaDEtWAKA2jsa2i8j+PVUuYIDjY58agAw78ED2UQ5rhESg== Received: from BY1P220CA0016.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:5c3::13) by LV3PR12MB9403.namprd12.prod.outlook.com (2603:10b6:408:217::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:38:07 +0000 Received: from MWH0EPF000989E9.namprd02.prod.outlook.com (2603:10b6:a03:5c3::4) by BY1P220CA0016.outlook.office365.com (2603:10b6:a03:5c3::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.19 via Frontend Transport; Tue, 18 Feb 2025 12:38:07 +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 MWH0EPF000989E9.mail.protection.outlook.com (10.167.241.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:38:07 +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; Tue, 18 Feb 2025 04:37:52 -0800 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; Tue, 18 Feb 2025 04:37:50 -0800 From: Xueming Li To: Rajesh Mudimadugula CC: , Akhil Goyal , dpdk stable Subject: patch 'crypto/virtio: fix redundant queue free' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:16 +0800 Message-ID: <20250218123523.36836-22-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-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: MWH0EPF000989E9:EE_|LV3PR12MB9403:EE_ X-MS-Office365-Filtering-Correlation-Id: 648b9840-0e30-4f14-74fa-08dd5019188e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?E94xrCKyak9Jy1cNABtFwJann9Gkp5+qF1bBQDsM/LQINt9e0Q1Ow31BTaeT?= =?us-ascii?Q?W7cdeNAf4iHFHA2QVMiBP4vNyzNIGdb2fGo+PeID79OU/wbRLe/2iEkFyviA?= =?us-ascii?Q?rdaxZ8JQET7fQ0T0p1seDh561CXLPDH0mCivHeReUMcag4KMfqTflWS1IRcM?= =?us-ascii?Q?UeullblsuQjZkgi1cL09ZaOLovVTjPnoQleueMc8KNpYGSp9vtFHfn0zDqlv?= =?us-ascii?Q?yw4r7c87tEwfNh17TNQcqO1/FbF3nBHxdeHnzKKul94HwG7GxM7+YDSmoDD5?= =?us-ascii?Q?gptBVtKQB1qxbRX7WpZ4wDx28m/7kL/hhDYhvXro28gV/HzC/xNokD3SUCU/?= =?us-ascii?Q?SpmASqn8l/KdshRq/QKD5WAmbSjxWCnje+DO9Zlk0ZvzfkvBwnotPCpmGy14?= =?us-ascii?Q?HgM3VckpCky/yZiMIm7SV8d7kM6/vsTpIY0qxzeoWj/A02z3jU3WOX7kgvc3?= =?us-ascii?Q?waQreUeKDa/2XnLstCYLO8SkLooMNPQ1wz3oSj4kG3BFCIa4o3bMeJEV4g1t?= =?us-ascii?Q?wI/anf0yhP2RRtJPRrd+cNYh9eq/XrxqPIYj9UMQ8KASitpTNZxv0VzyjAKQ?= =?us-ascii?Q?f3uQKrSqcRmbcuQWbvX64IJsJ50XKtQ3Tm1/99Bk8BZJkHfw9FdgN+A9Xg4X?= =?us-ascii?Q?Yk7difxA0TAejozZIxU32zQWUd1OflN/wQQWgPo83QeyohQzxojYYwjakopU?= =?us-ascii?Q?pXtPyYU/cwT89dlbapAgmYUcISegP7UNF3FneQec62XmSlNVYDc8iG43Fi/C?= =?us-ascii?Q?QbdAxGSBu0hOLLDol0oVKEkAo/nJezUjOx6cr8MhieGkMQFaIPxuMypjYNV+?= =?us-ascii?Q?ajCT4ykc69EqyGeWWalE/o46jRoEM9dCpZP1yDHEHzupJdYBCeOz3bAliCAJ?= =?us-ascii?Q?Gat0e1w7RkIFdjcMiHnG2FbRexDLDhb4RTNafOe46o3YcxRSpF649z0JP+0y?= =?us-ascii?Q?YBFe0ERUGVzY7/DVRUcknzyotL1rqnnDarDXKAUFtrY3KQeKgkAwRITZkK3F?= =?us-ascii?Q?EveSrKFJMmSmVBHDT8xkm38yD6Hta73WoWoPIjUCe6U5JqyuUimOfn/6ctq2?= =?us-ascii?Q?RGNp3QkAX/u37faiYus9I8ugveHzGpJrsePSDObpaf696dY9m9bGlg0fPFgf?= =?us-ascii?Q?n7nGULh1mSN+3a5J5aPfa79hvssadbSYPJrAWo99Rf+lDuzdTADBuxy9tY0s?= =?us-ascii?Q?jZIAONeGdhWMYWEVf8pF3p2HAExlgf64h/zJz5f9srRXj6wul1g1dnDCBu5i?= =?us-ascii?Q?zcBd/LjAdyQu02FVeboRAjBAkdy+4W5qxUn/5hubHGXC9TVbuG9gVD0fFu7a?= =?us-ascii?Q?9NGlTd4zD4iGZK7DqI77RT82lQXoRchXILl/XOre6zbQGJoh1X8lmL/y0trx?= =?us-ascii?Q?puYxn55+pkEqzU1B1TsJJX0BV27rljOePMvHJurvkFLWbfk9dkYS0/YM0LxU?= =?us-ascii?Q?l6z0q/+iA4fBnYqxpetVeLnO4sRMqrFee2VmzUGlUf3Gskt5aD+xqvoM1YMv?= =?us-ascii?Q?GoJseleVknN2QMU=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)(376014)(36860700013)(1800799024)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:38:07.1934 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 648b9840-0e30-4f14-74fa-08dd5019188e 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: MWH0EPF000989E9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9403 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=90eb624eb6120756bd3ab64b2a0350406203840e Thanks. Xueming Li --- >From 90eb624eb6120756bd3ab64b2a0350406203840e Mon Sep 17 00:00:00 2001 From: Rajesh Mudimadugula Date: Wed, 27 Nov 2024 14:12:48 +0000 Subject: [PATCH] crypto/virtio: fix redundant queue free Cc: Xueming Li [ upstream commit 89241aba832c044a9efb99329cfaa9faff8a6c4e ] Remove multiple invocations of virtio_crypto_queue_release, and set virtio crypto queue as null upon free to avoid segfaults. Fixes: 6f0175ff53e0 ("crypto/virtio: support basic PMD ops") Signed-off-by: Rajesh Mudimadugula Acked-by: Akhil Goyal --- .mailmap | 1 + drivers/crypto/virtio/virtio_cryptodev.c | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.mailmap b/.mailmap index 75440baa40..658de81358 100644 --- a/.mailmap +++ b/.mailmap @@ -1185,6 +1185,7 @@ Rahul Gupta Rahul Lakkireddy Rahul Shah Raja Zidane +Rajesh Mudimadugula Rajesh Ravi Rakesh Kudurumalla Ralf Hoffmann diff --git a/drivers/crypto/virtio/virtio_cryptodev.c b/drivers/crypto/virtio/virtio_cryptodev.c index c0d3178b71..0c3af3e3b0 100644 --- a/drivers/crypto/virtio/virtio_cryptodev.c +++ b/drivers/crypto/virtio/virtio_cryptodev.c @@ -479,10 +479,13 @@ virtio_crypto_free_queues(struct rte_cryptodev *dev) /* control queue release */ virtio_crypto_queue_release(hw->cvq); + hw->cvq = NULL; /* data queue release */ - for (i = 0; i < hw->max_dataqueues; i++) + for (i = 0; i < hw->max_dataqueues; i++) { virtio_crypto_queue_release(dev->data->queue_pairs[i]); + dev->data->queue_pairs[i] = NULL; + } } static int @@ -614,6 +617,7 @@ virtio_crypto_qp_release(struct rte_cryptodev *dev, uint16_t queue_pair_id) } virtio_crypto_queue_release(vq); + dev->data->queue_pairs[queue_pair_id] = NULL; return 0; } @@ -761,8 +765,6 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev, static int virtio_crypto_dev_uninit(struct rte_cryptodev *cryptodev) { - struct virtio_crypto_hw *hw = cryptodev->data->dev_private; - PMD_INIT_FUNC_TRACE(); if (rte_eal_process_type() == RTE_PROC_SECONDARY) @@ -777,9 +779,6 @@ virtio_crypto_dev_uninit(struct rte_cryptodev *cryptodev) cryptodev->enqueue_burst = NULL; cryptodev->dequeue_burst = NULL; - /* release control queue */ - virtio_crypto_queue_release(hw->cvq); - rte_free(cryptodev->data); cryptodev->data = NULL; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.496296798 +0800 +++ 0021-crypto-virtio-fix-redundant-queue-free.patch 2025-02-18 19:39:00.468244075 +0800 @@ -1 +1 @@ -From 89241aba832c044a9efb99329cfaa9faff8a6c4e Mon Sep 17 00:00:00 2001 +From 90eb624eb6120756bd3ab64b2a0350406203840e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 89241aba832c044a9efb99329cfaa9faff8a6c4e ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 8524952d24..e428ed3dec 100644 +index 75440baa40..658de81358 100644 @@ -24 +26 @@ -@@ -1252,6 +1252,7 @@ Rahul Gupta +@@ -1185,6 +1185,7 @@ Rahul Gupta @@ -33 +35 @@ -index 643921dc02..98415af123 100644 +index c0d3178b71..0c3af3e3b0 100644 @@ -36 +38 @@ -@@ -478,10 +478,13 @@ virtio_crypto_free_queues(struct rte_cryptodev *dev) +@@ -479,10 +479,13 @@ virtio_crypto_free_queues(struct rte_cryptodev *dev) @@ -51 +53 @@ -@@ -613,6 +616,7 @@ virtio_crypto_qp_release(struct rte_cryptodev *dev, uint16_t queue_pair_id) +@@ -614,6 +617,7 @@ virtio_crypto_qp_release(struct rte_cryptodev *dev, uint16_t queue_pair_id) @@ -59 +61 @@ -@@ -760,8 +764,6 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev, +@@ -761,8 +765,6 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev, @@ -68 +70 @@ -@@ -776,9 +778,6 @@ virtio_crypto_dev_uninit(struct rte_cryptodev *cryptodev) +@@ -777,9 +779,6 @@ virtio_crypto_dev_uninit(struct rte_cryptodev *cryptodev)