* [dpdk-stable] [PATCH] net/ixgbe: fix sctp port support limitation @ 2017-07-19 8:39 Qi Zhang 2017-07-19 3:47 ` [dpdk-stable] [dpdk-dev] " Zhao1, Wei 2017-07-20 8:19 ` [dpdk-stable] [PATCH v2] net/ixgbe: " Qi Zhang 0 siblings, 2 replies; 5+ messages in thread From: Qi Zhang @ 2017-07-19 8:39 UTC (permalink / raw) To: wenzhuo.lu; +Cc: dev, Qi Zhang, stable Only x550 family support sctp port in fdir filter, so add this limiation when parse consistent API. Fixes: 11777435c727 ("net/ixgbe: parse flow director filter") Cc: stable@dpdk.org Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> --- drivers/net/ixgbe/ixgbe_flow.c | 107 ++++++++++++++++++++++++----------------- 1 file changed, 64 insertions(+), 43 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c index f70bdb0..4b5697a 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -1375,7 +1375,8 @@ static inline uint8_t signature_match(const struct rte_flow_item pattern[]) * Item->last should be NULL. */ static int -ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr, +ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev, + const struct rte_flow_attr *attr, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], struct ixgbe_fdir_rule *rule, @@ -1398,9 +1399,10 @@ ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr, const struct rte_flow_item_vlan *vlan_mask; const struct rte_flow_item_raw *raw_mask; const struct rte_flow_item_raw *raw_spec; - uint8_t j; + struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + if (!pattern) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM_NUM, @@ -1897,49 +1899,68 @@ ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr, item, "Not supported last point for range"); return -rte_errno; } - /** - * Only care about src & dst ports, - * others should be masked. - */ - if (!item->mask) { - memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, "Not supported by fdir filter"); - return -rte_errno; - } - rule->b_mask = TRUE; - sctp_mask = - (const struct rte_flow_item_sctp *)item->mask; - if (sctp_mask->hdr.tag || - sctp_mask->hdr.cksum) { - memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, "Not supported by fdir filter"); - return -rte_errno; - } - rule->mask.src_port_mask = sctp_mask->hdr.src_port; - rule->mask.dst_port_mask = sctp_mask->hdr.dst_port; - if (item->spec) { - rule->b_spec = TRUE; - sctp_spec = + /* only x550 family support sctp port */ + if (hw->mac.type == ixgbe_mac_X550 || + hw->mac.type == ixgbe_mac_X550EM_x || + hw->mac.type == ixgbe_mac_X550EM_a) { + /** + * Only care about src & dst ports, + * others should be masked. + */ + if (!item->mask) { + memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, "Not supported by fdir filter"); + return -rte_errno; + } + rule->b_mask = TRUE; + sctp_mask = + (const struct rte_flow_item_sctp *)item->mask; + if (sctp_mask->hdr.tag || + sctp_mask->hdr.cksum) { + memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, "Not supported by fdir filter"); + return -rte_errno; + } + rule->mask.src_port_mask = sctp_mask->hdr.src_port; + rule->mask.dst_port_mask = sctp_mask->hdr.dst_port; + + if (item->spec) { + rule->b_spec = TRUE; + sctp_spec = (const struct rte_flow_item_sctp *)item->spec; - rule->ixgbe_fdir.formatted.src_port = - sctp_spec->hdr.src_port; - rule->ixgbe_fdir.formatted.dst_port = - sctp_spec->hdr.dst_port; - } + rule->ixgbe_fdir.formatted.src_port = + sctp_spec->hdr.src_port; + rule->ixgbe_fdir.formatted.dst_port = + sctp_spec->hdr.dst_port; + } - item = next_no_fuzzy_pattern(pattern, item); - if (item->type != RTE_FLOW_ITEM_TYPE_RAW && - item->type != RTE_FLOW_ITEM_TYPE_END) { - memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, "Not supported by fdir filter"); - return -rte_errno; + item = next_no_fuzzy_pattern(pattern, item); + if (item->type != RTE_FLOW_ITEM_TYPE_RAW && + item->type != RTE_FLOW_ITEM_TYPE_END) { + memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, "Not supported by fdir filter"); + return -rte_errno; + } + } else { + /* sctp port is not supported */ + sctp_mask = + (const struct rte_flow_item_sctp *)item->mask; + if (sctp_mask && + (sctp_mask->hdr.src_port || + sctp_mask->hdr.dst_port)) { + memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, "Not supported by fdir filter"); + return -rte_errno; + } } } @@ -2528,7 +2549,7 @@ ixgbe_parse_fdir_filter(struct rte_eth_dev *dev, hw->mac.type != ixgbe_mac_X550EM_a) return -ENOTSUP; - ret = ixgbe_parse_fdir_filter_normal(attr, pattern, + ret = ixgbe_parse_fdir_filter_normal(dev, attr, pattern, actions, rule, error); if (!ret) -- 2.9.4 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-stable] [dpdk-dev] [PATCH] net/ixgbe: fix sctp port support limitation 2017-07-19 8:39 [dpdk-stable] [PATCH] net/ixgbe: fix sctp port support limitation Qi Zhang @ 2017-07-19 3:47 ` Zhao1, Wei 2017-07-19 4:12 ` Zhang, Qi Z 2017-07-20 8:19 ` [dpdk-stable] [PATCH v2] net/ixgbe: " Qi Zhang 1 sibling, 1 reply; 5+ messages in thread From: Zhao1, Wei @ 2017-07-19 3:47 UTC (permalink / raw) To: Zhang, Qi Z, Lu, Wenzhuo; +Cc: dev, Zhang, Qi Z, stable Hi, zhangqi 82599 also support SCTP packet type, you can reference to this patch: http://dpdk.org/dev/patchwork/patch/27012/ > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Qi Zhang > Sent: Wednesday, July 19, 2017 4:39 PM > To: Lu, Wenzhuo <wenzhuo.lu@intel.com> > Cc: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org > Subject: [dpdk-dev] [PATCH] net/ixgbe: fix sctp port support limitation > > Only x550 family support sctp port in fdir filter, so add this limiation when > parse consistent API. > > Fixes: 11777435c727 ("net/ixgbe: parse flow director filter") > Cc: stable@dpdk.org > > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> > --- > drivers/net/ixgbe/ixgbe_flow.c | 107 ++++++++++++++++++++++++--------- > -------- > 1 file changed, 64 insertions(+), 43 deletions(-) > > diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c > index f70bdb0..4b5697a 100644 > --- a/drivers/net/ixgbe/ixgbe_flow.c > +++ b/drivers/net/ixgbe/ixgbe_flow.c > @@ -1375,7 +1375,8 @@ static inline uint8_t signature_match(const struct > rte_flow_item pattern[]) > * Item->last should be NULL. > */ > static int > -ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr, > +ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev, > + const struct rte_flow_attr *attr, > const struct rte_flow_item pattern[], > const struct rte_flow_action actions[], > struct ixgbe_fdir_rule *rule, @@ -1398,9 +1399,10 > @@ ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr, > const struct rte_flow_item_vlan *vlan_mask; > const struct rte_flow_item_raw *raw_mask; > const struct rte_flow_item_raw *raw_spec; > - > uint8_t j; > > + struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data- > >dev_private); > + > if (!pattern) { > rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ITEM_NUM, > @@ -1897,49 +1899,68 @@ ixgbe_parse_fdir_filter_normal(const struct > rte_flow_attr *attr, > item, "Not supported last point for range"); > return -rte_errno; > } > - /** > - * Only care about src & dst ports, > - * others should be masked. > - */ > - if (!item->mask) { > - memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); > - rte_flow_error_set(error, EINVAL, > - RTE_FLOW_ERROR_TYPE_ITEM, > - item, "Not supported by fdir filter"); > - return -rte_errno; > - } > - rule->b_mask = TRUE; > - sctp_mask = > - (const struct rte_flow_item_sctp *)item->mask; > - if (sctp_mask->hdr.tag || > - sctp_mask->hdr.cksum) { > - memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); > - rte_flow_error_set(error, EINVAL, > - RTE_FLOW_ERROR_TYPE_ITEM, > - item, "Not supported by fdir filter"); > - return -rte_errno; > - } > - rule->mask.src_port_mask = sctp_mask->hdr.src_port; > - rule->mask.dst_port_mask = sctp_mask->hdr.dst_port; > > - if (item->spec) { > - rule->b_spec = TRUE; > - sctp_spec = > + /* only x550 family support sctp port */ > + if (hw->mac.type == ixgbe_mac_X550 || > + hw->mac.type == ixgbe_mac_X550EM_x || > + hw->mac.type == ixgbe_mac_X550EM_a) { > + /** > + * Only care about src & dst ports, > + * others should be masked. > + */ > + if (!item->mask) { > + memset(rule, 0, sizeof(struct > ixgbe_fdir_rule)); > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, "Not supported by fdir filter"); > + return -rte_errno; > + } > + rule->b_mask = TRUE; > + sctp_mask = > + (const struct rte_flow_item_sctp *)item- > >mask; > + if (sctp_mask->hdr.tag || > + sctp_mask->hdr.cksum) { > + memset(rule, 0, sizeof(struct > ixgbe_fdir_rule)); > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, "Not supported by fdir filter"); > + return -rte_errno; > + } > + rule->mask.src_port_mask = sctp_mask- > >hdr.src_port; > + rule->mask.dst_port_mask = sctp_mask- > >hdr.dst_port; > + > + if (item->spec) { > + rule->b_spec = TRUE; > + sctp_spec = > (const struct rte_flow_item_sctp *)item- > >spec; > - rule->ixgbe_fdir.formatted.src_port = > - sctp_spec->hdr.src_port; > - rule->ixgbe_fdir.formatted.dst_port = > - sctp_spec->hdr.dst_port; > - } > + rule->ixgbe_fdir.formatted.src_port = > + sctp_spec->hdr.src_port; > + rule->ixgbe_fdir.formatted.dst_port = > + sctp_spec->hdr.dst_port; > + } > > - item = next_no_fuzzy_pattern(pattern, item); > - if (item->type != RTE_FLOW_ITEM_TYPE_RAW && > - item->type != RTE_FLOW_ITEM_TYPE_END) { > - memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); > - rte_flow_error_set(error, EINVAL, > - RTE_FLOW_ERROR_TYPE_ITEM, > - item, "Not supported by fdir filter"); > - return -rte_errno; > + item = next_no_fuzzy_pattern(pattern, item); > + if (item->type != RTE_FLOW_ITEM_TYPE_RAW && > + item->type != RTE_FLOW_ITEM_TYPE_END) { > + memset(rule, 0, sizeof(struct > ixgbe_fdir_rule)); > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, "Not supported by fdir filter"); > + return -rte_errno; > + } > + } else { > + /* sctp port is not supported */ > + sctp_mask = > + (const struct rte_flow_item_sctp *)item- > >mask; > + if (sctp_mask && > + (sctp_mask->hdr.src_port || > + sctp_mask->hdr.dst_port)) { > + memset(rule, 0, sizeof(struct > ixgbe_fdir_rule)); > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, "Not supported by fdir filter"); > + return -rte_errno; > + } > } > } > > @@ -2528,7 +2549,7 @@ ixgbe_parse_fdir_filter(struct rte_eth_dev *dev, > hw->mac.type != ixgbe_mac_X550EM_a) > return -ENOTSUP; > > - ret = ixgbe_parse_fdir_filter_normal(attr, pattern, > + ret = ixgbe_parse_fdir_filter_normal(dev, attr, pattern, > actions, rule, error); > > if (!ret) > -- > 2.9.4 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-stable] [dpdk-dev] [PATCH] net/ixgbe: fix sctp port support limitation 2017-07-19 3:47 ` [dpdk-stable] [dpdk-dev] " Zhao1, Wei @ 2017-07-19 4:12 ` Zhang, Qi Z 0 siblings, 0 replies; 5+ messages in thread From: Zhang, Qi Z @ 2017-07-19 4:12 UTC (permalink / raw) To: Zhao1, Wei, Lu, Wenzhuo; +Cc: dev, stable Ok, will submit v2 and rebase on your patch. > -----Original Message----- > From: Zhao1, Wei > Sent: Wednesday, July 19, 2017 11:48 AM > To: Zhang, Qi Z <qi.z.zhang@intel.com>; Lu, Wenzhuo <wenzhuo.lu@intel.com> > Cc: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org > Subject: RE: [dpdk-dev] [PATCH] net/ixgbe: fix sctp port support limitation > > Hi, zhangqi > 82599 also support SCTP packet type, you can reference to this patch: > http://dpdk.org/dev/patchwork/patch/27012/ > > > -----Original Message----- > > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Qi Zhang > > Sent: Wednesday, July 19, 2017 4:39 PM > > To: Lu, Wenzhuo <wenzhuo.lu@intel.com> > > Cc: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org > > Subject: [dpdk-dev] [PATCH] net/ixgbe: fix sctp port support > > limitation > > > > Only x550 family support sctp port in fdir filter, so add this > > limiation when parse consistent API. > > > > Fixes: 11777435c727 ("net/ixgbe: parse flow director filter") > > Cc: stable@dpdk.org > > > > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> > > --- > > drivers/net/ixgbe/ixgbe_flow.c | 107 > > ++++++++++++++++++++++++--------- > > -------- > > 1 file changed, 64 insertions(+), 43 deletions(-) > > > > diff --git a/drivers/net/ixgbe/ixgbe_flow.c > > b/drivers/net/ixgbe/ixgbe_flow.c index f70bdb0..4b5697a 100644 > > --- a/drivers/net/ixgbe/ixgbe_flow.c > > +++ b/drivers/net/ixgbe/ixgbe_flow.c > > @@ -1375,7 +1375,8 @@ static inline uint8_t signature_match(const > > struct rte_flow_item pattern[]) > > * Item->last should be NULL. > > */ > > static int > > -ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr, > > +ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev, > > + const struct rte_flow_attr *attr, > > const struct rte_flow_item pattern[], > > const struct rte_flow_action actions[], > > struct ixgbe_fdir_rule *rule, @@ -1398,9 +1399,10 > @@ > > ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr, > > const struct rte_flow_item_vlan *vlan_mask; > > const struct rte_flow_item_raw *raw_mask; > > const struct rte_flow_item_raw *raw_spec; > > - > > uint8_t j; > > > > + struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data- > > >dev_private); > > + > > if (!pattern) { > > rte_flow_error_set(error, EINVAL, > > RTE_FLOW_ERROR_TYPE_ITEM_NUM, > > @@ -1897,49 +1899,68 @@ ixgbe_parse_fdir_filter_normal(const struct > > rte_flow_attr *attr, > > item, "Not supported last point for range"); > > return -rte_errno; > > } > > - /** > > - * Only care about src & dst ports, > > - * others should be masked. > > - */ > > - if (!item->mask) { > > - memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); > > - rte_flow_error_set(error, EINVAL, > > - RTE_FLOW_ERROR_TYPE_ITEM, > > - item, "Not supported by fdir filter"); > > - return -rte_errno; > > - } > > - rule->b_mask = TRUE; > > - sctp_mask = > > - (const struct rte_flow_item_sctp *)item->mask; > > - if (sctp_mask->hdr.tag || > > - sctp_mask->hdr.cksum) { > > - memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); > > - rte_flow_error_set(error, EINVAL, > > - RTE_FLOW_ERROR_TYPE_ITEM, > > - item, "Not supported by fdir filter"); > > - return -rte_errno; > > - } > > - rule->mask.src_port_mask = sctp_mask->hdr.src_port; > > - rule->mask.dst_port_mask = sctp_mask->hdr.dst_port; > > > > - if (item->spec) { > > - rule->b_spec = TRUE; > > - sctp_spec = > > + /* only x550 family support sctp port */ > > + if (hw->mac.type == ixgbe_mac_X550 || > > + hw->mac.type == ixgbe_mac_X550EM_x || > > + hw->mac.type == ixgbe_mac_X550EM_a) { > > + /** > > + * Only care about src & dst ports, > > + * others should be masked. > > + */ > > + if (!item->mask) { > > + memset(rule, 0, sizeof(struct > > ixgbe_fdir_rule)); > > + rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ITEM, > > + item, "Not supported by fdir filter"); > > + return -rte_errno; > > + } > > + rule->b_mask = TRUE; > > + sctp_mask = > > + (const struct rte_flow_item_sctp *)item- > > >mask; > > + if (sctp_mask->hdr.tag || > > + sctp_mask->hdr.cksum) { > > + memset(rule, 0, sizeof(struct > > ixgbe_fdir_rule)); > > + rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ITEM, > > + item, "Not supported by fdir filter"); > > + return -rte_errno; > > + } > > + rule->mask.src_port_mask = sctp_mask- > > >hdr.src_port; > > + rule->mask.dst_port_mask = sctp_mask- > > >hdr.dst_port; > > + > > + if (item->spec) { > > + rule->b_spec = TRUE; > > + sctp_spec = > > (const struct rte_flow_item_sctp *)item- > > >spec; > > - rule->ixgbe_fdir.formatted.src_port = > > - sctp_spec->hdr.src_port; > > - rule->ixgbe_fdir.formatted.dst_port = > > - sctp_spec->hdr.dst_port; > > - } > > + rule->ixgbe_fdir.formatted.src_port = > > + sctp_spec->hdr.src_port; > > + rule->ixgbe_fdir.formatted.dst_port = > > + sctp_spec->hdr.dst_port; > > + } > > > > - item = next_no_fuzzy_pattern(pattern, item); > > - if (item->type != RTE_FLOW_ITEM_TYPE_RAW && > > - item->type != RTE_FLOW_ITEM_TYPE_END) { > > - memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); > > - rte_flow_error_set(error, EINVAL, > > - RTE_FLOW_ERROR_TYPE_ITEM, > > - item, "Not supported by fdir filter"); > > - return -rte_errno; > > + item = next_no_fuzzy_pattern(pattern, item); > > + if (item->type != RTE_FLOW_ITEM_TYPE_RAW && > > + item->type != RTE_FLOW_ITEM_TYPE_END) { > > + memset(rule, 0, sizeof(struct > > ixgbe_fdir_rule)); > > + rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ITEM, > > + item, "Not supported by fdir filter"); > > + return -rte_errno; > > + } > > + } else { > > + /* sctp port is not supported */ > > + sctp_mask = > > + (const struct rte_flow_item_sctp *)item- > > >mask; > > + if (sctp_mask && > > + (sctp_mask->hdr.src_port || > > + sctp_mask->hdr.dst_port)) { > > + memset(rule, 0, sizeof(struct > > ixgbe_fdir_rule)); > > + rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_ITEM, > > + item, "Not supported by fdir filter"); > > + return -rte_errno; > > + } > > } > > } > > > > @@ -2528,7 +2549,7 @@ ixgbe_parse_fdir_filter(struct rte_eth_dev *dev, > > hw->mac.type != ixgbe_mac_X550EM_a) > > return -ENOTSUP; > > > > - ret = ixgbe_parse_fdir_filter_normal(attr, pattern, > > + ret = ixgbe_parse_fdir_filter_normal(dev, attr, pattern, > > actions, rule, error); > > > > if (!ret) > > -- > > 2.9.4 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [dpdk-stable] [PATCH v2] net/ixgbe: net/ixgbe: fix sctp port support limitation 2017-07-19 8:39 [dpdk-stable] [PATCH] net/ixgbe: fix sctp port support limitation Qi Zhang 2017-07-19 3:47 ` [dpdk-stable] [dpdk-dev] " Zhao1, Wei @ 2017-07-20 8:19 ` Qi Zhang 2017-07-20 11:12 ` Ferruh Yigit 1 sibling, 1 reply; 5+ messages in thread From: Qi Zhang @ 2017-07-20 8:19 UTC (permalink / raw) To: wenzhuo.lu; +Cc: dev, Qi Zhang, stable Only x550 family support sctp port in fdir filter, so add this limiation when parse consistent API. Fixes: 11777435c727 ("net/ixgbe: parse flow director filter") Cc: stable@dpdk.org Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> --- v2: - rebase to next-net drivers/net/ixgbe/ixgbe_flow.c | 57 ++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c index b34835a..7a5c3f9 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -1387,7 +1387,8 @@ static inline uint8_t signature_match(const struct rte_flow_item pattern[]) * Item->last should be NULL. */ static int -ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr, +ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev, + const struct rte_flow_attr *attr, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], struct ixgbe_fdir_rule *rule, @@ -1410,9 +1411,10 @@ ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr, const struct rte_flow_item_vlan *vlan_mask; const struct rte_flow_item_raw *raw_mask; const struct rte_flow_item_raw *raw_spec; - uint8_t j; + struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + if (!pattern) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM_NUM, @@ -1910,7 +1912,21 @@ ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr, return -rte_errno; } - if (item->mask) { + /* only x550 family only support sctp port */ + if (hw->mac.type == ixgbe_mac_X550 || + hw->mac.type == ixgbe_mac_X550EM_x || + hw->mac.type == ixgbe_mac_X550EM_a) { + /** + * Only care about src & dst ports, + * others should be masked. + */ + if (!item->mask) { + memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, "Not supported by fdir filter"); + return -rte_errno; + } rule->b_mask = TRUE; sctp_mask = (const struct rte_flow_item_sctp *)item->mask; @@ -1924,21 +1940,36 @@ ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr, } rule->mask.src_port_mask = sctp_mask->hdr.src_port; rule->mask.dst_port_mask = sctp_mask->hdr.dst_port; - } - if (item->spec) { - rule->b_spec = TRUE; - sctp_spec = + if (item->spec) { + rule->b_spec = TRUE; + sctp_spec = (const struct rte_flow_item_sctp *)item->spec; - rule->ixgbe_fdir.formatted.src_port = - sctp_spec->hdr.src_port; - rule->ixgbe_fdir.formatted.dst_port = - sctp_spec->hdr.dst_port; + rule->ixgbe_fdir.formatted.src_port = + sctp_spec->hdr.src_port; + rule->ixgbe_fdir.formatted.dst_port = + sctp_spec->hdr.dst_port; + } + /* others even sctp port is not supported */ + } else { + sctp_mask = + (const struct rte_flow_item_sctp *)item->mask; + if (sctp_mask && + (sctp_mask->hdr.src_port || + sctp_mask->hdr.dst_port || + sctp_mask->hdr.tag || + sctp_mask->hdr.cksum)) { + memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, "Not supported by fdir filter"); + return -rte_errno; + } } item = next_no_fuzzy_pattern(pattern, item); if (item->type != RTE_FLOW_ITEM_TYPE_RAW && - item->type != RTE_FLOW_ITEM_TYPE_END) { + item->type != RTE_FLOW_ITEM_TYPE_END) { memset(rule, 0, sizeof(struct ixgbe_fdir_rule)); rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, @@ -2532,7 +2563,7 @@ ixgbe_parse_fdir_filter(struct rte_eth_dev *dev, hw->mac.type != ixgbe_mac_X550EM_a) return -ENOTSUP; - ret = ixgbe_parse_fdir_filter_normal(attr, pattern, + ret = ixgbe_parse_fdir_filter_normal(dev, attr, pattern, actions, rule, error); if (!ret) -- 2.9.4 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-stable] [PATCH v2] net/ixgbe: net/ixgbe: fix sctp port support limitation 2017-07-20 8:19 ` [dpdk-stable] [PATCH v2] net/ixgbe: " Qi Zhang @ 2017-07-20 11:12 ` Ferruh Yigit 0 siblings, 0 replies; 5+ messages in thread From: Ferruh Yigit @ 2017-07-20 11:12 UTC (permalink / raw) To: Qi Zhang, wenzhuo.lu; +Cc: dev, stable On 7/20/2017 9:19 AM, Qi Zhang wrote: > Only x550 family support sctp port in fdir filter, so > add this limiation when parse consistent API. > > Fixes: 11777435c727 ("net/ixgbe: parse flow director filter") > Cc: stable@dpdk.org > > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> Applied to dpdk-next-net/master, thanks. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-07-20 11:12 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-07-19 8:39 [dpdk-stable] [PATCH] net/ixgbe: fix sctp port support limitation Qi Zhang 2017-07-19 3:47 ` [dpdk-stable] [dpdk-dev] " Zhao1, Wei 2017-07-19 4:12 ` Zhang, Qi Z 2017-07-20 8:19 ` [dpdk-stable] [PATCH v2] net/ixgbe: " Qi Zhang 2017-07-20 11:12 ` Ferruh Yigit
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).