X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fice%2Fice_generic_flow.c;h=ad103d0e88d0b41cb5f7a16d30b31da0382369af;hb=39395b9d41aff5488db4924df94098abbe4d4e8c;hp=a1648eeb583be782d1c66a1876b30cd767a344f7;hpb=31108c69ba5d55a7f35da1b650998be9a19e13dc;p=dpdk.git diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index a1648eeb58..ad103d0e88 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -1122,12 +1122,25 @@ enum rte_flow_item_type pattern_eth_pppoes[] = { RTE_FLOW_ITEM_TYPE_PPPOES, RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_pppoes_proto[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_PPPOES, + RTE_FLOW_ITEM_TYPE_PPPOE_PROTO_ID, + RTE_FLOW_ITEM_TYPE_END, +}; enum rte_flow_item_type pattern_eth_vlan_pppoes[] = { RTE_FLOW_ITEM_TYPE_ETH, RTE_FLOW_ITEM_TYPE_VLAN, RTE_FLOW_ITEM_TYPE_PPPOES, RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_vlan_pppoes_proto[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_VLAN, + RTE_FLOW_ITEM_TYPE_PPPOES, + RTE_FLOW_ITEM_TYPE_PPPOE_PROTO_ID, + RTE_FLOW_ITEM_TYPE_END, +}; enum rte_flow_item_type pattern_eth_qinq_pppoes[] = { RTE_FLOW_ITEM_TYPE_ETH, RTE_FLOW_ITEM_TYPE_VLAN, @@ -1369,6 +1382,79 @@ enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_icmp6[] = { RTE_FLOW_ITEM_TYPE_ICMP6, RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_ipv4_esp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_ESP, + RTE_FLOW_ITEM_TYPE_END, +}; +enum rte_flow_item_type pattern_eth_ipv6_esp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_ESP, + RTE_FLOW_ITEM_TYPE_END, +}; +enum rte_flow_item_type pattern_eth_ipv4_ah[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_AH, + RTE_FLOW_ITEM_TYPE_END, +}; +enum rte_flow_item_type pattern_eth_ipv6_ah[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_AH, + RTE_FLOW_ITEM_TYPE_END, +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_esp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_ESP, + RTE_FLOW_ITEM_TYPE_END, +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_esp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_ESP, + RTE_FLOW_ITEM_TYPE_END, +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_ah[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_AH, + RTE_FLOW_ITEM_TYPE_END, +}; +enum rte_flow_item_type pattern_eth_ipv4_l2tp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_L2TPV3OIP, + RTE_FLOW_ITEM_TYPE_END, +}; +enum rte_flow_item_type pattern_eth_ipv6_l2tp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_L2TPV3OIP, + RTE_FLOW_ITEM_TYPE_END, +}; +enum rte_flow_item_type pattern_eth_ipv4_pfcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_PFCP, + RTE_FLOW_ITEM_TYPE_END, +}; +enum rte_flow_item_type pattern_eth_ipv6_pfcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_PFCP, + RTE_FLOW_ITEM_TYPE_END, +}; + + typedef struct ice_flow_engine * (*parse_engine_t)(struct ice_adapter *ad, struct rte_flow *flow, @@ -1395,6 +1481,7 @@ ice_flow_init(struct ice_adapter *ad) TAILQ_INIT(&pf->rss_parser_list); TAILQ_INIT(&pf->perm_parser_list); TAILQ_INIT(&pf->dist_parser_list); + rte_spinlock_init(&pf->flow_ops_lock); TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { if (engine->init == NULL) { @@ -1862,19 +1949,24 @@ ice_flow_create(struct rte_eth_dev *dev, return flow; } + rte_spinlock_lock(&pf->flow_ops_lock); + ret = ice_flow_process_filter(dev, flow, attr, pattern, actions, &engine, ice_parse_engine_create, error); - if (ret < 0) - goto free_flow; + if (ret < 0) { + PMD_DRV_LOG(ERR, "Failed to create flow"); + rte_free(flow); + flow = NULL; + goto out; + } + flow->engine = engine; TAILQ_INSERT_TAIL(&pf->flow_list, flow, node); PMD_DRV_LOG(INFO, "Succeeded to create (%d) flow", engine->type); - return flow; -free_flow: - PMD_DRV_LOG(ERR, "Failed to create flow"); - rte_free(flow); - return NULL; +out: + rte_spinlock_unlock(&pf->flow_ops_lock); + return flow; } static int @@ -1894,8 +1986,9 @@ ice_flow_destroy(struct rte_eth_dev *dev, return -rte_errno; } - ret = flow->engine->destroy(ad, flow, error); + rte_spinlock_lock(&pf->flow_ops_lock); + ret = flow->engine->destroy(ad, flow, error); if (!ret) { TAILQ_REMOVE(&pf->flow_list, flow, node); rte_free(flow); @@ -1903,6 +1996,8 @@ ice_flow_destroy(struct rte_eth_dev *dev, PMD_DRV_LOG(ERR, "Failed to destroy flow"); } + rte_spinlock_unlock(&pf->flow_ops_lock); + return ret; } @@ -1937,6 +2032,7 @@ ice_flow_query(struct rte_eth_dev *dev, struct ice_adapter *ad = ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct rte_flow_query_count *count = data; + struct ice_pf *pf = &ad->pf; if (!flow || !flow->engine || !flow->engine->query_count) { rte_flow_error_set(error, EINVAL, @@ -1945,6 +2041,8 @@ ice_flow_query(struct rte_eth_dev *dev, return -rte_errno; } + rte_spinlock_lock(&pf->flow_ops_lock); + for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) { switch (actions->type) { case RTE_FLOW_ACTION_TYPE_VOID: @@ -1959,5 +2057,34 @@ ice_flow_query(struct rte_eth_dev *dev, "action not supported"); } } + + rte_spinlock_unlock(&pf->flow_ops_lock); + return ret; } + +int +ice_flow_redirect(struct ice_adapter *ad, + struct ice_flow_redirect *rd) +{ + struct ice_pf *pf = &ad->pf; + struct rte_flow *p_flow; + void *temp; + int ret; + + rte_spinlock_lock(&pf->flow_ops_lock); + + TAILQ_FOREACH_SAFE(p_flow, &pf->flow_list, node, temp) { + if (!p_flow->engine->redirect) + continue; + ret = p_flow->engine->redirect(ad, p_flow, rd); + if (ret) { + PMD_DRV_LOG(ERR, "Failed to redirect flows"); + return ret; + } + } + + rte_spinlock_unlock(&pf->flow_ops_lock); + + return 0; +}