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 AD26DA0093 for ; Tue, 10 May 2022 14:31:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A78B842831; Tue, 10 May 2022 14:31:03 +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 74E1E42840 for ; Tue, 10 May 2022 14:31:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185861; 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=D0SxDeiRlDddKeqxci4jCdQFi26UHkWIHcdQn/LNRCU=; b=RhsodWHudt+XyVv4MYmPpJOtnCLuMTr/v+XUP05mPp2uE+3pswUZaHxLnWuj8PvZ2pHgSL CTxs9jKabZuNSEKA32uMAJnKi9xeJ2HxgX60/HtlvH5j3HgLfznSJVhiticer+YMSqhu4d rxytCLl8TBXxgyc17JVzHYn7lY+XYp4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-367-3F_ioAuHMHe8BNlDm4B_UQ-1; Tue, 10 May 2022 08:30:58 -0400 X-MC-Unique: 3F_ioAuHMHe8BNlDm4B_UQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A55D4185A7A4; Tue, 10 May 2022 12:30:57 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id D83D5400E89C; Tue, 10 May 2022 12:30:56 +0000 (UTC) From: Kevin Traynor To: Gagandeep Singh Cc: Akhil Goyal , dpdk stable Subject: patch 'crypto/dpaa2_sec: fix chained FD length in raw datapath' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:30:05 +0100 Message-Id: <20220510123010.159523-28-ktraynor@redhat.com> In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> References: <20220510123010.159523-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 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 21.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 05/15/22. 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/15a3ae1a5f67dd8d3f489a259191f9bd52587072 Thanks. Kevin --- >From 15a3ae1a5f67dd8d3f489a259191f9bd52587072 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Thu, 28 Apr 2022 17:17:23 +0530 Subject: [PATCH] crypto/dpaa2_sec: fix chained FD length in raw datapath [ upstream commit 46cc6dcc4112f9dbf4a3affbb37ea186e1c6c58f ] DPAA2 sec raw driver is calculating the wrong lengths while creating the FD for chain. This patch fixes lengths for chain FD. Fixes: aa6ec1fd8443 ("crypto/dpaa2_sec: support authenc with raw buffer API") Signed-off-by: Gagandeep Singh Acked-by: Akhil Goyal --- drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c index 74f2045637..e68a4875dd 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2021 NXP + * Copyright 2021-2022 NXP */ @@ -45,6 +45,6 @@ build_raw_dp_chain_fd(uint8_t *drv_ctx, ofs.ofs.auth.head; - uint16_t auth_tail_len = ofs.ofs.auth.tail; - uint32_t auth_only_len = (auth_tail_len << 16) | auth_hdr_len; + uint16_t auth_tail_len; + uint32_t auth_only_len; int icv_len = sess->digest_length; uint8_t *old_icv; @@ -56,4 +56,6 @@ build_raw_dp_chain_fd(uint8_t *drv_ctx, cipher_len = data_len - ofs.ofs.cipher.head - ofs.ofs.cipher.tail; auth_len = data_len - ofs.ofs.auth.head - ofs.ofs.auth.tail; + auth_tail_len = auth_len - cipher_len - auth_hdr_len; + auth_only_len = (auth_tail_len << 16) | auth_hdr_len; /* first FLE entry used to store session ctxt */ fle = (struct qbman_fle *)rte_malloc(NULL, @@ -105,4 +107,5 @@ build_raw_dp_chain_fd(uint8_t *drv_ctx, sge->length = dest_sgl->vec[i].len; } + sge->length -= ofs.ofs.cipher.tail; } else { /* Configure Output SGE for Encap/Decap */ @@ -118,4 +121,5 @@ build_raw_dp_chain_fd(uint8_t *drv_ctx, sge->length = sgl->vec[i].len; } + sge->length -= ofs.ofs.cipher.tail; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-10 13:24:22.316885583 +0100 +++ 0028-crypto-dpaa2_sec-fix-chained-FD-length-in-raw-datapa.patch 2022-05-10 13:24:21.621646383 +0100 @@ -1 +1 @@ -From 46cc6dcc4112f9dbf4a3affbb37ea186e1c6c58f Mon Sep 17 00:00:00 2001 +From 15a3ae1a5f67dd8d3f489a259191f9bd52587072 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 46cc6dcc4112f9dbf4a3affbb37ea186e1c6c58f ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org