From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id D30EBA0577;
Tue, 14 Apr 2020 16:17:18 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 3B52E1C2BB;
Tue, 14 Apr 2020 16:17:18 +0200 (CEST)
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
by dpdk.org (Postfix) with ESMTP id BC8341C24A
for <dev@dpdk.org>; Tue, 14 Apr 2020 16:17:16 +0200 (CEST)
IronPort-SDR: PGaypvvW/GtEFg0fmiOuZShifZDEKXe6yQ6SYXr91+Y3I+ccOhvPKwtSMR7LLRUYEAJjBTCYH7
WrPx3fztl1aw==
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga003.fm.intel.com ([10.253.24.29])
by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
14 Apr 2020 07:17:15 -0700
IronPort-SDR: ctg9M8D6F4/kXWIOgix1BkfYmOipC+TOA69oq2FD4DkP7ZQJOqrGTN2v6acQ2S2PFtQeQ2Z3uH
ZnLh11HZLOHg==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.72,382,1580803200"; d="scan'208";a="298712355"
Received: from silpixa00400072.ir.intel.com ([10.237.222.213])
by FMSMGA003.fm.intel.com with ESMTP; 14 Apr 2020 07:17:14 -0700
From: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
To: dev@dpdk.org
Cc: konstantin.ananyev@intel.com, akhil.goyal@nxp.com,
vladimir.medvedkin@intel.com
Date: Tue, 14 Apr 2020 15:17:10 +0100
Message-Id: <6001e9c347d26c4e2f80765c8abc7f74fcf8bbf2.1586873664.git.vladimir.medvedkin@intel.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <f27f45e4d0b4b6b42884a827c14be08a5bd2c6bd.1586546944.git.vladimir.medvedkin@intel.com>
References: <f27f45e4d0b4b6b42884a827c14be08a5bd2c6bd.1586546944.git.vladimir.medvedkin@intel.com>
Subject: [dpdk-dev] [PATCH v2] examples/ipsec-secgw: remove limitation for
crypto sessions
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Get rid of hardcoded limit of cryptodev sessions.
Fixes: e1143d7dbbf4 ("examples/ipsec-secgw: get rid of maximum SA limitation")
Cc: vladimir.medvedkin@intel.com
Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
---
examples/ipsec-secgw/ipsec-secgw.c | 12 +++++++-----
examples/ipsec-secgw/ipsec.h | 3 +++
examples/ipsec-secgw/sa.c | 9 +++++++++
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
index 4799bc9..0b8177b 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -58,7 +58,6 @@
#define CDEV_QUEUE_DESC 2048
#define CDEV_MAP_ENTRIES 16384
-#define CDEV_MP_NB_OBJS 1024
#define CDEV_MP_CACHE_SZ 64
#define MAX_QUEUE_PAIRS 1
@@ -1916,10 +1915,11 @@ cryptodevs_init(void)
dev_conf.ff_disable = RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO;
uint32_t dev_max_sess = cdev_info.sym.max_nb_sessions;
- if (dev_max_sess != 0 && dev_max_sess < CDEV_MP_NB_OBJS)
+ if (dev_max_sess != 0 &&
+ dev_max_sess < get_nb_crypto_sessions())
rte_exit(EXIT_FAILURE,
"Device does not support at least %u "
- "sessions", CDEV_MP_NB_OBJS);
+ "sessions", get_nb_crypto_sessions());
if (rte_cryptodev_configure(cdev_id, &dev_conf))
rte_panic("Failed to initialize cryptodev %u\n",
@@ -2175,7 +2175,8 @@ session_pool_init(struct socket_ctx *ctx, int32_t socket_id, size_t sess_sz)
snprintf(mp_name, RTE_MEMPOOL_NAMESIZE,
"sess_mp_%u", socket_id);
sess_mp = rte_cryptodev_sym_session_pool_create(
- mp_name, CDEV_MP_NB_OBJS,
+ mp_name, get_nb_crypto_sessions() +
+ CDEV_MP_CACHE_SZ * rte_lcore_count(),
sess_sz, CDEV_MP_CACHE_SZ, 0,
socket_id);
ctx->session_pool = sess_mp;
@@ -2197,7 +2198,8 @@ session_priv_pool_init(struct socket_ctx *ctx, int32_t socket_id,
snprintf(mp_name, RTE_MEMPOOL_NAMESIZE,
"sess_mp_priv_%u", socket_id);
sess_mp = rte_mempool_create(mp_name,
- CDEV_MP_NB_OBJS,
+ get_nb_crypto_sessions() +
+ CDEV_MP_CACHE_SZ * rte_lcore_count(),
sess_sz,
CDEV_MP_CACHE_SZ,
0, NULL, NULL, NULL,
diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h
index 4f2fd61..a5c4923 100644
--- a/examples/ipsec-secgw/ipsec.h
+++ b/examples/ipsec-secgw/ipsec.h
@@ -384,4 +384,7 @@ int
create_inline_session(struct socket_ctx *skt_ctx, struct ipsec_sa *sa,
struct rte_ipsec_session *ips);
+uint32_t
+get_nb_crypto_sessions(void);
+
#endif /* __IPSEC_H__ */
diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 4822d6b..5c3c2a8 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -135,6 +135,7 @@ const struct supported_aead_algo aead_algos[] = {
#define SA_INIT_NB 128
+static uint32_t nb_crypto_sessions;
static struct ipsec_sa *sa_out;
static uint32_t sa_out_sz;
static uint32_t nb_sa_out;
@@ -678,6 +679,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
}
rule->fallback_sessions = 1;
+ nb_crypto_sessions++;
fallback_p = 1;
continue;
}
@@ -722,6 +724,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
rule->portid = -1;
}
+ nb_crypto_sessions++;
*ri = *ri + 1;
}
@@ -1553,3 +1556,9 @@ sa_sort_arr(void)
qsort(sa_in, nb_sa_in, sizeof(struct ipsec_sa), sa_cmp);
qsort(sa_out, nb_sa_out, sizeof(struct ipsec_sa), sa_cmp);
}
+
+uint32_t
+get_nb_crypto_sessions(void)
+{
+ return nb_crypto_sessions;
+}
--
2.7.4