From patchwork Mon Sep 28 06:31:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zhirun" X-Patchwork-Id: 78966 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7F719A04C0; Mon, 28 Sep 2020 08:37:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9786F1BE8A; Mon, 28 Sep 2020 08:37:20 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 7383B1BBDB for ; Mon, 28 Sep 2020 08:37:16 +0200 (CEST) IronPort-SDR: rcd3dlJqKVsEb9AEundop353vzgWtLfcOjtLmkzq5Nz9DibSu/2CDdsJxMxS6Qkehi5SBe05X4 yUZNxX9FT2Ow== X-IronPort-AV: E=McAfee;i="6000,8403,9757"; a="159293717" X-IronPort-AV: E=Sophos;i="5.77,312,1596524400"; d="scan'208";a="159293717" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2020 23:37:15 -0700 IronPort-SDR: OxR0cqurUV9B8/a+Q9e//UFDyFlLPytWdJg72HkqRFKcA6UG20THN/6SV7KiR65z1HqME6MwO4 AkZMQT/EbHPw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,312,1596524400"; d="scan'208";a="324188070" Received: from dpdk-zhirun-dev.sh.intel.com ([10.67.118.201]) by orsmga002.jf.intel.com with ESMTP; 27 Sep 2020 23:37:13 -0700 From: Zhirun Yan To: qi.z.zhang@intel.com, dev@dpdk.org Cc: yahui.cao@intel.com, xiao.w.wang@intel.com, simei.su@intel.com, junfeng.guo@intel.com, Zhirun Yan Date: Mon, 28 Sep 2020 14:31:45 +0800 Message-Id: <20200928063146.668003-2-zhirun.yan@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200928063146.668003-1-zhirun.yan@intel.com> References: <20200928063146.668003-1-zhirun.yan@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v1 1/2] net/ice/base: add tunnel support for FDIR X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add struct to store outer part for tunnel rule. Add vxlan ptype in ipv4 mac bitmap. So when create a vxlan rule, the ptype group will be valid. Signed-off-by: Zhirun Yan --- drivers/net/ice/base/ice_fdir.c | 7 +++++++ drivers/net/ice/base/ice_fdir.h | 9 +++++++++ drivers/net/ice/base/ice_flow.c | 6 +++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c index aea388f2a..c15b232db 100644 --- a/drivers/net/ice/base/ice_fdir.c +++ b/drivers/net/ice/base/ice_fdir.c @@ -1057,6 +1057,13 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input, loc[20] = ICE_FDIR_IPV4_PKT_FLAG_DF; break; case ICE_FLTR_PTYPE_NONF_IPV4_UDP: + ice_pkt_insert_mac_addr(pkt, input->ext_data_outer.dst_mac); + ice_pkt_insert_mac_addr(pkt + ETH_ALEN, input->ext_data_outer.src_mac); + ice_pkt_insert_u32(pkt, ICE_IPV4_SRC_ADDR_OFFSET, + input->ip_outer.v4.dst_ip); + ice_pkt_insert_u32(pkt, ICE_IPV4_DST_ADDR_OFFSET, + input->ip_outer.v4.src_ip); + ice_pkt_insert_u8(pkt, ICE_IPV4_TOS_OFFSET, input->ip_outer.v4.tos); ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET, input->ip.v4.src_ip); ice_pkt_insert_u16(loc, ICE_IPV4_UDP_DST_PORT_OFFSET, diff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h index 7e00bb273..d363de385 100644 --- a/drivers/net/ice/base/ice_fdir.h +++ b/drivers/net/ice/base/ice_fdir.h @@ -181,6 +181,15 @@ struct ice_fdir_fltr { struct ice_fdir_v6 v6; } ip, mask; + /* for tunnel outer part */ + union { + struct ice_fdir_v4 v4; + struct ice_fdir_v6 v6; + } ip_outer, mask_outer; + + struct ice_fdir_extra ext_data_outer; + struct ice_fdir_extra ext_mask_outer; + struct ice_fdir_udp_gtp gtpu_data; struct ice_fdir_udp_gtp gtpu_mask; diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c index de5dfb228..35e8c59f6 100644 --- a/drivers/net/ice/base/ice_flow.c +++ b/drivers/net/ice/base/ice_flow.c @@ -222,7 +222,7 @@ static const u32 ice_ptypes_macvlan_il[] = { * include IPV4 other PTYPEs */ static const u32 ice_ptypes_ipv4_ofos[] = { - 0x1DC00000, 0x04000800, 0x00000000, 0x00000000, + 0x1DC00000, 0x24000800, 0x00000000, 0x00000000, 0x00000000, 0x00000155, 0x00000000, 0x00000000, 0x00000000, 0x000FC000, 0x000002A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, @@ -236,7 +236,7 @@ static const u32 ice_ptypes_ipv4_ofos[] = { * IPV4 other PTYPEs */ static const u32 ice_ptypes_ipv4_ofos_all[] = { - 0x1DC00000, 0x04000800, 0x00000000, 0x00000000, + 0x1DC00000, 0x24000800, 0x00000000, 0x00000000, 0x00000000, 0x00000155, 0x00000000, 0x00000000, 0x00000000, 0x000FC000, 0x83E0FAA0, 0x00000101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, @@ -434,7 +434,7 @@ static const u32 ice_ptypes_gre_of[] = { /* Packet types for packets with an Innermost/Last MAC header */ static const u32 ice_ptypes_mac_il[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, From patchwork Mon Sep 28 06:31:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zhirun" X-Patchwork-Id: 78967 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 747F2A04C0; Mon, 28 Sep 2020 08:37:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BF36D1D5FC; Mon, 28 Sep 2020 08:37:22 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id EA0C71BFDA for ; Mon, 28 Sep 2020 08:37:19 +0200 (CEST) IronPort-SDR: /LRfvvcqxvb4p2cM9C/sICn4LHSz5OyQh0Gx7D3+lx7vT+wzIYwfMw6gazWqQ1Qag7azYhQ6UW zm8kiWovTnpg== X-IronPort-AV: E=McAfee;i="6000,8403,9757"; a="159293726" X-IronPort-AV: E=Sophos;i="5.77,312,1596524400"; d="scan'208";a="159293726" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2020 23:37:19 -0700 IronPort-SDR: QqhmMqP0JALxCu3xEWA+YG7XHf2WcBtrOq36xiveq7cyO84D5nLtozP9xSEizRHwGVXQep97oH SX6LonQqCVlg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,312,1596524400"; d="scan'208";a="324188100" Received: from dpdk-zhirun-dev.sh.intel.com ([10.67.118.201]) by orsmga002.jf.intel.com with ESMTP; 27 Sep 2020 23:37:16 -0700 From: Zhirun Yan To: qi.z.zhang@intel.com, dev@dpdk.org Cc: yahui.cao@intel.com, xiao.w.wang@intel.com, simei.su@intel.com, junfeng.guo@intel.com, Zhirun Yan Date: Mon, 28 Sep 2020 14:31:46 +0800 Message-Id: <20200928063146.668003-3-zhirun.yan@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200928063146.668003-1-zhirun.yan@intel.com> References: <20200928063146.668003-1-zhirun.yan@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v1 2/2] net/ice: support inner/outer L2/L3 field for FDIR X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Distinguish inner/outer fields for parse pattern. So FDIR for tunnel can be more flexible. Enable VXLAN inner/outer L3/L4 different fields for FDIR. Signed-off-by: Zhirun Yan --- drivers/net/ice/ice_fdir_filter.c | 59 +++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 175abcdd5..961528d17 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -56,6 +56,11 @@ ICE_INSET_SCTP_SRC_PORT | ICE_INSET_SCTP_DST_PORT) #define ICE_FDIR_INSET_VXLAN_IPV4 (\ + ICE_FDIR_INSET_ETH | \ + ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ + ICE_INSET_IPV4_TOS | \ + ICE_INSET_UDP_DST_PORT | \ + ICE_INSET_TUN_DMAC | ICE_INSET_TUN_SMAC | \ ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST) #define ICE_FDIR_INSET_VXLAN_IPV4_TCP (\ @@ -907,6 +912,7 @@ ice_fdir_input_set_parse(uint64_t inset, enum ice_flow_field *field) }; static const struct ice_inset_map ice_inset_map[] = { {ICE_INSET_DMAC, ICE_FLOW_FIELD_IDX_ETH_DA}, + {ICE_INSET_SMAC, ICE_FLOW_FIELD_IDX_ETH_SA}, {ICE_INSET_ETHERTYPE, ICE_FLOW_FIELD_IDX_ETH_TYPE}, {ICE_INSET_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA}, {ICE_INSET_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA}, @@ -1655,6 +1661,14 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, uint32_t vtc_flow_cpu; uint16_t ether_type; enum rte_flow_item_type next_type; + bool is_outer_part = true; + + for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { + if (item->type == RTE_FLOW_ITEM_TYPE_VXLAN) { + tunnel_type = ICE_FDIR_TUNNEL_TYPE_VXLAN; + break; + } + } for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { if (item->last) { @@ -1672,7 +1686,25 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, eth_mask = item->mask; next_type = (item + 1)->type; - if (eth_spec && eth_mask) { + if (!(eth_spec && eth_mask)) + break; + + /* handle outer L2 fields */ + if (is_outer_part && tunnel_type == ICE_FDIR_TUNNEL_TYPE_VXLAN) { + if (!rte_is_zero_ether_addr(ð_mask->dst)) { + filter->outer_input_set |= ICE_INSET_DMAC; + rte_memcpy(&filter->input.ext_data_outer.dst_mac, + ð_spec->dst, + RTE_ETHER_ADDR_LEN); + } + + if (!rte_is_zero_ether_addr(ð_mask->src)) { + filter->outer_input_set |= ICE_INSET_SMAC; + rte_memcpy(&filter->input.ext_data_outer.src_mac, + ð_spec->src, + RTE_ETHER_ADDR_LEN); + } + } else { if (!rte_is_zero_ether_addr(ð_mask->dst)) { input_set |= ICE_INSET_DMAC; rte_memcpy(&filter->input.ext_data.dst_mac, @@ -1714,7 +1746,27 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, ipv4_spec = item->spec; ipv4_mask = item->mask; - if (ipv4_spec && ipv4_mask) { + if (!(ipv4_spec && ipv4_mask)) + break; + + /* handle outer L3 fields */ + if (is_outer_part && tunnel_type == ICE_FDIR_TUNNEL_TYPE_VXLAN) { + if (ipv4_mask->hdr.dst_addr == UINT32_MAX) { + filter->outer_input_set |= ICE_INSET_IPV4_DST; + filter->input.ip_outer.v4.dst_ip = + ipv4_spec->hdr.dst_addr; + } + if (ipv4_mask->hdr.src_addr == UINT32_MAX) { + filter->outer_input_set |= ICE_INSET_IPV4_SRC; + filter->input.ip_outer.v4.src_ip = + ipv4_spec->hdr.src_addr; + } + if (ipv4_mask->hdr.type_of_service == UINT8_MAX) { + input_set |= ICE_INSET_IPV4_TOS; + filter->input.ip_outer.v4.tos = + ipv4_spec->hdr.type_of_service; + } + } else { /* Check IPv4 mask and update input set */ if (ipv4_mask->hdr.version_ihl || ipv4_mask->hdr.total_length || @@ -1944,6 +1996,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, break; case RTE_FLOW_ITEM_TYPE_VXLAN: l3 = RTE_FLOW_ITEM_TYPE_END; + is_outer_part = false; + vxlan_spec = item->spec; vxlan_mask = item->mask; @@ -1955,7 +2009,6 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, return -rte_errno; } - tunnel_type = ICE_FDIR_TUNNEL_TYPE_VXLAN; break; case RTE_FLOW_ITEM_TYPE_GTPU: l3 = RTE_FLOW_ITEM_TYPE_END;