Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/138453/?format=api
{ "id": 138453, "url": "http://patches.dpdk.org/api/patches/138453/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240318111838.16991-5-fengchengwen@huawei.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20240318111838.16991-5-fengchengwen@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240318111838.16991-5-fengchengwen@huawei.com", "date": "2024-03-18T11:18:36", "name": "[v4,4/6] argparse: fix argument flags operate as uint32 type", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "f2725436ff5337ed2b20a3ffa3cb937742265848", "submitter": { "id": 2146, "url": "http://patches.dpdk.org/api/people/2146/?format=api", "name": "fengchengwen", "email": "fengchengwen@huawei.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20240318111838.16991-5-fengchengwen@huawei.com/mbox/", "series": [ { "id": 31544, "url": "http://patches.dpdk.org/api/series/31544/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31544", "date": "2024-03-18T11:18:32", "name": "refine argparse library", "version": 4, "mbox": "http://patches.dpdk.org/series/31544/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/138453/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/138453/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id CC8C943CE3;\n\tMon, 18 Mar 2024 12:21:34 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id ECCF840DCB;\n\tMon, 18 Mar 2024 12:21:09 +0100 (CET)", "from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35])\n by mails.dpdk.org (Postfix) with ESMTP id D957D40A6C\n for <dev@dpdk.org>; Mon, 18 Mar 2024 12:21:00 +0100 (CET)", "from mail.maildlp.com (unknown [172.19.163.17])\n by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4TysmM1vXxz1QBq9;\n Mon, 18 Mar 2024 19:18:27 +0800 (CST)", "from dggpeml500024.china.huawei.com (unknown [7.185.36.10])\n by mail.maildlp.com (Postfix) with ESMTPS id 49EE51A0172;\n Mon, 18 Mar 2024 19:20:59 +0800 (CST)", "from localhost.localdomain (10.50.165.33) by\n dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.1.2507.35; Mon, 18 Mar 2024 19:20:59 +0800" ], "From": "Chengwen Feng <fengchengwen@huawei.com>", "To": "<thomas@monjalon.net>, <david.marchand@redhat.com>", "CC": "<dev@dpdk.org>", "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>\n <20240318111838.16991-1-fengchengwen@huawei.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.50.165.33]", "X-ClientProxiedBy": "dggems704-chm.china.huawei.com (10.3.19.181) To\n 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 <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "The struct rte_argparse_arg's flags was 64bit type, uint64_t should be\nused instead of uint32_t where the operation happened.\n\nAlso, the flags' bit16 was also unused, so don't test bit16 in testcase\ntest_argparse_invalid_arg_flags.\n\nIn addition, this commit introduces two bitmask marcros and removes an\ninternal duplicate macro.\n\nFixes: 6c5c6571601c (\"argparse: verify argument config\")\nFixes: 31ed9f9f43bb (\"argparse: parse parameters\")\n\nSigned-off-by: Chengwen Feng <fengchengwen@huawei.com>\n---\n app/test/test_argparse.c | 18 ++++++++++--------\n lib/argparse/rte_argparse.c | 24 ++++++++++++------------\n lib/argparse/rte_argparse.h | 5 +++++\n 3 files changed, 27 insertions(+), 20 deletions(-)", "diff": "diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c\nindex c98bcee56d..1a7211eb01 100644\n--- a/app/test/test_argparse.c\n+++ b/app/test/test_argparse.c\n@@ -188,7 +188,7 @@ test_argparse_invalid_arg_help(void)\n static int\n test_argparse_invalid_has_val(void)\n {\n-\tuint32_t set_mask[] = { 0,\n+\tuint64_t set_mask[] = { 0,\n \t\t\t\tRTE_ARGPARSE_ARG_NO_VALUE,\n \t\t\t\tRTE_ARGPARSE_ARG_OPTIONAL_VALUE\n \t\t\t };\n@@ -197,7 +197,7 @@ test_argparse_invalid_has_val(void)\n \tint ret;\n \n \tobj = test_argparse_init_obj();\n-\tobj->args[0].flags &= ~0x3u;\n+\tobj->args[0].flags &= ~RTE_ARGPARSE_HAS_VAL_BITMASK;\n \tret = rte_argparse_parse(obj, default_argc, default_argv);\n \tTEST_ASSERT(ret == -EINVAL, \"Argparse parse expect failed!\");\n \n@@ -205,7 +205,7 @@ test_argparse_invalid_has_val(void)\n \t\tobj = test_argparse_init_obj();\n \t\tobj->args[0].name_long = \"abc\";\n \t\tobj->args[0].name_short = NULL;\n-\t\tobj->args[0].flags &= ~0x3u;\n+\t\tobj->args[0].flags &= ~RTE_ARGPARSE_HAS_VAL_BITMASK;\n \t\tobj->args[0].flags |= set_mask[index];\n \t\tret = rte_argparse_parse(obj, default_argc, default_argv);\n \t\tTEST_ASSERT(ret == -EINVAL, \"Argparse parse expect failed!\");\n@@ -269,7 +269,9 @@ test_argparse_invalid_arg_flags(void)\n \tint ret;\n \n \tobj = test_argparse_init_obj();\n-\tobj->args[0].flags |= ~0x107FFu;\n+\tobj->args[0].flags |= ~(RTE_ARGPARSE_HAS_VAL_BITMASK |\n+\t\t\t\tRTE_ARGPARSE_VAL_TYPE_BITMASK |\n+\t\t\t\tRTE_ARGPARSE_ARG_SUPPORT_MULTI);\n \tret = rte_argparse_parse(obj, default_argc, default_argv);\n \tTEST_ASSERT(ret == -EINVAL, \"Argparse parse expect failed!\");\n \n@@ -337,7 +339,7 @@ test_argparse_invalid_option(void)\n static int\n test_argparse_opt_autosave_parse_int_of_no_val(void)\n {\n-\tuint32_t flags = RTE_ARGPARSE_ARG_NO_VALUE | RTE_ARGPARSE_ARG_VALUE_INT;\n+\tuint64_t flags = RTE_ARGPARSE_ARG_NO_VALUE | RTE_ARGPARSE_ARG_VALUE_INT;\n \tstruct rte_argparse *obj;\n \tint val_saver = 0;\n \tchar *argv[2];\n@@ -369,7 +371,7 @@ test_argparse_opt_autosave_parse_int_of_no_val(void)\n static int\n test_argparse_opt_autosave_parse_int_of_required_val(void)\n {\n-\tuint32_t flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT;\n+\tuint64_t flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT;\n \tstruct rte_argparse *obj;\n \tint val_saver = 0;\n \tchar *argv[3];\n@@ -410,7 +412,7 @@ test_argparse_opt_autosave_parse_int_of_required_val(void)\n static int\n test_argparse_opt_autosave_parse_int_of_optional_val(void)\n {\n-\tuint32_t flags = RTE_ARGPARSE_ARG_OPTIONAL_VALUE | RTE_ARGPARSE_ARG_VALUE_INT;\n+\tuint64_t flags = RTE_ARGPARSE_ARG_OPTIONAL_VALUE | RTE_ARGPARSE_ARG_VALUE_INT;\n \tstruct rte_argparse *obj;\n \tint val_saver = 0;\n \tchar *argv[2];\n@@ -645,7 +647,7 @@ test_argparse_opt_callback_parse_int_of_optional_val(void)\n static int\n test_argparse_pos_autosave_parse_int(void)\n {\n-\tuint32_t flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT;\n+\tuint64_t flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT;\n \tstruct rte_argparse *obj;\n \tint val_saver = 0;\n \tchar *argv[3];\ndiff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c\nindex 6e890cdc0d..e7007afc6a 100644\n--- a/lib/argparse/rte_argparse.c\n+++ b/lib/argparse/rte_argparse.c\n@@ -15,9 +15,6 @@ RTE_LOG_REGISTER_DEFAULT(rte_argparse_logtype, INFO);\n #define ARGPARSE_LOG(level, ...) \\\n \tRTE_LOG_LINE(level, ARGPARSE, \"\" __VA_ARGS__)\n \n-#define ARG_ATTR_HAS_VAL_MASK\t\tRTE_GENMASK64(1, 0)\n-#define ARG_ATTR_VAL_TYPE_MASK\t\tRTE_GENMASK64(9, 2)\n-#define ARG_ATTR_SUPPORT_MULTI_MASK\tRTE_BIT64(10)\n #define ARG_ATTR_FLAG_PARSED_MASK\tRTE_BIT64(63)\n \n static inline bool\n@@ -35,26 +32,27 @@ is_arg_positional(const struct rte_argparse_arg *arg)\n static inline uint32_t\n arg_attr_has_val(const struct rte_argparse_arg *arg)\n {\n-\treturn RTE_FIELD_GET64(ARG_ATTR_HAS_VAL_MASK, arg->flags);\n+\treturn RTE_FIELD_GET64(RTE_ARGPARSE_HAS_VAL_BITMASK, arg->flags);\n }\n \n static inline uint32_t\n arg_attr_val_type(const struct rte_argparse_arg *arg)\n {\n-\treturn RTE_FIELD_GET64(ARG_ATTR_VAL_TYPE_MASK, arg->flags);\n+\treturn RTE_FIELD_GET64(RTE_ARGPARSE_VAL_TYPE_BITMASK, arg->flags);\n }\n \n static inline bool\n arg_attr_flag_multi(const struct rte_argparse_arg *arg)\n {\n-\treturn RTE_FIELD_GET64(ARG_ATTR_SUPPORT_MULTI_MASK, arg->flags);\n+\treturn RTE_FIELD_GET64(RTE_ARGPARSE_ARG_SUPPORT_MULTI, arg->flags);\n }\n \n-static inline uint32_t\n+static inline uint64_t\n arg_attr_unused_bits(const struct rte_argparse_arg *arg)\n {\n-#define USED_BIT_MASK\t(ARG_ATTR_HAS_VAL_MASK | ARG_ATTR_VAL_TYPE_MASK | \\\n-\t\t\t ARG_ATTR_SUPPORT_MULTI_MASK)\n+#define USED_BIT_MASK\t(RTE_ARGPARSE_HAS_VAL_BITMASK | \\\n+\t\t\t RTE_ARGPARSE_VAL_TYPE_BITMASK | \\\n+\t\t\t RTE_ARGPARSE_ARG_SUPPORT_MULTI)\n \treturn arg->flags & ~USED_BIT_MASK;\n }\n \n@@ -133,7 +131,8 @@ verify_arg_has_val(const struct rte_argparse_arg *arg)\n static int\n verify_arg_saver(const struct rte_argparse *obj, uint32_t index)\n {\n-\tuint32_t cmp_max = RTE_FIELD_GET64(ARG_ATTR_VAL_TYPE_MASK, RTE_ARGPARSE_ARG_VALUE_MAX);\n+\tuint32_t cmp_max = RTE_FIELD_GET64(RTE_ARGPARSE_VAL_TYPE_BITMASK,\n+\t\t\t\t\t RTE_ARGPARSE_ARG_VALUE_MAX);\n \tconst struct rte_argparse_arg *arg = &obj->args[index];\n \tuint32_t val_type = arg_attr_val_type(arg);\n \tuint32_t has_val = arg_attr_has_val(arg);\n@@ -172,7 +171,7 @@ static int\n verify_arg_flags(const struct rte_argparse *obj, uint32_t index)\n {\n \tconst struct rte_argparse_arg *arg = &obj->args[index];\n-\tuint32_t unused_bits = arg_attr_unused_bits(arg);\n+\tuint64_t unused_bits = arg_attr_unused_bits(arg);\n \n \tif (unused_bits != 0) {\n \t\tARGPARSE_LOG(ERR, \"argument %s flags unused bits should not be set!\",\n@@ -768,7 +767,8 @@ rte_argparse_parse(struct rte_argparse *obj, int argc, char **argv)\n int\n rte_argparse_parse_type(const char *str, uint64_t val_type, void *val)\n {\n-\tuint32_t cmp_max = RTE_FIELD_GET64(ARG_ATTR_VAL_TYPE_MASK, RTE_ARGPARSE_ARG_VALUE_MAX);\n+\tuint32_t cmp_max = RTE_FIELD_GET64(RTE_ARGPARSE_VAL_TYPE_BITMASK,\n+\t\t\t\t\t RTE_ARGPARSE_ARG_VALUE_MAX);\n \tstruct rte_argparse_arg arg = {\n \t\t.name_long = str,\n \t\t.name_short = NULL,\ndiff --git a/lib/argparse/rte_argparse.h b/lib/argparse/rte_argparse.h\nindex a6a7790cb4..98ad9971ea 100644\n--- a/lib/argparse/rte_argparse.h\n+++ b/lib/argparse/rte_argparse.h\n@@ -72,6 +72,11 @@ extern \"C\" {\n #define RTE_ARGPARSE_ARG_RESERVED_FIELD RTE_GENMASK64(63, 48)\n /**@}*/\n \n+/** Bitmask used to get the argument whether has value. */\n+#define RTE_ARGPARSE_HAS_VAL_BITMASK\tRTE_GENMASK64(1, 0)\n+/** Bitmask used to get the argument's value type. */\n+#define RTE_ARGPARSE_VAL_TYPE_BITMASK\tRTE_GENMASK64(9, 2)\n+\n /**\n * A structure used to hold argument's configuration.\n */\n", "prefixes": [ "v4", "4/6" ] }