From: Zhirun Yan <zhirun.yan@intel.com> 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 <zhirun.yan@intel.com> Subject: [dpdk-dev] [PATCH v2 1/2] net/ice: refactor FDIR set conf function Date: Mon, 14 Sep 2020 11:05:29 +0800 Message-ID: <20200914030530.3077904-2-zhirun.yan@intel.com> (raw) In-Reply-To: <20200914030530.3077904-1-zhirun.yan@intel.com> The original set conf function in FDIR was very long. Refactor to increase readability to make it clearer and allow for more convenient further changes. No functional change here. Signed-off-by: Zhirun Yan <zhirun.yan@intel.com> --- drivers/net/ice/ice_fdir_filter.c | 54 ++++++++++++++++++------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 88c9bb03d..593dfd0e2 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -964,30 +964,10 @@ ice_fdir_input_set_parse(uint64_t inset, enum ice_flow_field *field) } } -static int -ice_fdir_input_set_conf(struct ice_pf *pf, enum ice_fltr_ptype flow, - uint64_t input_set, enum ice_fdir_tunnel_type ttype) +static void +ice_fdir_input_set_hdrs(enum ice_fltr_ptype flow, struct ice_flow_seg_info *seg, + enum ice_fdir_tunnel_type ttype) { - struct ice_flow_seg_info *seg; - struct ice_flow_seg_info *seg_tun = NULL; - enum ice_flow_field field[ICE_FLOW_FIELD_IDX_MAX]; - bool is_tunnel; - int i, ret; - - if (!input_set) - return -EINVAL; - - seg = (struct ice_flow_seg_info *) - ice_malloc(hw, sizeof(*seg)); - if (!seg) { - PMD_DRV_LOG(ERR, "No memory can be allocated"); - return -ENOMEM; - } - - for (i = 0; i < ICE_FLOW_FIELD_IDX_MAX; i++) - field[i] = ICE_FLOW_FIELD_IDX_MAX; - ice_fdir_input_set_parse(input_set, field); - switch (flow) { case ICE_FLTR_PTYPE_NONF_IPV4_UDP: ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_UDP | @@ -1063,6 +1043,34 @@ ice_fdir_input_set_conf(struct ice_pf *pf, enum ice_fltr_ptype flow, PMD_DRV_LOG(ERR, "not supported filter type."); break; } +} + +static int +ice_fdir_input_set_conf(struct ice_pf *pf, enum ice_fltr_ptype flow, + uint64_t input_set, enum ice_fdir_tunnel_type ttype) +{ + struct ice_flow_seg_info *seg; + struct ice_flow_seg_info *seg_tun = NULL; + enum ice_flow_field field[ICE_FLOW_FIELD_IDX_MAX]; + bool is_tunnel; + int i, ret; + + if (!input_set) + return -EINVAL; + + seg = (struct ice_flow_seg_info *) + ice_malloc(hw, sizeof(*seg)); + if (!seg) { + PMD_DRV_LOG(ERR, "No memory can be allocated"); + return -ENOMEM; + } + + for (i = 0; i < ICE_FLOW_FIELD_IDX_MAX; i++) + field[i] = ICE_FLOW_FIELD_IDX_MAX; + + ice_fdir_input_set_parse(input_set, field); + + ice_fdir_input_set_hdrs(flow, seg, ttype); for (i = 0; field[i] != ICE_FLOW_FIELD_IDX_MAX; i++) { ice_flow_set_fld(seg, field[i], -- 2.25.1
next prev parent reply other threads:[~2020-09-14 3:09 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-08 7:39 [dpdk-dev] [PATCH v1 0/2] refactor and clean FDIR Zhirun Yan 2020-09-08 7:39 ` [dpdk-dev] [PATCH v1 1/2] net/ice: refactor FDIR set conf function Zhirun Yan 2020-09-08 7:39 ` [dpdk-dev] [PATCH v1 2/2] net/ice: merge inner/outer flow seg info for FDIR Zhirun Yan 2020-09-11 5:53 ` Zhang, Qi Z 2020-09-14 3:05 ` [dpdk-dev] [PATCH v1 0/2] refactor and clean FDIR Zhirun Yan 2020-09-14 3:05 ` Zhirun Yan [this message] 2020-09-14 10:54 ` [dpdk-dev] [PATCH v2 1/2] net/ice: refactor FDIR set conf function Ferruh Yigit 2020-09-15 5:30 ` Yan, Zhirun 2020-09-14 3:05 ` [dpdk-dev] [PATCH v2 2/2] net/ice: merge inner/outer flow seg info for FDIR Zhirun Yan 2020-09-14 5:23 ` [dpdk-dev] [PATCH v1 0/2] refactor and clean FDIR Zhang, Qi Z 2020-09-15 5:27 ` [dpdk-dev] [PATCH v3 " Zhirun Yan 2020-09-15 5:27 ` [dpdk-dev] [PATCH v3 1/2] net/ice: refactor FDIR set conf function Zhirun Yan 2020-09-18 9:28 ` Cao, Yahui 2020-09-15 5:27 ` [dpdk-dev] [PATCH v3 2/2] net/ice: merge inner/outer flow seg info for FDIR Zhirun Yan 2020-09-18 9:30 ` Cao, Yahui 2020-09-15 5:38 ` [dpdk-dev] [PATCH v3 0/2] refactor and clean FDIR 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=20200914030530.3077904-2-zhirun.yan@intel.com \ --to=zhirun.yan@intel.com \ --cc=dev@dpdk.org \ --cc=junfeng.guo@intel.com \ --cc=qi.z.zhang@intel.com \ --cc=simei.su@intel.com \ --cc=xiao.w.wang@intel.com \ --cc=yahui.cao@intel.com \ /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
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/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 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git