| Message ID | 20201201083207.70668-1-yuying.zhang@intel.com |
|---|---|
| State | Superseded |
| Delegated to: | Qi Zhang |
| Headers | show |
| Series |
|
| Related | show |
| Context | Check | Description |
|---|---|---|
| ci/iol-mellanox-Performance | success | Performance Testing PASS |
| ci/travis-robot | success | Travis build: passed |
| ci/iol-intel-Performance | success | Performance Testing PASS |
| ci/Intel-compilation | success | Compilation OK |
| ci/iol-intel-Functional | success | Functional Testing PASS |
| ci/iol-testing | success | Testing PASS |
| ci/iol-broadcom-Functional | success | Functional Testing PASS |
| ci/iol-broadcom-Performance | success | Performance Testing PASS |
| ci/checkpatch | success | coding style OK |
> -----Original Message----- > From: Zhang, Yuying <yuying.zhang@intel.com> > Sent: Tuesday, December 1, 2020 4:32 PM > To: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>; Wu, Jingjing > <jingjing.wu@intel.com> > Cc: Zhang, Yuying <yuying.zhang@intel.com> > Subject: [PATCH v1] net/iavf: support FDIR TCP/UDP pattern without input set > > This patch adds an input set refinement function to support outer and inner > TCP/UDP patterns without input set for flow director filter. > > Signed-off-by: Yuying Zhang <yuying.zhang@intel.com> Acked-by: Qi Zhang <qi.z.zhang@intel.com> Applied to dpdk-next-net-intel. Thanks Qi
On 12/1/2020 8:32 AM, Yuying Zhang wrote: > This patch adds an input set refinement function to support outer > and inner TCP/UDP patterns without input set for flow director filter. > Can you please describe more what is supported now, it can be even better to give same samples which patter is supported now, which was not supported before? > Signed-off-by: Yuying Zhang <yuying.zhang@intel.com> > --- > drivers/net/iavf/iavf_fdir.c | 67 ++++++++++++++++++++++++++++++------ > 1 file changed, 56 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c > index 7054bde0b..2c57313e4 100644 > --- a/drivers/net/iavf/iavf_fdir.c > +++ b/drivers/net/iavf/iavf_fdir.c > @@ -448,9 +448,56 @@ iavf_fdir_parse_action(struct iavf_adapter *ad, > return 0; > } > > +static int > +iavf_fdir_refine_input_set(const uint64_t input_set, > + const uint64_t input_set_mask, > + struct iavf_fdir_conf *filter) > +{ > + struct virtchnl_proto_hdr *hdr, *hdr_last; > + struct rte_flow_item_ipv4 ipv4_spec; > + struct rte_flow_item_ipv6 ipv6_spec; > + int last_layer; > + uint8_t proto_id; > + > + if (input_set & ~input_set_mask) > + return -rte_errno; What is the value of the 'rte_errno' at this stage, why returning it instead of setting it? > + else if (input_set) > + return 0; > + > + last_layer = filter->add_fltr.rule_cfg.proto_hdrs.count - 1; > + hdr_last = &filter->add_fltr.rule_cfg.proto_hdrs.proto_hdr[last_layer]; > + if (hdr_last->type == VIRTCHNL_PROTO_HDR_TCP) > + proto_id = 6; > + else if (hdr_last->type == VIRTCHNL_PROTO_HDR_UDP) > + proto_id = 17; > + else > + return -rte_errno; > + > + hdr = &filter->add_fltr.rule_cfg.proto_hdrs.proto_hdr[last_layer - 1]; Do we know here that 'last_layer' > 0 ? > + switch (hdr->type) { > + case VIRTCHNL_PROTO_HDR_IPV4: > + VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4, PROT); > + memset(&ipv4_spec, 0, sizeof(ipv4_spec)); > + ipv4_spec.hdr.next_proto_id = proto_id; > + rte_memcpy(hdr->buffer, &ipv4_spec.hdr, > + sizeof(ipv4_spec.hdr)); > + return 0; > + case VIRTCHNL_PROTO_HDR_IPV6: > + VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6, PROT); > + memset(&ipv6_spec, 0, sizeof(ipv6_spec)); > + ipv6_spec.hdr.proto = proto_id; > + rte_memcpy(hdr->buffer, &ipv6_spec.hdr, > + sizeof(ipv6_spec.hdr)); > + return 0; > + default: > + return -rte_errno; > + } > +} > + <...>
diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c index 7054bde0b..2c57313e4 100644 --- a/drivers/net/iavf/iavf_fdir.c +++ b/drivers/net/iavf/iavf_fdir.c @@ -448,9 +448,56 @@ iavf_fdir_parse_action(struct iavf_adapter *ad, return 0; } +static int +iavf_fdir_refine_input_set(const uint64_t input_set, + const uint64_t input_set_mask, + struct iavf_fdir_conf *filter) +{ + struct virtchnl_proto_hdr *hdr, *hdr_last; + struct rte_flow_item_ipv4 ipv4_spec; + struct rte_flow_item_ipv6 ipv6_spec; + int last_layer; + uint8_t proto_id; + + if (input_set & ~input_set_mask) + return -rte_errno; + else if (input_set) + return 0; + + last_layer = filter->add_fltr.rule_cfg.proto_hdrs.count - 1; + hdr_last = &filter->add_fltr.rule_cfg.proto_hdrs.proto_hdr[last_layer]; + if (hdr_last->type == VIRTCHNL_PROTO_HDR_TCP) + proto_id = 6; + else if (hdr_last->type == VIRTCHNL_PROTO_HDR_UDP) + proto_id = 17; + else + return -rte_errno; + + hdr = &filter->add_fltr.rule_cfg.proto_hdrs.proto_hdr[last_layer - 1]; + switch (hdr->type) { + case VIRTCHNL_PROTO_HDR_IPV4: + VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4, PROT); + memset(&ipv4_spec, 0, sizeof(ipv4_spec)); + ipv4_spec.hdr.next_proto_id = proto_id; + rte_memcpy(hdr->buffer, &ipv4_spec.hdr, + sizeof(ipv4_spec.hdr)); + return 0; + case VIRTCHNL_PROTO_HDR_IPV6: + VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6, PROT); + memset(&ipv6_spec, 0, sizeof(ipv6_spec)); + ipv6_spec.hdr.proto = proto_id; + rte_memcpy(hdr->buffer, &ipv6_spec.hdr, + sizeof(ipv6_spec.hdr)); + return 0; + default: + return -rte_errno; + } +} + static int iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, const struct rte_flow_item pattern[], + const uint64_t input_set_mask, struct rte_flow_error *error, struct iavf_fdir_conf *filter) { @@ -924,6 +971,13 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, return -rte_errno; } + if (iavf_fdir_refine_input_set(input_set, input_set_mask, filter)) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM_SPEC, pattern, + "Invalid input set"); + return -rte_errno; + } + filter->input_set = input_set; return 0; @@ -941,7 +995,6 @@ iavf_fdir_parse(struct iavf_adapter *ad, struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad); struct iavf_fdir_conf *filter = &vf->fdir.conf; struct iavf_pattern_match_item *item = NULL; - uint64_t input_set; int ret; memset(filter, 0, sizeof(*filter)); @@ -950,19 +1003,11 @@ iavf_fdir_parse(struct iavf_adapter *ad, if (!item) return -rte_errno; - ret = iavf_fdir_parse_pattern(ad, pattern, error, filter); + ret = iavf_fdir_parse_pattern(ad, pattern, item->input_set_mask, + error, filter); if (ret) goto error; - input_set = filter->input_set; - if (!input_set || input_set & ~item->input_set_mask) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM_SPEC, pattern, - "Invalid input set"); - ret = -rte_errno; - goto error; - } - ret = iavf_fdir_parse_action(ad, actions, error, filter); if (ret) goto error;
This patch adds an input set refinement function to support outer and inner TCP/UDP patterns without input set for flow director filter. Signed-off-by: Yuying Zhang <yuying.zhang@intel.com> --- drivers/net/iavf/iavf_fdir.c | 67 ++++++++++++++++++++++++++++++------ 1 file changed, 56 insertions(+), 11 deletions(-)