net/mlx5: optimize header modify action memory

[dpdk.git] / app / test-crypto-perf / cperf_options_parsing.c

diff --git a/app/test-crypto-perf/cperf_options_parsing.c b/app/test-crypto-perf/cperf_options_parsing.c
index 8e086f8..e84f56c 100644 (file)
--- a/app/test-crypto-perf/cperf_options_parsing.c
+++ b/app/test-crypto-perf/cperf_options_parsing.c
@@ -24,7 +24,7 @@ usage(char *progname)
 {
        printf("%s [EAL options] --\n"
                " --silent: disable options dump\n"
-               " --ptest throughput / latency / verify / pmd-cycleount :"
+               " --ptest throughput / latency / verify / pmd-cyclecount :"
                " set test type\n"
                " --pool_sz N: set the number of crypto ops/mbufs allocated\n"
                " --total-ops N: set the number of total operations performed\n"
@@ -57,7 +57,7 @@ usage(char *progname)
                " --pmd-cyclecount-delay-ms N: set delay between enqueue\n"
                "           and dequeue in pmd-cyclecount benchmarking mode\n"
                " --csv-friendly: enable test result output CSV friendly\n"
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
                " --pdcp-sn-sz N: set PDCP SN size N <5/7/12/15/18>\n"
                " --pdcp-domain DOMAIN: set PDCP domain <control/user>\n"
                " --pdcp-ses-hfn-en: enable session based fixed HFN\n"
@@ -506,6 +506,12 @@ parse_test_name(struct cperf_options *opts,
 {
        char *test_name = (char *) rte_zmalloc(NULL,
                sizeof(char) * (strlen(arg) + 3), 0);
+       if (test_name == NULL) {
+               RTE_LOG(ERR, USER1, "Failed to rte zmalloc with size: %zu\n",
+                       strlen(arg) + 3);
+               return -1;
+       }
+
        snprintf(test_name, strlen(arg) + 3, "[%s]", arg);
        opts->test_name = test_name;
 
@@ -631,7 +637,7 @@ parse_digest_sz(struct cperf_options *opts, const char *arg)
        return parse_uint16_t(&opts->digest_sz, arg);
 }
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 static int
 parse_pdcp_sn_sz(struct cperf_options *opts, const char *arg)
 {
@@ -841,7 +847,7 @@ static struct option lgopts[] = {
 
        { CPERF_DIGEST_SZ, required_argument, 0, 0 },
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
        { CPERF_PDCP_SN_SZ, required_argument, 0, 0 },
        { CPERF_PDCP_DOMAIN, required_argument, 0, 0 },
        { CPERF_PDCP_SES_HFN_EN, no_argument, 0, 0 },
@@ -913,7 +919,7 @@ cperf_options_default(struct cperf_options *opts)
        opts->digest_sz = 12;
 
        opts->pmdcc_delay = 0;
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
        opts->pdcp_sn_sz = 12;
        opts->pdcp_domain = RTE_SECURITY_PDCP_MODE_CONTROL;
        opts->pdcp_ses_hfn_en = 0;
@@ -954,7 +960,7 @@ cperf_opts_parse_long(int opt_idx, struct cperf_options *opts)
                { CPERF_AEAD_IV_SZ,     parse_aead_iv_sz },
                { CPERF_AEAD_AAD_SZ,    parse_aead_aad_sz },
                { CPERF_DIGEST_SZ,      parse_digest_sz },
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
                { CPERF_PDCP_SN_SZ,     parse_pdcp_sn_sz },
                { CPERF_PDCP_DOMAIN,    parse_pdcp_domain },
                { CPERF_PDCP_SES_HFN_EN,        parse_pdcp_ses_hfn_en },
@@ -983,7 +989,7 @@ cperf_options_parse(struct cperf_options *options, int argc, char **argv)
                switch (opt) {
                case 'h':
                        usage(argv[0]);
-                       rte_exit(EXIT_SUCCESS, "Displayed help\n");
+                       exit(EXIT_SUCCESS);
                        break;
                /* long options */
                case 0:
@@ -1061,7 +1067,7 @@ check_cipher_buffer_length(struct cperf_options *options)
        return 0;
 }
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 static int
 check_docsis_buffer_length(struct cperf_options *options)
 {
@@ -1215,7 +1221,7 @@ cperf_options_check(struct cperf_options *options)
                        return -EINVAL;
        }
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
        if (options->op_type == CPERF_DOCSIS) {
                if (check_docsis_buffer_length(options) < 0)
                        return -EINVAL;
@@ -1308,7 +1314,7 @@ cperf_options_dump(struct cperf_options *opts)
                printf("#\n");
        }
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
        if (opts->op_type == CPERF_DOCSIS) {
                printf("# docsis header size: %u\n", opts->docsis_hdr_sz);
                printf("#\n");