Currently, the tunnel "set" function is using rte_zmalloc to allocate a temporary variable. It is actually not needed in this context and can be avoided entirely and replaced with stack allocation.
Signed-off-by: Anatoly Burakov <[email protected]> --- drivers/net/intel/i40e/i40e_ethdev.c | 124 ++++++++++++--------------- 1 file changed, 53 insertions(+), 71 deletions(-) diff --git a/drivers/net/intel/i40e/i40e_ethdev.c b/drivers/net/intel/i40e/i40e_ethdev.c index c8153f3351..f327a3927f 100644 --- a/drivers/net/intel/i40e/i40e_ethdev.c +++ b/drivers/net/intel/i40e/i40e_ethdev.c @@ -8511,38 +8511,27 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, struct i40e_pf_vf *vf = NULL; struct i40e_hw *hw = I40E_PF_TO_HW(pf); struct i40e_vsi *vsi; - struct i40e_aqc_cloud_filters_element_bb *cld_filter; - struct i40e_aqc_cloud_filters_element_bb *pfilter; + struct i40e_aqc_cloud_filters_element_bb cld_filter = {0}; struct i40e_tunnel_rule *tunnel_rule = &pf->tunnel; - struct i40e_tunnel_filter *tunnel, *node; + struct i40e_tunnel_filter *node; struct i40e_tunnel_filter check_filter; /* Check if filter exists */ uint32_t teid_le; bool big_buffer = 0; - cld_filter = rte_zmalloc("tunnel_filter", - sizeof(struct i40e_aqc_add_rm_cloud_filt_elem_ext), - 0); - - if (cld_filter == NULL) { - PMD_DRV_LOG(ERR, "Failed to alloc memory."); - return -ENOMEM; - } - pfilter = cld_filter; - rte_ether_addr_copy(&tunnel_filter->outer_mac, - (struct rte_ether_addr *)&pfilter->element.outer_mac); + (struct rte_ether_addr *)&cld_filter.element.outer_mac); rte_ether_addr_copy(&tunnel_filter->inner_mac, - (struct rte_ether_addr *)&pfilter->element.inner_mac); + (struct rte_ether_addr *)&cld_filter.element.inner_mac); - pfilter->element.inner_vlan = + cld_filter.element.inner_vlan = rte_cpu_to_le_16(tunnel_filter->inner_vlan); if (tunnel_filter->ip_type == I40E_TUNNEL_IPTYPE_IPV4) { ip_type = I40E_AQC_ADD_CLOUD_FLAGS_IPV4; ipv4_addr = rte_be_to_cpu_32(tunnel_filter->ip_addr.ipv4_addr); ipv4_addr_le = rte_cpu_to_le_32(ipv4_addr); - rte_memcpy(&pfilter->element.ipaddr.v4.data, + rte_memcpy(&cld_filter.element.ipaddr.v4.data, &ipv4_addr_le, - sizeof(pfilter->element.ipaddr.v4.data)); + sizeof(cld_filter.element.ipaddr.v4.data)); } else { ip_type = I40E_AQC_ADD_CLOUD_FLAGS_IPV6; for (i = 0; i < 4; i++) { @@ -8550,9 +8539,9 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, rte_cpu_to_le_32(rte_be_to_cpu_32( tunnel_filter->ip_addr.ipv6_addr[i])); } - rte_memcpy(&pfilter->element.ipaddr.v6.data, + rte_memcpy(&cld_filter.element.ipaddr.v6.data, &convert_ipv6, - sizeof(pfilter->element.ipaddr.v6.data)); + sizeof(cld_filter.element.ipaddr.v6.data)); } /* check tunneled type */ @@ -8573,11 +8562,11 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, pf->mpls_replace_flag = 1; } teid_le = rte_cpu_to_le_32(tunnel_filter->tenant_id); - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0] = teid_le >> 4; - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1] = (teid_le & 0xF) << 12; - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2] = 0x40; big_buffer = 1; tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_MPLSOUDP; @@ -8589,11 +8578,11 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, pf->mpls_replace_flag = 1; } teid_le = rte_cpu_to_le_32(tunnel_filter->tenant_id); - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0] = teid_le >> 4; - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1] = (teid_le & 0xF) << 12; - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2] = 0x0; big_buffer = 1; tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_MPLSOGRE; @@ -8605,11 +8594,11 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, pf->gtp_replace_flag = 1; } teid_le = rte_cpu_to_le_32(tunnel_filter->tenant_id); - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD0] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD0] = (teid_le >> 16) & 0xFFFF; - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD1] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD1] = teid_le & 0xFFFF; - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD2] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD2] = 0x0; big_buffer = 1; break; @@ -8620,11 +8609,11 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, pf->gtp_replace_flag = 1; } teid_le = rte_cpu_to_le_32(tunnel_filter->tenant_id); - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD0] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD0] = (teid_le >> 16) & 0xFFFF; - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD1] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD1] = teid_le & 0xFFFF; - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD2] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD2] = 0x0; big_buffer = 1; break; @@ -8641,8 +8630,8 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, * Big Buffer should be set, see changes in * i40e_aq_add_cloud_filters */ - pfilter->general_fields[0] = tunnel_filter->inner_vlan; - pfilter->general_fields[1] = tunnel_filter->outer_vlan; + cld_filter.general_fields[0] = tunnel_filter->inner_vlan; + cld_filter.general_fields[1] = tunnel_filter->outer_vlan; big_buffer = 1; break; case I40E_CLOUD_TYPE_UDP: @@ -8657,20 +8646,20 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, pf->sport_replace_flag = 1; } teid_le = rte_cpu_to_le_32(tunnel_filter->tenant_id); - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0] = I40E_DIRECTION_INGRESS_KEY; if (tunnel_filter->tunnel_type == I40E_CLOUD_TYPE_UDP) - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1] = I40E_TR_L4_TYPE_UDP; else if (tunnel_filter->tunnel_type == I40E_CLOUD_TYPE_TCP) - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1] = I40E_TR_L4_TYPE_TCP; else - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1] = I40E_TR_L4_TYPE_SCTP; - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2] = (teid_le >> 16) & 0xFFFF; big_buffer = 1; } else { @@ -8682,20 +8671,20 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, pf->dport_replace_flag = 1; } teid_le = rte_cpu_to_le_32(tunnel_filter->tenant_id); - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD0] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD0] = I40E_DIRECTION_INGRESS_KEY; if (tunnel_filter->tunnel_type == I40E_CLOUD_TYPE_UDP) - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD1] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD1] = I40E_TR_L4_TYPE_UDP; else if (tunnel_filter->tunnel_type == I40E_CLOUD_TYPE_TCP) - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD1] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD1] = I40E_TR_L4_TYPE_TCP; else - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD1] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD1] = I40E_TR_L4_TYPE_SCTP; - pfilter->general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD2] = + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD2] = (teid_le >> 16) & 0xFFFF; big_buffer = 1; } @@ -8704,48 +8693,46 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, default: /* Other tunnel types is not supported. */ PMD_DRV_LOG(ERR, "tunnel type is not supported."); - rte_free(cld_filter); return -EINVAL; } if (tunnel_filter->tunnel_type == I40E_TUNNEL_TYPE_MPLSoUDP) - pfilter->element.flags = + cld_filter.element.flags = I40E_AQC_ADD_CLOUD_FILTER_0X11; else if (tunnel_filter->tunnel_type == I40E_TUNNEL_TYPE_MPLSoGRE) - pfilter->element.flags = + cld_filter.element.flags = I40E_AQC_ADD_CLOUD_FILTER_0X12; else if (tunnel_filter->tunnel_type == I40E_TUNNEL_TYPE_GTPC) - pfilter->element.flags = + cld_filter.element.flags = I40E_AQC_ADD_CLOUD_FILTER_0X11; else if (tunnel_filter->tunnel_type == I40E_TUNNEL_TYPE_GTPU) - pfilter->element.flags = + cld_filter.element.flags = I40E_AQC_ADD_CLOUD_FILTER_0X12; else if (tunnel_filter->tunnel_type == I40E_TUNNEL_TYPE_QINQ) - pfilter->element.flags |= + cld_filter.element.flags |= I40E_AQC_ADD_CLOUD_FILTER_0X10; else if (tunnel_filter->tunnel_type == I40E_CLOUD_TYPE_UDP || tunnel_filter->tunnel_type == I40E_CLOUD_TYPE_TCP || tunnel_filter->tunnel_type == I40E_CLOUD_TYPE_SCTP) { if (tunnel_filter->l4_port_type == I40E_L4_PORT_TYPE_SRC) - pfilter->element.flags |= + cld_filter.element.flags |= I40E_AQC_ADD_CLOUD_FILTER_0X11; else - pfilter->element.flags |= + cld_filter.element.flags |= I40E_AQC_ADD_CLOUD_FILTER_0X10; } else { val = i40e_dev_get_filter_type(tunnel_filter->filter_type, - &pfilter->element.flags); + &cld_filter.element.flags); if (val < 0) { - rte_free(cld_filter); return -EINVAL; } } - pfilter->element.flags |= rte_cpu_to_le_16( - I40E_AQC_ADD_CLOUD_FLAGS_TO_QUEUE | - ip_type | (tun_type << I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT)); - pfilter->element.tenant_id = rte_cpu_to_le_32(tunnel_filter->tenant_id); - pfilter->element.queue_number = + cld_filter.element.flags |= + rte_cpu_to_le_16(I40E_AQC_ADD_CLOUD_FLAGS_TO_QUEUE | ip_type | + (tun_type << I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT)); + cld_filter.element.tenant_id = rte_cpu_to_le_32(tunnel_filter->tenant_id); + cld_filter.element.queue_number = rte_cpu_to_le_16(tunnel_filter->queue_id); if (!tunnel_filter->is_to_vf) @@ -8753,7 +8740,6 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, else { if (tunnel_filter->vf_id >= pf->vf_num) { PMD_DRV_LOG(ERR, "Invalid argument."); - rte_free(cld_filter); return -EINVAL; } vf = &pf->vfs[tunnel_filter->vf_id]; @@ -8762,38 +8748,36 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, /* Check if there is the filter in SW list */ memset(&check_filter, 0, sizeof(check_filter)); - i40e_tunnel_filter_convert(cld_filter, &check_filter); + i40e_tunnel_filter_convert(&cld_filter, &check_filter); check_filter.is_to_vf = tunnel_filter->is_to_vf; check_filter.vf_id = tunnel_filter->vf_id; node = i40e_sw_tunnel_filter_lookup(tunnel_rule, &check_filter.input); if (add && node) { PMD_DRV_LOG(ERR, "Conflict with existing tunnel rules!"); - rte_free(cld_filter); return -EINVAL; } if (!add && !node) { PMD_DRV_LOG(ERR, "There's no corresponding tunnel filter!"); - rte_free(cld_filter); return -EINVAL; } if (add) { + struct i40e_tunnel_filter *tunnel; + if (big_buffer) ret = i40e_aq_add_cloud_filters_bb(hw, - vsi->seid, cld_filter, 1); + vsi->seid, &cld_filter, 1); else ret = i40e_aq_add_cloud_filters(hw, - vsi->seid, &cld_filter->element, 1); + vsi->seid, &cld_filter.element, 1); if (ret < 0) { PMD_DRV_LOG(ERR, "Failed to add a tunnel filter."); - rte_free(cld_filter); return -ENOTSUP; } tunnel = rte_zmalloc("tunnel_filter", sizeof(*tunnel), 0); if (tunnel == NULL) { PMD_DRV_LOG(ERR, "Failed to alloc memory."); - rte_free(cld_filter); return -ENOMEM; } @@ -8804,19 +8788,17 @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, } else { if (big_buffer) ret = i40e_aq_rem_cloud_filters_bb( - hw, vsi->seid, cld_filter, 1); + hw, vsi->seid, &cld_filter, 1); else ret = i40e_aq_rem_cloud_filters(hw, vsi->seid, - &cld_filter->element, 1); + &cld_filter.element, 1); if (ret < 0) { PMD_DRV_LOG(ERR, "Failed to delete a tunnel filter."); - rte_free(cld_filter); return -ENOTSUP; } ret = i40e_sw_tunnel_filter_del(pf, &node->input); } - rte_free(cld_filter); return ret; } -- 2.47.3
