From: Wenzhuo Lu <wenzhuo.lu@intel.com>
To: dev@dpdk.org
Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>
Subject: [dpdk-dev] [PATCH v2 2/3] app/testpmd: fix wrong flow director mask
Date: Wed, 12 Oct 2016 14:24:21 +0800 [thread overview]
Message-ID: <1476253462-13000-3-git-send-email-wenzhuo.lu@intel.com> (raw)
In-Reply-To: <1476253462-13000-1-git-send-email-wenzhuo.lu@intel.com>
In mac-vlan mode, MAC address mask is not supported by HW.
The MAC address mask should not be set in mac-vlan mode.
Remove this parameter from the CLI. Remove MAC address
from mask print too.
Fixes: 53b2bb9b7ea7 ("app/testpmd: new flow director commands")
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---
app/test-pmd/cmdline.c | 5 +----
app/test-pmd/config.c | 13 ++++++-------
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 3 +--
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 6e95ca2..259090a 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -720,7 +720,7 @@ static void cmd_help_long_parsed(void *parsed_result,
" Set flow director IP mask.\n\n"
"flow_director_mask (port_id) mode MAC-VLAN"
- " vlan (vlan_value) mac (mac_value)\n"
+ " vlan (vlan_value)\n"
" Set flow director MAC-VLAN mask.\n\n"
"flow_director_mask (port_id) mode Tunnel"
@@ -9075,7 +9075,6 @@ cmd_flow_director_mask_parsed(void *parsed_result,
}
mask->vlan_tci_mask = res->vlan_mask;
- mask->mac_addr_byte_mask = res->mac_addr_byte_mask;
} else if (fdir_conf.mode == RTE_FDIR_MODE_PERFECT_TUNNEL) {
if (strcmp(res->mode_value, "Tunnel")) {
printf("Please set mode to Tunnel.\n");
@@ -9206,8 +9205,6 @@ cmdline_parse_inst_t cmd_set_flow_director_mac_vlan_mask = {
(void *)&cmd_flow_director_mask_mode_mac_vlan,
(void *)&cmd_flow_director_mask_vlan,
(void *)&cmd_flow_director_mask_vlan_value,
- (void *)&cmd_flow_director_mask_mac,
- (void *)&cmd_flow_director_mask_mac_value,
NULL,
},
};
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 83bebfe..238c4fd 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2045,16 +2045,15 @@ set_qmap(portid_t port_id, uint8_t is_rx, uint16_t queue_id, uint8_t map_value)
static inline void
print_fdir_mask(struct rte_eth_fdir_masks *mask)
{
- printf("\n vlan_tci: 0x%04x, ", mask->vlan_tci_mask);
+ printf("\n vlan_tci: 0x%04x", mask->vlan_tci_mask);
- if (fdir_conf.mode == RTE_FDIR_MODE_PERFECT_MAC_VLAN)
- printf("mac_addr: 0x%02x", mask->mac_addr_byte_mask);
- else if (fdir_conf.mode == RTE_FDIR_MODE_PERFECT_TUNNEL)
- printf("mac_addr: 0x%02x, tunnel_type: 0x%01x, tunnel_id: 0x%08x",
+ if (fdir_conf.mode == RTE_FDIR_MODE_PERFECT_TUNNEL)
+ printf(", mac_addr: 0x%02x, tunnel_type: 0x%01x,"
+ " tunnel_id: 0x%08x",
mask->mac_addr_byte_mask, mask->tunnel_type_mask,
mask->tunnel_id_mask);
- else {
- printf("src_ipv4: 0x%08x, dst_ipv4: 0x%08x,"
+ else if (fdir_conf.mode != RTE_FDIR_MODE_PERFECT_MAC_VLAN) {
+ printf(", src_ipv4: 0x%08x, dst_ipv4: 0x%08x,"
" src_port: 0x%04x, dst_port: 0x%04x",
mask->ipv4_mask.src_ip, mask->ipv4_mask.dst_ip,
mask->src_port_mask, mask->dst_port_mask);
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index f87e0c2..ed04532 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1844,8 +1844,7 @@ Set flow director's input masks::
src_mask (ipv4_src) (ipv6_src) (src_port) \
dst_mask (ipv4_dst) (ipv6_dst) (dst_port)
- flow_director_mask (port_id) mode MAC-VLAN vlan (vlan_value) \
- mac (mac_value)
+ flow_director_mask (port_id) mode MAC-VLAN vlan (vlan_value)
flow_director_mask (port_id) mode Tunnel vlan (vlan_value) \
mac (mac_value) tunnel-type (tunnel_type_value) \
--
1.9.3
next prev parent reply other threads:[~2016-10-12 6:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-10 7:46 [dpdk-dev] [PATCH 0/3] fix flow director mask issues Wenzhuo Lu
2016-10-10 7:46 ` [dpdk-dev] [PATCH 1/3] ixgbe: fix wrong flow director mask Wenzhuo Lu
2016-10-10 7:46 ` [dpdk-dev] [PATCH 2/3] app/testpmd: fix flow director endian issue Wenzhuo Lu
2016-10-10 7:46 ` [dpdk-dev] [PATCH 3/3] app/testpmd: fix wrong flow director mask Wenzhuo Lu
2016-10-12 6:24 ` [dpdk-dev] [PATCH v2 0/3] fix flow director mask issues Wenzhuo Lu
2016-10-12 6:24 ` [dpdk-dev] [PATCH v2 1/3] ixgbe: fix wrong flow director mask Wenzhuo Lu
2016-10-12 6:24 ` Wenzhuo Lu [this message]
2016-10-13 11:00 ` [dpdk-dev] [PATCH v2 2/3] app/testpmd: " Ferruh Yigit
2016-10-17 20:18 ` De Lara Guarch, Pablo
2016-10-12 6:24 ` [dpdk-dev] [PATCH v2 3/3] app/testpmd: fix flow director endian issue Wenzhuo Lu
2016-10-17 20:18 ` De Lara Guarch, Pablo
2016-10-19 0:46 ` Lu, Wenzhuo
2016-10-19 1:22 ` [dpdk-dev] [PATCH v3 0/3] fix flow director mask issues Wenzhuo Lu
2016-10-19 1:22 ` [dpdk-dev] [PATCH v3 1/3] ixgbe: fix wrong flow director mask Wenzhuo Lu
2016-10-19 1:22 ` [dpdk-dev] [PATCH v3 2/3] app/testpmd: " Wenzhuo Lu
2016-10-19 1:23 ` [dpdk-dev] [PATCH v3 3/3] app/testpmd: fix flow director endian issue Wenzhuo Lu
2016-10-19 9:35 ` [dpdk-dev] [PATCH v3 0/3] fix flow director mask issues 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=1476253462-13000-3-git-send-email-wenzhuo.lu@intel.com \
--to=wenzhuo.lu@intel.com \
--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).