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 AB353A0540 for ; Thu, 7 Jul 2022 09:55:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A6268406B4; Thu, 7 Jul 2022 09:55:51 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 69BE6410D3 for ; Thu, 7 Jul 2022 09:55:50 +0200 (CEST) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 13B0240274 for ; Thu, 7 Jul 2022 07:55:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180550; bh=VEqPcXGcPoPFbhuoQGNpcSatI/f7kPbvn2TddP3n5SE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JEY/kCvGuUxeTUJngCFXa7IZraaNIq/5ALFGIossZ5Ufpbk4zzWQiPl9BpQgt2xjF Pz06ILDwv+VRy6eLWHpK3SNNnNJ/DCG57edi6XdDSENz4MboFTpIbOz1ZFM3aOKino RIUXjsHUY1anhsVILgEjOTU8OlrAPebaPMzqGosSwdc4LbmZ8/ugiDagclEAMlPVGk 7Z+6gdclY/RXoXUhjEqPtXmW0zxRM5xvuZ3OFcjB/0i2U3TjAJWaWjrF6hibgDTjps NWiX55gSEP+tr7VdCDtZKugzKlKjrP4/PdlomMYs+r/iVmZNer6p3oaakF9DiR0cpX O85jCJp6JuB7Q== Received: by mail-ed1-f71.google.com with SMTP id z13-20020a056402274d00b004357fcdd51fso13329547edd.17 for ; Thu, 07 Jul 2022 00:55:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VEqPcXGcPoPFbhuoQGNpcSatI/f7kPbvn2TddP3n5SE=; b=aFYCqxDjex08o+l0RHe0AX7z44c5+ehqKvGO3hgpTxawmDJiaP7G3O5UDoKbYSNVDQ Qq3OeQhmUEnPb4l60+tQceKlH3981Xx2zGBkJz3ryGJ0xcnWD2AIMbFLq6fqR7MpT137 eQDuk/Niz1PpX5v3WHvQ19yzGJj5g9UdOt7iIWnxe665oYGTsV6sDup6gm0dkFecxyeE /0gWjVMJlO7kuOAaCEx7PC4dATEPtYPoMfx/sl98uMALBKAWwZbCat1CIHgtLDfWe7KS 6gSDd79m1GpCqObTkiLU3NJIGC/2tzvTEd6Ohg0lABwTeXH29SbTJFFcCB1bGgJMu7Vb WNTA== X-Gm-Message-State: AJIora9nLcejpFW5EdI7aFgVQ8BQSvhP+Qd798ASscf5EFK6NJ093/iA hyQuRrdbV4uVlf3oUFsLHsdc2irAYx6lvzjrL6PwKXYDHVLXN+FB4VHcvMWcgEoOS/4Me8o/q30 24jCMfhwBaO+c4GohPfP+PBOV X-Received: by 2002:a17:906:74c7:b0:722:e657:4220 with SMTP id z7-20020a17090674c700b00722e6574220mr43213854ejl.589.1657180549525; Thu, 07 Jul 2022 00:55:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1trWPIjdkc05YZAlPrTQEqkM9G/kY0OKFw3veU4fxvXgX739ifcv7qhgvtjvRiIeirbnzaqOg== X-Received: by 2002:a17:906:74c7:b0:722:e657:4220 with SMTP id z7-20020a17090674c700b00722e6574220mr43213841ejl.589.1657180549346; Thu, 07 Jul 2022 00:55:49 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id c12-20020a170906d18c00b00727c6da69besm11731855ejz.38.2022.07.07.00.55.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:55:48 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Gagandeep Singh Cc: Akhil Goyal , dpdk stable Subject: patch 'crypto/dpaa2_sec: fix buffer pool ID check' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:04 +0200 Message-Id: <20220707075522.194223-9-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.13 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/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/003f602e622878405ba07c2a5b3c560ebb96c0c9 Thanks. Christian Ehrhardt --- >From 003f602e622878405ba07c2a5b3c560ebb96c0c9 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 e6691c6cd0..634f94fe4e 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -1530,6 +1530,10 @@ sec_simple_fd_to_mbuf(const struct qbman_fd *fd) int16_t diff = 0; 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)), rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size); @@ -1576,11 +1580,6 @@ sec_fd_to_mbuf(const struct qbman_fd *fd) * We can have a better approach to use the inline Mbuf */ - 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)); /* Prefeth op */ -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:11.589491121 +0200 +++ 0009-crypto-dpaa2_sec-fix-buffer-pool-ID-check.patch 2022-07-07 09:54:10.793823555 +0200 @@ -1 +1 @@ -From e2b70a309f901b6aa947087a318ba0be3ea8782b Mon Sep 17 00:00:00 2001 +From 003f602e622878405ba07c2a5b3c560ebb96c0c9 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 e6691c6cd0..634f94fe4e 100644 @@ -26 +27 @@ -@@ -1566,6 +1566,10 @@ sec_simple_fd_to_mbuf(const struct qbman_fd *fd) +@@ -1530,6 +1530,10 @@ sec_simple_fd_to_mbuf(const struct qbman_fd *fd) @@ -37 +38 @@ -@@ -1612,11 +1616,6 @@ sec_fd_to_mbuf(const struct qbman_fd *fd) +@@ -1576,11 +1580,6 @@ sec_fd_to_mbuf(const struct qbman_fd *fd)