Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/56249/?format=api
{ "id": 56249, "url": "https://patches.dpdk.org/api/patches/56249/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190708182614.1677-6-stephen@networkplumber.org/", "project": { "id": 1, "url": "https://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": "<20190708182614.1677-6-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20190708182614.1677-6-stephen@networkplumber.org", "date": "2019-07-08T18:26:08", "name": "[v9,05/11] cmdline: use new ethernet address parser", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "fe622c923ee65e1f7bfacfa9c649a3ba9e913342", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190708182614.1677-6-stephen@networkplumber.org/mbox/", "series": [ { "id": 5401, "url": "https://patches.dpdk.org/api/series/5401/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=5401", "date": "2019-07-08T18:26:03", "name": "ether: improvements and optimizations", "version": 9, "mbox": "https://patches.dpdk.org/series/5401/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/56249/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/56249/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 50F321BD66;\n\tMon, 8 Jul 2019 20:26:36 +0200 (CEST)", "from mail-pf1-f195.google.com (mail-pf1-f195.google.com\n\t[209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 962D11B9BD\n\tfor <dev@dpdk.org>; Mon, 8 Jul 2019 20:26:28 +0200 (CEST)", "by mail-pf1-f195.google.com with SMTP id y15so8002138pfn.5\n\tfor <dev@dpdk.org>; Mon, 08 Jul 2019 11:26:28 -0700 (PDT)", "from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n\tby smtp.gmail.com with ESMTPSA id\n\to15sm18769295pgj.18.2019.07.08.11.26.26\n\t(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);\n\tMon, 08 Jul 2019 11:26:26 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=EFUFljh3axlAK6eXAFn522LadK+xf2lpYYPH4K1GNG0=;\n\tb=pr9Pm09mRyeJd3lgSvbr9GPGFzEakZ0Cp1NNtLpMTNIXEv7+m47/UgP1RSXz3NgzUQ\n\t/uDPdaFfs2V28Bq+T6znIRqeyX9jgLjkqDFruufRgt9HiRqVQCbpb0YTff/O5FB/SNo/\n\tGR25+UWqkc1Fq7am8hhFSlckii3wyjkVJNm89VMv/lu1h020S9P6EFJNHMhsPgtMR1jU\n\tOYVVvjVE1gKlah1l6Db1+zGO9Ej+3qu4FbRQCH1ETeWWBw4EYTrv3ZZ69Saui7gWSS8R\n\thvjR/FI3MxSWlflZ9U+/7w/e047nCs+JSfizGHUEmNt8CU34Kmx9SESHkdgAosVg/fzP\n\tfqTQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=EFUFljh3axlAK6eXAFn522LadK+xf2lpYYPH4K1GNG0=;\n\tb=k0yhgT9Vjs6A5+O29TwAgqMjr4VV67LALk6saYq1pfHTrp5rF9aGrGGlknE2B4pgDh\n\tgrbGpyVRXobPyPqt7XIozuKlFObbJsrY5T91JGCS0AwxYP95JVsEiYORYchw0MMxHB06\n\ton5Nr7q0s23Ww2HAhNLnjX7wQ05s7/YTFodVeuGAHDPlCz2m35XKtI0vpKAOLfw8CenS\n\t5fPgdoNWy9YUkGGjuSwB65YzNQkuaKP6SQ7AMKwfZpujN31WrZyW59Eq6lehvH2Cyzea\n\t78bM1iILQTP15VNCyJ8kI3fDoAts7td9WX6GD7sUd/n7L5v+ptYY2iWf7SF66D3dkAJV\n\taipg==", "X-Gm-Message-State": "APjAAAV0A9NfoVbn08izu+JMh26jKUNoVgADcI69XvgaRAPj5ttNKA5v\n\trGhkOQ1Bodru0vmlx5NJzMeAK6yXVP0=", "X-Google-Smtp-Source": "APXvYqxEEfAIdTX0pggfXaQK4W7i9TPvWY+Je18IK1xJ+jaz2npyo0hwWxbW7cN5hlPplNGSDFABmA==", "X-Received": "by 2002:a17:90a:cb18:: with SMTP id\n\tz24mr26797146pjt.108.1562610387493; \n\tMon, 08 Jul 2019 11:26:27 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n\tOlivier Matz <olivier.matz@6wind.com>", "Date": "Mon, 8 Jul 2019 11:26:08 -0700", "Message-Id": "<20190708182614.1677-6-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190708182614.1677-1-stephen@networkplumber.org>", "References": "<20190516180427.17270-1-stephen@networkplumber.org>\n\t<20190708182614.1677-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v9 05/11] cmdline: use new ethernet address parser", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Now that there is a version of ether_aton in rte_ether, it can\nbe used by the cmdline ethernet address parser.\n\nNote: ether_aton_r can not be used in cmdline because\nthe old code would accept either bytes XX:XX:XX:XX:XX:XX\nor words XXXX:XXXX:XXXX and we need to keep compatiablity.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\nAcked-by: Olivier Matz <olivier.matz@6wind.com>\n---\n lib/Makefile | 2 +-\n lib/librte_cmdline/Makefile | 3 +-\n lib/librte_cmdline/cmdline_parse_etheraddr.c | 71 +++-----------------\n lib/librte_cmdline/meson.build | 6 +-\n lib/meson.build | 2 +-\n 5 files changed, 15 insertions(+), 69 deletions(-)", "diff": "diff --git a/lib/Makefile b/lib/Makefile\nindex 493aeab7572e..bdb8a67e2d9d 100644\n--- a/lib/Makefile\n+++ b/lib/Makefile\n@@ -20,7 +20,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer\n DEPDIRS-librte_timer := librte_eal\n DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile\n DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline\n-DEPDIRS-librte_cmdline := librte_eal\n+DEPDIRS-librte_cmdline := librte_eal librte_net\n DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ethdev\n DEPDIRS-librte_ethdev := librte_net librte_eal librte_mempool librte_ring\n DEPDIRS-librte_ethdev += librte_mbuf\ndiff --git a/lib/librte_cmdline/Makefile b/lib/librte_cmdline/Makefile\nindex c64142b8d5a0..04057d7c671f 100644\n--- a/lib/librte_cmdline/Makefile\n+++ b/lib/librte_cmdline/Makefile\n@@ -7,6 +7,7 @@ include $(RTE_SDK)/mk/rte.vars.mk\n LIB = librte_cmdline.a\n \n CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3\n+CFLAGS += -DALLOW_EXPERIMENTAL_API\n \n EXPORT_MAP := rte_cmdline_version.map\n \n@@ -25,7 +26,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_vt100.c\n SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_socket.c\n SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_portlist.c\n \n-LDLIBS += -lrte_eal\n+LDLIBS += -lrte_net -lrte_eal\n \n # install includes\n INCS := cmdline.h cmdline_parse.h cmdline_parse_num.h cmdline_parse_ipaddr.h\ndiff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.c b/lib/librte_cmdline/cmdline_parse_etheraddr.c\nindex 24e04755cd9e..2cb8dd2a1267 100644\n--- a/lib/librte_cmdline/cmdline_parse_etheraddr.c\n+++ b/lib/librte_cmdline/cmdline_parse_etheraddr.c\n@@ -12,9 +12,9 @@\n #include <ctype.h>\n #include <string.h>\n #include <sys/types.h>\n-#include <net/ethernet.h>\n \n #include <rte_string_fns.h>\n+#include <rte_ether.h>\n \n #include \"cmdline_parse.h\"\n #include \"cmdline_parse_etheraddr.h\"\n@@ -26,69 +26,15 @@ struct cmdline_token_ops cmdline_token_etheraddr_ops = {\n \t.get_help = cmdline_get_help_etheraddr,\n };\n \n-/* the format can be either XX:XX:XX:XX:XX:XX or XXXX:XXXX:XXXX */\n-#define ETHER_ADDRSTRLENLONG 18\n-#define ETHER_ADDRSTRLENSHORT 15\n-\n-#ifdef __linux__\n-#define ea_oct ether_addr_octet\n-#else\n-#define ea_oct octet\n-#endif\n-\n-\n-static struct ether_addr *\n-my_ether_aton(const char *a)\n-{\n-\tint i;\n-\tchar *end;\n-\tunsigned long o[ETHER_ADDR_LEN];\n-\tstatic struct ether_addr ether_addr;\n-\n-\ti = 0;\n-\tdo {\n-\t\terrno = 0;\n-\t\to[i] = strtoul(a, &end, 16);\n-\t\tif (errno != 0 || end == a || (end[0] != ':' && end[0] != 0))\n-\t\t\treturn NULL;\n-\t\ta = end + 1;\n-\t} while (++i != sizeof (o) / sizeof (o[0]) && end[0] != 0);\n-\n-\t/* Junk at the end of line */\n-\tif (end[0] != 0)\n-\t\treturn NULL;\n-\n-\t/* Support the format XX:XX:XX:XX:XX:XX */\n-\tif (i == ETHER_ADDR_LEN) {\n-\t\twhile (i-- != 0) {\n-\t\t\tif (o[i] > UINT8_MAX)\n-\t\t\t\treturn NULL;\n-\t\t\tether_addr.ea_oct[i] = (uint8_t)o[i];\n-\t\t}\n-\t/* Support the format XXXX:XXXX:XXXX */\n-\t} else if (i == ETHER_ADDR_LEN / 2) {\n-\t\twhile (i-- != 0) {\n-\t\t\tif (o[i] > UINT16_MAX)\n-\t\t\t\treturn NULL;\n-\t\t\tether_addr.ea_oct[i * 2] = (uint8_t)(o[i] >> 8);\n-\t\t\tether_addr.ea_oct[i * 2 + 1] = (uint8_t)(o[i] & 0xff);\n-\t\t}\n-\t/* unknown format */\n-\t} else\n-\t\treturn NULL;\n-\n-\treturn (struct ether_addr *)ðer_addr;\n-}\n-\n int\n cmdline_parse_etheraddr(__attribute__((unused)) cmdline_parse_token_hdr_t *tk,\n \tconst char *buf, void *res, unsigned ressize)\n {\n \tunsigned int token_len = 0;\n-\tchar ether_str[ETHER_ADDRSTRLENLONG+1];\n-\tstruct ether_addr *tmp;\n+\tchar ether_str[RTE_ETHER_ADDR_FMT_SIZE];\n+\tstruct rte_ether_addr tmp;\n \n-\tif (res && ressize < sizeof(struct ether_addr))\n+\tif (res && ressize < sizeof(tmp))\n \t\treturn -1;\n \n \tif (!buf || ! *buf)\n@@ -98,17 +44,16 @@ cmdline_parse_etheraddr(__attribute__((unused)) cmdline_parse_token_hdr_t *tk,\n \t\ttoken_len++;\n \n \t/* if token doesn't match possible string lengths... */\n-\tif ((token_len != ETHER_ADDRSTRLENLONG - 1) &&\n-\t\t\t(token_len != ETHER_ADDRSTRLENSHORT - 1))\n+\tif (token_len >= RTE_ETHER_ADDR_FMT_SIZE)\n \t\treturn -1;\n \n \tstrlcpy(ether_str, buf, token_len + 1);\n \n-\ttmp = my_ether_aton(ether_str);\n-\tif (tmp == NULL)\n+\tif (rte_ether_unformat_addr(ether_str, &tmp) < 0)\n \t\treturn -1;\n+\n \tif (res)\n-\t\tmemcpy(res, tmp, sizeof(struct ether_addr));\n+\t\tmemcpy(res, &tmp, sizeof(tmp));\n \treturn token_len;\n }\n \ndiff --git a/lib/librte_cmdline/meson.build b/lib/librte_cmdline/meson.build\nindex 0fa61385fccf..07334c1b0956 100644\n--- a/lib/librte_cmdline/meson.build\n+++ b/lib/librte_cmdline/meson.build\n@@ -1,10 +1,8 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2017 Intel Corporation\n \n-# This library is processed before EAL\n-includes = [global_inc]\n-\n version = 2\n+allow_experimental_apis = true\n sources = files('cmdline.c',\n \t'cmdline_cirbuf.c',\n \t'cmdline_parse.c',\n@@ -28,3 +26,5 @@ headers = files('cmdline.h',\n \t'cmdline_socket.h',\n \t'cmdline_cirbuf.h',\n \t'cmdline_parse_portlist.h')\n+\n+deps += ['net']\ndiff --git a/lib/meson.build b/lib/meson.build\nindex 3d77b1f9014a..e5ff83893489 100644\n--- a/lib/meson.build\n+++ b/lib/meson.build\n@@ -11,8 +11,8 @@\n libraries = [\n \t'kvargs', # eal depends on kvargs\n \t'eal', # everything depends on eal\n-\t'cmdline', # ethdev depends on cmdline for parsing functions\n \t'ring', 'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci', # core\n+\t'cmdline',\n \t'metrics', # bitrate/latency stats depends on this\n \t'hash', # efd depends on this\n \t'timer', # eventdev depends on this\n", "prefixes": [ "v9", "05/11" ] }