From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [dpdk-dev] [PATCH v4 6/8] cmdline: use rte_ether_unformat_addr
Date: Wed, 5 Jun 2019 11:09:46 -0700 [thread overview]
Message-ID: <20190605180948.22414-7-stephen@networkplumber.org> (raw)
In-Reply-To: <20190605180948.22414-1-stephen@networkplumber.org>
Now that there is a version of ether_aton in rte_ether, it can
be used by the cmdline ethernet address parser.
Note: ether_aton_r can not be used in cmdline because
the old code would accept either bytes XX:XX:XX:XX:XX:XX
or words XXXX:XXXX:XXXX and we need to keep compatiablity.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/Makefile | 2 +-
lib/librte_cmdline/Makefile | 3 +-
lib/librte_cmdline/cmdline_parse_etheraddr.c | 71 +++-----------------
lib/librte_cmdline/meson.build | 6 +-
lib/meson.build | 2 +-
5 files changed, 15 insertions(+), 69 deletions(-)
diff --git a/lib/Makefile b/lib/Makefile
index 82b2c4bfa8ea..cc36fe7591f0 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -20,7 +20,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer
DEPDIRS-librte_timer := librte_eal
DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile
DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline
-DEPDIRS-librte_cmdline := librte_eal
+DEPDIRS-librte_cmdline := librte_eal librte_net
DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ethdev
DEPDIRS-librte_ethdev := librte_net librte_eal librte_mempool librte_ring
DEPDIRS-librte_ethdev += librte_mbuf
diff --git a/lib/librte_cmdline/Makefile b/lib/librte_cmdline/Makefile
index c64142b8d5a0..04057d7c671f 100644
--- a/lib/librte_cmdline/Makefile
+++ b/lib/librte_cmdline/Makefile
@@ -7,6 +7,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
LIB = librte_cmdline.a
CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
+CFLAGS += -DALLOW_EXPERIMENTAL_API
EXPORT_MAP := rte_cmdline_version.map
@@ -25,7 +26,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_vt100.c
SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_socket.c
SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_portlist.c
-LDLIBS += -lrte_eal
+LDLIBS += -lrte_net -lrte_eal
# install includes
INCS := cmdline.h cmdline_parse.h cmdline_parse_num.h cmdline_parse_ipaddr.h
diff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.c b/lib/librte_cmdline/cmdline_parse_etheraddr.c
index 24e04755cd9e..2cb8dd2a1267 100644
--- a/lib/librte_cmdline/cmdline_parse_etheraddr.c
+++ b/lib/librte_cmdline/cmdline_parse_etheraddr.c
@@ -12,9 +12,9 @@
#include <ctype.h>
#include <string.h>
#include <sys/types.h>
-#include <net/ethernet.h>
#include <rte_string_fns.h>
+#include <rte_ether.h>
#include "cmdline_parse.h"
#include "cmdline_parse_etheraddr.h"
@@ -26,69 +26,15 @@ struct cmdline_token_ops cmdline_token_etheraddr_ops = {
.get_help = cmdline_get_help_etheraddr,
};
-/* the format can be either XX:XX:XX:XX:XX:XX or XXXX:XXXX:XXXX */
-#define ETHER_ADDRSTRLENLONG 18
-#define ETHER_ADDRSTRLENSHORT 15
-
-#ifdef __linux__
-#define ea_oct ether_addr_octet
-#else
-#define ea_oct octet
-#endif
-
-
-static struct ether_addr *
-my_ether_aton(const char *a)
-{
- int i;
- char *end;
- unsigned long o[ETHER_ADDR_LEN];
- static struct ether_addr ether_addr;
-
- i = 0;
- do {
- errno = 0;
- o[i] = strtoul(a, &end, 16);
- if (errno != 0 || end == a || (end[0] != ':' && end[0] != 0))
- return NULL;
- a = end + 1;
- } while (++i != sizeof (o) / sizeof (o[0]) && end[0] != 0);
-
- /* Junk at the end of line */
- if (end[0] != 0)
- return NULL;
-
- /* Support the format XX:XX:XX:XX:XX:XX */
- if (i == ETHER_ADDR_LEN) {
- while (i-- != 0) {
- if (o[i] > UINT8_MAX)
- return NULL;
- ether_addr.ea_oct[i] = (uint8_t)o[i];
- }
- /* Support the format XXXX:XXXX:XXXX */
- } else if (i == ETHER_ADDR_LEN / 2) {
- while (i-- != 0) {
- if (o[i] > UINT16_MAX)
- return NULL;
- ether_addr.ea_oct[i * 2] = (uint8_t)(o[i] >> 8);
- ether_addr.ea_oct[i * 2 + 1] = (uint8_t)(o[i] & 0xff);
- }
- /* unknown format */
- } else
- return NULL;
-
- return (struct ether_addr *)ðer_addr;
-}
-
int
cmdline_parse_etheraddr(__attribute__((unused)) cmdline_parse_token_hdr_t *tk,
const char *buf, void *res, unsigned ressize)
{
unsigned int token_len = 0;
- char ether_str[ETHER_ADDRSTRLENLONG+1];
- struct ether_addr *tmp;
+ char ether_str[RTE_ETHER_ADDR_FMT_SIZE];
+ struct rte_ether_addr tmp;
- if (res && ressize < sizeof(struct ether_addr))
+ if (res && ressize < sizeof(tmp))
return -1;
if (!buf || ! *buf)
@@ -98,17 +44,16 @@ cmdline_parse_etheraddr(__attribute__((unused)) cmdline_parse_token_hdr_t *tk,
token_len++;
/* if token doesn't match possible string lengths... */
- if ((token_len != ETHER_ADDRSTRLENLONG - 1) &&
- (token_len != ETHER_ADDRSTRLENSHORT - 1))
+ if (token_len >= RTE_ETHER_ADDR_FMT_SIZE)
return -1;
strlcpy(ether_str, buf, token_len + 1);
- tmp = my_ether_aton(ether_str);
- if (tmp == NULL)
+ if (rte_ether_unformat_addr(ether_str, &tmp) < 0)
return -1;
+
if (res)
- memcpy(res, tmp, sizeof(struct ether_addr));
+ memcpy(res, &tmp, sizeof(tmp));
return token_len;
}
diff --git a/lib/librte_cmdline/meson.build b/lib/librte_cmdline/meson.build
index 0fa61385fccf..07334c1b0956 100644
--- a/lib/librte_cmdline/meson.build
+++ b/lib/librte_cmdline/meson.build
@@ -1,10 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-# This library is processed before EAL
-includes = [global_inc]
-
version = 2
+allow_experimental_apis = true
sources = files('cmdline.c',
'cmdline_cirbuf.c',
'cmdline_parse.c',
@@ -28,3 +26,5 @@ headers = files('cmdline.h',
'cmdline_socket.h',
'cmdline_cirbuf.h',
'cmdline_parse_portlist.h')
+
+deps += ['net']
diff --git a/lib/meson.build b/lib/meson.build
index e067ce5ea349..fc57fec1908a 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -11,8 +11,8 @@
libraries = [
'kvargs', # eal depends on kvargs
'eal', # everything depends on eal
- 'cmdline', # ethdev depends on cmdline for parsing functions
'ring', 'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci', # core
+ 'cmdline',
'metrics', # bitrate/latency stats depends on this
'hash', # efd depends on this
'timer', # eventdev depends on this
--
2.20.1
next prev parent reply other threads:[~2019-06-05 18:10 UTC|newest]
Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-16 18:04 [dpdk-dev] [PATCH v2 0/7] ether: improvements and optimizations Stephen Hemminger
2019-05-16 18:04 ` [dpdk-dev] [PATCH v2 1/7] ether: mark ethernet addresses as being 2-byte aligned Stephen Hemminger
2019-05-16 18:04 ` [dpdk-dev] [PATCH v2 2/7] ether: do not mark ethernet address and header as packed Stephen Hemminger
2019-05-16 20:40 ` Bruce Richardson
2019-05-16 23:17 ` Stephen Hemminger
2019-05-16 18:04 ` [dpdk-dev] [PATCH v2 3/7] ether: deinline non-critical functions Stephen Hemminger
2019-05-16 18:29 ` Rami Rosen
2019-05-17 7:08 ` David Marchand
2019-05-16 18:04 ` [dpdk-dev] [PATCH v2 4/7] ether: add eth_unformat_addr Stephen Hemminger
2019-05-17 7:08 ` David Marchand
2019-05-16 18:04 ` [dpdk-dev] [PATCH v2 5/7] ethdev: use eth_unformat_addr Stephen Hemminger
2019-05-16 18:04 ` [dpdk-dev] [PATCH v2 6/7] ether: use bitops to speedup comparison Stephen Hemminger
2019-05-16 18:04 ` [dpdk-dev] [PATCH v2 7/7] cmdline: use ether_unformat_addr Stephen Hemminger
2019-06-05 1:08 ` [dpdk-dev] [PATCH v3 0/6] net/ether: improvements and optimizations Stephen Hemminger
2019-06-05 1:08 ` [dpdk-dev] [PATCH v3 1/6] net/rte_ether: deinline non-critical functions Stephen Hemminger
2019-06-05 8:44 ` Andrew Rybchenko
2019-06-05 16:29 ` Stephen Hemminger
2019-06-05 1:08 ` [dpdk-dev] [PATCH v3 2/6] net/ether: add rte_eth_unformat_addr Stephen Hemminger
2019-06-05 8:55 ` Andrew Rybchenko
2019-06-05 16:31 ` Stephen Hemminger
2019-06-05 1:08 ` [dpdk-dev] [PATCH v3 3/6] ethdev: use rte_eth_unformat_addr Stephen Hemminger
2019-06-05 8:59 ` Andrew Rybchenko
2019-06-05 15:02 ` Stephen Hemminger
2019-06-05 16:33 ` Stephen Hemminger
2019-06-05 1:08 ` [dpdk-dev] [PATCH v3 4/6] net/ether: use bitops to speedup comparison Stephen Hemminger
2019-06-05 9:02 ` Andrew Rybchenko
2019-06-05 1:08 ` [dpdk-dev] [PATCH v3 5/6] net/ether: mark ethernet addresses as being 2-byte aligned Stephen Hemminger
2019-06-05 9:04 ` Andrew Rybchenko
2019-06-05 1:08 ` [dpdk-dev] [PATCH v3 6/6] cmdline: use rte_ether_unformat_addr Stephen Hemminger
2019-06-05 18:09 ` [dpdk-dev] [PATCH v4 0/8] net/ether: enhancements and optimizations Stephen Hemminger
2019-06-05 18:09 ` [dpdk-dev] [PATCH v4 1/8] net/rte_ether: deinline non-critical functions Stephen Hemminger
2019-06-06 8:06 ` Maxime Coquelin
2019-06-05 18:09 ` [dpdk-dev] [PATCH v4 2/8] net/ether: add rte_eth_unformat_addr Stephen Hemminger
2019-06-05 18:09 ` [dpdk-dev] [PATCH v4 3/8] ethdev: use rte_eth_unformat_addr Stephen Hemminger
2019-06-05 18:09 ` [dpdk-dev] [PATCH v4 4/8] net/ether: use bitops to speedup comparison Stephen Hemminger
2019-06-05 18:09 ` [dpdk-dev] [PATCH v4 5/8] net/ether: mark ethernet addresses as being 2-byte aligned Stephen Hemminger
2019-06-07 16:59 ` Ananyev, Konstantin
2019-06-07 18:35 ` Stephen Hemminger
2019-06-07 20:40 ` Richardson, Bruce
2019-06-08 11:51 ` Ananyev, Konstantin
2019-06-07 20:39 ` Richardson, Bruce
2019-06-08 12:15 ` Ananyev, Konstantin
2019-06-05 18:09 ` Stephen Hemminger [this message]
2019-06-05 18:09 ` [dpdk-dev] [PATCH v4 7/8] net/bonding: use rte_ether_unformat_addr rather than cmdline_parse Stephen Hemminger
2019-06-05 18:09 ` [dpdk-dev] [PATCH v4 8/8] app/testpmd: use rte_ether_unformat_addr Stephen Hemminger
2019-06-20 14:18 ` Iremonger, Bernard
2019-06-20 16:12 ` Stephen Hemminger
2019-06-24 20:44 ` [dpdk-dev] [PATCH v5 0/8] net/ether: enhancements and optimizations Stephen Hemminger
2019-06-24 20:44 ` [dpdk-dev] [PATCH v5 1/8] net/rte_ether: deinline non-critical functions Stephen Hemminger
2019-07-02 7:56 ` Olivier Matz
2019-06-24 20:44 ` [dpdk-dev] [PATCH v5 2/8] net/ether: add function to convert string to ethernet address Stephen Hemminger
2019-06-24 20:44 ` [dpdk-dev] [PATCH v5 3/8] ethdev: use new ethernet parsing function Stephen Hemminger
2019-06-24 20:44 ` [dpdk-dev] [PATCH v5 4/8] net/ether: use bitops to speedup comparison Stephen Hemminger
2019-07-02 7:53 ` Olivier Matz
2019-07-02 9:26 ` Olivier Matz
2019-07-02 15:28 ` Stephen Hemminger
2019-06-24 20:44 ` [dpdk-dev] [PATCH v5 5/8] net/ether: mark ethernet addresses as being 2-byte aligned Stephen Hemminger
2019-06-24 20:44 ` [dpdk-dev] [PATCH v5 6/8] cmdline: use new ethernet address parser Stephen Hemminger
[not found] ` <8688172CD5C0B74590FAE19D9579F94B53742875@SHSMSX103.ccr.corp.intel.com>
2019-07-16 16:17 ` Stephen Hemminger
2019-07-17 14:04 ` Aaron Conole
2019-07-17 14:39 ` Olivier Matz
2019-06-24 20:44 ` [dpdk-dev] [PATCH v5 7/8] net/bonding: " Stephen Hemminger
2019-06-24 20:44 ` [dpdk-dev] [PATCH v5 8/8] app/testpmd: " Stephen Hemminger
2019-07-02 16:50 ` [dpdk-dev] [PATCH v6 0/8] net/ether: enhancements and optimizations Stephen Hemminger
2019-07-02 16:50 ` [dpdk-dev] [PATCH v6 1/8] net/rte_ether: deinline non-critical functions Stephen Hemminger
2019-07-02 16:50 ` [dpdk-dev] [PATCH v6 2/8] net/ether: add function to convert string to ethernet address Stephen Hemminger
2019-07-02 16:50 ` [dpdk-dev] [PATCH v6 3/8] ethdev: use new ethernet parsing function Stephen Hemminger
2019-07-02 16:50 ` [dpdk-dev] [PATCH v6 4/8] net/ether: use bitops to speedup comparison Stephen Hemminger
2019-07-02 16:50 ` [dpdk-dev] [PATCH v6 5/8] net/ether: mark ethernet addresses as being 2-byte aligned Stephen Hemminger
2019-07-02 21:46 ` Ananyev, Konstantin
2019-07-02 16:50 ` [dpdk-dev] [PATCH v6 6/8] cmdline: use new ethernet address parser Stephen Hemminger
2019-07-02 16:50 ` [dpdk-dev] [PATCH v6 7/8] net/bonding: " Stephen Hemminger
2019-07-02 16:50 ` [dpdk-dev] [PATCH v6 8/8] app/testpmd: " Stephen Hemminger
2019-07-02 21:37 ` [dpdk-dev] [PATCH v6 0/8] net/ether: enhancements and optimizations Thomas Monjalon
2019-07-02 22:03 ` Stephen Hemminger
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 00/12] ether: improvements " Stephen Hemminger
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 01/12] net/rte_ether: deinline non-critical functions Stephen Hemminger
2019-07-05 14:25 ` Olivier Matz
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 02/12] net/ether: add function to convert string to ethernet address Stephen Hemminger
2019-07-05 14:25 ` Olivier Matz
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 03/12] ethdev: use new ethernet parsing function Stephen Hemminger
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 04/12] net/ether: use bitops to speedup comparison Stephen Hemminger
2019-07-05 14:34 ` Olivier Matz
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 05/12] net/ether: mark ethernet addresses as being 2-byte aligned Stephen Hemminger
2019-07-05 14:34 ` Olivier Matz
2019-07-05 15:45 ` Richardson, Bruce
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 06/12] cmdline: use new ethernet address parser Stephen Hemminger
2019-07-05 14:46 ` Olivier Matz
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 07/12] net/bonding: " Stephen Hemminger
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 08/12] app/testpmd: " Stephen Hemminger
2019-07-03 13:30 ` Iremonger, Bernard
2019-07-05 17:12 ` Stephen Hemminger
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 09/12] net/virtio: use new ether addr parsing Stephen Hemminger
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 10/12] net/failsafe: use common ether address parsing routine Stephen Hemminger
2019-07-03 9:10 ` Gaëtan Rivet
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 11/12] net/vdev_netvsc: use common ethernet address parsing Stephen Hemminger
2019-07-03 8:12 ` Matan Azrad
2019-07-02 22:12 ` [dpdk-dev] [PATCH v7 12/12] net/memif: use common ethernet address parsing routine Stephen Hemminger
2019-07-05 17:16 ` [dpdk-dev] [PATCH v8 00/11] ether: improvements and optimizations Stephen Hemminger
2019-07-05 17:16 ` [dpdk-dev] [PATCH v8 01/11] net/ether: deinline non-critical functions Stephen Hemminger
2019-07-05 17:16 ` [dpdk-dev] [PATCH v8 02/11] net/ether: add function to convert string to ethernet address Stephen Hemminger
2019-07-05 17:16 ` [dpdk-dev] [PATCH v8 03/11] ethdev: use new ethernet parsing function Stephen Hemminger
2019-07-05 17:16 ` [dpdk-dev] [PATCH v8 04/11] net/ether: use bitops to speedup comparison Stephen Hemminger
2019-07-05 17:16 ` [dpdk-dev] [PATCH v8 05/11] cmdline: use new ethernet address parser Stephen Hemminger
2019-07-05 17:16 ` [dpdk-dev] [PATCH v8 06/11] net/bonding: " Stephen Hemminger
2019-07-05 17:16 ` [dpdk-dev] [PATCH v8 07/11] app/testpmd: " Stephen Hemminger
2019-07-05 17:16 ` [dpdk-dev] [PATCH v8 08/11] net/virtio: use new ether addr parsing Stephen Hemminger
2019-07-05 17:16 ` [dpdk-dev] [PATCH v8 09/11] net/failsafe: use common ether address parsing routine Stephen Hemminger
2019-07-05 17:16 ` [dpdk-dev] [PATCH v8 10/11] net/vdev_netvsc: use common ethernet address parsing Stephen Hemminger
2019-07-05 17:16 ` [dpdk-dev] [PATCH v8 11/11] net/memif: use common ethernet address parsing routine Stephen Hemminger
2019-07-08 18:26 ` [dpdk-dev] [PATCH v9 00/11] ether: improvements and optimizations Stephen Hemminger
2019-07-08 18:26 ` [dpdk-dev] [PATCH v9 01/11] net/ether: deinline non-critical functions Stephen Hemminger
2019-07-08 18:26 ` [dpdk-dev] [PATCH v9 02/11] net/ether: add function to convert string to ethernet address Stephen Hemminger
2019-07-08 18:26 ` [dpdk-dev] [PATCH v9 03/11] ethdev: use new ethernet parsing function Stephen Hemminger
2019-07-08 18:26 ` [dpdk-dev] [PATCH v9 04/11] net/ether: use bitops to speedup comparison Stephen Hemminger
2019-07-08 18:26 ` [dpdk-dev] [PATCH v9 05/11] cmdline: use new ethernet address parser Stephen Hemminger
2019-07-08 18:26 ` [dpdk-dev] [PATCH v9 06/11] net/bonding: " Stephen Hemminger
2019-07-08 18:26 ` [dpdk-dev] [PATCH v9 07/11] app/testpmd: " Stephen Hemminger
2019-07-21 13:42 ` Raslan Darawsheh
2019-07-22 12:09 ` Thomas Monjalon
2019-07-22 16:15 ` Ferruh Yigit
2019-07-08 18:26 ` [dpdk-dev] [PATCH v9 08/11] net/virtio: use new ether addr parsing Stephen Hemminger
2019-07-08 18:26 ` [dpdk-dev] [PATCH v9 09/11] net/failsafe: use common ether address parsing routine Stephen Hemminger
2019-07-08 18:26 ` [dpdk-dev] [PATCH v9 10/11] net/vdev_netvsc: use common ethernet address parsing Stephen Hemminger
2019-07-08 18:26 ` [dpdk-dev] [PATCH v9 11/11] net/memif: use common ethernet address parsing routine Stephen Hemminger
2019-07-08 19:13 ` [dpdk-dev] [PATCH v9 00/11] ether: improvements and optimizations Ferruh Yigit
2019-07-09 15:01 ` Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190605180948.22414-7-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).