X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-crypto-perf%2Fcperf_options.h;h=031b238b20fdf26d01c09770083a8798f52cefb0;hb=39ddd5d1895e72ba2bc974eddbc12a3135639ed1;hp=2f42cb61bd9d880642b8467262643d5ad1785f99;hpb=96dfeb609be100d74cdbf7fb2cc3c30b85879163;p=dpdk.git

diff --git a/app/test-crypto-perf/cperf_options.h b/app/test-crypto-perf/cperf_options.h
index 2f42cb61bd..031b238b20 100644
--- a/app/test-crypto-perf/cperf_options.h
+++ b/app/test-crypto-perf/cperf_options.h
@@ -1,8 +1,15 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
 
 #ifndef _CPERF_OPTIONS_
 #define _CPERF_OPTIONS_
 
 #include <rte_crypto.h>
+#include <rte_cryptodev.h>
+#ifdef RTE_LIB_SECURITY
+#include <rte_security.h>
+#endif
 
 #define CPERF_PTEST_TYPE	("ptest")
 #define CPERF_SILENT		("silent")
@@ -11,8 +18,9 @@
 #define CPERF_TOTAL_OPS		("total-ops")
 #define CPERF_BURST_SIZE	("burst-sz")
 #define CPERF_BUFFER_SIZE	("buffer-sz")
-#define CPERF_SEGMENTS_NB	("segments-nb")
+#define CPERF_SEGMENT_SIZE	("segment-sz")
 #define CPERF_DESC_NB		("desc-nb")
+#define CPERF_IMIX		("imix")
 
 #define CPERF_DEVTYPE		("devtype")
 #define CPERF_OPTYPE		("optype")
@@ -39,6 +47,14 @@
 
 #define CPERF_DIGEST_SZ		("digest-sz")
 
+#ifdef RTE_LIB_SECURITY
+#define CPERF_PDCP_SN_SZ	("pdcp-sn-sz")
+#define CPERF_PDCP_DOMAIN	("pdcp-domain")
+#define CPERF_PDCP_SES_HFN_EN	("pdcp-ses-hfn-en")
+#define PDCP_DEFAULT_HFN	0x1
+#define CPERF_DOCSIS_HDR_SZ	("docsis-hdr-sz")
+#endif
+
 #define CPERF_CSV		("csv-friendly")
 
 /* benchmark-specific options */
@@ -61,7 +77,11 @@ enum cperf_op_type {
 	CPERF_AUTH_ONLY,
 	CPERF_CIPHER_THEN_AUTH,
 	CPERF_AUTH_THEN_CIPHER,
-	CPERF_AEAD
+	CPERF_AEAD,
+	CPERF_PDCP,
+	CPERF_DOCSIS,
+	CPERF_IPSEC,
+	CPERF_ASYM_MODEX
 };
 
 extern const char *cperf_op_type_strs[];
@@ -71,9 +91,13 @@ struct cperf_options {
 
 	uint32_t pool_sz;
 	uint32_t total_ops;
-	uint32_t segments_nb;
+	uint32_t headroom_sz;
+	uint32_t tailroom_sz;
+	uint32_t segment_sz;
 	uint32_t test_buffer_size;
+	uint32_t *imix_buffer_sizes;
 	uint32_t nb_descriptors;
+	uint16_t nb_qps;
 
 	uint32_t sessionless:1;
 	uint32_t out_of_place:1;
@@ -101,7 +125,13 @@ struct cperf_options {
 
 	uint16_t digest_sz;
 
-	char device_type[RTE_CRYPTODEV_NAME_LEN];
+#ifdef RTE_LIB_SECURITY
+	uint16_t pdcp_sn_sz;
+	uint16_t pdcp_ses_hfn_en;
+	enum rte_security_pdcp_domain pdcp_domain;
+	uint16_t docsis_hdr_sz;
+#endif
+	char device_type[RTE_CRYPTODEV_NAME_MAX_LEN];
 	enum cperf_op_type op_type;
 
 	char *test_file;
@@ -121,6 +151,8 @@ struct cperf_options {
 
 	/* pmd-cyclecount specific options */
 	uint32_t pmdcc_delay;
+	uint32_t imix_distribution_list[MAX_LIST];
+	uint8_t imix_distribution_count;
 };
 
 void