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 75A0DA0093 for ; Tue, 10 May 2022 14:31:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 70F7C42836; Tue, 10 May 2022 14:31:01 +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 3426442831 for ; Tue, 10 May 2022 14:31:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185859; 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=O3wDINGUkp8ijSidOJHd526p1eEaUdjFAQUZGv6Z5B8=; b=Qa3wOx1xoydcmrgm73+I+b7q/6q+DV0UEykii/rBFCa0Rot72+XD4A/jiyWdBzOMNWyDn7 UZPny/Vdax4YRy2fXG3YO3nAeWyujbsIdDvVuZxgFO6MLvI3GE1YqySJKrcqaRh8PSpPRW CSL+P//XjITknazjskqyTdrmfHUu1Ac= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-587-FtdHbrk5O8C7ctka8L9XWg-1; Tue, 10 May 2022 08:30:56 -0400 X-MC-Unique: FtdHbrk5O8C7ctka8L9XWg-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 869B729ABA29; Tue, 10 May 2022 12:30:56 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9613140CFD1A; Tue, 10 May 2022 12:30:55 +0000 (UTC) From: Kevin Traynor To: Gagandeep Singh Cc: Akhil Goyal , dpdk stable Subject: patch 'crypto/dpaa_sec: fix chained FD length in raw datapath' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:30:04 +0100 Message-Id: <20220510123010.159523-27-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/bee2c296c83b630a1d1bd809c232bc8e78f7f945 Thanks. Kevin --- >From bee2c296c83b630a1d1bd809c232bc8e78f7f945 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Thu, 28 Apr 2022 17:17:22 +0530 Subject: [PATCH] crypto/dpaa_sec: fix chained FD length in raw datapath [ upstream commit b5e761fc6be268f3894ca0bba1030fc53c2b3183 ] DPAA sec raw driver is calculating the wrong lengths while creating the FD for chain. This patch fixes lengths for chain FD. Fixes: 78156d38e112 ("crypto/dpaa_sec: support authonly and chain with raw API") Signed-off-by: Gagandeep Singh Acked-by: Akhil Goyal --- drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c index 522685f8cf..29f4e6d40b 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2021 NXP + * Copyright 2021-2022 NXP */ @@ -398,6 +398,6 @@ build_dpaa_raw_dp_chain_fd(uint8_t *drv_ctx, uint16_t auth_hdr_len = ofs.ofs.cipher.head - 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 data_len = 0, auth_len = 0, cipher_len = 0; @@ -407,4 +407,6 @@ build_dpaa_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; if (sgl->num > MAX_SG_ENTRIES) { @@ -449,4 +451,5 @@ build_dpaa_raw_dp_chain_fd(uint8_t *drv_ctx, sg->length = dest_sgl->vec[i].len; } + sg->length -= ofs.ofs.cipher.tail; } else { qm_sg_entry_set64(sg, sgl->vec[0].iova); @@ -461,4 +464,5 @@ build_dpaa_raw_dp_chain_fd(uint8_t *drv_ctx, sg->length = sgl->vec[i].len; } + sg->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.296961238 +0100 +++ 0027-crypto-dpaa_sec-fix-chained-FD-length-in-raw-datapat.patch 2022-05-10 13:24:21.620646382 +0100 @@ -1 +1 @@ -From b5e761fc6be268f3894ca0bba1030fc53c2b3183 Mon Sep 17 00:00:00 2001 +From bee2c296c83b630a1d1bd809c232bc8e78f7f945 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b5e761fc6be268f3894ca0bba1030fc53c2b3183 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org