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 66567A00BE for ; Tue, 10 May 2022 14:31:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5164F4283B; Tue, 10 May 2022 14:31:00 +0200 (CEST) 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 0C0734069D for ; Tue, 10 May 2022 14:30:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185858; 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=BXZEtnQxVRksgI7jcMCc51YwFfArhW+EDb3zIgXBOrw=; b=d1xBkiFV0c7u9Q9niLiloOKwrJcmnLqFfKNtbRj3eAFktYPIgtMnOAX/MIUBKwBX91wAKp YQn5EAvrdsLJCOK3HPfc+9rHlhwS41h0hwGyuiM9wBx0PGiGlrmtDro6FVaVM7PqmF+YHr aGgAjxz2/JHfLaUv0yzDaozg3g6wMiA= 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-2-QgC6lFJkOLyG4L6D9mYBHw-1; Tue, 10 May 2022 08:30:55 -0400 X-MC-Unique: QgC6lFJkOLyG4L6D9mYBHw-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 4622C382ECD7; Tue, 10 May 2022 12:30:55 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9195E40CFD06; Tue, 10 May 2022 12:30:54 +0000 (UTC) From: Kevin Traynor To: Gagandeep Singh Cc: Akhil Goyal , dpdk stable Subject: patch 'crypto/dpaa2_sec: fix buffer pool ID check' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:30:03 +0100 Message-Id: <20220510123010.159523-26-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/86ba4e206ec094503816b47b825752e14ca7c302 Thanks. Kevin --- >From 86ba4e206ec094503816b47b825752e14ca7c302 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Thu, 28 Apr 2022 17:17:21 +0530 Subject: [PATCH] crypto/dpaa2_sec: fix buffer pool ID check [ upstream commit e2b70a309f901b6aa947087a318ba0be3ea8782b ] Simple fd rely on bpid of the buffers whereas other FD types can support buffers without bpid of pool. So moving the bpid check to simple fd to mbuf conversion function. Fixes: 8d1f3a5d751b ("crypto/dpaa2_sec: support crypto operation") Signed-off-by: Gagandeep Singh Acked-by: Akhil Goyal --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 9b461357c0..c7651c3d6d 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -1555,4 +1555,8 @@ sec_simple_fd_to_mbuf(const struct qbman_fd *fd) dpaa2_sec_session *sess_priv __rte_unused; + if (unlikely(DPAA2_GET_FD_IVP(fd))) { + DPAA2_SEC_ERR("error: non inline buffer"); + return NULL; + } struct rte_mbuf *mbuf = DPAA2_INLINE_MBUF_FROM_BUF( DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)), @@ -1601,9 +1605,4 @@ sec_fd_to_mbuf(const struct qbman_fd *fd) */ - if (unlikely(DPAA2_GET_FD_IVP(fd))) { - /* TODO complete it. */ - DPAA2_SEC_ERR("error: non inline buffer"); - return NULL; - } op = (struct rte_crypto_op *)DPAA2_GET_FLE_ADDR((fle - 1)); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-10 13:24:22.274153225 +0100 +++ 0026-crypto-dpaa2_sec-fix-buffer-pool-ID-check.patch 2022-05-10 13:24:21.620646382 +0100 @@ -1 +1 @@ -From e2b70a309f901b6aa947087a318ba0be3ea8782b Mon Sep 17 00:00:00 2001 +From 86ba4e206ec094503816b47b825752e14ca7c302 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e2b70a309f901b6aa947087a318ba0be3ea8782b ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 03fef5e500..2374d67978 100644 +index 9b461357c0..c7651c3d6d 100644 @@ -26 +27 @@ -@@ -1567,4 +1567,8 @@ sec_simple_fd_to_mbuf(const struct qbman_fd *fd) +@@ -1555,4 +1555,8 @@ sec_simple_fd_to_mbuf(const struct qbman_fd *fd) @@ -35 +36 @@ -@@ -1613,9 +1617,4 @@ sec_fd_to_mbuf(const struct qbman_fd *fd) +@@ -1601,9 +1605,4 @@ sec_fd_to_mbuf(const struct qbman_fd *fd)