From: Wei Zhao <wei.zhao1@intel.com> To: dev@dpdk.org Cc: stable@dpdk.org, qi.z.zhang@intel.com, Wei Zhao <wei.zhao1@intel.com> Subject: [dpdk-stable] [PATCH v2 3/4] net/ice: add check for NVGRE protocol Date: Wed, 17 Jun 2020 14:14:28 +0800 Message-ID: <20200617061429.6447-4-wei.zhao1@intel.com> (raw) In-Reply-To: <20200617061429.6447-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..3b38195d6 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 0x2F #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 prev parent reply other threads:[~2020-06-17 6:39 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20200605074031.16231-1-wei.zhao1@intel.com> 2020-06-05 7:40 ` [dpdk-stable] [PATCH 2/4] net/ice: add redirect support for VSI list rule Wei Zhao 2020-06-05 7:40 ` [dpdk-stable] [PATCH 3/4] net/ice: add check for NVGRE protocol Wei Zhao 2020-06-05 7:40 ` [dpdk-stable] [PATCH 4/4] net/ice: support switch flow for specific L4 type Wei Zhao 2020-06-17 6:14 ` [dpdk-stable] [PATCH v2 0/4] enable more PPPoE packet type for switch Wei Zhao 2020-06-17 6:14 ` [dpdk-stable] [PATCH v2 1/4] net/ice: add support " Wei Zhao 2020-06-17 6:14 ` [dpdk-stable] [PATCH v2 2/4] net/ice: add redirect support for VSI list rule Wei Zhao 2020-06-22 15:25 ` Zhang, Qi Z 2020-06-17 6:14 ` Wei Zhao [this message] 2020-06-22 15:49 ` [dpdk-stable] [PATCH v2 3/4] net/ice: add check for NVGRE protocol Zhang, Qi Z 2020-06-23 1:11 ` Zhao1, Wei 2020-06-17 6:14 ` [dpdk-stable] [PATCH v2 4/4] net/ice: support switch flow for specific L4 type Wei Zhao 2020-06-22 15:36 ` Zhang, Qi Z 2020-06-23 1:12 ` Zhao1, Wei 2020-06-28 3:21 ` [dpdk-stable] [PATCH v3 0/4] enable more PPPoE packet type for switch Wei Zhao 2020-06-28 3:21 ` [dpdk-stable] [PATCH v3 1/4] net/ice: add support " Wei Zhao 2020-06-28 3:21 ` [dpdk-stable] [PATCH v3 2/4] net/ice: fix tunnel type for switch rule Wei Zhao 2020-06-28 3:21 ` [dpdk-stable] [PATCH v3 3/4] net/ice: support switch flow for specific L4 type Wei Zhao 2020-06-28 3:21 ` [dpdk-stable] [PATCH v3 4/4] net/ice: add input set byte number check Wei Zhao 2020-06-28 5:01 ` [dpdk-stable] [PATCH v3 0/4] enable more PPPoE packet type for switch Wei Zhao 2020-06-28 5:01 ` [dpdk-stable] [PATCH v3 1/4] net/ice: add support " Wei Zhao 2020-06-28 5:01 ` [dpdk-stable] [PATCH v3 2/4] net/ice: fix tunnel type for switch rule Wei Zhao 2020-06-28 5:01 ` [dpdk-stable] [PATCH v3 3/4] net/ice: support switch flow for specific L4 type Wei Zhao 2020-06-29 1:55 ` Zhang, Qi Z 2020-06-29 2:01 ` Zhao1, Wei 2020-06-28 5:01 ` [dpdk-stable] [PATCH v3 4/4] net/ice: add input set byte number check Wei Zhao 2020-06-28 5:28 ` [dpdk-stable] [PATCH v4 0/4] enable more PPPoE packet type for switch Wei Zhao 2020-06-28 5:28 ` [dpdk-stable] [PATCH v4 1/4] net/ice: add support " Wei Zhao 2020-06-28 5:28 ` [dpdk-stable] [PATCH v4 2/4] net/ice: fix tunnel type for switch rule Wei Zhao 2020-06-28 5:28 ` [dpdk-stable] [PATCH v4 3/4] net/ice: support switch flow for specific L4 type Wei Zhao 2020-06-28 5:28 ` [dpdk-stable] [PATCH v4 4/4] net/ice: add input set byte number check Wei Zhao 2020-06-29 5:10 ` [dpdk-stable] [PATCH v5 0/5] enable more PPPoE packet type for switch Wei Zhao 2020-06-29 5:10 ` [dpdk-stable] [PATCH v5 1/5] net/ice: add support " Wei Zhao 2020-06-29 5:10 ` [dpdk-stable] [PATCH v5 2/5] net/ice: fix tunnel type for switch rule Wei Zhao 2020-06-29 5:10 ` [dpdk-stable] [PATCH v5 3/5] net/ice: support switch flow for specific L4 type Wei Zhao 2020-06-29 5:10 ` [dpdk-stable] [PATCH v5 4/5] net/ice: add input set byte number check Wei Zhao 2020-06-29 5:10 ` [dpdk-stable] [PATCH v5 5/5] net/ice: fix typo Wei Zhao 2020-07-03 2:47 ` [dpdk-stable] [PATCH v5 0/5] enable more PPPoE packet type for switch Lu, Nannan 2020-07-03 6:19 ` [dpdk-stable] [PATCH v6 " Wei Zhao 2020-07-03 6:19 ` [dpdk-stable] [PATCH v6 1/5] net/ice: add support more PPPoE packeat " Wei Zhao 2020-07-03 6:19 ` [dpdk-stable] [PATCH v6 2/5] net/ice: fix tunnel type for switch rule Wei Zhao 2020-07-03 6:19 ` [dpdk-stable] [PATCH v6 3/5] net/ice: support switch flow for specific L4 type Wei Zhao 2020-07-03 6:19 ` [dpdk-stable] [PATCH v6 4/5] net/ice: add input set byte number check Wei Zhao 2020-07-03 6:19 ` [dpdk-stable] [PATCH v6 5/5] net/ice: fix typo Wei Zhao 2020-07-03 13:46 ` [dpdk-stable] [PATCH v6 0/5] enable more PPPoE packet type for switch Zhang, Qi Z
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=20200617061429.6447-4-wei.zhao1@intel.com \ --to=wei.zhao1@intel.com \ --cc=dev@dpdk.org \ --cc=qi.z.zhang@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
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git