From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 33870A04B5; Thu, 29 Oct 2020 23:07:54 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CED7DCAD0; Thu, 29 Oct 2020 23:07:52 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 156A7CAAA for ; Thu, 29 Oct 2020 23:07:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604009268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1F/bCB8Oqj4gR2etYvF2GhCIClnFzRPuJue7HNnsQFI=; b=G3zTzuMY34bW0Z/eN8VdqMynBSKDvRRMKUT9jifhsPgtw3nDicOINwBQHMhwPeNxuFiQNl Ey/edp8IkPsmqEaZHRlocbwYzt/b+xnV3gyyEio4FnJzDQWkx9z8LL5Ow/QmqdB7Eone3Y NnE5DFIDjjm/TKerMiNe8LZgLFUapqQ= Received: from mail-vk1-f199.google.com (mail-vk1-f199.google.com [209.85.221.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-321-49qIYoV9MRatcGWLkKk62w-1; Thu, 29 Oct 2020 18:07:46 -0400 X-MC-Unique: 49qIYoV9MRatcGWLkKk62w-1 Received: by mail-vk1-f199.google.com with SMTP id j129so1204183vkb.15 for ; Thu, 29 Oct 2020 15:07:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=1F/bCB8Oqj4gR2etYvF2GhCIClnFzRPuJue7HNnsQFI=; b=cUHrhSxmRiYNBf83CT3O6iSLzdjSyUJKFCydcQLxFPTJZZFf5uJ1akUdJPYdhnkPXc MgJNxIIPxpotV/27BoMbeyvpKy3uqLByTzc2nmWDwywx20e1e4VIbRO9K8+IAYgPpsvl q3mG7OXFCkQE4g+4x8sviDJIGW95USfr14w3I/9oNyz7drjdmz4NkiEphpKw2bbQdQqD YhPlji9wjHhVlBN9xNIdbCr8cE44w/Vj4ThwAaMm3+hPMPwAy752wUXlOGPMMferkA7a 73gSaMNGc3qn8j7waqFTFeX4yHhc2eESCspWo3im6C/lvbYzMs8YWxiY8A50vwPCZRST Z4ZA== X-Gm-Message-State: AOAM533kkP8T4ERexwM9cjf4ldiqK+AZqAK6ddfkj9ms5JaefDocz6c0 qv1/pvA1LqRfr9DROmGdAXwyzcPipv5npOqN9BpkaVcKSzRfm4hr3HjuYKdFbgOmtIQyPXjH4Hy dI3lHmN6PB6wkr5R//eo= X-Received: by 2002:a67:fb50:: with SMTP id e16mr5554059vsr.10.1604009266160; Thu, 29 Oct 2020 15:07:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwi9g/kiVbTtq1WuiNrlhSOhqcflLPe2FgdT840SlrM1mbN1E5Nk7XzePyrOW1DBbJVuA2kDuGcUcOTMQodfi4= X-Received: by 2002:a67:fb50:: with SMTP id e16mr5554027vsr.10.1604009265887; Thu, 29 Oct 2020 15:07:45 -0700 (PDT) MIME-Version: 1.0 References: <20201029125339.30916-1-ibtisam.tariq@emumba.com> In-Reply-To: <20201029125339.30916-1-ibtisam.tariq@emumba.com> From: David Marchand Date: Thu, 29 Oct 2020 23:07:34 +0100 Message-ID: To: Ibtisam Tariq Cc: "Kovacevic, Marko" , "Ananyev, Konstantin" , "Pattan, Reshma" , "Mcnamara, John" , Cristian Dumitrescu , "Singh, Jasvinder" , "Xia, Chenbo" , Maxime Coquelin , Xiaoyun Li , dev Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dmarchan@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH 1/8] examples/fips_validation: enhance getopt_long usage X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hello Ibtisam, On Thu, Oct 29, 2020 at 1:55 PM Ibtisam Tariq wrote: > > Instead of using getopt_long return value, strcmp was used to > compare the input parameters with the struct option array. This > patch get rid of all those strcmp by directly binding each longopt > with an int enum. > > Bugzilla ID: 238 > Fixes: 3d0fad56b74 ("examples/fips_validation: add crypto FIPS application"} I consider this bz as an enhancement, for better readability / consistency in the project code. This is not a bugfix, and I would not flag the patches with a Fixes: tag. > Cc: marko.kovacevic@intel.com > > Reported-by: David Marchand > Signed-off-by: Ibtisam Tariq > --- > examples/fips_validation/main.c | 241 +++++++++++++++++++------------- > 1 file changed, 143 insertions(+), 98 deletions(-) > > diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c > index 07532c956..5fb76b421 100644 > --- a/examples/fips_validation/main.c > +++ b/examples/fips_validation/main.c > @@ -15,17 +15,31 @@ > #include "fips_validation.h" > #include "fips_dev_self_test.h" > > +enum{ Missing space. The _KEYWORD suffix gives no info and can be dropped in all those defines / enums. > #define REQ_FILE_PATH_KEYWORD "req-file" > + /* first long only option value must be >= 256, so that we won't > + * conflict with short options > + */ This comment is copied from the EAL header, but there is no mapping to a short option in this example. You can drop it. > + REQ_FILE_PATH_KEYWORD_NUM = 256, > #define RSP_FILE_PATH_KEYWORD "rsp-file" > + RSP_FILE_PATH_KEYWORD_NUM, > #define MBUF_DATAROOM_KEYWORD "mbuf-dataroom" > + MBUF_DATAROOM_KEYWORD_NUM, > #define FOLDER_KEYWORD "path-is-folder" > + FOLDER_KEYWORD_NUM, > #define CRYPTODEV_KEYWORD "cryptodev" > + CRYPTODEV_KEYWORD_NUM, > #define CRYPTODEV_ID_KEYWORD "cryptodev-id" > + CRYPTODEV_ID_KEYWORD_NUM, > #define CRYPTODEV_ST_KEYWORD "self-test" > + CRYPTODEV_ST_KEYWORD_NUM, > #define CRYPTODEV_BK_ID_KEYWORD "broken-test-id" > + CRYPTODEV_BK_ID_KEYWORD_NUM, > #define CRYPTODEV_BK_DIR_KEY "broken-test-dir" > + CRYPTODEV_BK_DIR_KEY_NUM, Those next two defines have nothing to do with getopt options and they are only used once. You can directly replace them as their fixed string later in the parsing code, and drop the defines. > #define CRYPTODEV_ENC_KEYWORD "enc" > #define CRYPTODEV_DEC_KEYWORD "dec" > +}; > > struct fips_test_vector vec; > struct fips_test_interim_info info; > @@ -226,15 +240,24 @@ cryptodev_fips_validate_parse_args(int argc, char **argv) > char **argvopt; > int option_index; > struct option lgopts[] = { > - {REQ_FILE_PATH_KEYWORD, required_argument, 0, 0}, > - {RSP_FILE_PATH_KEYWORD, required_argument, 0, 0}, > - {FOLDER_KEYWORD, no_argument, 0, 0}, > - {MBUF_DATAROOM_KEYWORD, required_argument, 0, 0}, > - {CRYPTODEV_KEYWORD, required_argument, 0, 0}, > - {CRYPTODEV_ID_KEYWORD, required_argument, 0, 0}, > - {CRYPTODEV_ST_KEYWORD, no_argument, 0, 0}, > - {CRYPTODEV_BK_ID_KEYWORD, required_argument, 0, 0}, > - {CRYPTODEV_BK_DIR_KEY, required_argument, 0, 0}, Single indent is enough. > + {REQ_FILE_PATH_KEYWORD, required_argument, > + NULL, REQ_FILE_PATH_KEYWORD_NUM}, > + {RSP_FILE_PATH_KEYWORD, required_argument, > + NULL, RSP_FILE_PATH_KEYWORD_NUM}, > + {FOLDER_KEYWORD, no_argument, > + NULL, FOLDER_KEYWORD_NUM}, > + {MBUF_DATAROOM_KEYWORD, required_argument, > + NULL, MBUF_DATAROOM_KEYWORD_NUM}, > + {CRYPTODEV_KEYWORD, required_argument, > + NULL, CRYPTODEV_KEYWORD_NUM}, > + {CRYPTODEV_ID_KEYWORD, required_argument, > + NULL, CRYPTODEV_ID_KEYWORD_NUM}, > + {CRYPTODEV_ST_KEYWORD, no_argument, > + NULL, CRYPTODEV_ST_KEYWORD_NUM}, > + {CRYPTODEV_BK_ID_KEYWORD, required_argument, > + NULL, CRYPTODEV_BK_ID_KEYWORD_NUM}, > + {CRYPTODEV_BK_DIR_KEY, required_argument, > + NULL, CRYPTODEV_BK_DIR_KEY_NUM}, > {NULL, 0, 0, 0} > }; > > @@ -251,105 +274,127 @@ cryptodev_fips_validate_parse_args(int argc, char **argv) > while ((opt = getopt_long(argc, argvopt, "s:", > lgopts, &option_index)) != EOF) { > > + if (opt == '?') { > + cryptodev_fips_validate_usage(prgname); > + return -1; > + } > + > switch (opt) { > - case 0: > - if (strcmp(lgopts[option_index].name, > - REQ_FILE_PATH_KEYWORD) == 0) > - env.req_path = optarg; > - else if (strcmp(lgopts[option_index].name, > - RSP_FILE_PATH_KEYWORD) == 0) > - env.rsp_path = optarg; > - else if (strcmp(lgopts[option_index].name, > - FOLDER_KEYWORD) == 0) > - env.is_path_folder = 1; > - else if (strcmp(lgopts[option_index].name, > - CRYPTODEV_KEYWORD) == 0) { > - ret = parse_cryptodev_arg(optarg); > - if (ret < 0) { > - cryptodev_fips_validate_usage(prgname); > - return -EINVAL; > - } > - } else if (strcmp(lgopts[option_index].name, > - CRYPTODEV_ID_KEYWORD) == 0) { > - ret = parse_cryptodev_id_arg(optarg); > - if (ret < 0) { > - cryptodev_fips_validate_usage(prgname); > - return -EINVAL; > - } > - } else if (strcmp(lgopts[option_index].name, > - CRYPTODEV_ST_KEYWORD) == 0) { > - env.self_test = 1; > - } else if (strcmp(lgopts[option_index].name, > - CRYPTODEV_BK_ID_KEYWORD) == 0) { > - if (!env.broken_test_config) { > - env.broken_test_config = rte_malloc( > - NULL, > - sizeof(*env.broken_test_config), > - 0); > - if (!env.broken_test_config) > - return -ENOMEM; > - > - env.broken_test_config->expect_fail_dir = > - self_test_dir_enc_auth_gen; > - } > + case REQ_FILE_PATH_KEYWORD_NUM: > + { Unless you need a temp variable, there is no need for a block for each case: statement. Simply: case REQ_FILE_PATH_NUM: env.req_path = optarg; break; > + env.req_path = optarg; > + break; > + } > + case RSP_FILE_PATH_KEYWORD_NUM: > + { > + env.rsp_path = optarg; > + break; > + } > + case FOLDER_KEYWORD_NUM: > + { > + env.is_path_folder = 1; > + break; > + } > + case CRYPTODEV_KEYWORD_NUM: > + { > + ret = parse_cryptodev_arg(optarg); > + if (ret < 0) { > + cryptodev_fips_validate_usage(prgname); > + return -EINVAL; > + } > > - if (parser_read_uint32( > - &env.broken_test_config->expect_fail_test_idx, > - optarg) < 0) { > - rte_free(env.broken_test_config); > - cryptodev_fips_validate_usage(prgname); > - return -EINVAL; > - } > - } else if (strcmp(lgopts[option_index].name, > - CRYPTODEV_BK_DIR_KEY) == 0) { > - if (!env.broken_test_config) { > - env.broken_test_config = rte_malloc( > - NULL, > - sizeof(*env.broken_test_config), > - 0); > - if (!env.broken_test_config) > - return -ENOMEM; > - > - env.broken_test_config-> > - expect_fail_test_idx = 0; > - } > + break; > + } > + case CRYPTODEV_ID_KEYWORD_NUM: > + { > + ret = parse_cryptodev_id_arg(optarg); > + if (ret < 0) { > + cryptodev_fips_validate_usage(prgname); > + return -EINVAL; > + } > + break; > + } > + case CRYPTODEV_ST_KEYWORD_NUM: > + { > + env.self_test = 1; > + break; > + } > + case CRYPTODEV_BK_ID_KEYWORD_NUM: > + { > + if (!env.broken_test_config) { > + env.broken_test_config = rte_malloc( > + NULL, > + sizeof(*env.broken_test_config), > + 0); > + if (!env.broken_test_config) > + return -ENOMEM; > + > + env.broken_test_config->expect_fail_dir = > + self_test_dir_enc_auth_gen; > + } > > - if (strcmp(optarg, CRYPTODEV_ENC_KEYWORD) == 0) > - env.broken_test_config->expect_fail_dir = > - self_test_dir_enc_auth_gen; > - else if (strcmp(optarg, CRYPTODEV_DEC_KEYWORD) > - == 0) > - env.broken_test_config->expect_fail_dir = > - self_test_dir_dec_auth_verify; > - else { > - rte_free(env.broken_test_config); > - cryptodev_fips_validate_usage(prgname); > - return -EINVAL; > - } > - } else if (strcmp(lgopts[option_index].name, > - MBUF_DATAROOM_KEYWORD) == 0) { > - uint32_t data_room_size; > - > - if (parser_read_uint32(&data_room_size, > - optarg) < 0) { > - cryptodev_fips_validate_usage(prgname); > - return -EINVAL; > - } > + if (parser_read_uint32( > + &env.broken_test_config->expect_fail_test_idx, > + optarg) < 0) { > + rte_free(env.broken_test_config); > + cryptodev_fips_validate_usage(prgname); > + return -EINVAL; > + } > + break; > + } > + case CRYPTODEV_BK_DIR_KEY_NUM: > + { > + if (!env.broken_test_config) { > + env.broken_test_config = rte_malloc( > + NULL, > + sizeof(*env.broken_test_config), > + 0); > + if (!env.broken_test_config) > + return -ENOMEM; > + > + env.broken_test_config-> > + expect_fail_test_idx = 0; > + } > > - if (data_room_size == 0 || > - data_room_size > UINT16_MAX) { > - cryptodev_fips_validate_usage(prgname); > - return -EINVAL; > - } > + if (strcmp(optarg, CRYPTODEV_ENC_KEYWORD) == 0) > + env.broken_test_config->expect_fail_dir = > + self_test_dir_enc_auth_gen; > + else if (strcmp(optarg, CRYPTODEV_DEC_KEYWORD) > + == 0) > + env.broken_test_config->expect_fail_dir = > + self_test_dir_dec_auth_verify; > + else { > + rte_free(env.broken_test_config); > + cryptodev_fips_validate_usage(prgname); > + return -EINVAL; > + } > + break; > + } > + case MBUF_DATAROOM_KEYWORD_NUM: > + { > + uint32_t data_room_size; Here, I don't think we need a temp storage. If the value is invalid, the parsing and then init will fail. You can directly pass &env.mbuf_data_room to parser_read_uint32 and check its value. > > - env.mbuf_data_room = data_room_size; > - } else { > + if (parser_read_uint32(&data_room_size, > + optarg) < 0) { > cryptodev_fips_validate_usage(prgname); > return -EINVAL; > } > + > + if (data_room_size == 0 || > + data_room_size > UINT16_MAX) { > + cryptodev_fips_validate_usage(prgname); > + return -EINVAL; > + } > + > + env.mbuf_data_room = data_room_size; > + > break; > + } > default: > - return -1; > + { > + cryptodev_fips_validate_usage(prgname); > + return -EINVAL; > + } > } > } > > -- > 2.17.1 > I did not look too much at the rest of the series, but I guess most of those comments apply to other patches. -- David Marchand