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 0E88D46211 for ; Thu, 13 Feb 2025 11:01:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0AC4940287; Thu, 13 Feb 2025 11:01:12 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 4D00F40287 for ; Thu, 13 Feb 2025 11:01:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YidFEAwF6e/II5GMlEUVpvIAb5VP0fg4DgGb4Lghf0k=; b=U/dp8ms/x/Xfekgby/j+KGWTueAQvvf0UlnpCA/qnbYuD9tI5Q0AHaQc250w0kTNjyotsi ar2heybhlwQ6l+BBfIgWb31xY4Ah9TWvevwa7fL9VHc66qCnpFN3qUqNwPQ5RAMLPo4sW9 iLRnlZtvwNSkwqGi7HwwFN/d3woqXng= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-654-P6RVS91TNhum4337TN7NSA-1; Thu, 13 Feb 2025 05:01:08 -0500 X-MC-Unique: P6RVS91TNhum4337TN7NSA-1 X-Mimecast-MFC-AGG-ID: P6RVS91TNhum4337TN7NSA Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1CD4318D95E0; Thu, 13 Feb 2025 10:01:07 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8C9EF1800570; Thu, 13 Feb 2025 10:01:05 +0000 (UTC) From: Kevin Traynor To: Gowrishankar Muthukrishnan Cc: Akhil Goyal , dpdk stable Subject: patch 'crypto/virtio: fix data queues iteration' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:03 +0000 Message-ID: <20250213095933.362078-36-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: iMBtM3kL-sEL3rKhgcPcHUsjEW25EbIQU2SVA_wVeHw_1739440867 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.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 02/17/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ec9f33f1daf1ef1506776ff0ca817593c5e7667f Thanks. Kevin --- >From ec9f33f1daf1ef1506776ff0ca817593c5e7667f Mon Sep 17 00:00:00 2001 From: Gowrishankar Muthukrishnan Date: Tue, 7 Jan 2025 23:06:02 +0530 Subject: [PATCH] crypto/virtio: fix data queues iteration [ upstream commit e27ff6e63a8d6202149d5b458ad3d78711806dfc ] Fix dataqueues iteration using nb_queue_pairs info available in device data instead of max dataqueues as dataqueue count might have been changed in device configuration. Fixes: 6f0175ff53e0 ("crypto/virtio: support basic PMD ops") Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Akhil Goyal --- drivers/crypto/virtio/virtio_cryptodev.c | 3 +-- drivers/crypto/virtio/virtio_rxtx.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/virtio/virtio_cryptodev.c b/drivers/crypto/virtio/virtio_cryptodev.c index 98415af123..b4a6fae9e0 100644 --- a/drivers/crypto/virtio/virtio_cryptodev.c +++ b/drivers/crypto/virtio/virtio_cryptodev.c @@ -849,7 +849,6 @@ virtio_crypto_dev_free_mbufs(struct rte_cryptodev *dev) { uint32_t i; - struct virtio_crypto_hw *hw = dev->data->dev_private; - for (i = 0; i < hw->max_dataqueues; i++) { + for (i = 0; i < dev->data->nb_queue_pairs; i++) { VIRTIO_CRYPTO_INIT_LOG_DBG("Before freeing dataq[%d] used " "and unused buf", i); diff --git a/drivers/crypto/virtio/virtio_rxtx.c b/drivers/crypto/virtio/virtio_rxtx.c index 48b5f4ebbb..d02486661f 100644 --- a/drivers/crypto/virtio/virtio_rxtx.c +++ b/drivers/crypto/virtio/virtio_rxtx.c @@ -420,10 +420,9 @@ virtio_crypto_dataq_start(struct rte_cryptodev *dev) */ uint16_t i; - struct virtio_crypto_hw *hw = dev->data->dev_private; PMD_INIT_FUNC_TRACE(); /* Start data vring. */ - for (i = 0; i < hw->max_dataqueues; i++) { + for (i = 0; i < dev->data->nb_queue_pairs; i++) { virtio_crypto_vring_start(dev->data->queue_pairs[i]); VIRTQUEUE_DUMP((struct virtqueue *)dev->data->queue_pairs[i]); -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:38.501734256 +0000 +++ 0036-crypto-virtio-fix-data-queues-iteration.patch 2025-02-12 17:29:34.311945697 +0000 @@ -1 +1 @@ -From e27ff6e63a8d6202149d5b458ad3d78711806dfc Mon Sep 17 00:00:00 2001 +From ec9f33f1daf1ef1506776ff0ca817593c5e7667f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e27ff6e63a8d6202149d5b458ad3d78711806dfc ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org