On 6/11/2020 9:43 AM, Qi Zhang wrote:
> This patch add support to get tunnel type of recipe
> after get recipe from fw. This will fix the issue in
> function ice_find_recp() for tunnel type comparing.
>
> Signed-off-by: Wei Zhao <wei.zh...@intel.com>
> Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell...@intel.com>
> Signed-off-by: Qi Zhang <qi.z.zh...@intel.com>
<...>
> /**
> + * ice_get_tun_type_for_recipe - get tunnel type for the recipe
> + * @rid: recipe ID that we are populating
> + */
> +static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid)
> +{
> + u8 vxlan_profile[12] = {10, 11, 12, 16, 17, 18, 22, 23, 24, 25, 26, 27};
> + u8 gre_profile[12] = {13, 14, 15, 19, 20, 21, 28, 29, 30, 31, 32, 33};
> + u8 pppoe_profile[7] = {34, 35, 36, 37, 38, 39, 40};
> + u8 non_tun_profile[6] = {4, 5, 6, 7, 8, 9};
> + enum ice_sw_tunnel_type tun_type;
> + u16 i, j, profile_num = 0;
> + bool non_tun_valid = false;
> + bool pppoe_valid = false;
> + bool vxlan_valid = false;
> + bool gre_valid = false;
> + bool gtp_valid = false;
> + bool flag_valid = false;
> +
> + for (j = 0; j < ICE_MAX_NUM_PROFILES; j++) {
> + if (!ice_is_bit_set(recipe_to_profile[rid], j))
> + continue;
> + else
> + profile_num++;
> +
> + for (i = 0; i < 12; i++) {
> + if (gre_profile[i] == j)
> + gre_valid = true;
> + }
> +
> + for (i = 0; i < 12; i++) {
> + if (vxlan_profile[i] == j)
> + vxlan_valid = true;
> + }
> +
> + for (i = 0; i < 7; i++) {
> + if (pppoe_profile[i] == j)
> + pppoe_valid = true;
> + }
> +
> + for (i = 0; i < 6; i++) {
> + if (non_tun_profile[i] == j)
> + non_tun_valid = true;
> + }
> +
> + if (j >= ICE_PROFID_IPV4_GTPC_TEID &&
> + j <= ICE_PROFID_IPV6_GTPU_IPV6_OTHER)
> + gtp_valid = true;
> +
> + if (j >= ICE_PROFID_IPV4_ESP &&
> + j <= ICE_PROFID_IPV6_PFCP_SESSION)
> + flag_valid = true;
> + }
> +
> + if (!non_tun_valid && vxlan_valid)
> + tun_type = ICE_SW_TUN_VXLAN;
> + else if (!non_tun_valid && gre_valid)
> + tun_type = ICE_SW_TUN_NVGRE;
> + else if (!non_tun_valid && pppoe_valid)
> + tun_type = ICE_SW_TUN_PPPOE;
> + else if (!non_tun_valid && gtp_valid)
> + tun_type = ICE_SW_TUN_GTP;
> + else if ((non_tun_valid && vxlan_valid) ||
> + (non_tun_valid && gre_valid) ||
> + (non_tun_valid && gtp_valid) ||
> + (non_tun_valid && pppoe_valid))
> + tun_type = ICE_SW_TUN_AND_NON_TUN;
> + else if ((non_tun_valid && !vxlan_valid) ||
> + (non_tun_valid && !gre_valid) ||
> + (non_tun_valid && !gtp_valid) ||
> + (non_tun_valid && !pppoe_valid))
> + tun_type = ICE_NON_TUN;
> +
> + if (profile_num > 1 && tun_type == ICE_SW_TUN_PPPOE) {
This is giving 'tun_type' may be used uninitialized warning [1], fixing it
setting a default value [2] while merging.
[1]
.../dpdk/drivers/net/ice/base/ice_switch.c: In function ‘ice_find_recp’:
.../dpdk/drivers/net/ice/base/ice_switch.c:1100:22: error: ‘tun_type’ may be
used uninitialized in this function [-Werror=maybe-uninitialized]
1100 | if (profile_num > 1 && tun_type == ICE_SW_TUN_PPPOE) {
| ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.../dpdk/drivers/net/ice/base/ice_switch.c:1037:26: note: ‘tun_type’ was
declared here
1037 | enum ice_sw_tunnel_type tun_type;
| ^~~~~~~~
[2]
- enum ice_sw_tunnel_type tun_type;
+ enum ice_sw_tunnel_type tun_type = ICE_NON_TUN;
