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 E5FCF4624E for ; Mon, 17 Feb 2025 18:05:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0E9A400EF; Mon, 17 Feb 2025 18:05:51 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id 9DC6B400EF for ; Mon, 17 Feb 2025 18:05:50 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43948f77f1aso29965585e9.0 for ; Mon, 17 Feb 2025 09:05:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739811950; x=1740416750; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ud/W2Y+EmP4mqXzZaAXBFGoiSUUjQHctvTUq4RJ0zhs=; b=Sl+iY7AJJEjvu4gwHdlyvA+jlGCwSz8oR5OcGTJmzuMuAFmCHAW21MN+WMN5pWo57W DY4/n+py83sezNaa9YC3S+n/zzkLUhZy1fvv05byePzcxy1m0UGI6UmBJvtN4T9eHofz 6IuIZVEh8XOwKY9wQIjpjnIcz2tGgClkHCBtNN/kEv0r4cq4WYJXyBX99fEnnGF7NB+e Kue9+MZpSZ6jTJymSCQbpkz0pHmY1a6OUBlLwWvCSK5vomZQV2xad1EqRjPSC2ete8NA uo/iNPoWajLbhjwHuNtD3gnX1r/oUkU6i1jHMQvzhxUfFVndFHQkgIoxmOFzQlNz/+QA ROnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739811950; x=1740416750; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ud/W2Y+EmP4mqXzZaAXBFGoiSUUjQHctvTUq4RJ0zhs=; b=cTgWVolsiHd1U3HNgxtPjOrZnv1nb5fdCHFZIJSsDQFLqbkqStKyiNiuopUHXbFNTW clE982wqUFj1nmbws/GY6EYBESjsO6Ljd8693vIy7CmB870Ud2QY7dVs3ln+83WIH+lk FaI4iNaxSJCT5zw/yw4Me740Miy42Vf8Gw0zZw25L7H7F22VHPkDVy9Hs5BbQr7jplVW KS7+dVJPplEr6VDkVsIovjZEnORz3AMFVy4TOmJbMy7UCT49pSEJ/FNjlYNhnuRxhx2U r5tCjHTnpHC6yQ6+5vlTWx5kiR+SLmnox337Oef98CaYPfYx8KA1DZXBeSzsCaoCbs3x i65g== X-Forwarded-Encrypted: i=1; AJvYcCWgDgecYOcVtxFAHRdh3oYNTxGTZ2KcjH1BgM4mSp0b9hxJfN/EHI7PV1VBfqniLOJB1BSPrMU=@dpdk.org X-Gm-Message-State: AOJu0Ywg1y1YiBkiHfksdL+IoYpJiNiM0k3lN+LkTIrDcq+jc4lcGzwA hc2TCQfOaq89BMTbkfpNOhgSU3X9qo0wY9O3GqDTB16QHzFXq1xZ X-Gm-Gg: ASbGnctSTq07a2BDnridielHqrYwG9oHomJ6/XYkovvMJVR61fCcqZd0Admh9WFhDeJ SIaGKjt5F7Eondp37Lx1ojVXeCxmq9sQHtV816tbwQSA/rC517dH1u7qxfdSe8tpqSQiwZwOX2Q u+fNVle+/DpyFkOMePZPkQ0d6jUT2TTJWcIpojZRoJcwylnjuG0IjHFmNM/vSzKv1WZVwVJlOWZ XnBn8FBmbM1/GtuzMLwM8kKs6HBwK3VkEvdsvqPTLl9kHKnOPHRK/V13R6I0i1AWPh4RVoOT8Oy 9Z5D68uhwnUHqSo/YFCZWg== X-Google-Smtp-Source: AGHT+IG9NwRIJhTQnP7i0GtCe+vJZscrYitQN1t/sStvhq3rwpDwAQ0/PpWKVV6WZatW/nopbfjkHg== X-Received: by 2002:a05:600c:3556:b0:438:da66:fdf9 with SMTP id 5b1f17b1804b1-4396e700506mr92310255e9.18.1739811949925; Mon, 17 Feb 2025 09:05:49 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f25915146sm12940212f8f.56.2025.02.17.09.05.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:05:49 -0800 (PST) From: luca.boccassi@gmail.com To: Rajesh Mudimadugula Cc: Akhil Goyal , dpdk stable Subject: patch 'crypto/virtio: fix redundant queue free' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:03:50 +0000 Message-ID: <20250217170456.1068278-17-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/19/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/8d2f28691561ee61e933df70b750f9b1fad0dc4a Thanks. Luca Boccassi --- >From 8d2f28691561ee61e933df70b750f9b1fad0dc4a 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 [ 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 8eb97ded9f..9b6f5f770d 100644 --- a/.mailmap +++ b/.mailmap @@ -1137,6 +1137,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 4854820ba6..b696cedb49 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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:17.491893186 +0000 +++ 0017-crypto-virtio-fix-redundant-queue-free.patch 2025-02-17 16:13:16.798441593 +0000 @@ -1 +1 @@ -From 89241aba832c044a9efb99329cfaa9faff8a6c4e Mon Sep 17 00:00:00 2001 +From 8d2f28691561ee61e933df70b750f9b1fad0dc4a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 89241aba832c044a9efb99329cfaa9faff8a6c4e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 8524952d24..e428ed3dec 100644 +index 8eb97ded9f..9b6f5f770d 100644 @@ -24 +25 @@ -@@ -1252,6 +1252,7 @@ Rahul Gupta +@@ -1137,6 +1137,7 @@ Rahul Gupta @@ -33 +34 @@ -index 643921dc02..98415af123 100644 +index 4854820ba6..b696cedb49 100644 @@ -36 +37 @@ -@@ -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 +52 @@ -@@ -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 +60 @@ -@@ -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 +69 @@ -@@ -776,9 +778,6 @@ virtio_crypto_dev_uninit(struct rte_cryptodev *cryptodev) +@@ -777,9 +779,6 @@ virtio_crypto_dev_uninit(struct rte_cryptodev *cryptodev)