From patchwork Mon Mar 18 11:18:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 138453 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CC8C943CE3; Mon, 18 Mar 2024 12:21:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ECCF840DCB; Mon, 18 Mar 2024 12:21:09 +0100 (CET) Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) by mails.dpdk.org (Postfix) with ESMTP id D957D40A6C for ; Mon, 18 Mar 2024 12:21:00 +0100 (CET) Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4TysmM1vXxz1QBq9; Mon, 18 Mar 2024 19:18:27 +0800 (CST) Received: from dggpeml500024.china.huawei.com (unknown [7.185.36.10]) by mail.maildlp.com (Postfix) with ESMTPS id 49EE51A0172; Mon, 18 Mar 2024 19:20:59 +0800 (CST) Received: from localhost.localdomain (10.50.165.33) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 18 Mar 2024 19:20:59 +0800 From: Chengwen Feng To: , CC: Subject: [PATCH v4 4/6] argparse: fix argument flags operate as uint32 type Date: Mon, 18 Mar 2024 11:18:36 +0000 Message-ID: <20240318111838.16991-5-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240318111838.16991-1-fengchengwen@huawei.com> References: <20240220131502.47510-1-fengchengwen@huawei.com> <20240318111838.16991-1-fengchengwen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.50.165.33] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500024.china.huawei.com (7.185.36.10) X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The struct rte_argparse_arg's flags was 64bit type, uint64_t should be used instead of uint32_t where the operation happened. Also, the flags' bit16 was also unused, so don't test bit16 in testcase test_argparse_invalid_arg_flags. In addition, this commit introduces two bitmask marcros and removes an internal duplicate macro. Fixes: 6c5c6571601c ("argparse: verify argument config") Fixes: 31ed9f9f43bb ("argparse: parse parameters") Signed-off-by: Chengwen Feng --- app/test/test_argparse.c | 18 ++++++++++-------- lib/argparse/rte_argparse.c | 24 ++++++++++++------------ lib/argparse/rte_argparse.h | 5 +++++ 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c index c98bcee56d..1a7211eb01 100644 --- a/app/test/test_argparse.c +++ b/app/test/test_argparse.c @@ -188,7 +188,7 @@ test_argparse_invalid_arg_help(void) static int test_argparse_invalid_has_val(void) { - uint32_t set_mask[] = { 0, + uint64_t set_mask[] = { 0, RTE_ARGPARSE_ARG_NO_VALUE, RTE_ARGPARSE_ARG_OPTIONAL_VALUE }; @@ -197,7 +197,7 @@ test_argparse_invalid_has_val(void) int ret; obj = test_argparse_init_obj(); - obj->args[0].flags &= ~0x3u; + obj->args[0].flags &= ~RTE_ARGPARSE_HAS_VAL_BITMASK; ret = rte_argparse_parse(obj, default_argc, default_argv); TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!"); @@ -205,7 +205,7 @@ test_argparse_invalid_has_val(void) obj = test_argparse_init_obj(); obj->args[0].name_long = "abc"; obj->args[0].name_short = NULL; - obj->args[0].flags &= ~0x3u; + obj->args[0].flags &= ~RTE_ARGPARSE_HAS_VAL_BITMASK; obj->args[0].flags |= set_mask[index]; ret = rte_argparse_parse(obj, default_argc, default_argv); TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!"); @@ -269,7 +269,9 @@ test_argparse_invalid_arg_flags(void) int ret; obj = test_argparse_init_obj(); - obj->args[0].flags |= ~0x107FFu; + obj->args[0].flags |= ~(RTE_ARGPARSE_HAS_VAL_BITMASK | + RTE_ARGPARSE_VAL_TYPE_BITMASK | + RTE_ARGPARSE_ARG_SUPPORT_MULTI); ret = rte_argparse_parse(obj, default_argc, default_argv); TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!"); @@ -337,7 +339,7 @@ test_argparse_invalid_option(void) static int test_argparse_opt_autosave_parse_int_of_no_val(void) { - uint32_t flags = RTE_ARGPARSE_ARG_NO_VALUE | RTE_ARGPARSE_ARG_VALUE_INT; + uint64_t flags = RTE_ARGPARSE_ARG_NO_VALUE | RTE_ARGPARSE_ARG_VALUE_INT; struct rte_argparse *obj; int val_saver = 0; char *argv[2]; @@ -369,7 +371,7 @@ test_argparse_opt_autosave_parse_int_of_no_val(void) static int test_argparse_opt_autosave_parse_int_of_required_val(void) { - uint32_t flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT; + uint64_t flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT; struct rte_argparse *obj; int val_saver = 0; char *argv[3]; @@ -410,7 +412,7 @@ test_argparse_opt_autosave_parse_int_of_required_val(void) static int test_argparse_opt_autosave_parse_int_of_optional_val(void) { - uint32_t flags = RTE_ARGPARSE_ARG_OPTIONAL_VALUE | RTE_ARGPARSE_ARG_VALUE_INT; + uint64_t flags = RTE_ARGPARSE_ARG_OPTIONAL_VALUE | RTE_ARGPARSE_ARG_VALUE_INT; struct rte_argparse *obj; int val_saver = 0; char *argv[2]; @@ -645,7 +647,7 @@ test_argparse_opt_callback_parse_int_of_optional_val(void) static int test_argparse_pos_autosave_parse_int(void) { - uint32_t flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT; + uint64_t flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT; struct rte_argparse *obj; int val_saver = 0; char *argv[3]; diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c index 6e890cdc0d..e7007afc6a 100644 --- a/lib/argparse/rte_argparse.c +++ b/lib/argparse/rte_argparse.c @@ -15,9 +15,6 @@ RTE_LOG_REGISTER_DEFAULT(rte_argparse_logtype, INFO); #define ARGPARSE_LOG(level, ...) \ RTE_LOG_LINE(level, ARGPARSE, "" __VA_ARGS__) -#define ARG_ATTR_HAS_VAL_MASK RTE_GENMASK64(1, 0) -#define ARG_ATTR_VAL_TYPE_MASK RTE_GENMASK64(9, 2) -#define ARG_ATTR_SUPPORT_MULTI_MASK RTE_BIT64(10) #define ARG_ATTR_FLAG_PARSED_MASK RTE_BIT64(63) static inline bool @@ -35,26 +32,27 @@ is_arg_positional(const struct rte_argparse_arg *arg) static inline uint32_t arg_attr_has_val(const struct rte_argparse_arg *arg) { - return RTE_FIELD_GET64(ARG_ATTR_HAS_VAL_MASK, arg->flags); + return RTE_FIELD_GET64(RTE_ARGPARSE_HAS_VAL_BITMASK, arg->flags); } static inline uint32_t arg_attr_val_type(const struct rte_argparse_arg *arg) { - return RTE_FIELD_GET64(ARG_ATTR_VAL_TYPE_MASK, arg->flags); + return RTE_FIELD_GET64(RTE_ARGPARSE_VAL_TYPE_BITMASK, arg->flags); } static inline bool arg_attr_flag_multi(const struct rte_argparse_arg *arg) { - return RTE_FIELD_GET64(ARG_ATTR_SUPPORT_MULTI_MASK, arg->flags); + return RTE_FIELD_GET64(RTE_ARGPARSE_ARG_SUPPORT_MULTI, arg->flags); } -static inline uint32_t +static inline uint64_t arg_attr_unused_bits(const struct rte_argparse_arg *arg) { -#define USED_BIT_MASK (ARG_ATTR_HAS_VAL_MASK | ARG_ATTR_VAL_TYPE_MASK | \ - ARG_ATTR_SUPPORT_MULTI_MASK) +#define USED_BIT_MASK (RTE_ARGPARSE_HAS_VAL_BITMASK | \ + RTE_ARGPARSE_VAL_TYPE_BITMASK | \ + RTE_ARGPARSE_ARG_SUPPORT_MULTI) return arg->flags & ~USED_BIT_MASK; } @@ -133,7 +131,8 @@ verify_arg_has_val(const struct rte_argparse_arg *arg) static int verify_arg_saver(const struct rte_argparse *obj, uint32_t index) { - uint32_t cmp_max = RTE_FIELD_GET64(ARG_ATTR_VAL_TYPE_MASK, RTE_ARGPARSE_ARG_VALUE_MAX); + uint32_t cmp_max = RTE_FIELD_GET64(RTE_ARGPARSE_VAL_TYPE_BITMASK, + RTE_ARGPARSE_ARG_VALUE_MAX); const struct rte_argparse_arg *arg = &obj->args[index]; uint32_t val_type = arg_attr_val_type(arg); uint32_t has_val = arg_attr_has_val(arg); @@ -172,7 +171,7 @@ static int verify_arg_flags(const struct rte_argparse *obj, uint32_t index) { const struct rte_argparse_arg *arg = &obj->args[index]; - uint32_t unused_bits = arg_attr_unused_bits(arg); + uint64_t unused_bits = arg_attr_unused_bits(arg); if (unused_bits != 0) { ARGPARSE_LOG(ERR, "argument %s flags unused bits should not be set!", @@ -768,7 +767,8 @@ rte_argparse_parse(struct rte_argparse *obj, int argc, char **argv) int rte_argparse_parse_type(const char *str, uint64_t val_type, void *val) { - uint32_t cmp_max = RTE_FIELD_GET64(ARG_ATTR_VAL_TYPE_MASK, RTE_ARGPARSE_ARG_VALUE_MAX); + uint32_t cmp_max = RTE_FIELD_GET64(RTE_ARGPARSE_VAL_TYPE_BITMASK, + RTE_ARGPARSE_ARG_VALUE_MAX); struct rte_argparse_arg arg = { .name_long = str, .name_short = NULL, diff --git a/lib/argparse/rte_argparse.h b/lib/argparse/rte_argparse.h index a6a7790cb4..98ad9971ea 100644 --- a/lib/argparse/rte_argparse.h +++ b/lib/argparse/rte_argparse.h @@ -72,6 +72,11 @@ extern "C" { #define RTE_ARGPARSE_ARG_RESERVED_FIELD RTE_GENMASK64(63, 48) /**@}*/ +/** Bitmask used to get the argument whether has value. */ +#define RTE_ARGPARSE_HAS_VAL_BITMASK RTE_GENMASK64(1, 0) +/** Bitmask used to get the argument's value type. */ +#define RTE_ARGPARSE_VAL_TYPE_BITMASK RTE_GENMASK64(9, 2) + /** * A structure used to hold argument's configuration. */