[dpdk-dev] [PATCH v6] devtools: add tags and cscope index file generation support
This script generates cscope, gtags, and tags index files based on
EAL environment(architecture and OS(linux/bsd)).
Selection of the architecture and OS environment is based on dpdk
configuration target(T=).If EAL environment(T=) is not specified,
the script generates tag files based on available source code.
Usage: make tags|cscope|gtags|etags [T=config]
example usage:
make cscope
make tags T=x86_64-native-linuxapp-gcc
make gtags T=arm64-armv8a-linuxapp-gcc
Signed-off-by: Jerin Jacob
Reviewed-by: Yuanhan Liu
Reviewed-by: Ferruh Yigit
---
v6:
- Addressed all the review comments from Thomas
http://dpdk.org/ml/archives/dev/2017-April/064964.html
v5:
- Added cscope,tags,gtags,etags makefile targets (Cristian)
v4:
- Accommodate the latest "test" directory rework change in master
v3:
- Added etags target for Emacs(John)
- EAL environment(config) is optional now(Thomas)
- Changed bash shebang to /bin/sh (Thomas)
- getopts based -v and -h option (Thomas)
- used $() instead of backquotes (Thomas)
- Removed "make" based frontend to the script to make it inline with
other devtools scripts in DPDK (Jerin)
v2:
- Moved tag.sh to devtools from scripts
- Rebased to master
---
.gitignore | 9 ++
devtools/build-tags.sh | 233 +
mk/rte.sdkroot.mk | 4 +
3 files changed, 246 insertions(+)
create mode 100755 devtools/build-tags.sh
diff --git a/.gitignore b/.gitignore
index c733967a8..6df5ba068 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,12 @@ doc/guides/cryptodevs/overview_feature_table.txt
doc/guides/cryptodevs/overview_cipher_table.txt
doc/guides/cryptodevs/overview_auth_table.txt
doc/guides/cryptodevs/overview_aead_table.txt
+cscope.out.po
+cscope.out.in
+cscope.out
+cscope.files
+GTAGS
+GPATH
+GRTAGS
+tags
+TAGS
diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh
new file mode 100755
index 0..2b4258972
--- /dev/null
+++ b/devtools/build-tags.sh
@@ -0,0 +1,233 @@
+#!/bin/sh -e
+# Generate tags or gtags or cscope or etags files
+#
+# BSD LICENSE
+#
+# Copyright 2017 Cavium Networks
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Cavium networks nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+verbose=false
+linux=true
+bsd=true
+x86_32=true
+x86_64=true
+ppc_64=true
+arm_32=true
+arm_64=true
+
+print_usage()
+{
+ echo "Usage: $(basename $0) [-h] [-v] tags|cscope|gtags|etags [config]"
+ echo "Valid configs are:"
+ make showconfigs | sed 's,^,\t,'
+}
+
+while getopts hv ARG ; do
+ case $ARG in
+ v ) verbose=true ;;
+ h ) print_usage; exit 0 ;;
+ ? ) print_usage; exit 1 ;;
+ esac
+done
+shift $(($OPTIND - 1))
+
+#ignore version control files
+ignore="( -name .svn -o -name CVS -o -name .hg -o -name .git ) -prune -o"
+
+source_dirs="test app buildtools drivers examples lib"
+
+skip_bsd="( -name bsdapp ) -prune -o"
+skip_linux="( -name linuxapp ) -prune -o"
+skip_arch="( -name arch ) -prune -o"
+skip_sse="( -name *_sse*.[chS] ) -prune -o"
+skip_avx="( -name *_avx*.[chS] ) -prune -o"
+skip_neon="( -name *_neon*.[chS] ) -prune -o"
+skip_altivec="( -name *_altivec*.[chS] ) -prune -o"
+skip_arm64="( -name *arm64*.[chS] ) -prune -o"
+skip_x86="( -name *x86*.[chS] ) -prune -o"
+skip_32b_files="( -name *_32.h ) -prune -o"
+skip_64b_files="( -name *_64.h ) -prune -o"
+
+skiplist="$skip_bsd $skip_linux $skip_arch $skip_sse $skip_avx \
+$skip_neon $skip_altivec $skip_x86 $skip_arm64"
+
+find_sources()
+{
+
[dpdk-dev] [PATCH v5 0/3] MAC address fail to be added shouldn't be stored
Current ethdev always stores MAC address even it fails to be added. Other function may regard the failed MAC address valid and lead to some errors. So There is a need to check if the addr is added successfully or not and discard it if it fails. In 3rd patch, add a command "add_more_mac_addr port_id base_mac_addr count" to add more than one MAC address one time. This command can simplify the test for the first patch. Normally a MAC address may fails to be added only after many MAC addresses have been added. Without this command, a tester may only trigger failed MAC address by running many times of testpmd command 'mac_addr add' . For v4 patch set, have got acknowledgement from Nelio Laranjeiro for mlx changes Yuanhan Liu for virtio changes --- Changes v5: 1. rebase master branch 2. add support to drivers/net/ark 3. fix some minor defects v4: 1. rebase master branch 2. follow code style v3: 1. Change return value for some specific NIC according to feedbacks from the community; 2. Add ABI change in release note; 3. Add more detailed commit message. v2: fix warnings and erros from check-git-log.sh and checkpatch.pl Wei Dai (3): ethdev: fix adding invalid MAC addr doc: change type of return value of adding MAC addr app/testpmd: add a command to add many MAC addrs app/test-pmd/cmdline.c | 55 ++ doc/guides/rel_notes/release_17_05.rst | 7 + drivers/net/ark/ark_ethdev.c | 15 ++ drivers/net/bnx2x/bnx2x_ethdev.c | 7 +++-- drivers/net/bnxt/bnxt_ethdev.c | 16 +- drivers/net/e1000/base/e1000_api.c | 2 +- drivers/net/e1000/em_ethdev.c | 8 ++--- drivers/net/e1000/igb_ethdev.c | 9 +++--- drivers/net/enic/enic.h| 2 +- drivers/net/enic/enic_ethdev.c | 4 +-- drivers/net/enic/enic_main.c | 9 +++--- drivers/net/fm10k/fm10k_ethdev.c | 3 +- drivers/net/i40e/i40e_ethdev.c | 17 ++- drivers/net/i40e/i40e_ethdev_vf.c | 14 - drivers/net/ixgbe/ixgbe_ethdev.c | 33 drivers/net/mlx4/mlx4.c| 16 ++ drivers/net/mlx5/mlx5.h| 4 +-- drivers/net/mlx5/mlx5_mac.c| 16 ++ drivers/net/qede/qede_ethdev.c | 6 ++-- drivers/net/ring/rte_eth_ring.c| 3 +- drivers/net/virtio/virtio_ethdev.c | 13 lib/librte_ether/rte_ethdev.c | 15 ++ lib/librte_ether/rte_ethdev.h | 2 +- 23 files changed, 185 insertions(+), 91 deletions(-) mode change 100644 => 100755 app/test-pmd/cmdline.c mode change 100644 => 100755 doc/guides/rel_notes/release_17_05.rst -- 2.7.4
[dpdk-dev] [PATCH v5 1/3] ethdev: fix adding invalid MAC addr
Some customers find adding MAC addr to VF sometimes can fail,
but it is still stored in dev->data->mac_addrs[ ]. So this
can lead to some errors that assumes the non-zero entry in
dev->data->mac_addrs[ ] is valid.
Following acknowledgements are from specific NIC PMD
maintainer for their managing part.
Fixes: af75078fece3 ("first public release")
Cc: sta...@dpdk.org
Signed-off-by: Wei Dai
Acked-by: Nelio Laranjeiro
Acked-by: Yuanhan Liu
---
drivers/net/ark/ark_ethdev.c | 15 +--
drivers/net/bnx2x/bnx2x_ethdev.c | 7 +--
drivers/net/bnxt/bnxt_ethdev.c | 16
drivers/net/e1000/base/e1000_api.c | 2 +-
drivers/net/e1000/em_ethdev.c | 8
drivers/net/e1000/igb_ethdev.c | 9 +
drivers/net/enic/enic.h| 2 +-
drivers/net/enic/enic_ethdev.c | 4 ++--
drivers/net/enic/enic_main.c | 9 -
drivers/net/fm10k/fm10k_ethdev.c | 3 ++-
drivers/net/i40e/i40e_ethdev.c | 17 +
drivers/net/i40e/i40e_ethdev_vf.c | 14 +++---
drivers/net/ixgbe/ixgbe_ethdev.c | 33 +
drivers/net/mlx4/mlx4.c| 16 ++--
drivers/net/mlx5/mlx5.h| 4 ++--
drivers/net/mlx5/mlx5_mac.c| 16 ++--
drivers/net/qede/qede_ethdev.c | 6 --
drivers/net/ring/rte_eth_ring.c| 3 ++-
drivers/net/virtio/virtio_ethdev.c | 13 +++--
lib/librte_ether/rte_ethdev.c | 15 +--
lib/librte_ether/rte_ethdev.h | 2 +-
21 files changed, 123 insertions(+), 91 deletions(-)
diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index 4caad98..0c3fa42 100644
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -71,10 +71,10 @@ static void eth_ark_dev_stats_get(struct rte_eth_dev *dev,
static void eth_ark_dev_stats_reset(struct rte_eth_dev *dev);
static void eth_ark_set_default_mac_addr(struct rte_eth_dev *dev,
struct ether_addr *mac_addr);
-static void eth_ark_macaddr_add(struct rte_eth_dev *dev,
- struct ether_addr *mac_addr,
- uint32_t index,
- uint32_t pool);
+static int eth_ark_macaddr_add(struct rte_eth_dev *dev,
+ struct ether_addr *mac_addr,
+ uint32_t index,
+ uint32_t pool);
static void eth_ark_macaddr_remove(struct rte_eth_dev *dev,
uint32_t index);
@@ -831,7 +831,7 @@ eth_ark_dev_stats_reset(struct rte_eth_dev *dev)
ark->user_ext.stats_reset(dev, ark->user_data);
}
-static void
+static int
eth_ark_macaddr_add(struct rte_eth_dev *dev,
struct ether_addr *mac_addr,
uint32_t index,
@@ -840,12 +840,15 @@ eth_ark_macaddr_add(struct rte_eth_dev *dev,
struct ark_adapter *ark =
(struct ark_adapter *)dev->data->dev_private;
- if (ark->user_ext.mac_addr_add)
+ if (ark->user_ext.mac_addr_add) {
ark->user_ext.mac_addr_add(dev,
mac_addr,
index,
pool,
ark->user_data);
+ return 0;
+ }
+ return -ENOTSUP;
}
static void
diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index 314e5ea..b79cfdb 100644
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -451,14 +451,17 @@ bnx2x_dev_infos_get(struct rte_eth_dev *dev, __rte_unused
struct rte_eth_dev_inf
dev_info->speed_capa = ETH_LINK_SPEED_10G | ETH_LINK_SPEED_20G;
}
-static void
+static int
bnx2x_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac_addr,
uint32_t index, uint32_t pool)
{
struct bnx2x_softc *sc = dev->data->dev_private;
- if (sc->mac_ops.mac_addr_add)
+ if (sc->mac_ops.mac_addr_add) {
sc->mac_ops.mac_addr_add(dev, mac_addr, index, pool);
+ return 0;
+ }
+ return -ENOTSUP;
}
static void
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 5dc3ff0..c18555f 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -614,9 +614,9 @@ static void bnxt_mac_addr_remove_op(struct rte_eth_dev
*eth_dev,
}
}
-static void bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
-struct ether_addr *mac_addr,
-uint32_t index, uint32_t pool)
+static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
+ struct ether_addr *mac_addr,
+ uint32_t index, uint32_t pool)
{
struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_
[dpdk-dev] [PATCH v5 3/3] app/testpmd: add a command to add many MAC addrs
This patch is added to introduce a testpmd command which
is used to add more than one MAC addresses one time.
This command can simplify the test for the change where
the type of return value of adding MAC address.
Normally a MAC address may fails to be added only after
many MAC addresses have been added.
Without this command, a tester may only trigger failed
MAC address by running many times of testpmd command
'mac_addr add' .
Signed-off-by: Wei Dai
---
app/test-pmd/cmdline.c | 55 ++
1 file changed, 55 insertions(+)
mode change 100644 => 100755 app/test-pmd/cmdline.c
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
old mode 100644
new mode 100755
index f6bd75b..a65f457
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -6436,6 +6436,60 @@ cmdline_parse_inst_t cmd_mac_addr = {
},
};
+/* *** ADD MORE THAN ONE MAC ADDRESS FROM A PORT *** */
+struct cmd_add_more_mac_addr_result {
+ cmdline_fixed_string_t mac_addr_cmd;
+ uint8_t port_num;
+ struct ether_addr address;
+ uint8_t cnt_addr;
+};
+
+static void cmd_add_more_mac_addr_parsed(void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ __attribute__((unused)) void *data)
+{
+ struct cmd_add_more_mac_addr_result *res = parsed_result;
+ int ret;
+ int k;
+
+ for (k = 0; k < res->cnt_addr; k++) {
+ ret = rte_eth_dev_mac_addr_add(res->port_num, &res->address, 0);
+ if (ret < 0) {
+ printf("Fail to add mac addr : (%s) after adding %u
addresses\n",
+ strerror(-ret), k);
+ return;
+ }
+ res->address.addr_bytes[5]++;
+ }
+ printf("Success to add %u mac addresses\n", k);
+}
+
+cmdline_parse_token_string_t cmd_add_more_mac_addr_cmd =
+ TOKEN_STRING_INITIALIZER(struct cmd_add_more_mac_addr_result,
+ mac_addr_cmd, "add_more_mac_addr");
+cmdline_parse_token_num_t cmd_add_more_mac_addr_portnum =
+ TOKEN_NUM_INITIALIZER(struct cmd_add_more_mac_addr_result,
+ port_num, UINT8);
+cmdline_parse_token_etheraddr_t cmd_add_more_mac_addr_addr =
+ TOKEN_ETHERADDR_INITIALIZER(struct cmd_add_more_mac_addr_result,
+ address);
+cmdline_parse_token_num_t cmd_add_more_mac_addr_cnt_addr =
+ TOKEN_NUM_INITIALIZER(struct cmd_add_more_mac_addr_result,
+ cnt_addr, UINT8);
+
+cmdline_parse_inst_t cmd_add_more_mac_addr = {
+ .f = cmd_add_more_mac_addr_parsed,
+ .data = (void *)0,
+ .help_str = "add_more_mac_addr : "
+ "Add cnt_addr MAC addresses on port_id",
+ .tokens = {
+ (void *)&cmd_add_more_mac_addr_cmd,
+ (void *)&cmd_add_more_mac_addr_portnum,
+ (void *)&cmd_add_more_mac_addr_addr,
+ (void *)&cmd_add_more_mac_addr_cnt_addr,
+ NULL,
+ },
+};
/* *** CONFIGURE QUEUE STATS COUNTER MAPPINGS *** */
struct cmd_set_qmap_result {
@@ -13612,6 +13666,7 @@ cmdline_parse_ctx_t main_ctx[] = {
(cmdline_parse_inst_t *)&cmd_read_rxd_txd,
(cmdline_parse_inst_t *)&cmd_stop,
(cmdline_parse_inst_t *)&cmd_mac_addr,
+ (cmdline_parse_inst_t *)&cmd_add_more_mac_addr,
(cmdline_parse_inst_t *)&cmd_set_qmap,
(cmdline_parse_inst_t *)&cmd_operate_port,
(cmdline_parse_inst_t *)&cmd_operate_specific_port,
--
2.7.4
[dpdk-dev] [PATCH v5 2/3] doc: change type of return value of adding MAC addr
Add following lines in section of API change in release note. If a MAC address fails to be added without this change, it is still stored and may be regarded as a valid one. This may lead to errors in application. The type of return value of eth_mac_addr_add_t in rte_ethdev.h is changed. Any specific NIC also follows this change. Signed-off-by: Wei Dai Acked-by: John McNamara --- doc/guides/rel_notes/release_17_05.rst | 7 +++ 1 file changed, 7 insertions(+) mode change 100644 => 100755 doc/guides/rel_notes/release_17_05.rst diff --git a/doc/guides/rel_notes/release_17_05.rst b/doc/guides/rel_notes/release_17_05.rst old mode 100644 new mode 100755 index ad20e86..8850fbe --- a/doc/guides/rel_notes/release_17_05.rst +++ b/doc/guides/rel_notes/release_17_05.rst @@ -481,6 +481,13 @@ ABI Changes * The ``rte_cryptodev_info.sym`` structure has new field ``max_nb_sessions_per_qp`` to support drivers which may support limited number of sessions per queue_pair. +* **Return if the MAC address is added successfully or not.** + + If a MAC address fails to be added without this change, it is still stored + and may be regarded as a valid one. This may lead to errors in application. + The type of return value of eth_mac_addr_add_t in rte_ethdev.h is changed. + Any specific NIC also follows this change. + Removed Items - -- 2.7.4
