From: Wei Zhao <wei.zhao1@intel.com>
To: qabuild@intel.com
Cc: Wei Zhao <wei.zhao1@intel.com>, stable@dpdk.org
Subject: [dpdk-stable] [DPDK 2/4] net/ice: fix tunnel type for switch rule
Date: Sun, 28 Jun 2020 11:14:20 +0800 [thread overview]
Message-ID: <20200628031422.70053-2-wei.zhao1@intel.com> (raw)
In-Reply-To: <20200628031422.70053-1-wei.zhao1@intel.com>
This patch add check for protocol type of IPv4 packet,
it need to update tunnel type when NVGRE is in payload.
Fixes: 6bc7628c5e0b ("net/ice: change default tunnel type")
Cc: stable@dpdk.org
Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
---
drivers/net/ice/ice_switch_filter.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index 3c0c36bce..c607e8d17 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -28,6 +28,7 @@
#define MAX_QGRP_NUM_TYPE 7
#define ICE_PPP_IPV4_PROTO 0x0021
#define ICE_PPP_IPV6_PROTO 0x0057
+#define ICE_IPV4_PROTO_NVGRE 0x002F
#define ICE_SW_INSET_ETHER ( \
ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
@@ -632,6 +633,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],
list[t].m_u.ipv4_hdr.protocol =
ipv4_mask->hdr.next_proto_id;
}
+ if ((ipv4_spec->hdr.next_proto_id &
+ ipv4_mask->hdr.next_proto_id) ==
+ ICE_IPV4_PROTO_NVGRE)
+ *tun_type = ICE_SW_TUN_AND_NON_TUN;
if (ipv4_mask->hdr.type_of_service) {
list[t].h_u.ipv4_hdr.tos =
ipv4_spec->hdr.type_of_service;
@@ -1526,7 +1531,7 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
const struct rte_flow_item *item = pattern;
uint16_t item_num = 0;
enum ice_sw_tunnel_type tun_type =
- ICE_SW_TUN_AND_NON_TUN;
+ ICE_NON_TUN;
struct ice_pattern_match_item *pattern_match_item = NULL;
for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
--
2.19.1
next parent reply other threads:[~2020-06-28 3:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200628031422.70053-1-wei.zhao1@intel.com>
2020-06-28 3:14 ` Wei Zhao [this message]
2020-06-28 3:14 ` [dpdk-stable] [DPDK 3/4] net/ice: support switch flow for specific L4 type Wei Zhao
2020-06-28 3:14 ` [dpdk-stable] [DPDK 4/4] net/ice: add input set byte number check Wei Zhao
[not found] <20200628031410.70004-1-wei.zhao1@intel.com>
2020-06-28 3:14 ` [dpdk-stable] [DPDK 2/4] net/ice: fix tunnel type for switch rule Wei Zhao
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=20200628031422.70053-2-wei.zhao1@intel.com \
--to=wei.zhao1@intel.com \
--cc=qabuild@intel.com \
--cc=stable@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).