Replace custom attr checks with a call to common checks. Flow subscription engine supports priority but other engines don't, so we move the attribute checks into the engines.
Signed-off-by: Anatoly Burakov <[email protected]> --- drivers/net/intel/iavf/iavf_fdir.c | 8 ++- drivers/net/intel/iavf/iavf_fsub.c | 20 ++++++- drivers/net/intel/iavf/iavf_generic_flow.c | 67 +++------------------- drivers/net/intel/iavf/iavf_generic_flow.h | 2 +- drivers/net/intel/iavf/iavf_hash.c | 10 ++-- drivers/net/intel/iavf/iavf_ipsec_crypto.c | 8 ++- 6 files changed, 43 insertions(+), 72 deletions(-) diff --git a/drivers/net/intel/iavf/iavf_fdir.c b/drivers/net/intel/iavf/iavf_fdir.c index 9eae874800..7dce5086cf 100644 --- a/drivers/net/intel/iavf/iavf_fdir.c +++ b/drivers/net/intel/iavf/iavf_fdir.c @@ -17,6 +17,7 @@ #include "iavf.h" #include "iavf_generic_flow.h" +#include "../common/flow_check.h" #include "virtchnl.h" #include "iavf_rxtx.h" @@ -1592,7 +1593,7 @@ iavf_fdir_parse(struct iavf_adapter *ad, uint32_t array_len, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], - uint32_t priority, + const struct rte_flow_attr *attr, void **meta, struct rte_flow_error *error) { @@ -1603,8 +1604,9 @@ iavf_fdir_parse(struct iavf_adapter *ad, memset(filter, 0, sizeof(*filter)); - if (priority >= 1) - return -rte_errno; + ret = ci_flow_check_attr(attr, NULL, error); + if (ret) + return ret; item = iavf_search_pattern_match_item(pattern, array, array_len, error); if (!item) diff --git a/drivers/net/intel/iavf/iavf_fsub.c b/drivers/net/intel/iavf/iavf_fsub.c index bfb34695de..010c1d5a44 100644 --- a/drivers/net/intel/iavf/iavf_fsub.c +++ b/drivers/net/intel/iavf/iavf_fsub.c @@ -20,6 +20,7 @@ #include <rte_flow.h> #include <iavf.h> #include "iavf_generic_flow.h" +#include "../common/flow_check.h" #define MAX_QGRP_NUM_TYPE 7 #define IAVF_IPV6_ADDR_LENGTH 16 @@ -725,12 +726,15 @@ iavf_fsub_parse(struct iavf_adapter *ad, uint32_t array_len, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], - uint32_t priority, + const struct rte_flow_attr *attr, void **meta, struct rte_flow_error *error) { struct iavf_fsub_conf *filter; struct iavf_pattern_match_item *pattern_match_item = NULL; + struct ci_flow_attr_check_param attr_param = { + .allow_priority = true, + }; int ret = 0; filter = rte_zmalloc(NULL, sizeof(*filter), 0); @@ -741,6 +745,18 @@ iavf_fsub_parse(struct iavf_adapter *ad, return -ENOMEM; } + ret = ci_flow_check_attr(attr, &attr_param, error); + if (ret) + goto error; + + if (attr->priority > 1) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, + attr, "Only support priority 0 and 1."); + ret = -rte_errno; + goto error; + } + /* search flow subscribe pattern */ pattern_match_item = iavf_search_pattern_match_item(pattern, array, array_len, error); @@ -762,7 +778,7 @@ iavf_fsub_parse(struct iavf_adapter *ad, goto error; /* parse flow subscribe pattern action */ - ret = iavf_fsub_parse_action((void *)ad, actions, priority, + ret = iavf_fsub_parse_action((void *)ad, actions, attr->priority, error, filter); error: diff --git a/drivers/net/intel/iavf/iavf_generic_flow.c b/drivers/net/intel/iavf/iavf_generic_flow.c index 42ecc90d1d..b8f6414b16 100644 --- a/drivers/net/intel/iavf/iavf_generic_flow.c +++ b/drivers/net/intel/iavf/iavf_generic_flow.c @@ -1785,7 +1785,7 @@ enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6_tcp[] = { typedef struct iavf_flow_engine * (*parse_engine_t)(struct iavf_adapter *ad, struct rte_flow *flow, struct iavf_parser_list *parser_list, - uint32_t priority, + const struct rte_flow_attr *attr, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], struct rte_flow_error *error); @@ -1939,45 +1939,6 @@ iavf_unregister_parser(struct iavf_flow_parser *parser, } } -static int -iavf_flow_valid_attr(const struct rte_flow_attr *attr, - struct rte_flow_error *error) -{ - /* Must be input direction */ - if (!attr->ingress) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, - attr, "Only support ingress."); - return -rte_errno; - } - - /* Not supported */ - if (attr->egress) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, - attr, "Not support egress."); - return -rte_errno; - } - - /* support priority for flow subscribe */ - if (attr->priority > 1) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, - attr, "Only support priority 0 and 1."); - return -rte_errno; - } - - /* Not supported */ - if (attr->group) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ATTR_GROUP, - attr, "Not support group."); - return -rte_errno; - } - - return 0; -} - /* Find the first VOID or non-VOID item pointer */ static const struct rte_flow_item * iavf_find_first_item(const struct rte_flow_item *item, bool is_void) @@ -2106,7 +2067,7 @@ static struct iavf_flow_engine * iavf_parse_engine_create(struct iavf_adapter *ad, struct rte_flow *flow, struct iavf_parser_list *parser_list, - uint32_t priority, + const struct rte_flow_attr *attr, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], struct rte_flow_error *error) @@ -2120,7 +2081,7 @@ iavf_parse_engine_create(struct iavf_adapter *ad, if (parser_node->parser->parse_pattern_action(ad, parser_node->parser->array, parser_node->parser->array_len, - pattern, actions, priority, &meta, error) < 0) + pattern, actions, attr, &meta, error) < 0) continue; engine = parser_node->parser->engine; @@ -2136,7 +2097,7 @@ static struct iavf_flow_engine * iavf_parse_engine_validate(struct iavf_adapter *ad, struct rte_flow *flow, struct iavf_parser_list *parser_list, - uint32_t priority, + const struct rte_flow_attr *attr, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], struct rte_flow_error *error) @@ -2150,7 +2111,7 @@ iavf_parse_engine_validate(struct iavf_adapter *ad, if (parser_node->parser->parse_pattern_action(ad, parser_node->parser->array, parser_node->parser->array_len, - pattern, actions, priority, &meta, error) < 0) + pattern, actions, attr, &meta, error) < 0) continue; engine = parser_node->parser->engine; @@ -2182,7 +2143,6 @@ iavf_flow_process_filter(struct rte_eth_dev *dev, parse_engine_t iavf_parse_engine, struct rte_flow_error *error) { - int ret = IAVF_ERR_CONFIG; struct iavf_adapter *ad = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad); @@ -2200,29 +2160,18 @@ iavf_flow_process_filter(struct rte_eth_dev *dev, return -rte_errno; } - if (!attr) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ATTR, - NULL, "NULL attribute."); - return -rte_errno; - } - - ret = iavf_flow_valid_attr(attr, error); - if (ret) - return ret; - *engine = iavf_parse_engine(ad, flow, &vf->rss_parser_list, - attr->priority, pattern, actions, error); + attr, pattern, actions, error); if (*engine) return 0; *engine = iavf_parse_engine(ad, flow, &vf->dist_parser_list, - attr->priority, pattern, actions, error); + attr, pattern, actions, error); if (*engine) return 0; *engine = iavf_parse_engine(ad, flow, &vf->ipsec_crypto_parser_list, - attr->priority, pattern, actions, error); + attr, pattern, actions, error); if (*engine) return 0; diff --git a/drivers/net/intel/iavf/iavf_generic_flow.h b/drivers/net/intel/iavf/iavf_generic_flow.h index b97cf8b7ff..ddc554996d 100644 --- a/drivers/net/intel/iavf/iavf_generic_flow.h +++ b/drivers/net/intel/iavf/iavf_generic_flow.h @@ -471,7 +471,7 @@ typedef int (*parse_pattern_action_t)(struct iavf_adapter *ad, uint32_t array_len, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], - uint32_t priority, + const struct rte_flow_attr *attr, void **meta, struct rte_flow_error *error); diff --git a/drivers/net/intel/iavf/iavf_hash.c b/drivers/net/intel/iavf/iavf_hash.c index d864998402..b569450b82 100644 --- a/drivers/net/intel/iavf/iavf_hash.c +++ b/drivers/net/intel/iavf/iavf_hash.c @@ -23,6 +23,7 @@ #include "iavf.h" #include "iavf_generic_flow.h" #include "iavf_hash.h" +#include "../common/flow_check.h" #define IAVF_PHINT_NONE 0 #define IAVF_PHINT_GTPU BIT_ULL(0) @@ -87,7 +88,7 @@ iavf_hash_parse_pattern_action(struct iavf_adapter *ad, uint32_t array_len, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], - uint32_t priority, + const struct rte_flow_attr *attr, void **meta, struct rte_flow_error *error); @@ -1520,7 +1521,7 @@ iavf_hash_parse_pattern_action(__rte_unused struct iavf_adapter *ad, uint32_t array_len, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], - uint32_t priority, + const struct rte_flow_attr *attr, void **meta, struct rte_flow_error *error) { @@ -1529,8 +1530,9 @@ iavf_hash_parse_pattern_action(__rte_unused struct iavf_adapter *ad, uint64_t phint = IAVF_PHINT_NONE; int ret = 0; - if (priority >= 1) - return -rte_errno; + ret = ci_flow_check_attr(attr, NULL, error); + if (ret) + return ret; rss_meta_ptr = rte_zmalloc(NULL, sizeof(*rss_meta_ptr), 0); if (!rss_meta_ptr) { diff --git a/drivers/net/intel/iavf/iavf_ipsec_crypto.c b/drivers/net/intel/iavf/iavf_ipsec_crypto.c index 1a3004b0fc..5c47b3ac4b 100644 --- a/drivers/net/intel/iavf/iavf_ipsec_crypto.c +++ b/drivers/net/intel/iavf/iavf_ipsec_crypto.c @@ -14,6 +14,7 @@ #include "iavf_rxtx.h" #include "iavf_log.h" #include "iavf_generic_flow.h" +#include "../common/flow_check.h" #include "iavf_ipsec_crypto.h" #include "iavf_ipsec_crypto_capabilities.h" @@ -1883,15 +1884,16 @@ iavf_ipsec_flow_parse(struct iavf_adapter *ad, uint32_t array_len, const struct rte_flow_item pattern[], const struct rte_flow_action actions[], - uint32_t priority, + const struct rte_flow_attr *attr, void **meta, struct rte_flow_error *error) { struct iavf_pattern_match_item *item = NULL; int ret = -1; - if (priority >= 1) - return -rte_errno; + ret = ci_flow_check_attr(attr, NULL, error); + if (ret) + return ret; item = iavf_search_pattern_match_item(pattern, array, array_len, error); if (item && item->meta) { -- 2.47.3
