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 2DAE946BAE for ; Fri, 18 Jul 2025 21:33:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 27CD040611; Fri, 18 Jul 2025 21:33:41 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 2A59E40E48 for ; Fri, 18 Jul 2025 21:33:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867218; 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=+HGRCrykIlwUPWzUK6U6jn+3WxafxIvuo/HTc6QZKIA=; b=CW1Fg7kax4Z4qeNti6QDUUfPt2DgREOz69XFuCNDzaycdFU6S+0CDUrZOnkQLL5C+jzJqz kPT6I9NsslYd9NJ5leZB6tMk0LHVRHVzHFbaTt489zJo2QH9eGth7rp2UgB8Ip0N1b2d73 I8q4WSZsIn55DB2hSEi77vcoV7F8sIM= Received: from mx-prod-mc-01.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-29-PWEs3VRePkWoZJ8go558ag-1; Fri, 18 Jul 2025 15:33:33 -0400 X-MC-Unique: PWEs3VRePkWoZJ8go558ag-1 X-Mimecast-MFC-AGG-ID: PWEs3VRePkWoZJ8go558ag_1752867212 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 53DB3195FCC2; Fri, 18 Jul 2025 19:33:32 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BF07218003FC; Fri, 18 Jul 2025 19:33:30 +0000 (UTC) From: Kevin Traynor To: Rajesh Mudimadugula Cc: Akhil Goyal , dpdk stable Subject: patch 'crypto/virtio: fix cipher data source length' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:11 +0100 Message-ID: <20250718193247.1008129-17-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-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: iRWjXX_M-h6sEZ6W20stWD6uEcHNjJZH5urxHmRNtjk_1752867212 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/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/b2c6f4b660fd898960430fcca12f5447de8e0f64 Thanks. Kevin --- >From b2c6f4b660fd898960430fcca12f5447de8e0f64 Mon Sep 17 00:00:00 2001 From: Rajesh Mudimadugula Date: Thu, 3 Apr 2025 12:26:03 +0000 Subject: [PATCH] crypto/virtio: fix cipher data source length [ upstream commit fcb4d1f48e4aecb6be4ef7a4f6f25df24fee0ea2 ] In symmetric algorithm chaining, we need to consider both cipher and auth data length for cipher source. Fixes: 82adb12a1fce ("crypto/virtio: support burst enqueue/dequeue") Signed-off-by: Rajesh Mudimadugula Acked-by: Akhil Goyal --- drivers/crypto/virtio/virtio_rxtx.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/virtio/virtio_rxtx.c b/drivers/crypto/virtio/virtio_rxtx.c index d02486661f..01977c7ec4 100644 --- a/drivers/crypto/virtio/virtio_rxtx.c +++ b/drivers/crypto/virtio/virtio_rxtx.c @@ -158,6 +158,8 @@ virtqueue_crypto_sym_pkt_header_arrange( req_data->u.sym_req.u.chain.para.src_data_len = - (sym_op->cipher.data.length + - sym_op->cipher.data.offset); + RTE_MAX((sym_op->cipher.data.length + + sym_op->cipher.data.offset), + (sym_op->auth.data.length + + sym_op->auth.data.offset)); req_data->u.sym_req.u.chain.para.dst_data_len = req_data->u.sym_req.u.chain.para.src_data_len; @@ -213,4 +215,5 @@ virtqueue_crypto_sym_enqueue_xmit( struct virtio_crypto_op_cookie *crypto_op_cookie; struct virtio_crypto_alg_chain_session_para *para; + uint32_t src_len; if (unlikely(sym_op->m_src->nb_segs != 1)) @@ -286,8 +289,11 @@ virtqueue_crypto_sym_enqueue_xmit( } + src_len = RTE_MAX((sym_op->cipher.data.offset + + sym_op->cipher.data.length), + (sym_op->auth.data.length + + sym_op->auth.data.offset)); /* indirect vring: src data */ desc[idx].addr = rte_pktmbuf_iova_offset(sym_op->m_src, 0); - desc[idx].len = (sym_op->cipher.data.offset - + sym_op->cipher.data.length); + desc[idx].len = src_len; desc[idx++].flags = VRING_DESC_F_NEXT; @@ -295,10 +301,8 @@ virtqueue_crypto_sym_enqueue_xmit( if (sym_op->m_dst) { desc[idx].addr = rte_pktmbuf_iova_offset(sym_op->m_dst, 0); - desc[idx].len = (sym_op->cipher.data.offset - + sym_op->cipher.data.length); + desc[idx].len = src_len; } else { desc[idx].addr = rte_pktmbuf_iova_offset(sym_op->m_src, 0); - desc[idx].len = (sym_op->cipher.data.offset - + sym_op->cipher.data.length); + desc[idx].len = src_len; } desc[idx++].flags = VRING_DESC_F_WRITE | VRING_DESC_F_NEXT; -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:11.700936578 +0100 +++ 0017-crypto-virtio-fix-cipher-data-source-length.patch 2025-07-18 20:29:10.821813025 +0100 @@ -1 +1 @@ -From fcb4d1f48e4aecb6be4ef7a4f6f25df24fee0ea2 Mon Sep 17 00:00:00 2001 +From b2c6f4b660fd898960430fcca12f5447de8e0f64 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fcb4d1f48e4aecb6be4ef7a4f6f25df24fee0ea2 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 0cc904485c..a7f1bd9753 100644 +index d02486661f..01977c7ec4 100644 @@ -22 +23 @@ -@@ -244,6 +244,8 @@ virtqueue_crypto_sym_pkt_header_arrange( +@@ -158,6 +158,8 @@ virtqueue_crypto_sym_pkt_header_arrange( @@ -33 +34 @@ -@@ -299,4 +301,5 @@ virtqueue_crypto_sym_enqueue_xmit_split( +@@ -213,4 +215,5 @@ virtqueue_crypto_sym_enqueue_xmit( @@ -39 +40 @@ -@@ -372,8 +375,11 @@ virtqueue_crypto_sym_enqueue_xmit_split( +@@ -286,8 +289,11 @@ virtqueue_crypto_sym_enqueue_xmit( @@ -53 +54 @@ -@@ -381,10 +387,8 @@ virtqueue_crypto_sym_enqueue_xmit_split( +@@ -295,10 +301,8 @@ virtqueue_crypto_sym_enqueue_xmit(