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 9E9FB42B2C for ; Wed, 17 May 2023 17:24:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 991DB406B7; Wed, 17 May 2023 17:24:29 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 8A2F240041 for ; Wed, 17 May 2023 17:24:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684337068; x=1715873068; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=CK99sOUzz3w28Pxc15Lb5sfoe+a+l9TJwoXRDVLDiVg=; b=ak+YlB8Zl2LHqqzYuHUkn79N6XAqQSQYqs8zFK7OMM8k6mq4gUzHqTq7 X4c+U+YdhpcKL6EYxC8XIAucd4v5p8GQ5sSM9lQKSUjWtQWEnEgNvbLno NrZ87a9cKDP89vJvlqfpFkKyuVqPB9ujO1aSj4loaPp9R40sSG/prDnbR wEpGhvSCPUp6Y9xhdfKrS1CNOE/0RdA8iaWs1eLjACxb3dg0O+xh6M9NA FXuvdvXYPVtiXRz1jjvLLsP43/9N2p1RL7K2jHhcS/VymzY4j6GflO7iF s+7/Uk4i3rfhEdGV02l2ESefPxoVr5FZE33+68cj6aMDdy3RvGl3tDdfm Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10713"; a="331404357" X-IronPort-AV: E=Sophos;i="5.99,282,1677571200"; d="scan'208";a="331404357" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2023 08:24:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10713"; a="876087286" X-IronPort-AV: E=Sophos;i="5.99,282,1677571200"; d="scan'208";a="876087286" Received: from silpixa00400355.ir.intel.com (HELO silpixa00400355.ger.corp.intel.com) ([10.237.222.80]) by orsmga005.jf.intel.com with ESMTP; 17 May 2023 08:24:08 -0700 From: Ciara Power To: Fan Zhang , Pablo de Lara Cc: stable@dpdk.org, kai.ji@intel.com, Ciara Power Subject: [PATCH 21.11] crypto/ipsec_mb: fix allocating mb_mgr in session Date: Wed, 17 May 2023 15:24:04 +0000 Message-Id: <20230517152404.1050004-1-ciara.power@intel.com> X-Mailer: git-send-email 2.25.1 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 When configuring the session, use the queue pair mb_mgr that was already allocated if possible. If this doesn't exist, then allocate a new mb_mgr. This reduces unnecessary cycles creating an mb_mgr for every session configured. Fixes: c75542a ("crypto/ipsec_mb: introduce IPsec_mb framework") Signed-off-by: Pablo de Lara Signed-off-by: Ciara Power --- Similar fix sent upstream for 23.07, and 22.11 backport: https://patches.dpdk.org/project/dpdk/patch/20230517151916.1048475-1-ciara.power@intel.com/ The 21.11 fix needed a few extra lines, so kept separate. --- drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c index 58ea4ee476..12f0dd25bd 100644 --- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c +++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c @@ -319,21 +319,29 @@ ipsec_mb_sym_session_configure( struct ipsec_mb_dev_private *internals = dev->data->dev_private; struct ipsec_mb_internals *pmd_data = &ipsec_mb_pmds[internals->pmd_type]; - IMB_MGR *mb_mgr = alloc_init_mb_mgr(); + struct ipsec_mb_qp *qp = dev->data->queue_pairs[0]; + IMB_MGR *mb_mgr; int ret = 0; + if (qp != NULL) + mb_mgr = qp->mb_mgr; + else + mb_mgr = alloc_init_mb_mgr(); + if (!mb_mgr) return -ENOMEM; if (unlikely(sess == NULL)) { IPSEC_MB_LOG(ERR, "invalid session struct"); - free_mb_mgr(mb_mgr); + if (qp == NULL) + free_mb_mgr(mb_mgr); return -EINVAL; } if (rte_mempool_get(mempool, &sess_private_data)) { IPSEC_MB_LOG(ERR, "Couldn't get object from session mempool"); - free_mb_mgr(mb_mgr); + if (qp == NULL) + free_mb_mgr(mb_mgr); return -ENOMEM; } @@ -343,13 +351,15 @@ ipsec_mb_sym_session_configure( /* Return session to mempool */ rte_mempool_put(mempool, sess_private_data); - free_mb_mgr(mb_mgr); + if (qp == NULL) + free_mb_mgr(mb_mgr); return ret; } set_sym_session_private_data(sess, dev->driver_id, sess_private_data); - free_mb_mgr(mb_mgr); + if (qp == NULL) + free_mb_mgr(mb_mgr); return 0; } -- 2.25.1