From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2EA14A2EDB for ; Sat, 7 Sep 2019 14:52:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3E4EB1BF60; Sat, 7 Sep 2019 14:52:14 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id A3089E07 for ; Sat, 7 Sep 2019 14:52:12 +0200 (CEST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Sep 2019 05:52:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,477,1559545200"; d="scan'208";a="383529931" Received: from yexl-server.sh.intel.com (HELO localhost) ([10.67.117.5]) by fmsmga005.fm.intel.com with ESMTP; 07 Sep 2019 05:52:09 -0700 Date: Sat, 7 Sep 2019 20:50:05 +0800 From: Ye Xiaolong To: Yahui Cao Cc: Qiming Yang , Wenzhuo Lu , dev@dpdk.org, Qi Zhang , Beilei Xing Message-ID: <20190907125005.GC110251@intel.com> References: <20190906120058.108073-1-yahui.cao@intel.com> <20190906120058.108073-5-yahui.cao@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190906120058.108073-5-yahui.cao@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [dpdk-dev] [dpdk-dev 04/12] net/ice: add FDIR create and destroy 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" On 09/06, Yahui Cao wrote: >Add ice_create_fdir_filter to create a rule. If a flow is matched by >flow director filter, filter rule will be set to HW. Only basic pattern >and queue/passthru/drop are supported. Only basic patterns and queue/passthru/drop actions are supported? > >Add ice_destroy_fdir_filter to destroy a rule. If a flow is created >before, filter rule will be removed from HW. > >Signed-off-by: Yahui Cao >--- > drivers/net/ice/ice_ethdev.h | 6 + > drivers/net/ice/ice_fdir_filter.c | 508 ++++++++++++++++++++++++++++++ > 2 files changed, 514 insertions(+) > >diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h >index ea68858d1..bb821bc41 100644 >--- a/drivers/net/ice/ice_ethdev.h >+++ b/drivers/net/ice/ice_ethdev.h >@@ -249,6 +249,11 @@ TAILQ_HEAD(ice_flow_list, rte_flow); > struct ice_flow_parser; > TAILQ_HEAD(ice_parser_list, ice_flow_parser); > >+struct ice_fdir_filter_conf { >+ struct ice_fdir_fltr input; >+ uint64_t input_set; >+}; >+ > /** > * A structure used to define fields of a FDIR related info. > */ >@@ -258,6 +263,7 @@ struct ice_fdir_info { > struct ice_rx_queue *rxq; > void *prg_pkt; /* memory for fdir program packet */ > uint64_t dma_addr; /* physic address of packet memory*/ >+ struct ice_fdir_filter_conf conf; > }; > > struct ice_pf { >diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c >index 0840c3b4b..98bc1be49 100644 >--- a/drivers/net/ice/ice_fdir_filter.c >+++ b/drivers/net/ice/ice_fdir_filter.c >@@ -7,6 +7,51 @@ > #include "ice_rxtx.h" > #include "ice_generic_flow.h" > >+#define ICE_FDIR_INSET_ETH_IPV4 (\ >+ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_IPV4_TOS | \ >+ ICE_INSET_IPV4_TTL | ICE_INSET_IPV4_PROTO) >+ >+#define ICE_FDIR_INSET_ETH_IPV4_UDP (\ >+ ICE_FDIR_INSET_ETH_IPV4 | \ >+ ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT) >+ >+#define ICE_FDIR_INSET_ETH_IPV4_TCP (\ >+ ICE_FDIR_INSET_ETH_IPV4 | \ >+ ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT) >+ >+#define ICE_FDIR_INSET_ETH_IPV4_SCTP (\ >+ ICE_FDIR_INSET_ETH_IPV4 | \ >+ ICE_INSET_SCTP_SRC_PORT | ICE_INSET_SCTP_DST_PORT) >+ >+#define ICE_FDIR_INSET_ETH_IPV6 (\ >+ ICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST | ICE_INSET_IPV6_TC | \ >+ ICE_INSET_IPV6_HOP_LIMIT | ICE_INSET_IPV6_NEXT_HDR) >+ >+#define ICE_FDIR_INSET_ETH_IPV6_UDP (\ >+ ICE_FDIR_INSET_ETH_IPV6 | \ >+ ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT) >+ >+#define ICE_FDIR_INSET_ETH_IPV6_TCP (\ >+ ICE_FDIR_INSET_ETH_IPV6 | \ >+ ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT) >+ >+#define ICE_FDIR_INSET_ETH_IPV6_SCTP (\ >+ ICE_FDIR_INSET_ETH_IPV6 | \ >+ ICE_INSET_SCTP_SRC_PORT | ICE_INSET_SCTP_DST_PORT) >+ >+static struct ice_pattern_match_item ice_fdir_pattern[] = { >+ {pattern_eth_ipv4, ICE_FDIR_INSET_ETH_IPV4, ICE_INSET_NONE}, >+ {pattern_eth_ipv4_udp, ICE_FDIR_INSET_ETH_IPV4_UDP, ICE_INSET_NONE}, >+ {pattern_eth_ipv4_tcp, ICE_FDIR_INSET_ETH_IPV4_TCP, ICE_INSET_NONE}, >+ {pattern_eth_ipv4_sctp, ICE_FDIR_INSET_ETH_IPV4_SCTP, ICE_INSET_NONE}, >+ {pattern_eth_ipv6, ICE_FDIR_INSET_ETH_IPV6, ICE_INSET_NONE}, >+ {pattern_eth_ipv6_udp, ICE_FDIR_INSET_ETH_IPV6_UDP, ICE_INSET_NONE}, >+ {pattern_eth_ipv6_tcp, ICE_FDIR_INSET_ETH_IPV6_TCP, ICE_INSET_NONE}, >+ {pattern_eth_ipv6_sctp, ICE_FDIR_INSET_ETH_IPV6_SCTP, ICE_INSET_NONE}, >+}; >+ >+static struct ice_flow_parser ice_fdir_parser; >+ > static const struct rte_memzone * > ice_memzone_reserve(const char *name, uint32_t len, int socket_id) > { >@@ -400,6 +445,10 @@ ice_init_fdir_filter(struct ice_adapter *ad) > int ret; > > ret = ice_fdir_setup(pf); >+ if (ret) >+ return ret; >+ >+ ret = ice_register_parser(&ice_fdir_parser, ad); > > return ret; return ice_register_parser(&ice_fdir_parser, ad); > } >@@ -409,15 +458,474 @@ ice_uninit_fdir_filter(struct ice_adapter *ad) > { > struct ice_pf *pf = &ad->pf; > >+ ice_unregister_parser(&ice_fdir_parser, ad); >+ > ice_fdir_teardown(pf); > } > >+static int >+ice_add_del_fdir_filter(struct ice_pf *pf, >+ struct ice_fdir_filter_conf *filter, >+ bool add) >+{ >+ struct ice_fltr_desc desc; >+ struct ice_hw *hw = ICE_PF_TO_HW(pf); >+ unsigned char *pkt = (unsigned char *)pf->fdir.prg_pkt; >+ int ret = 0; >+ >+ memset(&desc, 0, sizeof(desc)); >+ ice_fdir_get_prgm_desc(hw, &filter->input, &desc, add); >+ >+ memset(pkt, 0, ICE_FDIR_PKT_LEN); >+ ret = ice_fdir_get_prgm_pkt(&filter->input, pkt, false); >+ if (ret) { >+ PMD_DRV_LOG(ERR, "Generate dummy packet failed"); >+ return -EINVAL; >+ } >+ >+ ret = ice_fdir_programming(pf, &desc); >+ if (ret) >+ return ret; >+ >+ return 0; return ice_fdir_programming(pf, &desc); >+} >+ >+static int >+ice_create_fdir_filter(struct ice_adapter *ad, >+ struct rte_flow *flow, >+ void *meta, >+ struct rte_flow_error *error) >+{ >+ struct ice_pf *pf = &ad->pf; >+ struct ice_hw *hw = ICE_PF_TO_HW(pf); >+ struct ice_fdir_filter_conf *filter = meta; >+ struct ice_fdir_filter_conf *rule; >+ int ret = 0; Unnecessary initialization for ret. Thanks, Xiaolong